diff --git a/packages/frontend/src/Layout.vue b/packages/frontend/src/Layout.vue index 54f42e0..2dc09b4 100755 --- a/packages/frontend/src/Layout.vue +++ b/packages/frontend/src/Layout.vue @@ -41,6 +41,15 @@ icon="material-symbols:groups-rounded" /> + +
+ +
@@ -60,7 +69,7 @@ ? "full-route" : ""' > - +
@@ -105,9 +114,11 @@ main.layout { -webkit-user-select: none; } -.left-menu a { +.left-menu > a, +.left-menu > div { display: block; position: relative; + cursor: pointer; z-index: 0; border-radius: 0.5rem; border: 1px solid transparent; @@ -117,7 +128,12 @@ main.layout { transition: background-color 200ms ease-out; } -.left-menu a * { +.left-menu > div { + margin-top: auto; +} + +.left-menu > a > *, +.left-menu > div > * { font-size: 3rem; padding: 0.25rem; border-radius: 0.5rem; @@ -130,7 +146,7 @@ main.layout { box-sizing: border-box; } -.left-menu a::before { +.left-menu > a::before { content: ""; display: block; position: absolute; @@ -144,16 +160,17 @@ main.layout { transition: all 200ms ease-out; } -.left-menu a.isActive::before { +.left-menu > a.isActive::before { background-color: var(--text-color); } -.left-menu a:hover, -.left-menu a.isActive { +.left-menu > a:hover, +.left-menu > a.isActive, +.left-menu > div:hover { background-color: var(--bg-sub-color); } -.left-menu a.isActive { +.left-menu > a.isActive { border: 1px solid var(--border-color); } @@ -191,7 +208,7 @@ main.layout { box-sizing: border-box; } -.content-main .route-main.full-route { +.content-main > .route-main.full-route { padding: 0; overflow: hidden; } @@ -232,21 +249,14 @@ import { communitys, serverInfo } from "@/lib/account"; import { computed, onBeforeUnmount, onMounted, watch } from "vue"; import { createModal } from "@/lib/modal"; import ErrorModal from "@/components/Modal/Error.vue"; +import CreateCommunity from "@/components/Modal/CreateCommunity.vue"; const router = useRouter(); const route = useRoute(); const isFullRoute = computed(() => route.meta.isFullRoute === true); -watch(route, (to, from) => { - if ( - to.matched[0]?.path === from.matched[0]?.path && - from.meta.canReloadTitle === false - ) { - routerStatus.isLoad = false; - return false; - } - +watch(route, () => { if (typeof route.meta.title === "string") title.value = route.meta.title; }); @@ -290,4 +300,11 @@ onBeforeUnmount(() => { window.removeEventListener("error", handleError); window.removeEventListener("unhandledrejection", handleError); }); + +const createCommunity = () => { + createModal({ + component: CreateCommunity, + }); + return; +} \ No newline at end of file diff --git a/packages/frontend/src/components/Message.vue b/packages/frontend/src/components/Message.vue index d1a246b..9c4a6b9 100644 --- a/packages/frontend/src/components/Message.vue +++ b/packages/frontend/src/components/Message.vue @@ -1,5 +1,5 @@