diff --git a/.env.development b/.env.development index 61c8220..e57fbbb 100644 --- a/.env.development +++ b/.env.development @@ -1,9 +1,11 @@ -VITE_APP_VERSION="3.1.2" +VITE_APP_VERSION="3.1.3" VITE_API_URL="http://localhost:8000/" VITE_API_KEY="your_api_key_should_be_here" VITE_ASSET_PATH="/assets" +VITE_CDN_PATH="https://cdn.phaseii.network/file/PhaseII" VITE_GAME_ASSET_PATH="https://cdn.phaseii.network/file/PhaseII/game-assets" VITE_DISCORD_OAUTH_URL="https://discord.com/oauth2/authorize?client_id=947985989421395988&response_type=code&redirect_uri=http%3A%2F%2Flocalhost%3A5173%2F%23%2Fprofile%2Fintegrate%2Fdiscord&scope=identify" VITE_TACHI_OAUTH_URL="https://kamai.tachi.ac/oauth/request-auth?clientID=CIb72d1ff81fcfdc001ead8bde3a0ae1a7e0663a37" VITE_DISCORD_URL="https://discord.gg/mNmjpX33cd" -VITE_DOCS_URL="https://docs.phaseii.network" \ No newline at end of file +VITE_DOCS_URL="https://docs.phaseii.network" +VITE_UNITY_URL="http://localhost:5174" \ No newline at end of file diff --git a/.env.production b/.env.production index 3509a2c..6f4d0f5 100644 --- a/.env.production +++ b/.env.production @@ -1,9 +1,11 @@ -VITE_APP_VERSION="3.1.2" +VITE_APP_VERSION="3.1.3" VITE_API_URL="https://restfulsleep.phaseii.network" VITE_API_KEY="your_api_key_should_be_here" VITE_ASSET_PATH="https://cdn.phaseii.network/file/PhaseII/web-assets" +VITE_CDN_PATH="https://cdn.phaseii.network/file/PhaseII" VITE_GAME_ASSET_PATH="https://cdn.phaseii.network/file/PhaseII/game-assets" VITE_DISCORD_OAUTH_URL="https://discord.com/oauth2/authorize?client_id=947985989421395988&response_type=code&redirect_uri=https%3A%2F%2Fweb3.phaseii.network%2Fprofile%2Fintegrate%2Fdiscord&scope=identify" VITE_TACHI_OAUTH_URL="https://kamai.tachi.ac/oauth/request-auth?clientID=CIce4260e1939ceed11c8e48ee857a3aef2a87ba56" VITE_DISCORD_URL="https://discord.gg/mNmjpX33cd" -VITE_DOCS_URL="https://docs.phaseii.network" \ No newline at end of file +VITE_DOCS_URL="https://docs.phaseii.network" +VITE_UNITY_URL="https://unity.phaseii.network" \ No newline at end of file diff --git a/package.json b/package.json index 402de29..06741a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phaseweb3", - "version": "3.1.2", + "version": "3.1.3", "scripts": { "dev": "vite --host", "build": "vite build", diff --git a/public/assets/card/unity.webp b/public/assets/card/unity.webp new file mode 100644 index 0000000..715a103 Binary files /dev/null and b/public/assets/card/unity.webp differ diff --git a/public/data-sources/changelog.json b/public/data-sources/changelog.json index 1149129..e385be5 100644 --- a/public/data-sources/changelog.json +++ b/public/data-sources/changelog.json @@ -48,5 +48,6 @@ "3.1.0-RC": ["- (Feature) Add onboarding page", "- (Minor) Add BaseImage component", "- (Minor) Add BaseAccordion component, - (Admin) Finish admin event log page"], "3.1.0": ["- (Major) WebUI V3 full release"], "3.1.1": ["- (Admin) Add more admin stats for users", "- (Minor) Add new greetings"], - "3.1.2": ["- (Major) Add initial code for oAuth pages", "- (Major) Add redirect to target page after login", "- (Minor) Add quick links to navbar", "- (Minor) Add new greetings", "- (Minor) Replace login page background", "- (Minor) Add animation to loading modal", "- (Bugfix) Refactor loading modal", "- (Bugfix) Refactor overlay layer", "- (Bugfix) Optimize main layouts", "- (Bugfix) Fix loading states around site", "- (Bugfix) Optimize news read api calls", "- (Minor) Add simple auth checkers to router, blocking access at webui level"] + "3.1.2": ["- (Major) Add initial code for oAuth pages", "- (Major) Add redirect to target page after login", "- (Minor) Add quick links to navbar", "- (Minor) Add new greetings", "- (Minor) Replace login page background", "- (Minor) Add animation to loading modal", "- (Bugfix) Refactor loading modal", "- (Bugfix) Refactor overlay layer", "- (Bugfix) Optimize main layouts", "- (Bugfix) Fix loading states around site", "- (Bugfix) Optimize news read api calls", "- (Minor) Add simple auth checkers to router, blocking access at webui level"], + "3.1.3": ["- (Major) Add better error popups, add new buttons on errors", "- (Major) Finish initial authorization page for internal apps", "- (Minor) Add more greetings", "- (Bugfix) Fix overlay layer transparency when saving", "- (Bugfix) Fix remaining missing colors"] } \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 3d135be..2ff339c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -24,7 +24,19 @@ watch(isActive, (val) => { if (!isActive.value) { showModal.value = false; } - }, 250); + }, 150); + } +}); + +watch(errorCode, (val) => { + if (val) { + showModal.value = true; + } else { + setTimeout(() => { + if (!errorCode.value) { + showModal.value = false; + } + }, 150); } }); diff --git a/src/colors.js b/src/colors.js index 65874bb..a611439 100644 --- a/src/colors.js +++ b/src/colors.js @@ -13,6 +13,7 @@ export const colorsBgLight = { info: "bg-blue-700 border-blue-500 text-white", sakura: "bg-pink-700 border-pink-500 text-white", gold: "bg-amber-700 border-amber-500 text-white", + slight_danger: "bg-red-600 border-red-500", }; export const colorsText = { diff --git a/src/components/Modal/LoadingModal.vue b/src/components/Modal/LoadingModal.vue index 60dab0a..6de120c 100644 --- a/src/components/Modal/LoadingModal.vue +++ b/src/components/Modal/LoadingModal.vue @@ -3,6 +3,7 @@ import { useRouter } from "vue-router"; import CardBox from "@/components/CardBox.vue"; import BaseIcon from "@/components/BaseIcon.vue"; import BaseButton from "@/components/BaseButton.vue"; +import BaseButtons from "@/components/BaseButtons.vue"; import { useMainStore } from "@/stores/main"; import { PhCloudCheck, PhCloudX, PhShrimp } from "@phosphor-icons/vue"; @@ -32,6 +33,18 @@ function hotReload() { $router.go(); return null; } + +function goBack() { + $router.go(-1); + return null; +} + +function closeModal() { + mainStore.errorCode = null; + mainStore.decrementLoading(); + mainStore.decrementSaving(); + return null; +} diff --git a/src/components/OverlayLayer.vue b/src/components/OverlayLayer.vue index e1b33ec..d72af44 100644 --- a/src/components/OverlayLayer.vue +++ b/src/components/OverlayLayer.vue @@ -1,7 +1,8 @@