fix: forget match new branch name

PCL-Community · Jan 28, 2025 · 0250a30 · 0250a30
1 parent b937249
commit 0250a30
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 139 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -3,7 +3,9 @@ name: 'publish'
 on:
   push:
     branches:
-      - main
+      - release
+      - beta
+      - dev
 
 # This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release.
 

diff --git a/src/app/FrmHome.vue b/src/app/FrmHome.vue
@@ -1,11 +1,10 @@
 <script lang="ts" setup>
-    
-    import LayoutHomeLeft from "../ui/layouts/Home/LayoutHomeLeft.vue";
+    import LayoutLeft from "../ui/layouts/home/LayoutLeft.vue";
 </script>
 
 <template>
     <main class="h-[calc(100vh-calc(var(--spacing)*14))] flex">
-        <LayoutHomeLeft class="basis-1/3" />
+        <LayoutLeft class="basis-1/3" />
     </main>
 </template>
 

diff --git a/src/app/FrmSettings.vue b/src/app/FrmSettings.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-
+    import LayoutLeft from "../ui/layouts/settings/LayoutLeft.vue";
 </script>
 
 <template>
-
+    <section class="h-[calc(100vh-calc(var(--spacing)*14))] flex">
+        <LayoutLeft class="basis-36" />
+        <section class="basis-full w-full h-full p-4">
+            <RouterView />
+        </section>
+    </section>
 </template>
-
-<style scoped lang="scss">
-
-</style>
diff --git a/src/modules/ModRouter.ts b/src/modules/ModRouter.ts
@@ -1,25 +1,25 @@
 import { createRouter, createWebHistory } from "vue-router";
-import ModEventBus from "./ModEventBus.ts";
+import { ModEventBus } from "./ModEventBus.ts";
 
 const router = createRouter({
     history: createWebHistory(),
     routes: [
         {
             path: "/",
             name: "FrmHome",
-            component: () => import("../app/FrmHome.vue")
+            component: () => import("../app/FrmHome.vue"),
         },
         {
             path: "/settings",
             name: "FrmSettings",
             component: () => import("../app/FrmSettings.vue"),
-            children: []
-        }
-    ]
+            children: [],
+        },
+    ],
 });
 
 ModEventBus.on("router:push", async (path: string) => {
     await router.push(path);
 });
 
-export default router;
+export default router;
diff --git a/src/ui/layouts/Home/LayoutHomeLeft.vue b/src/ui/layouts/Home/LayoutHomeLeft.vue
diff --git a/src/ui/layouts/LayoutHeader.vue b/src/ui/layouts/LayoutHeader.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
     import { getCurrentWindow } from "@tauri-apps/api/window";
     import CompRadioButton from "../components/CompRadioButton.vue";
-    import ModEventBus from "../../modules/ModEventBus.ts";
+    import { ModEventBus } from "../../modules/ModEventBus.ts";
     import { useRoute } from "vue-router";
-    
+
     const AppWindow = getCurrentWindow();
-    
+
     const $route = useRoute();
-    
+
     const handleNavigate = (path: string) => {
         ModEventBus.emit("router:push", path);
     };
@@ -21,44 +21,49 @@
         <!-- TODO: Dynamic Title Content -->
         <section class="text-xl font-semibold text-white flex gap-0 mr-4 items-center float-left">
             <svg xmlns="http://www.w3.org/2000/svg" class="scale-75 scale-x-85 w-[80px] h-[30px] flex">
-                <path fill="none" stroke="currentColor" stroke-width="3" x="26" y="29"
-                        d="M26,29 v-25 h5 a7,7 180 0 1 0,14 h-5 M61,6.5 a10,11.5 180 1 0 0,18 M68,2.5 v24.5 h12"/>
+                <path
+                    fill="none"
+                    stroke="currentColor"
+                    stroke-width="3"
+                    x="26"
+                    y="29"
+                    d="M26,29 v-25 h5 a7,7 180 0 1 0,14 h-5 M61,6.5 a10,11.5 180 1 0 0,18 M68,2.5 v24.5 h12" />
             </svg>
             <span class="badge px-1.5 rounded-sm translate-y-[1px] mr-2 ml-2">Nova</span>
             <!-- <span class="badge badge-warning text-black px-1.5 rounded-sm translate-y-[1px]">Beta</span> -->
             <span class="badge badge-warning text-black px-1.5 rounded-sm translate-y-[1px]">Dev</span>
         </section>
         <!-- NavigateButtons Align=Center -->
         <section class="flex gap-4 mr-4">
-            <CompRadioButton :checked="$route.path === '/'" text="主页" @click="handleNavigate(`/`)" >
+            <CompRadioButton :checked="$route.path === '/'" text="主页" @click="handleNavigate(`/`)">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" class="scale-75">
                     <path
                         fill="currentColor"
                         d="M985.403 552.96C985.403 812.702 773.041 1024 512 1024S38.597 812.702 38.597 552.96c0-158.208 79.163-304.955 211.771-392.625 31.074-20.52 72.94-11.973 93.46 19.101s12.012 72.94-19.062 93.46c-94.681 62.622-151.237 167.306-151.237 280.064 0 185.344 151.788 336.108 338.471 336.108S850.471 738.304 850.471 552.96c0-114.649-57.974-220.278-155.096-282.585-31.35-20.125-40.448-61.833-20.362-93.184s61.794-40.448 93.184-20.4c135.995 87.236 217.206 235.362 217.206 396.169zM512 560.128c37.258 0 67.466-30.208 67.466-67.466V67.466C579.466 30.208 549.258 0 512 0s-67.466 30.208-67.466 67.466v425.196c0 37.258 30.208 67.466 67.466 67.466z" />
                 </svg>
             </CompRadioButton>
-            <CompRadioButton :checked="$route.path.includes('/downloads')" text="下载" @click="handleNavigate(`/downloads/auto`)" >
+            <CompRadioButton :checked="$route.path.includes('/downloads')" text="下载" @click="handleNavigate(`/downloads/auto`)">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" class="scale-85">
                     <path
                         fill="currentColor"
                         d="M955 610h-59c-15 0-29 13-29 29v196c0 15-13 29-29 29h-649c-15 0-29-13-29-29v-196c0-15-13-29-29-29h-59c-15 0-29 13-29 29V905c0 43 35 78 78 78h787c43 0 78-35 78-78V640c0-15-13-29-29-29zM492 740c11 11 29 11 41 0l265-265c11-11 11-29 0-41l-41-41c-11-11-29-11-41 0l-110 110c-11 11-33 3-33-13V68C571 53 555 39 541 39h-59c-15 0-29 13-29 29v417c0 17-21 25-33 13l-110-110c-11-11-29-11-41 0L226 433c-11 11-11 29 0 41L492 740z" />
                 </svg>
             </CompRadioButton>
-            <CompRadioButton :checked="$route.path.includes('/links')" text="联机" @click="handleNavigate(`/links/frp`)" >
+            <CompRadioButton :checked="$route.path.includes('/links')" text="联机" @click="handleNavigate(`/links/frp`)">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" class="scale-105">
                     <path
                         fill="currentColor"
                         d="M512 817c-48.601 0-88-39.399-88-88s39.399-88 88-88 88 39.399 88 88-39.399 88-88 88zM237.671 565.74C308.335 474.58 397.369 429 504.774 429c118.433 0 214.225 55.421 287.377 166.264l-53.407 30.369c-13.84 7.87-31.362 4.367-41.114-8.219-50.291-64.911-114.577-97.367-192.856-97.367-86.851 0-156.835 40.318-209.95 120.953l-47.995-28.02c-15.263-8.91-20.412-28.507-11.502-43.77a32 32 0 0 1 2.344-3.47zM107.691 419.47C205.24 278.491 337.805 208 505.379 208c178.77 0 317.694 80.224 416.772 240.672l-56.54 31.73c-13.686 7.68-30.922 4.303-40.697-7.975C735.581 360.213 629.07 303.009 505.38 300.815 373.997 298.485 261.637 362.88 168.3 494l-50.116-28.505c-15.362-8.738-20.732-28.275-11.994-43.637a32 32 0 0 1 1.5-2.387z" />
                 </svg>
             </CompRadioButton>
-            <CompRadioButton :checked="$route.path.includes('/settings')" text="设置" @click="handleNavigate(`/settings/custom`)" >
+            <CompRadioButton :checked="$route.path.includes('/settings')" text="设置" @click="handleNavigate(`/settings/custom`)">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" class="scale-95">
                     <path
                         fill="currentColor"
                         d="M940.4 463.7L773.3 174.2c-17.3-30-49.2-48.4-83.8-48.4H340.2c-34.6 0-66.5 18.5-83.8 48.4L89.2 463.7c-17.3 30-17.3 66.9 0 96.8L256.4 850c17.3 30 49.2 48.4 83.8 48.4h349.2c34.6 0 66.5-18.5 83.8-48.4l167.2-289.5c17.3-29.9 17.3-66.8 0-96.8z m-94.6 96.8L725.9 768.1c-17.3 30-49.2 48.4-83.8 48.4H387.5c-34.6 0-66.5-18.5-83.8-48.4L183.9 560.5c-17.3-30-17.3-66.9 0-96.8l119.8-207.5c17.3-30 49.2-48.4 83.8-48.4h254.6c34.6 0 66.5 18.5 83.8 48.4l119.8 207.5c17.3 30 17.3 66.9 0.1 96.8z M522.3 321.2c-2.5-0.1-5-0.2-7.5-0.2-119.9 0-214 110.3-186.3 235 15.8 70.9 71.5 126.6 142.4 142.4 17.5 3.9 34.7 5.4 51.4 4.7 102.1-3.9 183.6-87.9 183.6-191 0.1-103-81.5-187-183.6-190.9z m68.6 269.1c-18.5 18-43 28.9-68.6 30.7l-6 0.3c-30.2 0.4-58.6-11.4-79.7-33-19.5-20.1-30.7-47-30.9-75-0.3-29.6 11.1-57.4 32-78.3 20.6-20.6 48-32 77.2-32 2.5 0 5 0.1 7.5 0.3 26.7 1.8 51.5 13.2 70.5 32.5 19.6 20 30.8 46.9 31.2 74.9 0.2 30.2-11.5 58.6-33.2 79.6z" />
                 </svg>
             </CompRadioButton>
-            <CompRadioButton :checked="$route.path.includes('/others')" text="更多" @click="handleNavigate(`/others/tools`)" >
+            <CompRadioButton :checked="$route.path.includes('/others')" text="更多" @click="handleNavigate(`/others/tools`)">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" class="scale-75">
                     <path
                         fill="currentColor"
@@ -67,15 +72,13 @@
             </CompRadioButton>
         </section>
         <!-- WindowControlButtons Align=Right -->
-        <section class="flex gap-2 ">
-            <button class="btn btn-ghost h-8 p-1 rounded-full border-none hover:bg-black/20"
-                    @click="AppWindow.minimize()">
+        <section class="flex gap-2">
+            <button class="btn btn-ghost h-8 p-1 rounded-full border-none hover:bg-black/20" @click="AppWindow.minimize()">
                 <svg class="w-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                     <path d="M20 14H4v-4h16" fill="white" />
                 </svg>
             </button>
-            <button class="btn btn-ghost h-8 p-1 rounded-full border-none hover:bg-black/20"
-                    @click="AppWindow.close()">
+            <button class="btn btn-ghost h-8 p-1 rounded-full border-none hover:bg-black/20" @click="AppWindow.close()">
                 <svg class="w-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                     <path
                         d="M20 6.91L17.09 4L12 9.09L6.91 4L4 6.91L9.09 12L4 17.09L6.91 20L12 14.91L17.09 20L20 17.09L14.91 12z"
@@ -85,4 +88,3 @@
         </section>
     </header>
 </template>
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,9 @@ name: 'publish' @@
     on:
       push:
         branches:
-          - main
+          - release
+          - beta
+          - dev
     # This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release.
@@ Expand Down @@