Fix: Merge conflicts

This commit is contained in:
Kamigen
2024-03-31 09:53:36 -04:00
3 changed files with 28 additions and 28 deletions

View File

@@ -1,7 +1,6 @@
<template>
<v-app style="background-color: #F4F4F4;">
<div style="background-color: #F4F4F4;">
<!--PC -->
@@ -247,7 +246,6 @@
</v-col>
<v-col>
<router-link :to="{ name: 'creatorfolio' }">
<img src="../../../images/guillaume.jpg" alt="Profile Image" class="profile-image">
@@ -259,11 +257,7 @@
Inscription
</v-btn>
</RouterLink>
</v-col>
</v-row>
@@ -405,26 +399,22 @@
</v-app>
</template>
<script async setup>
<script setup>
import DefaultLayout from '@/layouts/DefaultLayout.vue';
import FooterLayout from '@/layouts/FooterLayout.vue';
import {useClient} from "@/plugins/api.js";
import {ref} from "vue";
import {useRouter} from "vue-router";
const api = useClient()
const router = useRouter()
const client = useClient();
const itemList = ref([]);
const errorNoAccessSnackBar = ref(false);
let itemList = ref([]);
let errorNoAccessSnackBar = ref(false);
async function callBackend() {
const callBackend = async () => {
try {
const response = await client.get('/api/TodoItems?ListId=1&PageNumber=1&PageSize=10');
const responseItems = response.data.items;
const orderedResponseItems = responseItems.sort((a, b) => a.id - b.id);
itemList.value = orderedResponseItems
const response = await api.get('/api/TodoItems?ListId=1&PageNumber=1&PageSize=10');
itemList.value = response.data.items;
} catch (error) {
errorNoAccessSnackBar.value = true;
}
@@ -433,8 +423,6 @@ async function callBackend() {
const goToLoginPage = () => {
router.push('/login');
}
</script>
<style src="../../cssstyle/index.css"></style>