From 118306400432da96341c4f9e9d3019df9a841aa6 Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Fri, 10 Feb 2023 17:03:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=A4=A7=E6=B3=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html                |   2 +-
 src/assets/logo.svg       |  11 ++++++-
 src/components/header.vue |   7 ++++-
 src/favicon.ico           | Bin 4286 -> 16958 bytes
 src/main.js               |  12 ++++----
 src/views/login.vue       |  21 +++++++++++--
 src/views/request.vue     |  60 +++++++++++++++++++++++---------------
 vue.live.js               |  10 ++++---
 8 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/index.html b/index.html
index 4ff92f1..55cd5dc 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
   <title>{{title}}</title>
   <meta name="keywords" content="{{keywords}}">
   <meta name="description" content="{{description}}">
-  <link rel="stylesheet" href="//jscdn.ink/@bytedo/wcui/dist/css/reset-basic.css">
+  <link rel="stylesheet" href="//a.jscdn.ink/@bytedo/wcui/dist/css/reset-basic.css">
   <script async src="//esm.tool/es-module-shims.wasm.js"></script>
   <script type="importmap">{{importmap}}</script>
 </head>
diff --git a/src/assets/logo.svg b/src/assets/logo.svg
index e2a9ebf..1388a76 100644
--- a/src/assets/logo.svg
+++ b/src/assets/logo.svg
@@ -1 +1,10 @@
-<svg viewBox="0 0 261.76 226.69" xmlns="http://www.w3.org/2000/svg"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/><path d="M36.21 192.639l160.921-74.805-81.778-5.063 119.519-67.69L49.06 126.138l88.8 2.712z" fill="rgb(252, 118, 97)"/></svg>
\ No newline at end of file
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" width="512" height="177">
+  <path fill-rule="evenodd"
+    d="M229.7 89q0-6.4 2-12t5.7-9.7q3.7-4.1 9-6.4 5.3-2.3 11.9-2.3 8.2 0 15.5 3l-2.9 10.9q-2.3-1-5.2-1.6-3-.7-6.3-.7-7.8 0-11.9 4.9-4.1 4.9-4.1 13.9 0 8.6 3.9 13.7 3.8 5 13 5 3.4 0 6.8-.7 3.3-.6 5.7-1.6l1.9 11q-2.2 1.1-6.7 2-4.5.9-9.2.9-7.5 0-12.9-2.3-5.5-2.2-9.1-6.3-3.6-4-5.4-9.6-1.7-5.6-1.7-12.1zm104.1 27.1q-4 1.2-10 2.2-6.1 1-12.7 1-6.8 0-12.3-2.1-5.4-2.1-9.2-6-3.8-4-5.9-9.5-2-5.6-2-12.6 0-6.8 1.7-12.4 1.7-5.6 5-9.6.9-1 1.8-1.9.9-.9 1.9-1.6 1-.8 2.1-1.5 1.1-.6 2.3-1.1 4.8-2.2 11-2.2 4.2 0 7.4 1t5.5 2.2V34.3l13.4-2.3zm-38.4-27.3q0 8.9 4.2 13.9t11.6 5q3.2 0 5.5-.2 2.3-.3 3.7-.6V73.7q-1.8-1.2-4.7-2.3-2.9-1-6.2-1-7.3 0-10.7 4.9-3.4 5-3.4 13.5zM351.7 62q3.9-1.2 10.1-2.1 6.2-1 13.7-1 7.1 0 11.9 1.9 4.7 1.9 7.5 5.4 2.8 3.5 4 8.4 1.2 4.9 1.2 10.8v32.5h-13.4V87.5q0-4.6-.6-7.9-.6-3.3-2-5.3-1.4-2.1-3.8-3-2.3-.9-5.8-.9-2.5 0-5.3.3-2.7.3-4.1.5v46.7h-13.4z"
+    fill="#a4b0be" />
+  <path fill-rule="evenodd"
+    d="M138.6 139.3q-1.4 0-4-.2-2.6-.3-4.6-1.1l1.8-10.9q2.4.7 5.8.7 4.7 0 6.6-2.7 1.8-2.7 1.8-8.1V60.9h13.4v56.3q0 11.3-5.3 16.7-5.4 5.4-15.5 5.4zm19.8-101.4q-2.4-2.2-5.7-2.2-3.4 0-5.9 2.2-2.4 2.2-2.4 6.1 0 3.8 2.4 6 2.5 2.2 5.9 2.2 3.3 0 5.7-2.2 2.5-2.2 2.5-6 0-3.9-2.5-6.1zm24 70.1q-4.1-1.1-7.1-2.3l-2.3 11.2q1.8.8 6.5 2 4.6 1.3 12.3 1.3 11.4 0 17.5-4.2 6.1-4.3 6.1-12.6 0-3.9-1-6.6-1-2.8-3.1-5-2.2-2.1-5.5-3.8-3.3-1.7-8.1-3.5-2.8-1-4.8-1.9-2-1-3.2-1.9-1.3-1-1.8-2.1-.4-1.1-.4-2.5-.1-2.9 2.5-4.3 2.5-1.4 6.6-1.4 4.6 0 8 .9 3.4.8 5.6 1.8l2.5-10.8q-2.4-.9-7-1.9-4.6-.9-9.7-.9-10.1 0-16 4.6-5.8 4.6-5.8 12.5 0 4.1 1.3 7 1.2 2.8 3.4 4.8t5.3 3.4q3 1.5 6.7 2.9 5.9 2.2 8.5 4.1 2.6 1.8 2.6 4.7 0 3.1-2.4 4.4-2.4 1.3-7.7 1.3-5.3 0-9.5-1.2z"
+    fill="#fff" />
+  <path fill="none" stroke="#ced6e0" stroke-width="10" stroke-linecap="round"
+    d="M114.6 136.5L61.4 91.6q-.9-.8-1.4-1.9-.6-1.1-.6-2.3 0-1.2.5-2.3.5-1.1 1.4-1.9l53.3-47.6M400.8 40.7l53.4 47.6q.9.8 1.3 1.9.5 1.1.5 2.3 0 1.2-.5 2.3-.5 1.1-1.5 1.9l-53.2 45" />
+</svg>
\ No newline at end of file
diff --git a/src/components/header.vue b/src/components/header.vue
index 820296e..981bd73 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -2,7 +2,7 @@
   <div class="common-header" :class="{ 'search-show': $store.searchShow }">
     <header class="navibar">
       <div class="wrapper">
-        <a class="logo">Js CDN</a>
+        <a class="logo"><img src="/assets/logo.svg" /></a>
 
         <nav class="navi">
           <router-link to="/">首 页</router-link>
@@ -56,6 +56,11 @@ export default {
     .logo {
       font-weight: bold;
       font-size: 26px;
+
+      img {
+        display: block;
+        height: 36px;
+      }
     }
 
     .navi {
diff --git a/src/favicon.ico b/src/favicon.ico
index df36fcfb72584e00488330b560ebcf34a41c64c2..c925161cc481624091047dbfd0ab8eb70fb88523 100644
GIT binary patch
literal 16958
zcmeHP=}#L+6nFoLe(tA+UQw%_>WQLOs#H~K+NPAl=B8k9f-%s<1QHZOVnPE+IAR+}
z%x!~hurap5T*3LXo~HAthHe(mGHdTbst#zGJ!WU;z4x2nJ4V7{d5!*-mRjiFH!LNW
zESA?T7E1{|=q<}_df@$|pVEIC<=?GLn#e=yKw>~*Kw>~*Kw>~*Kw>~*Kw>~*Kw_XU
z3}n)2;+@Pw^Q}D?7~6qVO8+>Sbc)POPs4!61CJj)g4Aa6Kar=!6B$zGIv{UeesO%1
zcO5`RXP$X~Xb8&7%LzLi4hO`d(N|grp~x2bw&^)2WykXi^jHXQf#`ZdTia~5W7(Mw
z8X6kN(&B>fIHKP(qTlqwHhf%}JGQx62Z6b5;dv)F5~QM{;)MLD2b;}G0)D^nSVqWp
z+8Ex6EWC5&U%abj|GfH8HwScfcD{svh5>9*H@H4do0r+ok>@(@?!twi`LcgidkAwO
zaqP1>C*teG+1{QP156jay}jqgi^*h~RQ<VsVy!D}|6|*8h^=P|=B!j|ll1lVYU;r0
zY=`x=*qLG>x|Si|x18iTrR=rtechO6wpX_g{u%}zA0QT*nwlUST0RpU1ednpGut7T
z=St{WxPE^ZaBZmNDCT-<Dgaiim5YVy>T2?IX4+I8j0Cc9v5e30@Bf}75Byov=CHK5
zNE#a(xjI0MjE;_&^8Fjb+C2BEH3v@@_4AxwOsvJC<f_BL)d8-D{{GvLrre=-?0o&x
zG<L1)(dIeif(Ye=eD9laZ!@_;dfaZVe?%R)TrR*kqL}X^cO!=@c};z8y}l0{$+MH4
z$%Fa9kk_lpi_Oi=u(}d1NC(ts6ZG9`dD%7coO5u`aGqoGiMEpy6Ob=fW-&r-Z7rD%
zKGVesV>8?EK{=o2-lehL;P{TNF-7Gmq~F}^EUBxj<8ne}WhEIO8xxxE!>KI1{VPA7
z`-sN)Q}g1nd?E4_@=h!o0lVF<$q5ffM>TbTT&LyRFEt)QIGWKMqma29^$zk~cXu}z
z2US&71pNo^dryMf-1UB?<KSF)jyG4{edI-~negI8tflbY9rk7O%Ku?SjuaEe^S)=+
zef0efM_b;t;Pu|)+8^^YtW_|MSGHf*9TKc>m^Ejk#-(cjT&|A1vZGJ%`+Qvc;~aiy
z<@<YD-#C*PuTWjkJdm{7?cDWG>qmgGlh*jlku9M0io6&=JYf7!{iEg>TH~AbY$Y55
znj3KKj``8T{G6uk+1zL>3*Y_0$H7~_yda*(uaf@{LQPGLmfcBcSzmsPb==F>4)XFL
z;sE2nu6w&e`eb@FqxJiqXy(Nj6GWqtg7CVznI_dYv~!=PzCB1Aoa>9~3F8@z?O3d<
zZk<jiB;xUcWM^~0I>xnuJ+5CsER=PgZES!({_fx)cdery+-^59DhEbg^o{HQVqWPJ
zmFF}ECTnr?V?&hb=FJ{W**$me(7Y^Fl--&Al`YnGwCdb6Mu6p2^J*X%-*$BHefv@U
zXT+TP57PtP#~>IFDs8Vk|D-BMa4&@QH>$<By|tB}-(YNyTxityw8ojIwSg~d__cwH
zzvT$#ky>Nud4|3V_rBEp#;(!#1)u55@%4N^U*FYOhG@kIm_y^<Z@zc++?$&X0@g5?
ztm+nHp3w4A(cjTCC)PKyks&`_<;MuPFVy8NJVprkeSo-D%gnCrEiHuR{f6@#lTW0@
zz5N=x*P-M9^?7Umo^Jb$kB@P4Sd<@q`$m!VO%eG-`?PDs2<SJ%5%C%+`Zz7jW9`>S
z-!3ZSY5i`|7y)wwwf*thH!JQFHWKlpJzj=$W$W>n<J(V@P4qeL5xqzGU#SDErRuGb
zJKA2ZUzoYKBPyF{Kdg^_Lt`Pt!WYy}PSU!X=)0_6WOaqsa2y!lLw$Wc1OonZ<vBJl
z(H8Rtw0W`npjfXkBbF7FL-sRvA6x2E>QiDsVnAX*VnAX*VnAX*VnAZx{4k*WUjXv_
I|EGb!0sk;)q5uE@

literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

diff --git a/src/main.js b/src/main.js
index 162ab45..fa77910 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,14 +1,16 @@
 import { createApp } from 'vue'
+
+import '//a.jscdn.ink/es.shim/dist/index.js'
+import '//a.jscdn.ink/@bytedo/wcui/dist/form/input.js'
+import '//a.jscdn.ink/@bytedo/wcui/dist/form/button.js'
+import '//a.jscdn.ink/@bytedo/wcui/dist/form/link.js'
+import '//a.jscdn.ink/@bytedo/wcui/dist/layer/index.js'
+
 import App from './app.vue'
 
 import router from './router'
 import store from './store'
 
-import '//jscdn.ink/@bytedo/wcui/dist/form/input.js'
-import '//jscdn.ink/@bytedo/wcui/dist/form/button.js'
-import '//jscdn.ink/@bytedo/wcui/dist/form/link.js'
-import '//jscdn.ink/@bytedo/wcui/dist/layer/index.js'
-
 const app = createApp(App)
 
 app.use(router).use(store).mount('.app')
diff --git a/src/views/login.vue b/src/views/login.vue
index 41cee86..446600d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -5,7 +5,9 @@
       <h3 class="name">{{ $store.user.name }}</h3>
       <cite class="homepage">
         <wc-icon is="home" />主页:
-        <a target="_blank" :href="$store.user.homepage">{{ $store.user.homepage }}</a>
+        <a target="_blank" :href="$store.user.homepage">{{
+          $store.user.homepage
+        }}</a>
       </cite>
       <wc-button class="logout" @click="logout">注销登录</wc-button>
     </div>
@@ -13,7 +15,13 @@
       <section class="title">请使用以下方式登录</section>
       <section class="third-part">
         <a class="github" title="github" @click="jumpLogin()">
-          <svg class="ico" viewBox="0 0 16 16" width="32" height="32" fill="currentColor">
+          <svg
+            class="ico"
+            viewBox="0 0 16 16"
+            width="32"
+            height="32"
+            fill="currentColor"
+          >
             <path
               d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 01-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 010 8c0-4.42 3.58-8 8-8z"
             />
@@ -45,13 +53,20 @@ export default {
         }
       })
         .then(r => {
+          let lastPath = localStorage.getItem('login_callback_path')
           layer.toast('登录成功', 'success')
           this.$store.user = r.data.user
           localStorage.setItem('user', JSON.stringify(r.data.user))
           localStorage.setItem('token', r.data.token)
-          this.$router.replace('/login')
+          if (lastPath) {
+            localStorage.removeItem('login_callback_path')
+            this.$router.replace(lastPath)
+          } else {
+            this.$router.replace('/login')
+          }
         })
         .catch(r => {
+          console.log(r)
           layer.toast(r.msg, 'error')
         })
     }
diff --git a/src/views/request.vue b/src/views/request.vue
index 7a7bd86..6b5d205 100644
--- a/src/views/request.vue
+++ b/src/views/request.vue
@@ -18,17 +18,29 @@
         <wc-td align="center">{{ it.id }}</wc-td>
         <wc-td align="center">{{ it.author }}</wc-td>
         <wc-td>{{ it.description }}</wc-td>
-        <wc-td>{{ it.sync_date }}</wc-td>
+        <wc-td align="center">{{ it.sync_date }}</wc-td>
         <wc-td align="center">{{ $store.stats[it.stat] }}</wc-td>
         <wc-td>{{ it.remark }}</wc-td>
-        <wc-td v-if="$store.user.admin" align="center">
+        <wc-td align="center">
           <wc-link @click="handlePackgae('sync', it.id)" type="info"
+            >更新</wc-link
+          >
+          <wc-link
+            v-if="$store.user.admin"
+            @click="handlePackgae('accept', it.id)"
+            type="info"
             >通过</wc-link
           >
-          <wc-link @click="handlePackgae('reject', it.id)" type="warning"
+          <wc-link
+            v-if="$store.user.admin"
+            @click="handlePackgae('reject', it.id)"
+            type="warning"
             >拒绝</wc-link
           >
-          <wc-link @click="handlePackgae('delete', it.id)" type="danger"
+          <wc-link
+            v-if="$store.user.admin"
+            @click="handlePackgae('delete', it.id)"
+            type="danger"
             >删除</wc-link
           >
         </wc-td>
@@ -79,9 +91,9 @@
 </template>
 
 <script>
-import '//unpkg.com/@bytedo/wcui/dist/table/index.js'
-import '//unpkg.com/@bytedo/wcui/dist/form/switch.js'
-import '//unpkg.com/@bytedo/wcui/dist/pager/index.js'
+import '//a.jscdn.ink/@bytedo/wcui/dist/table/index.js'
+import '//a.jscdn.ink/@bytedo/wcui/dist/form/switch.js'
+import '//a.jscdn.ink/@bytedo/wcui/dist/pager/index.js'
 import fetch from '@/lib/fetch.js'
 
 export default {
@@ -95,7 +107,8 @@ export default {
         '介绍',
         '最后同步日期',
         '收录状态',
-        '备注'
+        '备注',
+        '操作'
       ]),
       page: 1,
       total: 0,
@@ -114,25 +127,15 @@ export default {
   mounted() {
     this.$store.searchShow = false
 
-    if (this.$store.user.admin) {
-      this.thead = JSON.stringify([
-        '开源库',
-        '作者',
-        '介绍',
-        '最后同步日期',
-        '收录状态',
-        '备注',
-        '操作'
-      ])
-    }
-
     this.fetchList()
   },
   methods: {
     fetchList() {
       fetch('/package/list').then(r => {
-        this.$list = r.data
-        this.list = r.data.filter(it =>
+        this.$list = r.data.map(
+          it => ((it.sync_date = new Date(it.sync_date).format('Y/m/d')), it)
+        )
+        this.list = this.$list.filter(it =>
           this.onlyShowWaited ? it.stat === 1 : true
         )
         this.total = this.list.length
@@ -158,7 +161,14 @@ export default {
     },
 
     openDialog() {
-      this.$refs.form.show()
+      if (this.$store.user.id) {
+        this.$refs.form.show()
+      } else {
+        layer.confirm('你还没有登录, 请先登录之后, 再申请').then(_ => {
+          localStorage.setItem('login_callback_path', this.$route.path)
+          this.$router.push('/login')
+        })
+      }
     },
 
     resetForm(force) {
@@ -245,12 +255,16 @@ export default {
     },
 
     handlePackgae(act, id) {
+      if (act !== 'sync' && !this.$store.user.admin) {
+        return layer.alert('别闹, 老实等管理员通过~~')
+      }
       fetch(`/package/${act}/${encodeURIComponent(id)}`)
         .then(r => {
           layer.toast('操作成功', 'success')
           this.fetchList()
         })
         .catch(r => {
+          console.log(r)
           layer.toast(r.msg, 'error')
         })
     }
diff --git a/vue.live.js b/vue.live.js
index 515e0d1..26603a4 100644
--- a/vue.live.js
+++ b/vue.live.js
@@ -25,11 +25,13 @@ export default {
   // 有用到其他的库, 可以手动添加,
   // 也可以在页面中直接引入完整的路径, 而不必须在这里声明
   imports: {
-    vue: '//jscdn.ink/vue/dist/vue.esm-browser.prod.js',
-    'vue-router': '//jscdn.ink/vue-router/dist/vue-router.esm-browser.js',
+    vue: '//a.jscdn.ink/vue/dist/vue.esm-browser.prod.js',
+    'vue-router': '//a.jscdn.ink/vue-router/dist/vue-router.esm-browser.js',
     // 这个库被vue-router依赖, 可以注释掉vue-router代码中的 @vue/devtools-api 的引入
     // 以达到减少不必须的体积的效果
-    '@vue/devtools-api': '//jscdn.ink/@vue/devtools-api@6.4.4/lib/esm/index.js',
-    fetch: '//jscdn.ink/@bytedo/fetch/dist/next.js'
+    '@vue/devtools-api':
+      '//a.jscdn.ink/@vue/devtools-api@6.4.4/lib/esm/index.js',
+    fetch: '//a.jscdn.ink/@bytedo/fetch/dist/next.js',
+    'node-fetch': '//a.jscdn.ink/@bytedo/fetch/dist/next.js'
   }
 }