diff --git a/package.json b/package.json index 247dfa9..4edf4b3 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "pinia": "^2.1.7", "universal-cookie": "^7.1.0", "vue": "^3.4.21", + "vue-advanced-cropper": "^2.8.8", "vue-easy-lightbox": "^1.19.0", "vue-router": "^4.3.0", "vuetify": "^3.5.12" diff --git a/src/assets/utils.css b/src/assets/utils.css index 9b3c597..627804e 100644 --- a/src/assets/utils.css +++ b/src/assets/utils.css @@ -11,6 +11,7 @@ body, .no-scrollbar::-webkit-scrollbar { width: 0; + display: none; } html, body { diff --git a/src/components/users/UserMenu.vue b/src/components/users/UserMenu.vue index 10a1c28..33b290d 100644 --- a/src/components/users/UserMenu.vue +++ b/src/components/users/UserMenu.vue @@ -1,43 +1,32 @@ diff --git a/src/layouts/master.vue b/src/layouts/master.vue index 0a4f4ab..74a4d2e 100644 --- a/src/layouts/master.vue +++ b/src/layouts/master.vue @@ -54,27 +54,7 @@ @@ -110,6 +90,7 @@ import { useUI } from "@/stores/ui" import RealmList from "@/components/realms/RealmList.vue" import NotificationList from "@/components/users/NotificationList.vue" import ChannelList from "@/components/chat/channels/ChannelList.vue" +import UserMenu from "@/components/users/UserMenu.vue" const ui = useUI() const expanded = ref(["channels"]) @@ -141,21 +122,9 @@ const nickname = computed(() => { id.readProfiles() -const meta = useWellKnown() - -const passportUrl = computed(() => { - return meta.wellKnown?.components?.identity -}) - -meta.readWellKnown() +useWellKnown().readWellKnown() const drawerOpen = ref(true) const drawerMini = ref(false) - -async function signout() { - signoutAccount().then(() => { - window.location.reload() - }) -} diff --git a/src/layouts/settings.vue b/src/layouts/settings.vue new file mode 100644 index 0000000..d3fedf9 --- /dev/null +++ b/src/layouts/settings.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 4f8b9b2..ca440d9 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -6,6 +6,7 @@ import nprogress from "nprogress"; import { authRouter } from "@/router/auth" import { plazaRouter } from "@/router/plaza" import { chatRouter } from "@/router/chat" +import { settingRouter } from "@/router/settings" const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -20,6 +21,12 @@ const router = createRouter({ component: () => import("@/views/users/page.vue") }, + { + path: "/settings", + component: () => import("@/layouts/settings.vue"), + children: settingRouter, + }, + { path: "/", component: () => import("@/layouts/plaza.vue"), diff --git a/src/router/settings.ts b/src/router/settings.ts new file mode 100644 index 0000000..0e59faf --- /dev/null +++ b/src/router/settings.ts @@ -0,0 +1,18 @@ +export const settingRouter = [ + { + path: "", + name: "settings", + component: () => import("@/views/settings.vue") + }, + + { + path: "account/personalize", + name: "settings.account.personalize", + component: () => import("@/views/users/me/personalize.vue") + }, + { + path: "account/personal-page", + name: "settings.account.personal-page", + component: () => import("@/views/users/me/personal-page.vue") + } +] \ No newline at end of file diff --git a/src/views/settings.vue b/src/views/settings.vue new file mode 100644 index 0000000..306450c --- /dev/null +++ b/src/views/settings.vue @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/src/views/users/me/personal-page.vue b/src/views/users/me/personal-page.vue new file mode 100644 index 0000000..a3ea035 --- /dev/null +++ b/src/views/users/me/personal-page.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/views/users/me/personalize.vue b/src/views/users/me/personalize.vue new file mode 100644 index 0000000..b2e57f7 --- /dev/null +++ b/src/views/users/me/personalize.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/users/page.vue b/src/views/users/page.vue index adddf89..461d981 100644 --- a/src/views/users/page.vue +++ b/src/views/users/page.vue @@ -2,7 +2,7 @@
- +