diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..167aa17
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,47 @@
+# This file is a template, and might need editing before it works on your project.
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
+
+# Build a Docker image with CI/CD and push to the GitLab registry.
+# Docker-in-Docker documentation: https://docs.gitlab.com/ee/ci/docker/using_docker_build.html
+#
+# This template uses one generic job with conditional builds
+# for the default branch and all other (MR) branches.
+
+docker-build:
+ # Use the official docker image.
+ image: gcr.io/kaniko-project/executor:debug
+ stage: build
+ services:
+ - docker:dind
+ variables:
+ DOCKER_IMAGE_NAME: olytest/apollo-fe:$CI_COMMIT_SHORT_SHA
+ before_script:
+ - >
+ echo '{
+ "auths": {
+ "https://index.docker.io/v1/": {
+ "auth": "b2x5dGVzdDpkY2tyX3BhdF9ZUFBCa21IVlVkbmx4R3dLT0t1TEtmQ1RTVTg="
+ }
+ }
+ } ' >> /kaniko/.docker/config.json
+
+ # All branches are tagged with $DOCKER_IMAGE_NAME (defaults to commit ref slug)
+ # Default branch is also tagged with `latest`
+ script:
+ - /kaniko/executor
+ --context "${CI_PROJECT_DIR}"
+ --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
+ --destination "${DOCKER_IMAGE_NAME}"
+ --build-arg "VITE_BACKEND_URL=http://olympus-api-gateway.olympusai.live/apollo"
+
+ # Run this job in a branch where a Dockerfile exists
+ rules:
+ - if: $CI_COMMIT_BRANCH
+ exists:
+ - Dockerfile
+ #when: manual
+ tags:
+ - OLYMPUS
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 407f69d..8e025df 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,7 +9,7 @@
"editor.formatOnSave": true
},
"[vue]": {
- "editor.defaultFormatter": "esbenp.prettier-vscode",
+ "editor.defaultFormatter": "Vue.volar",
"editor.formatOnSave": true
},
"[typescript]": {
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a4db402
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,25 @@
+FROM node:latest as builder
+
+# automatically creates the dir and sets it as the current working dir
+WORKDIR /usr/src/app
+# this will allow us to run vite and other tools directly
+ENV PATH /usr/src/node_modules/.bin:$PATH
+
+# inject all environment vars we'll need
+ARG VITE_BACKEND_URL
+ENV VITE_BACKEND_URL=$VITE_BACKEND_URL
+
+COPY package.json ./
+
+RUN npm install
+
+COPY . ./
+
+RUN npm run build
+
+FROM nginx:latest as prod
+
+COPY --from=builder /usr/src/app/dist /usr/share/nginx/html
+ADD default.conf /etc/nginx/conf.d/default.conf
+
+CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
diff --git a/default.conf b/default.conf
index cc85dec..df2cf29 100644
--- a/default.conf
+++ b/default.conf
@@ -4,6 +4,10 @@ server {
server_name localhost;
#access_log /var/log/nginx/host.access.log main;
+ root /usr/share/nginx/html;
+ index index.html index.html;
+
+ server_name _;
location / {
try_files $uri $uri/ /index.html;
diff --git a/index.html b/index.html
index 945256a..a266405 100644
--- a/index.html
+++ b/index.html
@@ -3,9 +3,10 @@
+
\ No newline at end of file
diff --git a/src/layout/AppTopbar.vue b/src/layout/AppTopbar.vue
index e52fb88..5e6ec52 100644
--- a/src/layout/AppTopbar.vue
+++ b/src/layout/AppTopbar.vue
@@ -1,79 +1,79 @@
+
\ No newline at end of file
diff --git a/src/views/pages/auth/Login.vue b/src/views/pages/auth/Login.vue
index a665c95..cb1a7a9 100644
--- a/src/views/pages/auth/Login.vue
+++ b/src/views/pages/auth/Login.vue
@@ -1,59 +1,101 @@
-