Skip to content
Snippets Groups Projects
Commit 329df7f6 authored by Magnus Rindal's avatar Magnus Rindal
Browse files

Merge branch 'badgeInfo-fix' into 'master'

fixed issues in BadgeInfo

See merge request !62
parents 890fea19 e5b8ae63
No related branches found
No related tags found
1 merge request!62fixed issues in BadgeInfo
Pipeline #280939 passed
...@@ -3,9 +3,9 @@ import { onMounted, ref } from 'vue' ...@@ -3,9 +3,9 @@ import { onMounted, ref } from 'vue'
import { getUserInfo } from '@/utils/profileutils' import { getUserInfo } from '@/utils/profileutils'
import { useTokenStore } from '@/stores/token' import { useTokenStore } from '@/stores/token'
interface Achievement{ interface Achievement{
id: number, achievementId: number,
title: string, achievementTitle: string,
img: string badge: string
} }
const props = defineProps <{ const props = defineProps <{
...@@ -28,8 +28,7 @@ onMounted(async () => { ...@@ -28,8 +28,7 @@ onMounted(async () => {
const fetchBadgeInfo = async ()=>{ const fetchBadgeInfo = async ()=>{
try { try {
const response = await getUserInfo(token) const response = await getUserInfo(token)
console.log(response) achievements.value = response.achievementDTOList;
achievements.value = response.achievements;
} catch (error){ } catch (error){
console.error('Error fetching achievements:') console.error('Error fetching achievements:')
} }
...@@ -41,9 +40,9 @@ const fetchBadgeInfo = async ()=>{ ...@@ -41,9 +40,9 @@ const fetchBadgeInfo = async ()=>{
<div class="badge-container"> <div class="badge-container">
<h3 class="title">{{title}}</h3> <h3 class="title">{{title}}</h3>
<div class="badges"> <div class="badges">
<div class="badge" v-for="(achievement) in achievements" :key="achievement.id"> <div class="badge" v-for="achievement in achievements" :key="achievement.achievementId">
<img class="badge-img" :src="achievement.img" :alt="achievement.title"> <img v-if="achievement.badge" class="badge-img" :src="achievement.badge" :alt="achievement.achievementTitle">
<h3 class="badge-title"> {{achievement.title}}</h3> <h3 class="badge-title"> {{achievement.achievementTitle}}</h3>
</div> </div>
</div> </div>
......
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