From 0f37f195a97ef263df90abba384fc8333fa0b2dc Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Wed, 17 Jan 2024 21:17:00 -0500 Subject: [PATCH] Added Dockerfile and some fixed some bugs --- Dockerfile | 3 + docker/nginx.conf | 34 ++++++++ index.html | 2 +- public/items/blessingPowerItems.json | 6 +- src/App.vue | 10 +++ src/assets/base.css | 82 +------------------ .../BlessingPower/SpecialItemsCard.vue | 2 +- .../FellowPower/SpecialItemsCard.vue | 2 +- src/views/BlessingPowerView.vue | 2 +- src/views/FellowPowerView.vue | 2 +- src/views/HomeView.vue | 7 +- 11 files changed, 59 insertions(+), 93 deletions(-) create mode 100644 Dockerfile create mode 100644 docker/nginx.conf diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..4784572 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:stable-alpine +COPY docker/nginx.conf /etc/nginx/nginx.conf +COPY ./dist /usr/share/nginx/html \ No newline at end of file diff --git a/docker/nginx.conf b/docker/nginx.conf new file mode 100644 index 0000000..f7076f3 --- /dev/null +++ b/docker/nginx.conf @@ -0,0 +1,34 @@ +# Ref: https://cli.vuejs.org/guide/deployment.html#docker-nginx + +user nginx; +worker_processes 1; +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; +events { + worker_connections 1024; +} +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + access_log /var/log/nginx/access.log main; + sendfile on; + keepalive_timeout 65; + server { + # good practice not to use port 80 inside a container + # because container should run as non root and they can't run under port < 1024 + listen 8080; + server_name localhost; + location / { + root /usr/share/nginx/html; + index index.html; + try_files $uri $uri/ /index.html; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + } +} \ No newline at end of file diff --git a/index.html b/index.html index a888544..3c62995 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - Vite App + Isekai: Slow Life - Calculator
diff --git a/public/items/blessingPowerItems.json b/public/items/blessingPowerItems.json index 5d9a224..51aad0d 100644 --- a/public/items/blessingPowerItems.json +++ b/public/items/blessingPowerItems.json @@ -13,7 +13,7 @@ }, "ddd29671-ca7f-4132-8784-80346e154059": { "iconURL": "", - "itemName": "Blessing Power Cachapon", + "itemName": "Blessing Power Gachapon", "minItemPower": 10, "maxItemPower": 30 }, @@ -62,7 +62,7 @@ "e2472929-1218-4cd6-a73b-b783c17bbc31": { "iconURL": "", "itemName": "Flaming Lion", - "minItemPower": -1, - "maxItemPower": 0 + "minItemPower": 14, + "maxItemPower": 48 } } \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index f7d5fa9..ceac73c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,6 +6,16 @@ import GlobalHeader from '@/components/GlobalHeader.vue'