Finished with Apollo testing lol, this branch should have been closed long ago. #2

Merged
Ajdj100 merged 3 commits from apollo-testing into master 2023-07-21 13:41:13 -05:00
7 changed files with 49 additions and 33 deletions
Showing only changes of commit 124a16a1a1 - Show all commits

View File

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

View File

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

View File

@@ -1,19 +1,18 @@
<script>
import { stringLiteral } from '@babel/types';
import { RouterLink } from 'vue-router'
export default {
name: 'subnav',
props: {
link: String,
content: String,
active: Boolean
props: ['link', 'content', 'active'],
components: {
RouterLink
},
setup(props) {
console.log(props.link);
}
}
</script>
<template>
<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>
</template>

View File

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

View File

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

View File

@@ -11,18 +11,23 @@ export default createRouter({
},
{
path: '/profile',
name: 'Profile',
name: 'profile',
component: () => import('./components/ProfilePage/profile.vue'),
children: [
{
path: '',
path: '/',
name: 'personnel',
component: () => import('./components/ProfilePage/personnel.vue')
},
{
path: 'activityHistory',
path: '/activityHistory',
name: 'activityHistory',
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>
<div>
<h1>Home screen</h1>
</div>
<h1>Here is a child component!</h1>
<card></card>
</template>