From 53dea0f45d8c3991d8886848509e87811054302f Mon Sep 17 00:00:00 2001 From: Daniel Ceregatti Date: Mon, 29 Jul 2024 07:54:16 -0700 Subject: [PATCH] Second working version with vite-express integration. Replace Bootstrap with Privemue. Add i18n support. English and Brazilian Portuguese to start. New UI with Primevue. Use tabbed menu, nice theme, etc.. WIP with Steam login. --- docker-compose.yml | 2 +- web/bin/start.sh | 4 +- web/docroot/src/App.vue | 6 +- web/docroot/src/components/Body.vue | 9 - web/docroot/src/components/Error.vue | 37 +--- web/docroot/src/components/Files.vue | 19 ++ web/docroot/src/components/Header.vue | 83 +++++---- web/docroot/src/components/Home.vue | 8 + web/docroot/src/components/Login.vue | 34 ---- web/docroot/src/components/Main.vue | 6 +- web/docroot/src/components/Mods.vue | 8 +- web/docroot/src/components/Servers.vue | 21 +-- web/docroot/src/components/Status.vue | 20 +- web/docroot/src/components/Steam.vue | 61 +++++++ web/docroot/src/css/index.css | 10 +- web/docroot/src/locales/en.js | 42 +++++ web/docroot/src/locales/index.js | 16 ++ web/docroot/src/locales/pt.js | 42 +++++ web/docroot/src/main.js | 22 ++- web/docroot/src/store.js | 10 +- web/index.js | 18 +- web/package-lock.json | 241 ++++++++++++++++++++++++- web/package.json | 7 +- 23 files changed, 553 insertions(+), 173 deletions(-) delete mode 100644 web/docroot/src/components/Body.vue create mode 100644 web/docroot/src/components/Files.vue create mode 100644 web/docroot/src/components/Home.vue delete mode 100644 web/docroot/src/components/Login.vue create mode 100644 web/docroot/src/components/Steam.vue create mode 100644 web/docroot/src/locales/en.js create mode 100644 web/docroot/src/locales/index.js create mode 100644 web/docroot/src/locales/pt.js diff --git a/docker-compose.yml b/docker-compose.yml index 8bb3804..a902d44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: args: - USER_ID user: ${USER_ID} - hostname: web + hostname: dayzdockerserver volumes: - homedir_main:/home/user - serverfiles:/serverfiles diff --git a/web/bin/start.sh b/web/bin/start.sh index 0eaaae0..7f5a0f5 100755 --- a/web/bin/start.sh +++ b/web/bin/start.sh @@ -7,12 +7,12 @@ trap ' ' SIGINT SIGTERM # Set PS1 so we know we're in the container -if grep -q "dz-web" .bashrc +if ! grep -q "dz-web" .bashrc then echo "Adding PS1 to .bashrc..." cat >> .bashrc < import Error from '@/components/Error.vue' -import Login from '@/components/Login.vue' -import Main from '@/components/Main.vue' +import Header from '@/components/Header.vue' import { useFetch } from '@vueuse/core' import { useAppStore } from '@/store.js' const store = useAppStore() @@ -17,8 +16,7 @@ useFetch('/status', {
- -
+
diff --git a/web/docroot/src/components/Body.vue b/web/docroot/src/components/Body.vue deleted file mode 100644 index 4c66730..0000000 --- a/web/docroot/src/components/Body.vue +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/web/docroot/src/components/Error.vue b/web/docroot/src/components/Error.vue index 07c6032..9bce847 100644 --- a/web/docroot/src/components/Error.vue +++ b/web/docroot/src/components/Error.vue @@ -1,40 +1,11 @@ diff --git a/web/docroot/src/components/Files.vue b/web/docroot/src/components/Files.vue new file mode 100644 index 0000000..bfca58c --- /dev/null +++ b/web/docroot/src/components/Files.vue @@ -0,0 +1,19 @@ + + + diff --git a/web/docroot/src/components/Header.vue b/web/docroot/src/components/Header.vue index d7637c7..483c036 100644 --- a/web/docroot/src/components/Header.vue +++ b/web/docroot/src/components/Header.vue @@ -1,45 +1,50 @@ diff --git a/web/docroot/src/components/Home.vue b/web/docroot/src/components/Home.vue new file mode 100644 index 0000000..5e1c03f --- /dev/null +++ b/web/docroot/src/components/Home.vue @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/web/docroot/src/components/Login.vue b/web/docroot/src/components/Login.vue deleted file mode 100644 index bb6b644..0000000 --- a/web/docroot/src/components/Login.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - - diff --git a/web/docroot/src/components/Main.vue b/web/docroot/src/components/Main.vue index 75969c5..57463f9 100644 --- a/web/docroot/src/components/Main.vue +++ b/web/docroot/src/components/Main.vue @@ -4,8 +4,6 @@ import Header from './Header.vue' diff --git a/web/docroot/src/components/Mods.vue b/web/docroot/src/components/Mods.vue index 35aed56..36009c2 100644 --- a/web/docroot/src/components/Mods.vue +++ b/web/docroot/src/components/Mods.vue @@ -4,7 +4,7 @@ import { useFetch } from '@vueuse/core' import { useAppStore } from '@/store.js' import ModInfo from '@/components/Modinfo.vue' const store = useAppStore() -const { data, error } = useFetch(config.baseUrl + '/mods', { +const { data, error } = useFetch('/mods', { afterFetch(ctx) { store.mods = ctx.data.mods return ctx @@ -13,14 +13,14 @@ const { data, error } = useFetch(config.baseUrl + '/mods', {