diff --git a/package.json b/package.json index bfad68b..4aa6bcf 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "private": true, "scripts": { "dev": "vite --host --port 8080", + "preview": "vite preview --host --port 8080", "build": "vite build" }, "dependencies": { diff --git a/src/assets/Global.scss b/src/assets/Global.scss index f3a1b00..88657c4 100644 --- a/src/assets/Global.scss +++ b/src/assets/Global.scss @@ -24,7 +24,7 @@ --primary: #FFFFFF; --primary-hover: #292b26; --secondary: #EAEAEA; - --tertiary: #cacaca; + --tertiary: #d3d3d3; --text: #111210; --text-inverse: #FFFFFF; --text-secondary: #404040; @@ -60,6 +60,11 @@ html, body { } +#app { + height: 100%; + display: flex; +} + .no-decoration { text-decoration: none !important; } diff --git a/src/components/Layout/GuildHeader.vue b/src/components/Layout/GuildHeader.vue index c3a2872..e3250d4 100644 --- a/src/components/Layout/GuildHeader.vue +++ b/src/components/Layout/GuildHeader.vue @@ -103,7 +103,9 @@ function updateServerInfo() { .container { display: flex; flex-direction: column; - gap: 10px;; + justify-content: space-between; + gap: 10px; + height: 100%; } .itm { @@ -146,6 +148,7 @@ function updateServerInfo() { position: absolute; background-color: var(--tertiary); border-radius: 0px 0px 10px 10px; + z-index: 1000; } .menu-content { diff --git a/src/components/Layout/Search.vue b/src/components/Layout/Search.vue index cbb87ed..f238dfd 100644 --- a/src/components/Layout/Search.vue +++ b/src/components/Layout/Search.vue @@ -1,13 +1,41 @@ \ No newline at end of file diff --git a/src/components/UI/ModalTree.vue b/src/components/UI/ModalTree.vue index 39007f2..a68d0b1 100644 --- a/src/components/UI/ModalTree.vue +++ b/src/components/UI/ModalTree.vue @@ -2,7 +2,7 @@
-

{{ title }}

+

{{ title }}

@@ -20,6 +20,16 @@ defineProps({ }) \ No newline at end of file diff --git a/src/components/UI/User.vue b/src/components/UI/User.vue index 081ee28..f813de5 100644 --- a/src/components/UI/User.vue +++ b/src/components/UI/User.vue @@ -11,7 +11,6 @@ + + \ No newline at end of file diff --git a/src/components/Widget/View/LoadingView.vue b/src/components/Widget/View/LoadingView.vue new file mode 100644 index 0000000..93175c7 --- /dev/null +++ b/src/components/Widget/View/LoadingView.vue @@ -0,0 +1,41 @@ + + + \ No newline at end of file diff --git a/src/components/Widget/View/SearchResults.vue b/src/components/Widget/View/SearchResults.vue new file mode 100644 index 0000000..af9fa97 --- /dev/null +++ b/src/components/Widget/View/SearchResults.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/Interface.vue b/src/views/Interface.vue index 316d593..3972b1b 100644 --- a/src/views/Interface.vue +++ b/src/views/Interface.vue @@ -1,8 +1,10 @@ @@ -29,6 +34,7 @@ import Account from '@/components/Layout/Account.vue'; import events from '@/utils/Events.js'; import GuildHeader from '@/components/Layout/GuildHeader.vue'; import Search from '@/components/Layout/Search.vue'; +import View from '@/components/Layout/View.vue'; const props = defineProps({ guildId: { @@ -98,11 +104,105 @@ function checkGuildAvailability() { \ No newline at end of file