Fix: Layout #1

Open
Flycro wants to merge 10 commits from fix_layout into main
24 changed files with 90 additions and 326 deletions

8
package-lock.json generated
View File

@ -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",

View File

@ -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"
}

View File

@ -1,5 +1,5 @@
<script setup>
import { NavigationModel, Nav } from '@/components';
import { NavigationModel } from "./components/Index.js";
</script>
@ -7,7 +7,7 @@ import { NavigationModel, Nav } from '@/components';
<div class="app-container">
<NavigationModel />
<!-- <Nav /> -->
<div class="container pt-4 pb-4">
<div class="container">
<router-view />
</div>
</div>
@ -15,57 +15,15 @@ import { NavigationModel, Nav } from '@/components';
<style scoped lang="scss">
@import '/css/head.scss';
header {
line-height: 1.5;
max-height: 100vh;
.app-container
{
width: 100%;
}
nav {
width: 100%;
font-size: 12px;
text-align: center;
margin-top: 2rem;
}
nav a.router-link-exact-active {
color: var(--color-text);
}
nav a.router-link-exact-active:hover {
background-color: transparent;
}
nav a {
display: inline-block;
padding: 0 1rem;
border-left: 1px solid var(--color-border);
}
nav a:first-of-type {
border: 0;
}
@media (min-width: 1024px) {
header {
display: flex;
place-items: top;
padding-right: calc(var(--section-gap));
}
header .wrapper {
display: flex;
place-items: flex-start;
flex-wrap: wrap;
}
nav {
text-align: center;
margin-left: 2rem;
font-size: 1rem;
padding: 1rem 0;
margin-top: 1rem;
}
.container{
max-width: 1024px;
margin: 1rem auto;
padding: 0.5rem 1rem;
background: grey;
}
</style>

View File

@ -1,65 +0,0 @@
/* color palette from <https://github.com/vuejs/theme> */
: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 */

View File

@ -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"}

View File

@ -1,74 +0,0 @@
/* color palette from <https://github.com/vuejs/theme> */
: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;
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -1,17 +1,47 @@
<script setup>
</script>
<template>
<nav v-show="true" class="navbar navbar-expand navbar-dark bg-dark">
<div class="logo">
LOGO IS HERE
</div>
<div class="navbar-nav">
<router-link to="/" class="nav-item nav-link">Home</router-link>
<router-link to="/Muscles/Legs" class="nav-item nav-link">Legs</router-link>
<router-link to="/Muscles/Back" class="nav-item nav-link">Back</router-link>
<router-link to="/Muscles/Chest" class="nav-item nav-link">Chest</router-link>
<router-link to="/Muscles/Shoulder" class="nav-item nav-link">Shoulder</router-link>
<router-link to="/Muscles/Triceps" class="nav-item nav-link">Triceps</router-link>
<router-link to="/Muscles/Bicepts" class="nav-item nav-link">Bicepts</router-link>
<router-link to="/" class="nav-item nav-link">HomeView</router-link>
<router-link to="/muscles/legs" class="nav-item nav-link">Legs</router-link>
<router-link to="/muscles/back" class="nav-item nav-link">Back</router-link>
<router-link to="/muscles/chest" class="nav-item nav-link">Chest</router-link>
<router-link to="/muscles/shoulder" class="nav-item nav-link">Shoulder</router-link>
<router-link to="/muscles/triceps" class="nav-item nav-link">Triceps</router-link>
<router-link to="/muscles/biceps" class="nav-item nav-link">Biceps</router-link>
</div>
</nav>
</template>
</template>
<script setup>
</script>
<style lang="scss" scoped>
.navbar{
display: flex;
width: 100%;
height: 4rem;
justify-content: start;
background: grey;
}
.navbar-nav{
display: flex;
width: 100%;
justify-content: start;
align-items: center;
}
.nav-item{
margin-left: 1rem;
margin-right: 1rem;
color: white;
text-decoration: none;
}
.nav-item:hover{
color: blue;
}
.logo{
width: 20%;
}
</style>

View File

@ -63,4 +63,3 @@
}
/*# sourceMappingURL=head.css.map */

View File

@ -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 */

View File

@ -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"}
{"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"}

View File

@ -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;
}

1
src/css/main.scss Normal file
View File

@ -0,0 +1 @@
@import 'base.scss';

View File

@ -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')
)
)

View File

@ -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),

View File

@ -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 },
]
};

View File

@ -4,6 +4,6 @@
<template>
<main>
<h1 HomeView h1/>
<h1>HomeView</h1>
</main>
</template>

View File

@ -3,6 +3,10 @@
<h1>Back</h1>
</div>
</template>
<script setup>
</script>
<style>
@media (min-width: 1024px) {
@ -13,4 +17,3 @@
}
}
</style>

View File

@ -3,6 +3,10 @@
<h1>Biceps</h1>
</div>
</template>
<script setup>
</script>
<style>
@media (min-width: 1024px) {
@ -13,4 +17,3 @@
}
}
</style>

View File

@ -1,13 +1,13 @@
<script setup>
</script>
<template>
<div class="chest">
<h1>Chest</h1>
</div>
</template>
<script setup>
</script>
<style>
@media (min-width: 1024px) {
.about {

View File

@ -3,6 +3,10 @@
<h1>Legs</h1>
</div>
</template>
<script setup>
</script>
<style>
@media (min-width: 1024px) {
@ -13,4 +17,3 @@
}
}
</style>

View File

@ -3,6 +3,10 @@
<h1>Shoulder</h1>
</div>
</template>
<script setup>
</script>
<style>
@media (min-width: 1024px) {
@ -13,4 +17,3 @@
}
}
</style>

View File

@ -3,6 +3,10 @@
<h1><button>Triceps</button></h1>
</div>
</template>
<script setup>
</script>
<style>
@media (min-width: 1024px) {
@ -13,4 +17,3 @@
}
}
</style>