diff --git a/index.html b/index.html
index 66bfd00..e197fef 100644
--- a/index.html
+++ b/index.html
@@ -4,9 +4,10 @@
amber-wails
-
-
-
-
-
+ transition: all 0.3s ease-in-out;">
diff --git a/src/components/Container.vue b/src/components/Container.vue
index 7ff5958..3841200 100644
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -1,12 +1,14 @@
-
+
diff --git a/src/layouts/Header.vue b/src/layouts/Header.vue
index 9c5ac64..a79b830 100644
--- a/src/layouts/Header.vue
+++ b/src/layouts/Header.vue
@@ -1,23 +1,23 @@
-
+
-
+
-
diff --git a/src/main.ts b/src/main.ts
index 9b74ecd..091b056 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,4 +25,26 @@ app.use(pinia);
app.use(naive);
app.use(router);
-app.mount("#app");
+// @ts-ignore ...
+if (process.env.NODE_ENV === "production") {
+ setTimeout(() => {
+ const appContainer = document.getElementById("app");
+ if (appContainer) {
+ appContainer.style.opacity = "0";
+ }
+ setTimeout(() => {
+ const defaultLoader = document.getElementById("default-loader");
+ // remove
+ defaultLoader?.remove();
+ }, 300);
+
+ setTimeout(() => {
+ app.mount("#app");
+ }, 300);
+ setTimeout(() => {
+ appContainer!.style.opacity = "1";
+ }, 300);
+ }, 200);
+} else {
+ app.mount("#app");
+}
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 43f84f3..48477b0 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -17,6 +17,7 @@ export const useUserStore = defineStore("user", {
id: 0,
name: "",
email: "",
+ avatar: "",
},
timer: 0,
}),
@@ -25,7 +26,7 @@ export const useUserStore = defineStore("user", {
idToken: string,
accessToken: string,
refreshToken: string,
- expiredAt: number,
+ expiredAt: number
) {
const idTokenParts = idToken.split(".");
@@ -38,9 +39,7 @@ export const useUserStore = defineStore("user", {
this.access_token = accessToken;
this.id_token = idToken;
- this.user.email = idTokenPayload.email;
- this.user.name = idTokenPayload.name;
- this.user.id = idTokenPayload.sub;
+ this.user = { ...idTokenPayload };
this.logined = true;
},
checkAndRefresh() {
@@ -74,7 +73,7 @@ export const useUserStore = defineStore("user", {
response.data.id_token,
response.data.access_token,
response.data.refresh_token,
- response.data.expires_in,
+ response.data.expires_in
);
})
.catch((error) => {
@@ -88,15 +87,10 @@ export const useUserStore = defineStore("user", {
});
},
logout() {
- this.user = {
- id: 0,
- name: "",
- email: "",
- };
-
- this.id_token = "";
- this.logined = false;
- }
+ this.$reset();
+ this.user = this.$state.user;
+ this.id_token = this.$state.id_token;
+ this.logined = this.$state.logined;
+ },
},
});
-
diff --git a/src/style.css b/src/style.css
index 68a28a8..ff56dc0 100644
--- a/src/style.css
+++ b/src/style.css
@@ -3,5 +3,9 @@
@tailwind utilities;
body {
- --header-height: 32px;
+ --header-height: 48px;
+}
+
+.header-height {
+ min-height: var(--header-height);
}