diff --git a/docker-compose.yml b/docker-compose.yml index fcc611ae..d7d7daa5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.5' - services: reverse-proxy: image: traefik diff --git a/frontend/Dockerfile b/frontend/Dockerfile index c9dcdc6a..006f8948 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Local development stage -FROM node:20.8-alpine3.18 as development-stage +FROM node:20.8-alpine3.18 AS development-stage WORKDIR /app COPY package.json /app/ COPY yarn.lock /app/ @@ -10,7 +10,7 @@ EXPOSE 3000 ENTRYPOINT ["yarn", "dev:host"] # Production Build stage -FROM node:20.8-alpine3.18 as production-build +FROM node:20.8-alpine3.18 AS production-build WORKDIR /app COPY ./src /app/src/ COPY package.json /app/ @@ -21,9 +21,9 @@ ARG VERSION_BUILD_TAG=latest ENV VITE_ROSALUTION_VERSION=$VERSION_BUILD_TAG -RUN yarn install --frozen-lockfile && yarn build --base=/rosalution/ +RUN yarn install --frozen-lockfile && yarn build --bASe=/rosalution/ -FROM nginx:1.25.2-alpine3.18 as production-stage +FROM nginx:1.25.2-alpine3.18 AS production-stage COPY etc/default.conf /etc/nginx/conf.d/ COPY --from=production-build /app/dist/ /usr/share/nginx/html/ diff --git a/frontend/package.json b/frontend/package.json index 1d416a93..9be7f56a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -21,7 +21,7 @@ "@fortawesome/free-solid-svg-icons": "6.4.2", "@fortawesome/vue-fontawesome": "3.0.3", "@rollup/plugin-strip": "3.0.4", - "vue": "3.3.4", + "vue": "3.5.12", "vue-router": "4.2.5" }, "devDependencies": { diff --git a/frontend/src/components/Dialogs/RosalutionToast.vue b/frontend/src/components/Dialogs/RosalutionToast.vue new file mode 100644 index 00000000..9ec327e8 --- /dev/null +++ b/frontend/src/components/Dialogs/RosalutionToast.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/frontend/src/components/Dialogs/Toast.vue b/frontend/src/components/Dialogs/Toast.vue deleted file mode 100644 index 9beb944f..00000000 --- a/frontend/src/components/Dialogs/Toast.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - - diff --git a/frontend/src/toast.js b/frontend/src/toast.js deleted file mode 100644 index 80b26860..00000000 --- a/frontend/src/toast.js +++ /dev/null @@ -1,54 +0,0 @@ -import {reactive} from 'vue'; - -const state = reactive({ - type: 'info', - active: false, - message: '', -}); - - -// ----------------------------------- -// Private Methods -// ----------------------------------- -let close; - -const dialogPromise = () => new Promise((resolve) => (close = resolve)); - -const open = (message) => { - state.message = message; - state.active = true; - return dialogPromise(); -}; - -const reset = () => { - state.active = false; - state.message = ''; - state.type = 'info'; -}; - -// ----------------------------------- -// Public interface -// ----------------------------------- - -export default { - get state() { - return state; - }, - success(message) { - state.type = 'success'; - return open(message); - }, - info(message) { - state.type = 'info'; - return open(message); - }, - error(message) { - state.type = 'error'; - return open(message); - }, - cancel() { - close(); - reset(); - }, -}; - diff --git a/frontend/src/views/AnalysisView.vue b/frontend/src/views/AnalysisView.vue index af850e1a..016152d0 100644 --- a/frontend/src/views/AnalysisView.vue +++ b/frontend/src/views/AnalysisView.vue @@ -1,4 +1,4 @@ -