merging
This commit is contained in:
@ -41,6 +41,7 @@ const props = defineProps<{
|
||||
|
||||
const expanded = ref(false);
|
||||
const currentDescriptions = ref<string[]>([]);
|
||||
currentDescriptions.value[0] = props.description;
|
||||
const editedDescriptions = ref<string[]>([]);
|
||||
const isEditing = ref<boolean[]>([]);
|
||||
|
||||
@ -212,6 +213,7 @@ const cancelEdit = (index: number) => {
|
||||
}
|
||||
|
||||
.expanded {
|
||||
padding-top: 10%;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
@ -47,13 +47,13 @@ const items = ref([
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.Probleme { grid-column: 1 / 3; grid-row: 1 / 5; }
|
||||
.Segments { grid-column: 9 / 11; grid-row: 1 / 5; }
|
||||
.Valeur { grid-column: 5 / 7; grid-row: 1 / 5; }
|
||||
.Solution { grid-column: 3 / 5; grid-row: 1 / 3; }
|
||||
.Avantage { grid-column: 7 / 9; grid-row: 1 / 3; }
|
||||
.Canaux { grid-column: 7 / 9; grid-row: 3 / 5; }
|
||||
.Indicateurs { grid-column: 3 / 5; grid-row: 3 / 5; }
|
||||
.Couts { grid-column: 1 / 6; grid-row: 5 / 7; }
|
||||
.Revenus { grid-column: 6 / 11; grid-row: 5 / 7; }
|
||||
.Probleme { grid-column: 1 / 3; grid-row: 1 / 5; padding-top: 20px;}
|
||||
.Segments { grid-column: 9 / 11; grid-row: 1 / 5; padding-top: 20px;}
|
||||
.Valeur { grid-column: 5 / 7; grid-row: 1 / 5; padding-top: 20px;}
|
||||
.Solution { grid-column: 3 / 5; grid-row: 1 / 3; padding-top: 20px;}
|
||||
.Avantage { grid-column: 7 / 9; grid-row: 1 / 3; padding-top: 20px;}
|
||||
.Canaux { grid-column: 7 / 9; grid-row: 3 / 5; padding-top: 20px;}
|
||||
.Indicateurs { grid-column: 3 / 5; grid-row: 3 / 5; padding-top: 20px;}
|
||||
.Couts { grid-column: 1 / 6; grid-row: 5 / 7; padding-top: 20px;}
|
||||
.Revenus { grid-column: 6 / 11; grid-row: 5 / 7; padding-top: 20px;}
|
||||
</style>
|
||||
|
18
front/MyINPulse-front/src/components/temp-modal.vue
Normal file
18
front/MyINPulse-front/src/components/temp-modal.vue
Normal file
@ -0,0 +1,18 @@
|
||||
<script setup lang="ts">
|
||||
import { addNewMessage } from "@/services/popupDisplayer.ts";
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<button
|
||||
@click="
|
||||
addNewMessage(
|
||||
'new error from another view',
|
||||
Math.floor(Math.random() * 4)
|
||||
)
|
||||
"
|
||||
>
|
||||
Add an error
|
||||
</button>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
@ -14,7 +14,8 @@ axiosInstance.interceptors.response.use(
|
||||
async (error) => {
|
||||
const originalRequest = error.config;
|
||||
if (
|
||||
error.response.status === 401 &&
|
||||
((error.response && error.response.status === 401) ||
|
||||
error.code == "ERR_NETWORK") &&
|
||||
!originalRequest._retry &&
|
||||
store.authenticated
|
||||
) {
|
||||
|
@ -1,6 +1,9 @@
|
||||
<script lang="ts" setup>
|
||||
import { store } from "../main.ts";
|
||||
import { callApi } from "@/services/api.ts";
|
||||
import { ref } from "vue";
|
||||
|
||||
const CustomRequest = ref("");
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@ -50,11 +53,19 @@ import { callApi } from "@/services/api.ts";
|
||||
<tr>
|
||||
<td>Unauth API call</td>
|
||||
<td>
|
||||
<button @click="callApi('random3')">call</button>
|
||||
<button @click="callApi('unauth/dev')">call</button>
|
||||
</td>
|
||||
<td>res</td>
|
||||
<td id="3"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<input v-model="CustomRequest" placeholder="edit me" />
|
||||
</td>
|
||||
<td>
|
||||
<button @click="callApi(CustomRequest)">call</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</template>
|
||||
|
Reference in New Issue
Block a user