diff --git a/package-lock.json b/package-lock.json index a6bd3ba..4634940 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "eslint-plugin-vue": "^9.9.0", "jsdom": "^21.1.0", "prettier": "^2.8.4", - "sass": "^1.62.0", + "sass": "^1.62.1", "vite": "^4.1.4", "vitest": "^0.29.1" } @@ -3300,9 +3300,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.62.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.0.tgz", - "integrity": "sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg==", + "version": "1.62.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz", + "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==", "devOptional": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index 0d058cb..92ceed7 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "eslint-plugin-vue": "^9.9.0", "jsdom": "^21.1.0", "prettier": "^2.8.4", - "sass": "^1.62.0", + "sass": "^1.62.1", "vite": "^4.1.4", "vitest": "^0.29.1" } diff --git a/src/App.vue b/src/App.vue index 76029c8..bc2e0c3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ @@ -7,7 +7,7 @@ import { NavigationModel, Nav } from '@/components';
-
+
@@ -15,57 +15,15 @@ import { NavigationModel, Nav } from '@/components'; diff --git a/src/assets/head.css b/src/assets/head.css deleted file mode 100644 index f553f21..0000000 --- a/src/assets/head.css +++ /dev/null @@ -1,65 +0,0 @@ -/* color palette from */ -:root { - --vt-c-white: #ffffff; - --vt-c-white-soft: #f8f8f8; - --vt-c-white-mute: #f2f2f2; - --vt-c-black: #181818; - --vt-c-black-soft: #222222; - --vt-c-black-mute: #282828; - --vt-c-indigo: #2c3e50; - --vt-c-divider-light-1: rgba(60, 60, 60, 0.29); - --vt-c-divider-light-2: rgba(60, 60, 60, 0.12); - --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65); - --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48); - --vt-c-text-light-1: var(--vt-c-indigo); - --vt-c-text-light-2: rgba(60, 60, 60, 0.66); - --vt-c-text-dark-1: var(--vt-c-white); - --vt-c-text-dark-2: rgba(235, 235, 235, 0.64); -} - -/* semantic color variables for this project */ -:root { - --color-background: var(--vt-c-white); - --color-background-soft: var(--vt-c-white-soft); - --color-background-mute: var(--vt-c-white-mute); - --color-border: var(--vt-c-divider-light-2); - --color-border-hover: var(--vt-c-divider-light-1); - --color-heading: var(--vt-c-text-light-1); - --color-text: var(--vt-c-text-light-1); - --section-gap: 160px; -} - -@media (prefers-color-scheme: dark) { - :root { - --color-background: var(--vt-c-black); - --color-background-soft: var(--vt-c-black-soft); - --color-background-mute: var(--vt-c-black-mute); - --color-border: var(--vt-c-divider-dark-2); - --color-border-hover: var(--vt-c-divider-dark-1); - --color-heading: var(--vt-c-text-dark-1); - --color-text: var(--vt-c-text-dark-2); - } -} -*, -*::before, -*::after { - box-sizing: border-box; - margin: 0; - position: relative; - font-weight: normal; -} - -body { - min-height: 100vh; - color: var(--color-text); - background: var(--color-background); - transition: color 0.5s, background-color 0.5s; - line-height: 1.6; - font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - font-size: 15px; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -/*# sourceMappingURL=head.css.map */ diff --git a/src/assets/head.css.map b/src/assets/head.css.map deleted file mode 100644 index 62dad0d..0000000 --- a/src/assets/head.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sourceRoot":"","sources":["head.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;EACA;EAEA;EACA;EACA;EAEA;EAEA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;EAEA;EACA;EAEA;EACA;EAEA;;;AAGF;EACE;IACE;IACA;IACA;IAEA;IACA;IAEA;IACA;;;AAIJ;AAAA;AAAA;EAGE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA","file":"head.css"} \ No newline at end of file diff --git a/src/assets/head.scss b/src/assets/head.scss deleted file mode 100644 index 71dc55a..0000000 --- a/src/assets/head.scss +++ /dev/null @@ -1,74 +0,0 @@ -/* color palette from */ -:root { - --vt-c-white: #ffffff; - --vt-c-white-soft: #f8f8f8; - --vt-c-white-mute: #f2f2f2; - - --vt-c-black: #181818; - --vt-c-black-soft: #222222; - --vt-c-black-mute: #282828; - - --vt-c-indigo: #2c3e50; - - --vt-c-divider-light-1: rgba(60, 60, 60, 0.29); - --vt-c-divider-light-2: rgba(60, 60, 60, 0.12); - --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65); - --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48); - - --vt-c-text-light-1: var(--vt-c-indigo); - --vt-c-text-light-2: rgba(60, 60, 60, 0.66); - --vt-c-text-dark-1: var(--vt-c-white); - --vt-c-text-dark-2: rgba(235, 235, 235, 0.64); -} - -/* semantic color variables for this project */ -:root { - --color-background: var(--vt-c-white); - --color-background-soft: var(--vt-c-white-soft); - --color-background-mute: var(--vt-c-white-mute); - - --color-border: var(--vt-c-divider-light-2); - --color-border-hover: var(--vt-c-divider-light-1); - - --color-heading: var(--vt-c-text-light-1); - --color-text: var(--vt-c-text-light-1); - - --section-gap: 160px; -} - -@media (prefers-color-scheme: dark) { - :root { - --color-background: var(--vt-c-black); - --color-background-soft: var(--vt-c-black-soft); - --color-background-mute: var(--vt-c-black-mute); - - --color-border: var(--vt-c-divider-dark-2); - --color-border-hover: var(--vt-c-divider-dark-1); - - --color-heading: var(--vt-c-text-dark-1); - --color-text: var(--vt-c-text-dark-2); - } -} - -*, -*::before, -*::after { - box-sizing: border-box; - margin: 0; - position: relative; - font-weight: normal; -} - -body { - min-height: 100vh; - color: var(--color-text); - background: var(--color-background); - transition: color 0.5s, background-color 0.5s; - line-height: 1.6; - font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, - Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; - font-size: 15px; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} diff --git a/src/assets/main.css b/src/assets/main.css deleted file mode 100644 index e8667cd..0000000 --- a/src/assets/main.css +++ /dev/null @@ -1,35 +0,0 @@ -@import './base.css'; - -#app { - max-width: 1280px; - margin: 0 auto; - padding: 2rem; - - font-weight: normal; -} - -a, -.green { - text-decoration: none; - color: hsla(160, 100%, 37%, 1); - transition: 0.4s; -} - -@media (hover: hover) { - a:hover { - background-color: hsla(160, 100%, 37%, 0.2); - } -} - -@media (min-width: 1024px) { - body { - display: flex; - place-items: center; - } - - #app { - display: grid; - grid-template-columns: 1fr 1fr; - padding: 0 2rem; - } -} diff --git a/src/assets/main.scss b/src/assets/main.scss deleted file mode 100644 index 79ecaf6..0000000 --- a/src/assets/main.scss +++ /dev/null @@ -1,35 +0,0 @@ -@import './base.scss'; - -#app { - max-width: 1280px; - margin: 0 auto; - padding: 2rem; - - font-weight: normal; -} - -a, -.green { - text-decoration: none; - color: hsla(160, 100%, 37%, 1); - transition: 0.4s; -} - -@media (hover: hover) { - a:hover { - background-color: hsla(160, 100%, 37%, 0.2); - } -} - -@media (min-width: 1024px) { - body { - display: flex; - place-items: center; - } - - #app { - display: grid; - grid-template-columns: 1fr 1fr; - padding: 0 2rem; - } -} diff --git a/src/components/NavigationModel.vue b/src/components/NavigationModel.vue index 1dba898..43557d9 100644 --- a/src/components/NavigationModel.vue +++ b/src/components/NavigationModel.vue @@ -1,17 +1,47 @@ - - \ No newline at end of file + + + + + diff --git a/src/assets/base.css b/src/css/base.scss similarity index 99% rename from src/assets/base.css rename to src/css/base.scss index 2cd529a..b922c47 100644 --- a/src/assets/base.css +++ b/src/css/base.scss @@ -63,4 +63,3 @@ } /*# sourceMappingURL=head.css.map */ - \ No newline at end of file diff --git a/src/css/head.css b/src/css/head.css index f553f21..d729e93 100644 --- a/src/css/head.css +++ b/src/css/head.css @@ -49,17 +49,4 @@ font-weight: normal; } -body { - min-height: 100vh; - color: var(--color-text); - background: var(--color-background); - transition: color 0.5s, background-color 0.5s; - line-height: 1.6; - font-family: Inter, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; - font-size: 15px; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - /*# sourceMappingURL=head.css.map */ diff --git a/src/css/head.css.map b/src/css/head.css.map index 62dad0d..dd9b48a 100644 --- a/src/css/head.css.map +++ b/src/css/head.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["head.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;EACA;EAEA;EACA;EACA;EAEA;EAEA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;EAEA;EACA;EAEA;EACA;EAEA;;;AAGF;EACE;IACE;IACA;IACA;IAEA;IACA;IAEA;IACA;;;AAIJ;AAAA;AAAA;EAGE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA","file":"head.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["head.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;EACA;EAEA;EACA;EACA;EAEA;EAEA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;EAEA;EACA;EAEA;EACA;EAEA;;;AAGF;EACE;IACE;IACA;IACA;IAEA;IACA;IAEA;IACA;;;AAIJ;AAAA;AAAA;EAGE;EACA;EACA;EACA","file":"head.css"} \ No newline at end of file diff --git a/src/css/head.scss b/src/css/head.scss index 71dc55a..198868a 100644 --- a/src/css/head.scss +++ b/src/css/head.scss @@ -58,17 +58,3 @@ position: relative; font-weight: normal; } - -body { - min-height: 100vh; - color: var(--color-text); - background: var(--color-background); - transition: color 0.5s, background-color 0.5s; - line-height: 1.6; - font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, - Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; - font-size: 15px; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} diff --git a/src/css/main.scss b/src/css/main.scss new file mode 100644 index 0000000..2f95237 --- /dev/null +++ b/src/css/main.scss @@ -0,0 +1 @@ +@import 'base.scss'; diff --git a/src/main.js b/src/main.js index 9b98d53..eb4809e 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import { createPinia } from 'pinia' import App from './App.vue' import router from './router' -import './assets/main.css' +import './css/main.scss' const app = createApp(App) app.use(createPinia()) @@ -13,4 +13,4 @@ app.use(router) window.addEventListener ('load', () => app.mount('#app') -) \ No newline at end of file +) diff --git a/src/router/index.js b/src/router/index.js index 7e40315..a61b4b9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,6 @@ import { createRouter, createWebHistory } from 'vue-router' import HomeView from '../views/Home.vue' -import MusclesRouter from './muscle.router.js'; +import MusclesRouter from './muscle.js'; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), diff --git a/src/router/muscle.router.js b/src/router/muscle.js similarity index 60% rename from src/router/muscle.router.js rename to src/router/muscle.js index f530d06..00fd73a 100644 --- a/src/router/muscle.router.js +++ b/src/router/muscle.js @@ -1,15 +1,13 @@ -import { Legs, Back, Chest, Shoulder, Triceps, Biceps } from '@/views/muscles'; -// import Tilebar from '@/views/layouts'; +import {Back, Biceps, Chest, Legs, Shoulder, Triceps } from "../views/muscles/Index.js"; export default { path: '/muscles', - // component: Tilebar, children: [ { path: 'legs', component: Legs }, { path: 'back', component: Back }, { path: 'chest', component: Chest }, { path: 'shoulder', component: Shoulder }, { path: 'triceps', component: Triceps }, - { path: 'bicepts', component: Biceps }, + { path: 'biceps', component: Biceps }, ] }; diff --git a/src/views/Home.vue b/src/views/Home.vue index 1172949..c291262 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -4,6 +4,6 @@ diff --git a/src/views/muscles/Back.vue b/src/views/muscles/Back.vue index 81bdeee..e1c4a96 100644 --- a/src/views/muscles/Back.vue +++ b/src/views/muscles/Back.vue @@ -3,6 +3,10 @@

Back

+ + - \ No newline at end of file diff --git a/src/views/muscles/Biceps.vue b/src/views/muscles/Biceps.vue index a6dc471..b84961b 100644 --- a/src/views/muscles/Biceps.vue +++ b/src/views/muscles/Biceps.vue @@ -3,6 +3,10 @@

Biceps

+ + - \ No newline at end of file diff --git a/src/views/muscles/Chest.vue b/src/views/muscles/Chest.vue index 5276ff8..5d8a0b4 100644 --- a/src/views/muscles/Chest.vue +++ b/src/views/muscles/Chest.vue @@ -1,13 +1,13 @@ - - + + - \ No newline at end of file diff --git a/src/views/muscles/Shoulder.vue b/src/views/muscles/Shoulder.vue index 701ab2a..45a09a0 100644 --- a/src/views/muscles/Shoulder.vue +++ b/src/views/muscles/Shoulder.vue @@ -3,6 +3,10 @@

Shoulder

+ + - \ No newline at end of file diff --git a/src/views/muscles/Triceps.vue b/src/views/muscles/Triceps.vue index 729fbc6..0aa5de9 100644 --- a/src/views/muscles/Triceps.vue +++ b/src/views/muscles/Triceps.vue @@ -3,6 +3,10 @@

+ + - \ No newline at end of file