Skip to content

Commit

Permalink
Merge pull request #2 from ppmpreetham/master
Browse files Browse the repository at this point in the history
feat: changed urls and added lugvitc theme
  • Loading branch information
ThEditor authored Sep 3, 2024
2 parents 96503d2 + 266c634 commit 015527c
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 27 deletions.
2 changes: 1 addition & 1 deletion frontend/src/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ <h1 class="text">
<load src="html/pages/404.html" />
</main>
</div>
<link rel="stylesheet" href="/themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="/themes/lugvitc.css" id="currentTheme" />
</body>
</html>
2 changes: 1 addition & 1 deletion frontend/src/email-handler.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Email Handler | Monkeytype</title>
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.min.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/html/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class="text">support</div>
</button>
<a
href="https://github.com/monkeytypegame/monkeytype"
href="https://github.com/lugvitc/lugtype"
class="textButton"
target="_blank"
rel="noreferrer noopener"
Expand All @@ -47,7 +47,7 @@
<div class="text">discord</div>
</a>
<a
href="https://x.com/monkeytype"
href="https://x.com/lugvitc"
class="textButton"
target="_blank"
rel="noreferrer noopener"
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/html/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</script>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Monkeytype | A minimalistic, customizable typing test</title>
<title>Lugtype | A minimalistic, customizable typing test</title>
<!-- default colors in case theme file fails to load -->
<style>
:root {
Expand Down Expand Up @@ -69,7 +69,7 @@
property="og:title"
content="Monkeytype | A minimalistic, customizable typing test"
/>
<meta property="og:url" content="https://monkeytype.com/" />
<meta property="og:url" content="https://type.lugvitc.net/" />
<meta property="og:type" content="website" />
<meta
property="og:image"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
async
defer
></script>
<link rel="stylesheet" href="/themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="/themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link rel="stylesheet" href="" id="globalFunBoxTheme" type="text/css" />
<script type="module" src="ts/index.ts"></script>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/privacy-policy.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Privacy Policy | Monkeytype</title>
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.min.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/security-policy.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Security Policy | Monkeytype</title>
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.min.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/terms-of-service.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Terms of Service | Monkeytype</title>
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.min.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down
18 changes: 9 additions & 9 deletions frontend/src/ts/constants/default-config.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import { Config } from "@monkeytype/shared-types/config";

export default {
theme: "serika_dark",
theme: "lugvitc",
themeLight: "serika",
themeDark: "serika_dark",
themeDark: "lugvitc",
autoSwitchTheme: false,
customTheme: false,
customThemeColors: [
"#323437",
"#e2b714",
"#e2b714",
"#646669",
"#2c2e31",
"#d1d0c5",
"#0c0d11",
"#0c0d11",
"#7ebab5",
"#546e7a",
"#171a25",
"#aed581",
"#ca4754",
"#7e2a33",
"#ca4754",
"#7e2a33",
],
favThemes: [],
favThemes: ["lugvitc"],
showKeyTips: true,
smoothCaret: "medium",
quickRestart: "off",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/ts/controllers/theme-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export async function loadStyle(name: string): Promise<void> {
resolve();
};
if (name === "custom") {
link.href = `/themes/serika_dark.css`;
link.href = `/themes/lugvitc.css`;
} else {
link.href = `/themes/${name}.css`;
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/ts/ready.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $((): void => {
window.localStorage.getItem("merchbannerclosed") === "true";
if (!merchBannerClosed) {
Notifications.addBanner(
`Check out our merchandise, available at <a target="_blank" rel="noopener" href="https://monkeytype.store/">monkeytype.store</a>`,
`Check out our GitHub, available at <a target="_blank" rel="noopener" href="https://github.com/lugvitc">github.com/lugvitc</a>`,
1,
"./images/merch2.png",
false,
Expand Down
12 changes: 6 additions & 6 deletions frontend/static/challenges/sourcecode.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3790,7 +3790,7 @@ backend/anticheat
/>
<link rel="stylesheet" href="css/balloon.css" />
<link rel="stylesheet" href="css/style.css?v=1" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="/images/favicon/favicon.ico" />
<link
Expand Down Expand Up @@ -8497,7 +8497,7 @@ backend/anticheat
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.css" />
<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down Expand Up @@ -9058,7 +9058,7 @@ letter {
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.css" />
<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down Expand Up @@ -9436,7 +9436,7 @@ letter {
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.css" />
<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down Expand Up @@ -9813,7 +9813,7 @@ Disallow:
<!-- <link rel="stylesheet" href="css/fa.css" /> -->
<link rel="stylesheet" href="css/balloon.css" />
<link rel="stylesheet" href="css/style.css" />
<link rel="stylesheet" href="themes/serika_dark.css" id="currentTheme" />
<link rel="stylesheet" href="themes/lugvitc.css" id="currentTheme" />
<link rel="stylesheet" href="" id="funBoxTheme" />
<link id="favicon" rel="shortcut icon" href="images/fav.png" />
<link rel="shortcut icon" href="images/fav.png" />
Expand Down Expand Up @@ -11098,7 +11098,7 @@ a:hover,
--colorful-error-extra-color: #7e2a33;
}

==> ./monkeytype/static/themes/serika_dark.css <==
==> ./monkeytype/static/themes/lugvitc.css <==
:root {
--bg-color: #323437;
--main-color: #e2b714;
Expand Down
8 changes: 8 additions & 0 deletions frontend/static/themes/_list.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
{
"name": "lugvitc",
"bgColor": "#0c0d11",
"mainColor": "#7ebab5",
"subColor": "#546e7a",
"textColor": "#aed581"
},

{
"name": "dark_note",
"bgColor": "#1f1f1f",
Expand Down
12 changes: 12 additions & 0 deletions frontend/static/themes/lugvitc.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
:root {
--bg-color: #0c0d11;
--main-color: #7ebab5;
--caret-color: #ffffff;
--sub-color: #546e7a;
--sub-alt-color: #171a25;
--text-color: #aed581;
--error-color: #ff4754;
--error-extra-color: #b02a33;
--colorful-error-color: #ff4754;
--colorful-error-extra-color: #b02a33;
}

0 comments on commit 015527c

Please sign in to comment.