summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/file/assets/avatar.jpg (renamed from src/file/resources/avatar.jpg)bin1322 -> 1322 bytes
-rw-r--r--src/file/assets/bad-egg.png (renamed from src/file/resources/bad-egg.png)bin4783 -> 4783 bytes
-rw-r--r--src/file/assets/dummy.png (renamed from src/file/resources/dummy.png)bin6285 -> 6285 bytes
-rw-r--r--src/file/server.ts12
-rw-r--r--src/himasaku/assets/himasaku.png (renamed from src/himasaku/resources/himasaku.png)bin144018 -> 144018 bytes
-rw-r--r--src/himasaku/assets/index.html (renamed from src/himasaku/resources/index.html)0
-rw-r--r--src/himasaku/server.ts4
-rw-r--r--src/web/about/assets/style.css (renamed from src/web/about/resources/style.css)0
-rw-r--r--src/web/about/index.ts2
-rw-r--r--src/web/app/auth/assets/logo.svg (renamed from src/web/app/auth/resources/logo.svg)0
-rw-r--r--src/web/app/auth/tags/index.tag2
-rw-r--r--src/web/app/auth/view.pug2
-rw-r--r--src/web/app/base.pug4
-rw-r--r--src/web/app/client/script.js4
-rw-r--r--src/web/app/client/view.pug2
-rw-r--r--src/web/app/common/tags/core-error.tag2
-rw-r--r--src/web/app/common/tags/messaging/index.tag2
-rw-r--r--src/web/app/common/tags/messaging/message.tag2
-rw-r--r--src/web/app/desktop/assets/header-logo-white.svg (renamed from src/web/app/desktop/resources/header-logo-white.svg)0
-rw-r--r--src/web/app/desktop/assets/header-logo.svg (renamed from src/web/app/desktop/resources/header-logo.svg)0
-rw-r--r--src/web/app/desktop/assets/remove.png (renamed from src/web/app/desktop/resources/remove.png)bin3115 -> 3115 bytes
-rw-r--r--src/web/app/desktop/tags/drive/file.tag6
-rw-r--r--src/web/app/desktop/tags/pages/entrance.tag2
-rw-r--r--src/web/app/desktop/tags/post-form.tag2
-rw-r--r--src/web/app/desktop/tags/ui-header.tag2
-rw-r--r--src/web/app/dev/view.pug2
-rw-r--r--src/web/app/mobile/tags/page/entrance.tag2
-rw-r--r--src/web/assets/error.jpg (renamed from src/web/resources/error.jpg)bin56865 -> 56865 bytes
-rw-r--r--src/web/assets/favicon.ico (renamed from src/web/resources/favicon.ico)bin360414 -> 360414 bytes
-rw-r--r--src/web/assets/label.svg (renamed from src/web/resources/label.svg)0
-rw-r--r--src/web/assets/manifest.json (renamed from src/web/resources/manifest.json)0
-rw-r--r--src/web/assets/title.svg (renamed from src/web/resources/title.svg)0
-rw-r--r--src/web/assets/unread.svg (renamed from src/web/resources/unread.svg)0
-rw-r--r--src/web/server.ts10
34 files changed, 32 insertions, 32 deletions
diff --git a/src/file/resources/avatar.jpg b/src/file/assets/avatar.jpg
index 3c803f568e..3c803f568e 100644
--- a/src/file/resources/avatar.jpg
+++ b/src/file/assets/avatar.jpg
Binary files differ
diff --git a/src/file/resources/bad-egg.png b/src/file/assets/bad-egg.png
index a7c5930bd4..a7c5930bd4 100644
--- a/src/file/resources/bad-egg.png
+++ b/src/file/assets/bad-egg.png
Binary files differ
diff --git a/src/file/resources/dummy.png b/src/file/assets/dummy.png
index 39332b0c1b..39332b0c1b 100644
--- a/src/file/resources/dummy.png
+++ b/src/file/assets/dummy.png
Binary files differ
diff --git a/src/file/server.ts b/src/file/server.ts
index 21447b596b..8ab638aa69 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -24,7 +24,7 @@ app.use(cors());
/**
* Statics
*/
-app.use('/resources', express.static(__dirname + '/resources', {
+app.use('/assets', express.static(__dirname + '/assets', {
maxAge: 1000 * 60 * 60 * 24 * 365 // 一年
}));
@@ -33,12 +33,12 @@ app.get('/', (req, res) => {
});
app.get('/default-avatar.jpg', (req, res) => {
- const file = fs.readFileSync(__dirname + '/resources/avatar.jpg');
+ const file = fs.readFileSync(__dirname + '/assets/avatar.jpg');
send(file, 'image/jpeg', req, res);
});
app.get('/app-default.jpg', (req, res) => {
- const file = fs.readFileSync(__dirname + '/resources/dummy.png');
+ const file = fs.readFileSync(__dirname + '/assets/dummy.png');
send(file, 'image/png', req, res);
});
@@ -54,7 +54,7 @@ async function raw(data: Buffer, type: string, download: boolean, res: express.R
async function thumbnail(data: Buffer, type: string, resize: number, res: express.Response): Promise<any> {
if (!/^image\/.*$/.test(type)) {
- data = fs.readFileSync(__dirname + '/resources/dummy.png');
+ data = fs.readFileSync(__dirname + '/assets/dummy.png');
}
let g = gm(data);
@@ -100,7 +100,7 @@ app.get('/:id', async (req, res) => {
const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
if (file == null) {
- res.status(404).sendFile(__dirname + '/resources/dummy.png');
+ res.status(404).sendFile(__dirname + '/assets/dummy.png');
return;
} else if (file.data == null) {
res.sendStatus(400);
@@ -120,7 +120,7 @@ app.get('/:id/:name', async (req, res) => {
const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
if (file == null) {
- res.status(404).sendFile(__dirname + '/resources/dummy.png');
+ res.status(404).sendFile(__dirname + '/assets/dummy.png');
return;
} else if (file.data == null) {
res.sendStatus(400);
diff --git a/src/himasaku/resources/himasaku.png b/src/himasaku/assets/himasaku.png
index 25cd91e954..25cd91e954 100644
--- a/src/himasaku/resources/himasaku.png
+++ b/src/himasaku/assets/himasaku.png
Binary files differ
diff --git a/src/himasaku/resources/index.html b/src/himasaku/assets/index.html
index f9e45d7a74..f9e45d7a74 100644
--- a/src/himasaku/resources/index.html
+++ b/src/himasaku/assets/index.html
diff --git a/src/himasaku/server.ts b/src/himasaku/server.ts
index e4fb0ef177..17edc66484 100644
--- a/src/himasaku/server.ts
+++ b/src/himasaku/server.ts
@@ -13,11 +13,11 @@ app.disable('x-powered-by');
app.locals.cache = true;
app.get('/himasaku.png', (req, res) => {
- res.sendFile(__dirname + '/resources/himasaku.png');
+ res.sendFile(__dirname + '/assets/himasaku.png');
});
app.get('*', (req, res) => {
- res.sendFile(__dirname + '/resources/index.html');
+ res.sendFile(__dirname + '/assets/index.html');
});
module.exports = app;
diff --git a/src/web/about/resources/style.css b/src/web/about/assets/style.css
index 028bffa525..028bffa525 100644
--- a/src/web/about/resources/style.css
+++ b/src/web/about/assets/style.css
diff --git a/src/web/about/index.ts b/src/web/about/index.ts
index 18d259bcc2..9fedeb6273 100644
--- a/src/web/about/index.ts
+++ b/src/web/about/index.ts
@@ -3,7 +3,7 @@ import ms = require('ms');
const router = express.Router();
-router.use('/@/about/resources', express.static(`${__dirname}/resources`, {
+router.use('/@/about/assets', express.static(`${__dirname}/assets`, {
maxAge: ms('7 days')
}));
diff --git a/src/web/app/auth/resources/logo.svg b/src/web/app/auth/assets/logo.svg
index 19b8a2737e..19b8a2737e 100644
--- a/src/web/app/auth/resources/logo.svg
+++ b/src/web/app/auth/assets/logo.svg
diff --git a/src/web/app/auth/tags/index.tag b/src/web/app/auth/tags/index.tag
index 218101f3dd..6bc545df3b 100644
--- a/src/web/app/auth/tags/index.tag
+++ b/src/web/app/auth/tags/index.tag
@@ -23,7 +23,7 @@
<h1>サインインしてください</h1>
<mk-signin></mk-signin>
</main>
- <footer><img src="/resources/auth/logo.svg" alt="Misskey"/></footer>
+ <footer><img src="/assets/auth/logo.svg" alt="Misskey"/></footer>
<style>
:scope
display block
diff --git a/src/web/app/auth/view.pug b/src/web/app/auth/view.pug
index 03ec4e6f72..ae2a652022 100644
--- a/src/web/app/auth/view.pug
+++ b/src/web/app/auth/view.pug
@@ -2,4 +2,4 @@ extends ../base
block head
meta(name='viewport' content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no')
- script(src=`/resources/auth/script.${version}.js` async defer)
+ script(src=`/assets/auth/script.${version}.js` async defer)
diff --git a/src/web/app/base.pug b/src/web/app/base.pug
index 90fb7b24a2..d1095f6466 100644
--- a/src/web/app/base.pug
+++ b/src/web/app/base.pug
@@ -1,6 +1,6 @@
doctype html
-!= '\r\n<!-- Thank you for using Misskey! @syuilo -->\r\n'
+!= '\n<!-- Thank you for using Misskey! @syuilo -->\n'
html(lang='ja' dir='ltr')
@@ -11,7 +11,7 @@ html(lang='ja' dir='ltr')
meta(name='referrer' content='origin')
title Misskey
style
- include ./../../../built/web/resources/init.css
+ include ./../../../built/web/assets/init.css
script(src='https://use.fontawesome.com/22aba0df4f.js' async)
block head
diff --git a/src/web/app/client/script.js b/src/web/app/client/script.js
index ee07edd60d..0f0fd7aa45 100644
--- a/src/web/app/client/script.js
+++ b/src/web/app/client/script.js
@@ -15,7 +15,7 @@
*/
function mountDesktop() {
const script = document.createElement('script');
- script.setAttribute('src', `/resources/desktop/script.${VERSION}.js`);
+ script.setAttribute('src', `/assets/desktop/script.${VERSION}.js`);
script.setAttribute('async', 'true');
script.setAttribute('defer', 'true');
head.appendChild(script);
@@ -31,7 +31,7 @@
head.appendChild(meta);
const script = document.createElement('script');
- script.setAttribute('src', `/resources/mobile/script.${VERSION}.js`);
+ script.setAttribute('src', `/assets/mobile/script.${VERSION}.js`);
script.setAttribute('async', 'true');
script.setAttribute('defer', 'true');
head.appendChild(script);
diff --git a/src/web/app/client/view.pug b/src/web/app/client/view.pug
index 6f0ff3cd5c..3441631cd7 100644
--- a/src/web/app/client/view.pug
+++ b/src/web/app/client/view.pug
@@ -2,4 +2,4 @@ extends ../base
block head
script
- include ./../../../../built/web/resources/client/script.js
+ include ./../../../../built/web/assets/client/script.js
diff --git a/src/web/app/common/tags/core-error.tag b/src/web/app/common/tags/core-error.tag
index b903ba3e81..dd6f994ea2 100644
--- a/src/web/app/common/tags/core-error.tag
+++ b/src/web/app/common/tags/core-error.tag
@@ -1,6 +1,6 @@
<mk-core-error>
<!--i: i.fa.fa-times-circle-->
- <img src="/resources/error.jpg" alt=""/>
+ <img src="/assets/error.jpg" alt=""/>
<h1>サーバーに接続できません</h1>
<p class="text">インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから<a onclick={ retry }>再度お試し</a>ください。</p>
<p class="thanks">いつもMisskeyをご利用いただきありがとうございます。</p>
diff --git a/src/web/app/common/tags/messaging/index.tag b/src/web/app/common/tags/messaging/index.tag
index 8f3f1ed98f..8677c9c7c6 100644
--- a/src/web/app/common/tags/messaging/index.tag
+++ b/src/web/app/common/tags/messaging/index.tag
@@ -191,7 +191,7 @@
&:not([data-is-me]):not([data-is-read])
> div
- background-image url("/resources/unread.svg")
+ background-image url("/assets/unread.svg")
background-repeat no-repeat
background-position 0 center
diff --git a/src/web/app/common/tags/messaging/message.tag b/src/web/app/common/tags/messaging/message.tag
index 6d2651e5a1..21c601157c 100644
--- a/src/web/app/common/tags/messaging/message.tag
+++ b/src/web/app/common/tags/messaging/message.tag
@@ -2,7 +2,7 @@
<div class="content-container">
<div class="balloon">
<p class="read" if={ message.is_me && message.is_read }>既読</p>
- <button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/resources/desktop/messaging/delete.png" alt="Delete"/></button>
+ <button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/assets/desktop/messaging/delete.png" alt="Delete"/></button>
<div class="content" if={ !message.is_deleted }>
<div ref="text"></div>
<div class="image" if={ message.file }><img src={ message.file.url } alt="image" title={ message.file.name }/></div>
diff --git a/src/web/app/desktop/resources/header-logo-white.svg b/src/web/app/desktop/assets/header-logo-white.svg
index f31d6a7a6b..f31d6a7a6b 100644
--- a/src/web/app/desktop/resources/header-logo-white.svg
+++ b/src/web/app/desktop/assets/header-logo-white.svg
diff --git a/src/web/app/desktop/resources/header-logo.svg b/src/web/app/desktop/assets/header-logo.svg
index 19b8a2737e..19b8a2737e 100644
--- a/src/web/app/desktop/resources/header-logo.svg
+++ b/src/web/app/desktop/assets/header-logo.svg
diff --git a/src/web/app/desktop/resources/remove.png b/src/web/app/desktop/assets/remove.png
index 8b1f4c06c9..8b1f4c06c9 100644
--- a/src/web/app/desktop/resources/remove.png
+++ b/src/web/app/desktop/assets/remove.png
Binary files differ
diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag
index 7da0f8b0d0..98e8a98a13 100644
--- a/src/web/app/desktop/tags/drive/file.tag
+++ b/src/web/app/desktop/tags/drive/file.tag
@@ -1,11 +1,11 @@
<mk-drive-browser-file data-is-selected={ isSelected } data-is-contextmenu-showing={ isContextmenuShowing.toString() } onclick={ onclick } oncontextmenu={ oncontextmenu } draggable="true" ondragstart={ ondragstart } ondragend={ ondragend } title={ title }>
- <div class="label" if={ I.avatar_id == file.id }><img src="/resources/label.svg"/>
+ <div class="label" if={ I.avatar_id == file.id }><img src="/assets/label.svg"/>
<p>アバター</p>
</div>
- <div class="label" if={ I.banner_id == file.id }><img src="/resources/label.svg"/>
+ <div class="label" if={ I.banner_id == file.id }><img src="/assets/label.svg"/>
<p>バナー</p>
</div>
- <div class="label" if={ I.data.wallpaper == file.id }><img src="/resources/label.svg"/>
+ <div class="label" if={ I.data.wallpaper == file.id }><img src="/assets/label.svg"/>
<p>壁紙</p>
</div>
<div class="thumbnail"><img src={ file.url + '?thumbnail&size=128' } alt=""/></div>
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index c6f0f5c90e..a9fb58ddb1 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -1,6 +1,6 @@
<mk-entrance>
<main>
- <img src="/resources/title.svg" alt="Misskey"/>
+ <img src="/assets/title.svg" alt="Misskey"/>
<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
<div class="introduction" if={ mode == 'introduction' }>
diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index 922cb74271..1f6303bcb1 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -5,7 +5,7 @@
<ul>
<li each={ files }>
<div class="img" style="background-image: url({ url + '?thumbnail&size=64' })" title={ name }></div>
- <img class="remove" onclick={ removeFile } src="/resources/desktop/remove.png" title="添付取り消し" alt=""/>
+ <img class="remove" onclick={ removeFile } src="/assets/desktop/remove.png" title="添付取り消し" alt=""/>
</li>
<li class="add" if={ files.length < 4 } title="PCからファイルを添付" onclick={ selectFile }><i class="fa fa-plus"></i></li>
</ul>
diff --git a/src/web/app/desktop/tags/ui-header.tag b/src/web/app/desktop/tags/ui-header.tag
index 5eb7156622..6ab4063d80 100644
--- a/src/web/app/desktop/tags/ui-header.tag
+++ b/src/web/app/desktop/tags/ui-header.tag
@@ -45,7 +45,7 @@
display block
width 100%
height 48px
- background-image url(/resources/desktop/header-logo-white.svg)
+ background-image url(/assets/desktop/header-logo-white.svg)
background-size 64px
background-position center
background-repeat no-repeat
diff --git a/src/web/app/dev/view.pug b/src/web/app/dev/view.pug
index 8d21c7e714..b8bbddb50c 100644
--- a/src/web/app/dev/view.pug
+++ b/src/web/app/dev/view.pug
@@ -1,4 +1,4 @@
extends ../base
block head
- script(src=`/resources/dev/script.${version}.js` async defer)
+ script(src=`/assets/dev/script.${version}.js` async defer)
diff --git a/src/web/app/mobile/tags/page/entrance.tag b/src/web/app/mobile/tags/page/entrance.tag
index 42b308e3e2..0ad530eb71 100644
--- a/src/web/app/mobile/tags/page/entrance.tag
+++ b/src/web/app/mobile/tags/page/entrance.tag
@@ -1,5 +1,5 @@
<mk-entrance>
- <main><img src="/resources/title.svg" alt="Misskey"/>
+ <main><img src="/assets/title.svg" alt="Misskey"/>
<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
<div class="introduction" if={ mode == 'introduction' }>
diff --git a/src/web/resources/error.jpg b/src/web/assets/error.jpg
index 872b1a3f5d..872b1a3f5d 100644
--- a/src/web/resources/error.jpg
+++ b/src/web/assets/error.jpg
Binary files differ
diff --git a/src/web/resources/favicon.ico b/src/web/assets/favicon.ico
index 4fd944c3da..4fd944c3da 100644
--- a/src/web/resources/favicon.ico
+++ b/src/web/assets/favicon.ico
Binary files differ
diff --git a/src/web/resources/label.svg b/src/web/assets/label.svg
index b1f85f3c07..b1f85f3c07 100644
--- a/src/web/resources/label.svg
+++ b/src/web/assets/label.svg
diff --git a/src/web/resources/manifest.json b/src/web/assets/manifest.json
index 0967ef424b..0967ef424b 100644
--- a/src/web/resources/manifest.json
+++ b/src/web/assets/manifest.json
diff --git a/src/web/resources/title.svg b/src/web/assets/title.svg
index d74b754039..d74b754039 100644
--- a/src/web/resources/title.svg
+++ b/src/web/assets/title.svg
diff --git a/src/web/resources/unread.svg b/src/web/assets/unread.svg
index 8c3cc9f475..8c3cc9f475 100644
--- a/src/web/resources/unread.svg
+++ b/src/web/assets/unread.svg
diff --git a/src/web/server.ts b/src/web/server.ts
index baad0f6c67..cd3560d834 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -35,12 +35,12 @@ app.use((req, res, next) => {
});
/**
- * Static resources
+ * Static assets
*/
-app.use(favicon(`${__dirname}/resources/favicon.ico`));
-app.get('/manifest.json', (req, res) => res.sendFile(__dirname + '/resources/manifest.json'));
-app.get('/apple-touch-icon.png', (req, res) => res.sendFile(__dirname + '/resources/apple-touch-icon.png'));
-app.use('/resources', express.static(`${__dirname}/resources`, {
+app.use(favicon(`${__dirname}/assets/favicon.ico`));
+app.get('/manifest.json', (req, res) => res.sendFile(__dirname + '/assets/manifest.json'));
+app.get('/apple-touch-icon.png', (req, res) => res.sendFile(__dirname + '/assets/apple-touch-icon.png'));
+app.use('/assets', express.static(`${__dirname}/assets`, {
maxAge: ms('7 days')
}));
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 15:57:24 +0000