diff --git a/.env.example b/.env.example index 468eda78..145253dd 100644 --- a/.env.example +++ b/.env.example @@ -2,6 +2,8 @@ VITE_BASE_URI="/" VITE_API_URI="/" VITE_AXIOS_TIMEOUT=10000 +VITE_WEBSOCKET_API_URL="" + VITE_USER_INFO_API_URI="" VITE_PROXY_API_URL="http://localhost:8090" diff --git a/.env.production b/.env.production index 31935393..c22f3b03 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,6 @@ VITE_BASE_URI="/collabsoft" VITE_API_URI="/collabsoft" VITE_AXIOS_TIMEOUT=10000 +VITE_WEBSOCKET_API_URL="" + VITE_USER_INFO_API_URI="/portail/api/v5-1/userinfo?claims=private&groups=" diff --git a/package.json b/package.json index 315f719d..f15cd7d5 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "release:major": "standard-version --release-as major" }, "dependencies": { - "@gip-recia/tldraw-webcomponent": "^1.5.1", + "@gip-recia/tldraw-webcomponent": "^1.6.0", "@vueuse/core": "^10.7.2", "pinia": "^2.1.7", "vue": "^3.4.15", diff --git a/src/main/webapp/src/stores/configurationStore.ts b/src/main/webapp/src/stores/configurationStore.ts index 5c6c2d8f..91d18dce 100644 --- a/src/main/webapp/src/stores/configurationStore.ts +++ b/src/main/webapp/src/stores/configurationStore.ts @@ -113,6 +113,8 @@ export const useConfigurationStore = defineStore('configuration', () => { const isJoin = ref(false); + const isWsOk = ref(true); + /* -- Gestion de l'affichage -- */ const isGrid = ref(false); @@ -141,6 +143,7 @@ export const useConfigurationStore = defineStore('configuration', () => { isNew, resetState, isJoin, + isWsOk, isGrid, isSettings, }; diff --git a/src/main/webapp/src/views/app/tldraw/JoinTldrawView.vue b/src/main/webapp/src/views/app/tldraw/JoinTldrawView.vue index 2db26370..7cd37516 100644 --- a/src/main/webapp/src/views/app/tldraw/JoinTldrawView.vue +++ b/src/main/webapp/src/views/app/tldraw/JoinTldrawView.vue @@ -1,11 +1,32 @@ diff --git a/src/main/webapp/src/views/app/tldraw/TldrawView.vue b/src/main/webapp/src/views/app/tldraw/TldrawView.vue index 4e1aec45..5dc12ea5 100644 --- a/src/main/webapp/src/views/app/tldraw/TldrawView.vue +++ b/src/main/webapp/src/views/app/tldraw/TldrawView.vue @@ -34,7 +34,7 @@ onUnmounted(() => {