💄 Optimized attachments view

💄 Better speed dial
💄 Better navbar
2024-03-30 20:24:26 +08:00 · 2024-03-30 20:08:39 +08:00 · 2024-03-30 19:24:19 +08:00 · 2024-03-30 18:52:03 +08:00 · 2024-03-30 12:06:19 +08:00
14 changed files with 234 additions and 137 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,3 +29,5 @@ coverage

 *.tsbuildinfo
 *.lockb
+
+*dist
--- a/index.html
+++ b/index.html
@ -2,7 +2,8 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/xml+svg" href="/favicon.png" />
+    <link rel="icon" type="image/png" href="/favicon.png" />
+    <link rel="apple-touch-icon" type="image/png" href="/apple-touch-icon.png" sizes="1024x1024">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
    <title>Solian</title>
  </head>
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/icon.png
+++ b/public/icon.png
--- a/public/manifest.webmanifest
+++ b/public/manifest.webmanifest
@ -1,46 +0,0 @@
-{
-  "icons": [
-    {
-      "src": "../icons/icon-48.webp",
-      "type": "image/png",
-      "sizes": "48x48",
-      "purpose": "any maskable"
-    },
-    {
-      "src": "../icons/icon-72.webp",
-      "type": "image/png",
-      "sizes": "72x72",
-      "purpose": "any maskable"
-    },
-    {
-      "src": "../icons/icon-96.webp",
-      "type": "image/png",
-      "sizes": "96x96",
-      "purpose": "any maskable"
-    },
-    {
-      "src": "../icons/icon-128.webp",
-      "type": "image/png",
-      "sizes": "128x128",
-      "purpose": "any maskable"
-    },
-    {
-      "src": "../icons/icon-192.webp",
-      "type": "image/png",
-      "sizes": "192x192",
-      "purpose": "any maskable"
-    },
-    {
-      "src": "../icons/icon-256.webp",
-      "type": "image/png",
-      "sizes": "256x256",
-      "purpose": "any maskable"
-    },
-    {
-      "src": "../icons/icon-512.webp",
-      "type": "image/png",
-      "sizes": "512x512",
-      "purpose": "any maskable"
-    }
-  ]
-}
--- a/public/robots.txt
+++ b/public/robots.txt
@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
--- a/src/components/posts/PostAttachment.vue
+++ b/src/components/posts/PostAttachment.vue
@ -3,33 +3,53 @@
    Attached {{ props.attachments.length }} attachment(s)
  </v-chip>

-  <v-card v-else variant="outlined" class="max-w-[540px] max-h-[720px]">
-    <v-carousel hide-delimiter-background height="100%" :show-arrows="false">
-      <v-carousel-item v-for="item in attachments">
-        <img v-if="item.type === 1" :src="getUrl(item)" :alt="item.filename" class="cursor-zoom-in"
-             @click="openLightbox" />
-        <video v-if="item.type === 2" controls class="w-full">
-          <source :src="getUrl(item)" />
-        </video>
-        <div v-if="item.type === 3" class="w-full px-7 py-12">
-          <audio controls :src="getUrl(item)" class="mx-auto"></audio>
-        </div>
-      </v-carousel-item>
-    </v-carousel>
+  <v-responsive v-else :aspect-ratio="16 / 9" max-height="720">
+    <v-card variant="outlined" class="w-full h-full">
+      <v-carousel
+        hide-delimiter-background
+        height="100%"
+        :hide-delimiters="props.attachments.length <= 1"
+        :show-arrows="false"
+      >
+        <v-carousel-item v-for="(item, idx) in attachments">
+          <img
+            v-if="item.type === 1"
+            loading="lazy"
+            decoding="async"
+            class="cursor-zoom-in content-visibility-auto"
+            :src="getUrl(item)"
+            :alt="item.filename"
+            @click="openLightbox(item, idx)"
+          />
+          <video v-if="item.type === 2" controls class="w-full content-visibility-auto">
+            <source :src="getUrl(item)" />
+          </video>
+          <div v-if="item.type === 3" class="w-full px-7 py-12">
+            <audio controls :src="getUrl(item)" class="mx-auto"></audio>
+          </div>
+        </v-carousel-item>
+      </v-carousel>

-    <vue-easy-lightbox teleport="#app" :visible="lightbox" :imgs="[getUrl(current)]" @hide="lightbox = false">
-      <template v-slot:close-btn="{ close }">
-        <v-btn
-          class="fixed left-2 top-2"
-          icon="mdi-close"
-          variant="text"
-          color="white"
-          :style="`margin-top: ${safeAreaTop}`"
-          @click="close"
-        />
-      </template>
-    </vue-easy-lightbox>
-  </v-card>
+      <vue-easy-lightbox
+        teleport="#app"
+        :visible="lightbox"
+        :imgs="props.attachments.map((x) => getUrl(x))"
+        v-model:index="currentIndex"
+        @hide="lightbox = false"
+      >
+        <template v-slot:close-btn="{ close }">
+          <v-btn
+            class="fixed left-2 top-2"
+            icon="mdi-close"
+            variant="text"
+            color="white"
+            :style="`margin-top: ${safeAreaTop}`"
+            @click="close"
+          />
+        </template>
+      </vue-easy-lightbox>
+    </v-card>
+  </v-responsive>
 </template>

 <script setup lang="ts">
@ -43,23 +63,24 @@ const props = defineProps<{ attachments: any[]; overview?: boolean }>()
 const ui = useUI()

 const lightbox = ref(false)
-const focus = ref(0)

-const current = computed(() => props.attachments[focus.value])
-const canLightbox = computed(() => current.value.type === 1)
+const current = ref<any>(null)
+const currentIndex = ref(0)

 const safeAreaTop = computed(() => {
  return `${ui.safeArea.top}px`
 })

 function getUrl(item: any) {
-  return item.external_url ? item.external_url : buildRequestUrl("interactive", `/api/attachments/o/${item.file_id}`)
+  return item.external_url
+    ? item.external_url
+    : buildRequestUrl("interactive", `/api/attachments/o/${item.file_id}`)
 }

-function openLightbox() {
-  if (canLightbox.value) {
-    lightbox.value = true
-  }
+function openLightbox(item: any, idx: number) {
+  current.value = item
+  currentIndex.value = idx
+  lightbox.value = true
 }
 </script>

--- a/src/components/posts/PostList.vue
+++ b/src/components/posts/PostList.vue
@ -1,8 +1,8 @@
 <template>
-  <div class="post-list">
+  <div class="post-list mx-[-8px]">
    <v-infinite-scroll :items="props.posts" :onLoad="props.loader">
      <template v-for="(item, idx) in props.posts" :key="item">
-        <div class="mb-3 px-1">
+        <div class="mb-3 px-[8px]">
          <v-card>
            <template #text>
              <post-item brief :item="item" @update:item="(val) => updateItem(idx, val)" />
--- a/src/layouts/master.vue
+++ b/src/layouts/master.vue
@ -6,25 +6,33 @@
    :rail="drawerMini"
    :rail-width="58"
    :order="0"
+    floating
    @click="drawerMini = false"
  >
    <div class="flex flex-col h-full">
-      <div class="flex items-center justify-between px-3 pb-2.5 border-opacity-15 min-h-[64px]"
-           style="border-bottom-width: thin"
-           :style="`padding-top: max(${safeAreaTop}, 10px)`">
+      <v-toolbar
+        class="flex items-center justify-between px-[14px] border-opacity-15"
+        color="primary"
+        height="64"
+        :style="`padding-top: ${safeAreaTop}`"
+      >
        <div class="flex items-center">
-          <img src="/favicon.png" alt="Logo" width="36" height="36" class="block" />
+          <img src="/favicon.png" alt="Logo" width="32" height="32" class="block" />
          <div v-show="!drawerMini" class="ms-6 font-medium">Solar Network</div>
        </div>

-        <v-btn
-          v-show="!drawerMini"
-          icon="mdi-arrow-collapse-left"
-          size="small"
-          variant="text"
-          @click.stop="drawerMini = true"
-        />
-      </div>
+        <v-spacer />
+
+        <div>
+          <v-btn
+            v-show="!drawerMini"
+            icon="mdi-arrow-collapse-left"
+            size="small"
+            variant="text"
+            @click.stop="drawerMini = true"
+          />
+        </div>
+      </v-toolbar>

      <div class="flex-grow-1">
        <realm-list />
@ -75,22 +83,6 @@
  <v-main id="main">
    <router-view />
  </v-main>
-
-  <v-menu open-on-hover open-on-click :open-delay="0" :close-delay="0" location="top"
-          transition="scroll-y-reverse-transition">
-    <template v-slot:activator="{ props }">
-      <v-fab v-bind="props" appear class="editor-fab" icon="mdi-pencil" color="primary" size="64"
-             :active="id.userinfo.isLoggedIn" />
-    </template>
-
-    <div class="flex flex-col items-center gap-4 mb-4">
-      <v-btn variant="elevated" color="secondary" icon="mdi-newspaper-variant" @click="editor.show.article = true" />
-      <v-btn variant="elevated" color="accent" icon="mdi-camera-iris" @click="editor.show.moment = true" />
-    </div>
-  </v-menu>
-
-  <post-tools />
-  <realm-tools />
 </template>

 <script setup lang="ts">
@ -115,7 +107,6 @@ const safeAreaBottom = computed(() => {
 })

 const id = useUserinfo()
-const editor = useEditor()

 const username = computed(() => {
  if (id.userinfo.isLoggedIn) {
@ -146,10 +137,3 @@ const drawerOpen = ref(true)
 const drawerMini = ref(false)
 </script>

-<style scoped>
-.editor-fab {
-  position: fixed !important;
-  bottom: 16px;
-  right: 20px;
-}
-</style>
--- a/src/layouts/plaza.vue
+++ b/src/layouts/plaza.vue
@ -0,0 +1,65 @@
+<template>
+  <router-view />
+
+  <v-fab
+    appear
+    class="editor-fab"
+    color="primary"
+    size="64"
+    :active="id.userinfo.isLoggedIn"
+  >
+    <v-icon icon="mdi-pencil" />
+
+    <v-speed-dial
+      target=".editor-fab"
+      activator="parent"
+      location="top center"
+      class="editor-speed-dial"
+      transition="slide-y-reverse-transition"
+      open-on-hover
+      open-on-click
+    >
+      <v-btn
+        key="article"
+        variant="elevated"
+        color="secondary"
+        icon="mdi-newspaper-variant"
+        @click="editor.show.article = true"
+      />
+      <v-btn
+        key="moment"
+        variant="elevated"
+        color="accent"
+        icon="mdi-camera-iris"
+        @click="editor.show.moment = true"
+      />
+    </v-speed-dial>
+  </v-fab>
+
+  <post-tools />
+  <realm-tools />
+</template>
+
+<script setup lang="ts">
+import PostTools from "@/components/publish/PostTools.vue"
+import RealmTools from "@/components/realms/RealmTools.vue"
+import { useEditor } from "@/stores/editor"
+import { useUserinfo } from "@/stores/userinfo"
+
+const id = useUserinfo()
+const editor = useEditor()
+</script>
+
+<style scoped>
+.editor-fab {
+  position: fixed !important;
+  bottom: 16px;
+  right: 20px;
+}
+
+.editor-speed-dial {
+  position: fixed !important;
+  bottom: 16px;
+  right: 20px;
+}
+</style>
--- a/src/router/index.ts
+++ b/src/router/index.ts
@ -10,25 +10,42 @@ const router = createRouter({
      children: [
        {
          path: "/",
-          name: "explore",
-          component: () => import("@/views/explore.vue")
+          component: () => import("@/layouts/plaza.vue"),
+          children: [
+            {
+              path: "/",
+              name: "explore",
+              component: () => import("@/views/explore.vue")
+            },
+
+            {
+              path: "/p/moments/:alias",
+              name: "posts.details.moments",
+              component: () => import("@/views/posts/moments.vue")
+            },
+            {
+              path: "/p/articles/:alias",
+              name: "posts.details.articles",
+              component: () => import("@/views/posts/articles.vue")
+            },
+
+            {
+              path: "/realms/:realmId",
+              name: "realms.page",
+              component: () => import("@/views/realms/page.vue")
+            }
+          ]
        },

        {
-          path: "/p/moments/:alias",
-          name: "posts.details.moments",
-          component: () => import("@/views/posts/moments.vue")
-        },
-        {
-          path: "/p/articles/:alias",
-          name: "posts.details.articles",
-          component: () => import("@/views/posts/articles.vue")
-        },
-
-        {
-          path: "/realms/:realmId",
-          name: "realms.page",
-          component: () => import("@/views/realms/page.vue")
+          path: "/chat",
+          children: [
+            {
+              path: ":channel",
+              name: "chat.channel",
+              component: () => import("@/views/chat/channel.vue")
+            }
+          ]
        },

        {
--- a/src/scripts/request.ts
+++ b/src/scripts/request.ts
@ -3,7 +3,8 @@ import { Preferences } from "@capacitor/preferences"

 const serviceMap: { [id: string]: string } = {
  interactive: "https://co.solsynth.dev",
-  identity: "https://id.solsynth.dev"
+  identity: "https://id.solsynth.dev",
+  messaging: "http://localhost:8447",
 }

 export async function request(service: string, input: string, init?: RequestInit, noRetry?: boolean) {
--- a/src/views/chat/channel.vue
+++ b/src/views/chat/channel.vue
@ -0,0 +1,41 @@
+<template>
+  <v-app-bar :order="5" color="grey-lighten-3">
+    <div class="max-md:px-5 md:px-12 flex flex-grow-1 items-center">
+      <v-app-bar-nav-icon icon="mdi-chat" :loading="loading" />
+
+      <h2 class="ml-2 text-lg font-500">{{ metadata?.name }}</h2>
+
+      <p class="ml-3 text-xs opacity-80">{{ metadata?.description }}</p>
+    </div>
+  </v-app-bar>
+
+  <!-- @vue-ignore -->
+  <v-snackbar v-model="error" :timeout="5000">Something went wrong... {{ error }}</v-snackbar>
+</template>
+
+<script setup lang="ts">
+import { request } from "@/scripts/request"
+import { useRoute } from "vue-router"
+import { ref } from "vue"
+
+const route = useRoute()
+
+const error = ref<string | null>(null)
+const loading = ref(false)
+
+const metadata = ref<any>(null)
+
+async function readMetadata() {
+  loading.value = true
+  const res = await request("messaging", `/api/channels/${route.params.channel}`)
+  if (res.status !== 200) {
+    error.value = await res.text()
+  } else {
+    error.value = null
+    metadata.value = await res.json()
+  }
+  loading.value = false
+}
+
+readMetadata()
+</script>
--- a/vite.config.ts
+++ b/vite.config.ts
@ -16,10 +16,19 @@ export default defineConfig({
      registerType: "autoUpdate",
      useCredentials: true,
      manifest: {
-        name: "Solian",
+        name: "Solar Network",
        short_name: "Solian",
        description: "The Solar Network entrypoint.",
        theme_color: "#4b5094",
+        display: "standalone",
+        icons: [
+          {
+            src: "icon.png",
+            sizes: "1024x1024",
+            type: "image/png",
+            purpose: "maskable"
+          },
+        ]
      },
    })
  ],
Author	SHA1	Message	Date
LittleSheep	05e8782557	💄 Optimized attachments view	2024-03-30 20:24:26 +08:00
LittleSheep	e986ff8c5f	💄 Better speed dial	2024-03-30 20:08:39 +08:00
LittleSheep	c616214c3b	💄 Better navbar	2024-03-30 19:24:19 +08:00
LittleSheep	f552cdcf74	🐛 Bug fixes & optimization	2024-03-30 18:52:03 +08:00
LittleSheep	d187ca0a88	✨ Add full PWA support	2024-03-30 12:06:19 +08:00