From 02ee7bf7f5b3d95a0dd89b1a3e0d20fd57d36f35 Mon Sep 17 00:00:00 2001 From: Leo Vasanko Date: Wed, 8 Nov 2023 14:48:36 -0800 Subject: [PATCH] Favicon, title, automatic & manual server naming. --- cista-front/index.html | 4 +- cista-front/public/favicon.ico | Bin 4286 -> 0 bytes cista-front/public/old-index.html | 241 ---------------------------- cista-front/public/robots.txt | 2 + cista-front/src/App.vue | 5 +- cista-front/src/assets/logo.svg | 1 + cista-front/src/repositories/WS.ts | 1 + cista-front/src/stores/documents.ts | 1 + cista/api.py | 2 +- cista/config.py | 1 + 10 files changed, 13 insertions(+), 245 deletions(-) delete mode 100644 cista-front/public/favicon.ico delete mode 100755 cista-front/public/old-index.html create mode 100644 cista-front/public/robots.txt create mode 100644 cista-front/src/assets/logo.svg diff --git a/cista-front/index.html b/cista-front/index.html index 34a5c8d..7459f57 100644 --- a/cista-front/index.html +++ b/cista-front/index.html @@ -1,9 +1,9 @@ -Cista +Cista Storage - + diff --git a/cista-front/public/favicon.ico b/cista-front/public/favicon.ico deleted file mode 100644 index df36fcfb72584e00488330b560ebcf34a41c64c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmZQzU}RuqP*4ET3Jfa*7#PGD7#K7d7#I{77#JKFAmR)lAOIqU2X5Zs$bgLL=_@3A zjhlBkf-u-E^l}5#e(vTSjvJvE#HNe&P`g3?jcVTE_#KKtY>*hu-2k;;s(FXw$>tr7 z|DhPf28q$seyH6be^xc`aQp|g8{`HM8zcsjqlp`k?AB}E;dmd(Zjk*T3=#v$(Zmf< z`&pZJIL^XiH^_bv2FZccP&Evoc7y!o(Y(X)10MT9av(JzwN!Hh)P8~H9gaKj*bVYO z2!qss)KbNMsNEp{q&4qw{6&QQAT=PhAUzbj0cyWO^A5*L7iKh$o<<{gf0*zB%ZV*ek6akv4b2c(xQH$d$Mg`s)#4##Kc_BU;D{GXL$3C18c zx;#`5NH53?lHCBcpR;*~<1!4hcRKzrpKSX--p3S-L2Mjh0MZLGgCzT*c7xm<)V#y- z3yS?a9sf71bNHW@Xz@SJ!xW4`Y>*fhH-Pkl%mA51v>TxIi#G3YJcMF5D4p$e{9n{+ z^FPkh6a|CCu-Feuiy$*VW)WpS)NYV_3!8U1{z0*Sr{n+HW%mD*!_C3|hP%PT6f6dk z!{P>z86dMjW)gG*)P9ZT9geq9><0OLyW{`dGAmTOVd3Cm3YKf$4zCkIeurU@Ss*j< z+7Gpxxp{}*uwyWnns+ArO_!|@D?-JmqL!|{JXy){Z+gZlMPypL%f2*-Jv z{(*|Y)q(V2GYe`5$S$z`P`g3ysYPp3f$NrjCM-5(c2Q8ptk?oiME5yuZM-3=hU zAT!X-h1vzO6J$So^A5*3=xSPaIsUJhX8S+E&kP=>F!STRO_wBvm~$isnlXSdhz$~h z$-`)nUXU3ev(U|l+6l5d9HUJID&yBX{7+ATmhrH(1){x7pC(=HT=LB0y}A7)UP8)AS^=9*`Lzvp{CT%!kq-J3)5yHScf)ByT?WW^if zV!|8eX^Mgqe9c%vaSpN<8H2>Ya%k#7X5$(!Tt{e|LXt$|6>oq zKji=a2jLI=|NlQ=hu{Ou|Nnz<1LOby3=ClWkAa~cg#R!w*n{v71_t>L3=I4r{D6Uh a9fS`sFffB~17iat17ib}cK|F4vKj!X^7qaF diff --git a/cista-front/public/old-index.html b/cista-front/public/old-index.html deleted file mode 100755 index db336cb..0000000 --- a/cista-front/public/old-index.html +++ /dev/null @@ -1,241 +0,0 @@ - -Storage - -
-

Quick file upload

-

Uses parallel WebSocket connections for increased bandwidth /api/upload

- - -
- -
-

Files

-
    -
    - - diff --git a/cista-front/public/robots.txt b/cista-front/public/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/cista-front/public/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / diff --git a/cista-front/src/App.vue b/cista-front/src/App.vue index dbb7e16..d7a91d5 100644 --- a/cista-front/src/App.vue +++ b/cista-front/src/App.vue @@ -15,7 +15,7 @@ import { RouterView } from 'vue-router' import type { ComputedRef } from 'vue' import type HeaderMain from '@/components/HeaderMain.vue' -import { onMounted, onUnmounted, ref } from 'vue' +import { onMounted, onUnmounted, ref, watchEffect } from 'vue' import { watchConnect, watchDisconnect } from '@/repositories/WS' import { useDocumentStore } from '@/stores/documents' @@ -35,6 +35,9 @@ const path: ComputedRef = computed(() => { pathList } }) +watchEffect(() => { + document.title = path.value.path.replace(/\/$/, '').split('/').pop() || documentStore.server.name || 'Cista Storage' +}) onMounted(watchConnect) onUnmounted(watchDisconnect) // Update human-readable x seconds ago messages from mtimes diff --git a/cista-front/src/assets/logo.svg b/cista-front/src/assets/logo.svg new file mode 100644 index 0000000..cf8f699 --- /dev/null +++ b/cista-front/src/assets/logo.svg @@ -0,0 +1 @@ + diff --git a/cista-front/src/repositories/WS.ts b/cista-front/src/repositories/WS.ts index b760e17..d5ebf8a 100644 --- a/cista-front/src/repositories/WS.ts +++ b/cista-front/src/repositories/WS.ts @@ -42,6 +42,7 @@ export const watchConnect = () => { } if ("server" in msg) { console.log('Connected to backend', msg) + store.server = msg.server store.connected = true reconnectDuration = 500 store.error = '' diff --git a/cista-front/src/stores/documents.ts b/cista-front/src/stores/documents.ts index 59662d0..97c6ca6 100644 --- a/cista-front/src/stores/documents.ts +++ b/cista-front/src/stores/documents.ts @@ -33,6 +33,7 @@ export const useDocumentStore = defineStore({ fileExplorer: null, error: '' as string, connected: false, + server: {} as Record, user: { username: '', privileged: false, diff --git a/cista/api.py b/cista/api.py index 38b16d1..d08705f 100644 --- a/cista/api.py +++ b/cista/api.py @@ -89,7 +89,7 @@ async def watch(req, ws): msgspec.json.encode( { "server": { - "name": "Cista", # Should be configurable + "name": config.config.name or config.config.path.name, "version": __version__, "public": config.config.public, }, diff --git a/cista/config.py b/cista/config.py index 56aa708..de5310c 100644 --- a/cista/config.py +++ b/cista/config.py @@ -14,6 +14,7 @@ class Config(msgspec.Struct): listen: str secret: str = secrets.token_hex(12) public: bool = False + name: str = "" users: dict[str, User] = {} links: dict[str, Link] = {} -- 2.56.0