change web urls

StardustDL · Feb 5, 2024 · 2fba941 · 2fba941
1 parent 2854300
commit 2fba941
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 77 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -151,7 +151,7 @@ jobs:
     - name: Set Build Env
       shell: bash
       run: |
-        echo "VITE_NOSERVER=1\nVITE_COMMIT_ID=${{ github.sha }}\nVITE_BUILD_DATE=$(date -Ins)" > ./src/web/.env
+        echo -e "VITE_NOSERVER=1\nVITE_COMMIT_ID=${{ github.sha }}\nVITE_BUILD_DATE=$(date -Ins)" > ./src/web/.env
     - name: Build
       run: |
         cd ./src/web && npm run build
@@ -207,7 +207,7 @@ jobs:
     - name: Add redirects
       shell: bash
       run: |
-        echo "/*  /index.html  200" > ./dist/_redirects
+        echo -e "/*  /index.html  200" > ./dist/_redirects
     - name: Deploy docs to netlify
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
       uses: netlify/actions/cli@master
@@ -229,7 +229,7 @@ jobs:
     - name: Add redirects
       shell: bash
       run: |
-        echo "/*  /index.html  200\n/data https://aexpy-docs.netlify.app 200\n/change-spec https://aexpy-docs.netlify.app 200" > ./dist/_redirects
+        echo -e "/data https://aexpy-docs.netlify.app 200\n/change-spec https://aexpy-docs.netlify.app 200\n/*  /index.html  200" > ./dist/_redirects
     - name: Deploy docs to netlify
       if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
       uses: netlify/actions/cli@master

diff --git a/README.md b/README.md
@@ -14,9 +14,9 @@ https://user-images.githubusercontent.com/34736356/182772349-af0a5f20-d009-4daa-
 
 - **How AexPy works?** Approach Design & Evaluation are in [AexPy's conference paper](https://ieeexplore.ieee.org/abstract/document/9978982), see also [talk](https://www.bilibili.com/video/BV1tv4y1D75F/) & [slides](https://stardustdl.github.io/assets/pdfs/aexpy/aexpy-slides.pdf).
 - **How we implement AexPy?** Source Code & Implemetation are in [AexPy's repository](https://github.com/StardustDL/aexpy), see also [system design (zh-cn)](https://stardustdl.github.io/assets/pdfs/aexpy/aexpy-chinasoft.pdf).
-- **How to use AexPy?** Detailed Document & Data are in [AexPy's website](https://aexpy.netlify.app/), see also [demo video](https://www.bilibili.com/video/BV1PG411F77m/) and [online AexPy data web viewer](https://aexpy-app.netlify.app/).
+- **How to use AexPy?** Detailed Document & Data are in [AexPy's documents](https://aexpy-docs.netlify.app/), see also [demo video](https://www.bilibili.com/video/BV1PG411F77m/) and [online AexPy (viewer only)](https://aexpy.netlify.app/).
 
-> **Attention**: For AexPy v0.1.x users, we have removed web front-end support in AexPy's Python package, and are focusing on command-line interface for now. The web interfaces are provided as [online AexPy data web viewer](https://aexpy-app.netlify.app/) now.
+> **Attention**: For AexPy v0.1.x users, we have removed web front-end support in AexPy's Python package, and are focusing on command-line interface for now. The web interfaces are provided as [online AexPy (viewer only)](https://aexpy.netlify.app/) now.
 > For the old available version, see [v0.1.2](https://github.com/StardustDL/aexpy/releases/tag/v0.1.2).
 
 ```mermaid

diff --git a/src/web/src/components/breadcrumbs/BatchBreadcrumbItem.vue b/src/web/src/components/breadcrumbs/BatchBreadcrumbItem.vue
diff --git a/src/web/src/components/breadcrumbs/DescriptionBreadcrumbItem.vue b/src/web/src/components/breadcrumbs/DescriptionBreadcrumbItem.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import { NIcon, NBreadcrumbItem } from 'naive-ui'
-import { ExtractIcon } from '../icons'
+import { DescriptionIcon } from '../icons'
 import { RouterLink } from 'vue-router'
 </script>
 
 <template>
     <n-breadcrumb-item>
-        <router-link to="/description">
+        <router-link to="/apis">
             <n-icon>
-                <ExtractIcon />
+                <DescriptionIcon />
             </n-icon>
-            Description
+            APIs
         </router-link>
     </n-breadcrumb-item>
 </template>
diff --git a/src/web/src/components/breadcrumbs/DifferenceBreadcrumbItem.vue b/src/web/src/components/breadcrumbs/DifferenceBreadcrumbItem.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import { NIcon, NBreadcrumbItem } from 'naive-ui'
-import { DiffIcon } from '../icons'
+import { DifferenceIcon } from '../icons'
 import { RouterLink } from 'vue-router'
 </script>
 
 <template>
     <n-breadcrumb-item>
-        <router-link to="/difference">
+        <router-link to="/changes">
             <n-icon>
-                <DiffIcon />
+                <DifferenceIcon />
             </n-icon>
-            Difference
+            Changes
         </router-link>
     </n-breadcrumb-item>
 </template>
diff --git a/src/web/src/components/breadcrumbs/DistributionBreadcrumbItem.vue b/src/web/src/components/breadcrumbs/DistributionBreadcrumbItem.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import { NIcon, NBreadcrumbItem } from 'naive-ui'
-import { PreprocessIcon } from '../icons'
+import { DistributionIcon } from '../icons'
 import { RouterLink } from 'vue-router'
 </script>
 
 <template>
     <n-breadcrumb-item>
-        <router-link to="/distribution">
+        <router-link to="/distributions">
             <n-icon>
-                <PreprocessIcon />
+                <DistributionIcon />
             </n-icon>
-            Distribution
+            Distributions
         </router-link>
     </n-breadcrumb-item>
 </template>
diff --git a/src/web/src/components/breadcrumbs/PackageBreadcrumbItem.vue b/src/web/src/components/breadcrumbs/PackageBreadcrumbItem.vue
@@ -0,0 +1,16 @@
+<script setup lang="ts">
+import { NIcon, NBreadcrumbItem } from 'naive-ui'
+import { PackageIcon } from '../icons'
+import { RouterLink } from 'vue-router'
+</script>
+
+<template>
+    <n-breadcrumb-item>
+        <router-link to="/packages">
+            <n-icon>
+                <PackageIcon />
+            </n-icon>
+            Packages
+        </router-link>
+    </n-breadcrumb-item>
+</template>
diff --git a/src/web/src/components/breadcrumbs/ReportBreadcrumbItem.vue b/src/web/src/components/breadcrumbs/ReportBreadcrumbItem.vue
@@ -6,7 +6,7 @@ import { RouterLink } from 'vue-router'
 
 <template>
     <n-breadcrumb-item>
-        <router-link to="/report">
+        <router-link to="/reports">
             <n-icon>
                 <ReportIcon />
             </n-icon>

diff --git a/src/web/src/components/icons.ts b/src/web/src/components/icons.ts
@@ -1,9 +1,9 @@
 import {
     File as FileIcon, ChartLine as TrendIcon, FileReport as LogIcon, ExternalLink as LinkIcon,
     Database as CountIcon, Versions as VersionIcon, ArrowRight as GoIcon,
-    Home as HomeIcon, Package as ReleaseIcon, BrandPython as RootIcon, WorldDownload as DistributionIcon,
+    Home as HomeIcon, Package, BrandPython as RootIcon, WorldDownload as DistributionIcon,
     Api as DescriptionIcon, FileDiff as DifferenceIcon, CheckupList as EvaluateIcon, ReportAnalytics as ReportIcon,
-    List as BatchIcon, ListCheck as BatchIndexIcon, Folder as DataDirectoryIcon, ShieldCheck as VerifiedIcon,
+    Folder as DataDirectoryIcon, ShieldCheck as VerifiedIcon,
     ShieldX as UnverifiedIcon, ShieldOff as NoverifyIcon,
     Code as CodeIcon, PhoneCall as CallIcon, Book as ViewIcon,
     Upload as UploadIcon
@@ -25,15 +25,17 @@ export {
     LogIcon,
     RootIcon,
     GoIcon,
-    ReleaseIcon,
+    Package as ReleaseIcon,
     Icon,
+    DistributionIcon,
+    DescriptionIcon,
+    DifferenceIcon,
+    Package as PackageIcon,
     DistributionIcon as PreprocessIcon,
     DescriptionIcon as ExtractIcon,
     DifferenceIcon as DiffIcon,
     EvaluateIcon,
     ReportIcon,
-    BatchIcon,
-    BatchIndexIcon,
     CodeIcon,
     ViewIcon,
     UploadIcon

diff --git a/src/web/src/components/products/PackageIndex.vue b/src/web/src/components/products/PackageIndex.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted, h, defineComponent, reactive } from 'vue'
 import { NSpace, NText, NDivider, DataTableColumns, NDataTable, DataTableBaseColumn, NScrollbar, NCollapseTransition, NPopover, NIcon, NButton, NInputGroup, NInput, NCode, useMessage } from 'naive-ui'
+import { PackageIcon } from '../icons'
 import { useStore } from '../../services/store'
 
 const message = useMessage();
@@ -22,7 +23,12 @@ onMounted(async () => {
 
 <template>
     <n-space v-if="packages">
-        <n-button v-for="item in packages" :key="item" text tag="a"
-            :href="`/packages/${item}`" target="_blank">{{ item }}</n-button>
+        <n-button v-for="item in packages" :key="item" text tag="a" :href="`/packages/${item}`" target="_blank">
+            <template #icon>
+                <n-icon>
+                    <PackageIcon />
+                </n-icon>
+            </template>
+            {{ item }}</n-button>
     </n-space>
 </template>
diff --git a/src/web/src/main.ts b/src/web/src/main.ts
@@ -48,6 +48,13 @@ const routes = [
             title: 'Home'
         }
     },
+    {
+        path: '/packages',
+        component: Home,
+        meta: {
+            title: 'Home'
+        }
+    },
     {
         path: '/distributions/:id',
         component: DistributionView,

diff --git a/src/web/src/pages/Layout.vue b/src/web/src/pages/Layout.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, h, onMounted, onUpdated, onUnmounted } from 'vue'
 import { NIcon, NSpin, NLayout, NLayoutSider, NLayoutContent, NMenu, NBackTop } from 'naive-ui'
-import { HomeIcon, PreprocessIcon, ExtractIcon, DiffIcon, EvaluateIcon, ReportIcon, BatchIcon, RootIcon, CodeIcon, ViewIcon } from '../components/icons';
+import { HomeIcon, DistributionIcon, DescriptionIcon, DifferenceIcon, EvaluateIcon, ReportIcon, PackageIcon, RootIcon, CodeIcon, ViewIcon } from '../components/icons';
 import { RouterView, useRouter } from 'vue-router'
 
 const router = useRouter();
@@ -19,26 +19,32 @@ const menuOptions = [
         icon: renderIcon(RootIcon),
         route: "/",
     },
+    {
+        label: "Packages",
+        key: "packages",
+        icon: renderIcon(PackageIcon),
+        route: "/packages"
+    },
     {
         key: 'divider-1',
         type: 'divider',
     },
     {
         label: "Distributions",
         key: "distributions",
-        icon: renderIcon(PreprocessIcon),
+        icon: renderIcon(DistributionIcon),
         route: "/distributions"
     },
     {
         label: "APIs",
         key: "apis",
-        icon: renderIcon(ExtractIcon),
+        icon: renderIcon(DescriptionIcon),
         route: "/apis"
     },
     {
         label: "Changes",
         key: "changes",
-        icon: renderIcon(DiffIcon),
+        icon: renderIcon(DifferenceIcon),
         route: "/changes"
     },
     {

diff --git a/src/web/src/pages/view/Description.vue b/src/web/src/pages/view/Description.vue
@@ -401,7 +401,7 @@ const argsEntryCounts = computed(() => {
                         </template>
                     </n-switch>
                     <n-button-group size="small" v-if="release">
-                        <n-button tag="a" :href="`/distribution/${release.toString()}/`"
+                        <n-button tag="a" :href="`/distributions/${release.toString()}/`"
                             target="_blank" type="info" ghost>
                             <n-icon size="large">
                                 <PreprocessIcon />

diff --git a/src/web/src/pages/view/Difference.vue b/src/web/src/pages/view/Difference.vue
@@ -141,7 +141,7 @@ async function onLog(value: boolean) {
                     <n-button-group size="small" v-if="release">
                         <n-button
                             tag="a"
-                            :href="`/distribution/${release.old.toString()}/`"
+                            :href="`/distributions/${release.old.toString()}/`"
                             target="_blank"
                             type="info"
                             ghost
@@ -152,7 +152,7 @@ async function onLog(value: boolean) {
                         </n-button>
                         <n-button
                             tag="a"
-                            :href="`/description/${release.old.toString()}/`"
+                            :href="`/apis/${release.old.toString()}/`"
                             target="_blank"
                             type="info"
                             ghost
@@ -163,7 +163,7 @@ async function onLog(value: boolean) {
                         </n-button>
                         <n-button
                             tag="a"
-                            :href="`/distribution/${release.new.toString()}/`"
+                            :href="`/distributions/${release.new.toString()}/`"
                             target="_blank"
                             type="info"
                             ghost
@@ -174,7 +174,7 @@ async function onLog(value: boolean) {
                         </n-button>
                         <n-button
                             tag="a"
-                            :href="`/description/${release.new.toString()}/`"
+                            :href="`/apis/${release.new.toString()}/`"
                             target="_blank"
                             type="info"
                             ghost
@@ -185,7 +185,7 @@ async function onLog(value: boolean) {
                         </n-button>
                         <n-button
                             tag="a"
-                            :href="`/report/${release.toString()}/`"
+                            :href="`/reports/${release.toString()}/`"
                             target="_blank"
                             type="info"
                             ghost

diff --git a/src/web/src/pages/view/Distribution.vue b/src/web/src/pages/view/Distribution.vue
@@ -128,7 +128,7 @@ async function onLog(value: boolean) {
                     <n-button-group size="small" v-if="release">
                         <n-button
                             tag="a"
-                            :href="`/description/${release.toString()}/`"
+                            :href="`/apis/${release.toString()}/`"
                             target="_blank"
                             type="info"
                             ghost

diff --git a/src/web/src/pages/view/Package.vue b/src/web/src/pages/view/Package.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { NPageHeader, NSpace, NText, NBreadcrumb, NCollapseTransition, NDivider, NDrawer, NDrawerContent, NProgress, NBreadcrumbItem, NSwitch, NCollapse, useLoadingBar, NCollapseItem, NLog, NIcon, NLayoutContent, NAvatar, NStatistic, NTabs, NTabPane, NCard, NButton, useOsTheme, useMessage, NDescriptions, NDescriptionsItem, NSpin } from 'naive-ui'
-import { HomeIcon, RootIcon, TrendIcon, CountIcon, BatchIcon, ReleaseIcon, LogIcon, PreprocessIcon, VersionIcon, DiffIcon, ExtractIcon, EvaluateIcon, ReportIcon } from '../../components/icons'
+import { HomeIcon, RootIcon, TrendIcon, CountIcon, PackageIcon, ReleaseIcon, LogIcon, PreprocessIcon, VersionIcon, DiffIcon, ExtractIcon, EvaluateIcon, ReportIcon } from '../../components/icons'
 import { useRouter, useRoute } from 'vue-router'
 import HomeBreadcrumbItem from '../../components/breadcrumbs/HomeBreadcrumbItem.vue'
 import ReleaseBreadcrumbItem from '../../components/breadcrumbs/ReleaseBreadcrumbItem.vue'
@@ -11,7 +11,7 @@ import { numberSum, numberAverage, publicVars } from '../../services/utils'
 import { hashedColor } from '../../services/utils'
 import NotFound from '../../components/NotFound.vue'
 import MetadataViewer from '../../components/metadata/MetadataViewer.vue'
-import BatchBreadcrumbItem from '../../components/breadcrumbs/BatchBreadcrumbItem.vue'
+import PackageBreadcrumbItem from '../../components/breadcrumbs/PackageBreadcrumbItem.vue'
 import DistributionViewer from '../../components/products/DistributionViewer.vue'
 import CountViewer from '../../components/metadata/CountViewer.vue'
 import { LineChart } from 'vue-chart-3'
@@ -556,18 +556,18 @@ function getBreakingKindCounts(diffed: { [key: string]: ApiDifference }) {
 
 <template>
     <n-space vertical>
-        <n-page-header :title="packageName?.toString() ?? 'Unknown'" subtitle="Batch" @back="() => router.back()">
+        <n-page-header :title="packageName?.toString() ?? 'Unknown'" subtitle="Packages" @back="() => router.back()">
             <template #avatar>
                 <n-avatar>
                     <n-icon>
-                        <BatchIcon />
+                        <PackageIcon />
                     </n-icon>
                 </n-avatar>
             </template>
             <template #header>
                 <n-breadcrumb>
                     <HomeBreadcrumbItem />
-                    <BatchBreadcrumbItem/>
+                    <PackageBreadcrumbItem/>
                     <n-breadcrumb-item>
                         <n-space>
                             <n-icon>