Made some changes to the alert and regular card, still nothing big there.

Finally fixed the damn subnav components for the profile page so that's back in progress.
This commit is contained in:
ajdj100
2023-07-21 14:39:01 -04:00
parent bf21b8ac16
commit 124a16a1a1
7 changed files with 49 additions and 33 deletions

View File

@@ -12,7 +12,13 @@ export default {
<template> <template>
<div id="ProfileWrapper"> <div id="ProfileWrapper">
<div>
<profileHeader></profileHeader> <profileHeader></profileHeader>
<div id="profileSubnavWrapper">
</div>
</div>
test words test words
<div id="profileContentWrapper"> <div id="profileContentWrapper">
<RouterView /> <RouterView />

View File

@@ -1,5 +1,5 @@
<script> <script>
// import {subnav} from './profileSubNav.vue' import profileSubNav from './profileSubNav.vue';
export default { export default {
name: 'profileHeader', name: 'profileHeader',
@@ -8,14 +8,19 @@ export default {
count: 0 count: 0
} }
}, },
// components: { components: {
// subnav, profileSubNav,
// } }
} }
</script> </script>
<template> <template>
<div id="wrapper"> <div id="wrapper">
<div>
<profileSubNav link="profile" content="Home"></profileSubNav>
<profileSubNav link="activityHistory" content="History"></profileSubNav>
<profileSubNav link="shadowbox" content="Shadowbox"></profileSubNav>
</div>
<div id="headerImages"> <div id="headerImages">
<img id="rankImg" src="../icons/misc/test.png" /> <img id="rankImg" src="../icons/misc/test.png" />
<img id="rangerTab" src="#" /> <img id="rangerTab" src="#" />
@@ -25,6 +30,7 @@ export default {
<h2>Rank</h2> <h2>Rank</h2>
<h2>Unit</h2> <h2>Unit</h2>
</div> </div>
</div> </div>
</template> </template>
@@ -62,5 +68,4 @@ export default {
margin-left: 25vw; margin-left: 25vw;
} }
} }
</style> </style>

View File

@@ -1,19 +1,18 @@
<script> <script>
import { stringLiteral } from '@babel/types';
import { RouterLink } from 'vue-router' import { RouterLink } from 'vue-router'
export default { export default {
name: 'subnav', props: ['link', 'content', 'active'],
props: { components: {
link: String, RouterLink
content: String,
active: Boolean
}, },
setup(props) {
console.log(props.link);
}
} }
</script> </script>
<template> <template>
<RouterLink :to="link"> <RouterLink :to="link">
<p :class="{active: active}">{{ content }}</p> <p class="ring-1 ring-blue rounded-md my-3 p-2 " :class="{ active: active }">{{ content }}</p>
</RouterLink> </RouterLink>
</template> </template>

View File

@@ -1,9 +1,8 @@
<script setup>
import { Icon } from '@iconify/vue'
</script>
<script> <script>
export const Alert = { import { Icon } from '@iconify/vue'
export default {
name: 'Alert', name: 'Alert',
props: { props: {
icon: String, icon: String,

View File

@@ -1,13 +1,12 @@
<template> <template>
<div class="card"> <div class="card">
<h1 class="bg-gray-dark rounded-xl w-fit p-5">HELLO</h1>
</div> </div>
</template> </template>
<style> <style>
.card { .card {
background-color: #ffffff;
color: var(--white); color: var(--white);
padding: 0 10px; padding: 0 10px;
margin: 10px; margin: 10px;

View File

@@ -11,18 +11,23 @@ export default createRouter({
}, },
{ {
path: '/profile', path: '/profile',
name: 'Profile', name: 'profile',
component: () => import('./components/ProfilePage/profile.vue'), component: () => import('./components/ProfilePage/profile.vue'),
children: [ children: [
{ {
path: '', path: '/',
name: 'personnel', name: 'personnel',
component: () => import('./components/ProfilePage/personnel.vue') component: () => import('./components/ProfilePage/personnel.vue')
}, },
{ {
path: 'activityHistory', path: '/activityHistory',
name: 'activityHistory', name: 'activityHistory',
component: () => import('./components/ProfilePage/activityHistory.vue') component: () => import('./components/ProfilePage/activityHistory.vue')
},
{
path: '/shadowbox',
name: 'shadowbox',
component: () => import('./components/ProfilePage/shadowbox.vue')
} }
] ]
}, },

View File

@@ -1,5 +1,8 @@
<script setup>
import card from '../components/cards/Card.vue'
</script>
<template> <template>
<div> <h1>Here is a child component!</h1>
<h1>Home screen</h1> <card></card>
</div>
</template> </template>