Skip to content

Commit f91d749

Browse files
DemetoryDemetory
authored
Merge pull request #1 from Demetory/develop
Refactor
2 parents 831d6dc + 601b0b9 commit f91d749

39 files changed

+648
-426
lines changed

‎.prettierrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"printWidth": 120
2+
"printWidth": 120,
3+
"endOfLine": "lf"
34
}

‎LICENSE

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright (c) 2012-now Demetory
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<body>
3838
<!--noindex-->
3939
<noscript>
40-
<img src="/images/fatality.svg" />
40+
<img alt="Fatality" src="/images/fatality.svg" />
4141
<div>
4242
<h1>Easy, Tiger</h1>
4343
<p>Turn JavaScript on, don't be so paraniod.</p>

‎package-lock.json

Lines changed: 223 additions & 218 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@
4646
"typescript": "~4.7.4",
4747
"vite": "^3.1.8",
4848
"vitest": "^0.24.3",
49-
"vue-tsc": "^1.0.8"
49+
"vue-tsc": "^1.0.11"
5050
}
5151
}

‎src/App.vue

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ import { useRoute } from "vue-router";
55
66
// Modules
77
import axios from "axios";
8+
import { initApp } from "@/modules/initApp";
89
import { useExamplePiniaStore } from "@/stores/examplePinia";
910
1011
// Components
11-
import TemplateHeader from "@/components/template/TemplateHeader.vue";
12-
13-
// Composables
14-
import { exampleLogo } from "@/modules/exampleLogo";
15-
import { useConsoleImage } from "@/composables/useConsoleImage";
12+
import MoleculeHeader from "@/components/molecule/MoleculeHeader.vue";
1613
1714
// Data
1815
const route = useRoute();
@@ -22,7 +19,7 @@ const exampleDataError = ref(null);
2219
2320
// Hooks
2421
onBeforeMount(() => {
25-
useConsoleImage(exampleLogo);
22+
initApp();
2623
getExampleData();
2724
});
2825
@@ -49,7 +46,7 @@ const getExampleData = () => {
4946
</script>
5047

5148
<template>
52-
<TemplateHeader />
49+
<MoleculeHeader />
5350

5451
<RouterView v-slot="{ Component }">
5552
<main :class="`page ${getPageName}`">

‎src/assets/images/ExampleLogo.svg

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/assets/scss/_core/_index.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* ==========================================================================
2+
STYLES: Default definitions to global scope
3+
4+
Edit carefully.
5+
========================================================================== */
6+
7+
@import "style.defaults";
8+
@import "style.helpers";
9+
@import "style.print";

‎src/assets/scss/_core/_style.defaults.scss

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
/* ==========================================================================
2+
STYLES: Default definitions
3+
4+
Common default definitions.
5+
Edit carefully.
6+
========================================================================== */
7+
8+
// Core
9+
html {
10+
display: flex;
11+
flex: 1;
12+
font-size: 62.5%;
13+
}
14+
15+
body {
16+
position: relative;
17+
display: flex;
18+
flex: 1;
19+
min-width: grid.$min-width;
20+
min-height: grid.$min-height;
21+
font-style: normal;
22+
font-size: 1.6rem;
23+
line-height: 1;
24+
color: colors.$font-main;
25+
background-color: colors.$bg-body;
26+
scroll-behavior: smooth;
27+
text-rendering: optimizeLegibility;
28+
-webkit-font-smoothing: antialiased;
29+
-moz-osx-font-smoothing: grayscale;
30+
}
31+
32+
#app {
33+
position: relative;
34+
display: flex;
35+
flex-direction: column;
36+
flex: 1;
37+
min-height: 100%;
38+
}
39+
40+
main {
41+
position: relative;
42+
display: flex;
43+
flex-direction: column;
44+
flex: 1;
45+
}
46+
47+
// Links
48+
a {
49+
color: colors.$link-main;
50+
transition: color grid.$transition;
51+
text-decoration: none;
52+
53+
&:hover {
54+
color: colors.$link-main-hover;
55+
}
56+
57+
&:active,
58+
&.router-link-exact-active {
59+
color: colors.$link-main-active;
60+
cursor: default;
61+
text-decoration: none;
62+
}
63+
}
64+
65+
// Selection Highlight
66+
::selection {
67+
background-color: colors.$bg-selection;
68+
color: colors.$font-selection;
69+
text-shadow: none;
70+
}
71+
72+
// Fade + Blur Transition
73+
.fade-enter-active,
74+
.fade-leave-active {
75+
transition: all grid.$transition;
76+
}
77+
78+
.fade-enter-from,
79+
.fade-leave-to {
80+
opacity: 0;
81+
filter: blur(1rem);
82+
}

‎src/assets/scss/_style.helpers.scss renamed to ‎src/assets/scss/_core/_style.helpers.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* ==========================================================================
2-
Helper classes
2+
STYLE: Helpers
3+
4+
CSS Helpers.
5+
Edit carefully.
36
========================================================================== */
47

58
// Hide visually and from screen readers

‎src/assets/scss/_style.print.scss renamed to ‎src/assets/scss/_core/_style.print.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
/* ==========================================================================
2-
Print styles
2+
STYLE: Print styles
3+
4+
Media queries for printing.
5+
Edit carefully.
36
========================================================================== */
47

58
@media print {

‎src/assets/scss/_style.common.scss

Lines changed: 0 additions & 136 deletions
This file was deleted.

‎src/assets/scss/_theme/_index.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* ==========================================================================
2+
STYLES: Custom theme styles
3+
4+
Feel free to customize your app ^-^
5+
========================================================================== */
6+
7+
@import "style.fonts";
8+
@import "style.theme";

‎src/assets/scss/_style.fonts.scss renamed to ‎src/assets/scss/_theme/_style.fonts.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* ==========================================================================
2-
Imported WebFonts
2+
MIXIN: Imported WebFonts
3+
4+
Global fonts import from /assets/fonts folder.
35
========================================================================== */
46

57
@mixin font($name, $style, $weight, $url) {
@@ -9,8 +11,7 @@
911
font-weight: $weight;
1012
src: local($name), url("@/assets/fonts/" + $url) format("woff2");
1113
font-display: swap;
12-
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB,
13-
U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
14+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
1415
}
1516
}
1617

0 commit comments

Comments
 (0)