From 5b965349a5abed481ef0d6649c02184f7b774036 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 7 Mar 2021 14:40:57 +0900 Subject: fix assets Fix #7314 Fix #7313 --- src/client/assets/about-icon.png | Bin 20528 -> 0 bytes src/client/assets/fedi.jpg | Bin 77752 -> 0 bytes src/client/assets/label-red.svg | 6 ----- src/client/assets/label.svg | 6 ----- src/client/assets/manifest.json | 28 --------------------- src/client/assets/misskey.svg | 7 ------ src/client/assets/redoc.html | 24 ------------------ src/client/assets/remove.png | Bin 424 -> 0 bytes src/client/assets/unread.svg | 7 ------ src/client/components/drive.file.vue | 6 ++--- src/client/pages/about-misskey.vue | 2 +- src/client/pages/explore.vue | 2 +- src/client/pages/messaging/index.vue | 2 +- .../pages/messaging/messaging-room.message.vue | 2 +- src/client/pages/welcome.entrance.a.vue | 2 +- src/client/pages/welcome.entrance.b.vue | 2 +- src/client/pages/welcome.entrance.c.vue | 2 +- src/client/scripts/room/room.ts | 4 +-- src/client/scripts/sound.ts | 2 +- 19 files changed, 13 insertions(+), 91 deletions(-) delete mode 100644 src/client/assets/about-icon.png delete mode 100644 src/client/assets/fedi.jpg delete mode 100644 src/client/assets/label-red.svg delete mode 100644 src/client/assets/label.svg delete mode 100644 src/client/assets/manifest.json delete mode 100644 src/client/assets/misskey.svg delete mode 100644 src/client/assets/redoc.html delete mode 100644 src/client/assets/remove.png delete mode 100644 src/client/assets/unread.svg (limited to 'src/client') diff --git a/src/client/assets/about-icon.png b/src/client/assets/about-icon.png deleted file mode 100644 index afc1f0c728..0000000000 Binary files a/src/client/assets/about-icon.png and /dev/null differ diff --git a/src/client/assets/fedi.jpg b/src/client/assets/fedi.jpg deleted file mode 100644 index cbf3748eb8..0000000000 Binary files a/src/client/assets/fedi.jpg and /dev/null differ diff --git a/src/client/assets/label-red.svg b/src/client/assets/label-red.svg deleted file mode 100644 index 45996aa9ce..0000000000 --- a/src/client/assets/label-red.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/src/client/assets/label.svg b/src/client/assets/label.svg deleted file mode 100644 index b1f85f3c07..0000000000 --- a/src/client/assets/label.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json deleted file mode 100644 index 48030a2980..0000000000 --- a/src/client/assets/manifest.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "short_name": "Misskey", - "name": "Misskey", - "start_url": "/", - "display": "standalone", - "background_color": "#313a42", - "theme_color": "#86b300", - "icons": [ - { - "src": "/static-assets/icons/192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/static-assets/icons/512.png", - "sizes": "512x512", - "type": "image/png" - } - ], - "share_target": { - "action": "/share/", - "params": { - "title": "title", - "text": "text", - "url": "url" - } - } -} diff --git a/src/client/assets/misskey.svg b/src/client/assets/misskey.svg deleted file mode 100644 index 3fcb2d3ecb..0000000000 --- a/src/client/assets/misskey.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/client/assets/redoc.html b/src/client/assets/redoc.html deleted file mode 100644 index 4d2360fb20..0000000000 --- a/src/client/assets/redoc.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - Misskey API - - - - - - - - - - - - - diff --git a/src/client/assets/remove.png b/src/client/assets/remove.png deleted file mode 100644 index c2e222a0fc..0000000000 Binary files a/src/client/assets/remove.png and /dev/null differ diff --git a/src/client/assets/unread.svg b/src/client/assets/unread.svg deleted file mode 100644 index 8c3cc9f475..0000000000 --- a/src/client/assets/unread.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/src/client/components/drive.file.vue b/src/client/components/drive.file.vue index d2b8b95f73..5075b574c4 100644 --- a/src/client/components/drive.file.vue +++ b/src/client/components/drive.file.vue @@ -9,15 +9,15 @@ :title="title" >
- +

{{ $ts.avatar }}

- +

{{ $ts.banner }}

- +

{{ $ts.nsfw }}

diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue index 7022a924b0..a52678e3cd 100644 --- a/src/client/pages/about-misskey.vue +++ b/src/client/pages/about-misskey.vue @@ -4,7 +4,7 @@
- +
Misskey
v{{ version }}
diff --git a/src/client/pages/explore.vue b/src/client/pages/explore.vue index 3ab7dda242..b78a3707ef 100644 --- a/src/client/pages/explore.vue +++ b/src/client/pages/explore.vue @@ -30,7 +30,7 @@
-
+
{{ $ts.exploreFediverse }}
diff --git a/src/client/pages/messaging/index.vue b/src/client/pages/messaging/index.vue index aefc31f3bc..afb240c051 100644 --- a/src/client/pages/messaging/index.vue +++ b/src/client/pages/messaging/index.vue @@ -200,7 +200,7 @@ export default defineComponent({ &:not(.isMe):not(.isRead) { > div { - background-image: url("/assets/unread.svg"); + background-image: url("/static-assets/client/unread.svg"); background-repeat: no-repeat; background-position: 0 center; } diff --git a/src/client/pages/messaging/messaging-room.message.vue b/src/client/pages/messaging/messaging-room.message.vue index d379c0c3c0..6d4ed96044 100644 --- a/src/client/pages/messaging/messaging-room.message.vue +++ b/src/client/pages/messaging/messaging-room.message.vue @@ -4,7 +4,7 @@
diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue index 872ea8797f..fa69c1a124 100644 --- a/src/client/pages/welcome.entrance.a.vue +++ b/src/client/pages/welcome.entrance.a.vue @@ -5,7 +5,7 @@
- +
diff --git a/src/client/pages/welcome.entrance.b.vue b/src/client/pages/welcome.entrance.b.vue index 95b99fb466..203618f17e 100644 --- a/src/client/pages/welcome.entrance.b.vue +++ b/src/client/pages/welcome.entrance.b.vue @@ -29,7 +29,7 @@
- +
diff --git a/src/client/pages/welcome.entrance.c.vue b/src/client/pages/welcome.entrance.c.vue index 8aba80e781..4c98baf8ea 100644 --- a/src/client/pages/welcome.entrance.c.vue +++ b/src/client/pages/welcome.entrance.c.vue @@ -11,7 +11,7 @@
- +
diff --git a/src/client/scripts/room/room.ts b/src/client/scripts/room/room.ts index 8fe3ebdeb0..4450210c6c 100644 --- a/src/client/scripts/room/room.ts +++ b/src/client/scripts/room/room.ts @@ -340,7 +340,7 @@ export class Room { @autobind private loadRoom() { const type = this.roomInfo.roomType; - new GLTFLoader().load(`/static-assets/room/rooms/${type}/${type}.glb`, gltf => { + new GLTFLoader().load(`/static-assets/client/room/rooms/${type}/${type}.glb`, gltf => { gltf.scene.traverse(child => { if (!(child instanceof THREE.Mesh)) return; @@ -375,7 +375,7 @@ export class Room { const def = furnitureDefs.find(d => d.id === furniture.type); return new Promise((res, rej) => { const loader = new GLTFLoader(); - loader.load(`/static-assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { + loader.load(`/static-assets/client/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { const model = gltf.scene; // Load animation diff --git a/src/client/scripts/sound.ts b/src/client/scripts/sound.ts index bb4cfee06a..9b7061d5fc 100644 --- a/src/client/scripts/sound.ts +++ b/src/client/scripts/sound.ts @@ -16,7 +16,7 @@ export function playFile(file: string, volume: number) { if (cache.has(file)) { audio = cache.get(file); } else { - audio = new Audio(`/static-assets/sounds/${file}.mp3`); + audio = new Audio(`/static-assets/client/sounds/${file}.mp3`); cache.set(file, audio); } audio.volume = masterVolume - ((1 - volume) * masterVolume); -- cgit v1.2.3-freya