Skip to content
Snippets Groups Projects
Commit f1e5cd6c authored by Anders Høvik's avatar Anders Høvik
Browse files

Merge branch 'feature/profile-layout' into 'main'

Feature/profile layout

See merge request !12
parents e824eb41 5efdd38f
No related branches found
No related tags found
1 merge request!12Feature/profile layout
Pipeline #274188 failed
src/assets/icons/dollar.png

46.4 KiB

src/assets/icons/fire.png

19.6 KiB

......@@ -45,7 +45,6 @@
</ul>
</li>
</ul>
</div>
</div>
</nav>
......@@ -83,8 +82,9 @@ function toFeedback() {
router.push('/news')
}
function toUserProfile() {
router.push('/news')
function toUserProfile(){
router.push('/profile')
}
......
<script setup lang="ts">
import Menu from "@/components/BaseComponents/Menu.vue";
import Footer from "@/components/BaseComponents/Footer.vue";
let points = 0;
let streak = 0;
</script>
<template>
<Menu></Menu>
<div class="container text-center">
<div class="row">
<div class="col">
<img src="/src/assets/userprofile.png" class="img-fluid">
<p class="h2">Username</p>
<p><a class="link-dark" href="#">Edit profile</a></p>
</div>
</div>
<div class="row">
<div class="col">
<img src="/src/assets/icons/fire.png" class="img-fluid" style="width: 30px; height: 30px" alt="dollar">
<p>Streak: 10</p>
</div>
</div>
<div class="row">
<div class="col-12">
<img src="/src/assets/icons/dollar.png" class="img-fluid" style="width: 30px; height: 30px" alt="dollar">
<p class="">Points: 2000 </p>
</div>
</div>
<div class="row">
<div class="col">
total points earned
</div>
<div class="col">
total badges earned
</div>
</div>
<div class="row">
<div class="col">
History
</div>
</div>
<div class="row">
<div class="col">
Your Badges
</div>
</div>
</div>
<Footer></Footer>
</template>
<style scoped>
</style>
\ No newline at end of file
......@@ -2,8 +2,10 @@
import { createRouter, createWebHistory } from 'vue-router';
import LoginView from '../views/Authentication/LoginView.vue';
import { useUserInfoStore } from '@/stores/UserStore';
import UserProfileView from "@/views/User/UserProfileView.vue";
import SignUp from '@/components/SignUp/SignUp.vue'
const routes = [
{
path: '/',
......@@ -69,6 +71,11 @@ const routes = [
name: 'login',
component: LoginView,
},
{
path: '/profile',
name: 'profile',
component: UserProfileView
},
{
path: '/sign-up',
name: 'sign up',
......
<script setup lang="ts">
import UserProfileLayout from "@/components/UserProfile/UserProfileLayout.vue";
</script>
<template>
<UserProfileLayout></UserProfileLayout>
</template>
<style scoped>
</style>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment