From b646877e8bf73650859c52fc00a601da5b34bfc0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 22 Mar 2017 16:19:32 +0900 Subject: #309 and some cleanups --- src/file/assets/avatar.jpg | Bin 0 -> 1322 bytes src/file/assets/bad-egg.png | Bin 0 -> 4783 bytes src/file/assets/dummy.png | Bin 0 -> 6285 bytes src/file/resources/avatar.jpg | Bin 1322 -> 0 bytes src/file/resources/bad-egg.png | Bin 4783 -> 0 bytes src/file/resources/dummy.png | Bin 6285 -> 0 bytes src/file/server.ts | 12 +- src/himasaku/assets/himasaku.png | Bin 0 -> 144018 bytes src/himasaku/assets/index.html | 35 ++++ src/himasaku/resources/himasaku.png | Bin 144018 -> 0 bytes src/himasaku/resources/index.html | 35 ---- src/himasaku/server.ts | 4 +- src/web/about/assets/style.css | 208 +++++++++++++++++++++ src/web/about/index.ts | 2 +- src/web/about/resources/style.css | 208 --------------------- src/web/app/auth/assets/logo.svg | 7 + src/web/app/auth/resources/logo.svg | 7 - src/web/app/auth/tags/index.tag | 2 +- src/web/app/auth/view.pug | 2 +- src/web/app/base.pug | 4 +- src/web/app/client/script.js | 4 +- src/web/app/client/view.pug | 2 +- src/web/app/common/tags/core-error.tag | 2 +- src/web/app/common/tags/messaging/index.tag | 2 +- src/web/app/common/tags/messaging/message.tag | 2 +- src/web/app/desktop/assets/header-logo-white.svg | 7 + src/web/app/desktop/assets/header-logo.svg | 7 + src/web/app/desktop/assets/remove.png | Bin 0 -> 3115 bytes .../app/desktop/resources/header-logo-white.svg | 7 - src/web/app/desktop/resources/header-logo.svg | 7 - src/web/app/desktop/resources/remove.png | Bin 3115 -> 0 bytes src/web/app/desktop/tags/drive/file.tag | 6 +- src/web/app/desktop/tags/pages/entrance.tag | 2 +- src/web/app/desktop/tags/post-form.tag | 2 +- src/web/app/desktop/tags/ui-header.tag | 2 +- src/web/app/dev/view.pug | 2 +- src/web/app/mobile/tags/page/entrance.tag | 2 +- src/web/assets/error.jpg | Bin 0 -> 56865 bytes src/web/assets/favicon.ico | Bin 0 -> 360414 bytes src/web/assets/label.svg | 6 + src/web/assets/manifest.json | 1 + src/web/assets/title.svg | 7 + src/web/assets/unread.svg | 7 + src/web/resources/error.jpg | Bin 56865 -> 0 bytes src/web/resources/favicon.ico | Bin 360414 -> 0 bytes src/web/resources/label.svg | 6 - src/web/resources/manifest.json | 1 - src/web/resources/title.svg | 7 - src/web/resources/unread.svg | 7 - src/web/server.ts | 10 +- 50 files changed, 317 insertions(+), 317 deletions(-) create mode 100644 src/file/assets/avatar.jpg create mode 100644 src/file/assets/bad-egg.png create mode 100644 src/file/assets/dummy.png delete mode 100644 src/file/resources/avatar.jpg delete mode 100644 src/file/resources/bad-egg.png delete mode 100644 src/file/resources/dummy.png create mode 100644 src/himasaku/assets/himasaku.png create mode 100644 src/himasaku/assets/index.html delete mode 100644 src/himasaku/resources/himasaku.png delete mode 100644 src/himasaku/resources/index.html create mode 100644 src/web/about/assets/style.css delete mode 100644 src/web/about/resources/style.css create mode 100644 src/web/app/auth/assets/logo.svg delete mode 100644 src/web/app/auth/resources/logo.svg create mode 100644 src/web/app/desktop/assets/header-logo-white.svg create mode 100644 src/web/app/desktop/assets/header-logo.svg create mode 100644 src/web/app/desktop/assets/remove.png delete mode 100644 src/web/app/desktop/resources/header-logo-white.svg delete mode 100644 src/web/app/desktop/resources/header-logo.svg delete mode 100644 src/web/app/desktop/resources/remove.png create mode 100644 src/web/assets/error.jpg create mode 100644 src/web/assets/favicon.ico create mode 100644 src/web/assets/label.svg create mode 100644 src/web/assets/manifest.json create mode 100644 src/web/assets/title.svg create mode 100644 src/web/assets/unread.svg delete mode 100644 src/web/resources/error.jpg delete mode 100644 src/web/resources/favicon.ico delete mode 100644 src/web/resources/label.svg delete mode 100644 src/web/resources/manifest.json delete mode 100644 src/web/resources/title.svg delete mode 100644 src/web/resources/unread.svg (limited to 'src') diff --git a/src/file/assets/avatar.jpg b/src/file/assets/avatar.jpg new file mode 100644 index 0000000000..3c803f568e Binary files /dev/null and b/src/file/assets/avatar.jpg differ diff --git a/src/file/assets/bad-egg.png b/src/file/assets/bad-egg.png new file mode 100644 index 0000000000..a7c5930bd4 Binary files /dev/null and b/src/file/assets/bad-egg.png differ diff --git a/src/file/assets/dummy.png b/src/file/assets/dummy.png new file mode 100644 index 0000000000..39332b0c1b Binary files /dev/null and b/src/file/assets/dummy.png differ diff --git a/src/file/resources/avatar.jpg b/src/file/resources/avatar.jpg deleted file mode 100644 index 3c803f568e..0000000000 Binary files a/src/file/resources/avatar.jpg and /dev/null differ diff --git a/src/file/resources/bad-egg.png b/src/file/resources/bad-egg.png deleted file mode 100644 index a7c5930bd4..0000000000 Binary files a/src/file/resources/bad-egg.png and /dev/null differ diff --git a/src/file/resources/dummy.png b/src/file/resources/dummy.png deleted file mode 100644 index 39332b0c1b..0000000000 Binary files a/src/file/resources/dummy.png and /dev/null 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 { 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/assets/himasaku.png b/src/himasaku/assets/himasaku.png new file mode 100644 index 0000000000..25cd91e954 Binary files /dev/null and b/src/himasaku/assets/himasaku.png differ diff --git a/src/himasaku/assets/index.html b/src/himasaku/assets/index.html new file mode 100644 index 0000000000..f9e45d7a74 --- /dev/null +++ b/src/himasaku/assets/index.html @@ -0,0 +1,35 @@ + + + + + + + + ひまさく + + + + ひまさく + + diff --git a/src/himasaku/resources/himasaku.png b/src/himasaku/resources/himasaku.png deleted file mode 100644 index 25cd91e954..0000000000 Binary files a/src/himasaku/resources/himasaku.png and /dev/null differ diff --git a/src/himasaku/resources/index.html b/src/himasaku/resources/index.html deleted file mode 100644 index f9e45d7a74..0000000000 --- a/src/himasaku/resources/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - ひまさく - - - - ひまさく - - 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/assets/style.css b/src/web/about/assets/style.css new file mode 100644 index 0000000000..028bffa525 --- /dev/null +++ b/src/web/about/assets/style.css @@ -0,0 +1,208 @@ +html { + font-family: sans-serif; +} + +body { + margin: 0; + color: #34495e; +} + +nav { + display: block; + float: left; + width: 210px; +} +nav ul { + display: block; + margin: 0 0 16px 0; + padding: 0 0 0 16px; + list-style: none; +} +nav ul li { + margin: 0; + padding: 0; +} +nav ul li p { + margin: 16px 0 0 0; +} +@media screen and (max-width: 910px) { + nav { + display: none; + } +} + +main { + float: left; + box-sizing: border-box; + padding: 32px; + width: 100%; + max-width: 700px; + overflow-wrap: break-word; +} +@media screen and (max-width: 700px) { + main { + font-size: 8px; + } +} + +footer { + padding: 32px 0 0 0; + margin: 32px 0 0 0; + border-top: solid 1px #eee; +} + +footer .contribution { + margin: 0 0 16px 0; +} + +footer .copyright { + margin: 16px 0 0 0; + color: #aaa; +} + +a { + text-decoration: none; + color: #f76d6c; +} + a:hover { + text-decoration: underline; + } + +hr { + border-top: solid 1px #eee; +} + +section { + margin: 32px 0; +} + +h1 { + margin: 0 0 24px 0; + padding: 16px 0; + font-size: 1.5em; + border-bottom: solid 2px #eee; +} + +h2 { + margin: 0 0 24px 0; + padding: 0 0 16px 0; + font-size: 1.4em; + border-bottom: solid 1px #eee; +} + +h3 { + margin: 0; + padding: 0; + font-size: 1.25em; +} + +h4 { + margin: 0; +} + +p { + margin: 1em 0; + line-height: 1.6em; +} + +p.tip { + position: relative; + padding: 12px 24px 12px 30px; + margin: 1em 0; + font-size: 0.9em; + border-left: 4px solid #f66; + background-color: #f8f8f8; + border-bottom-right-radius: 2px; + border-top-right-radius: 2px; +} + p.tip:before { + position: absolute; + top: 14px; + left: -12px; + background-color: #f66; + color: #fff; + content: "!"; + width: 20px; + height: 20px; + border-radius: 100%; + text-align: center; + line-height: 20px; + font-weight: bold; + font-family: 'Dosis', 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif; + font-size: 14px; + } + +hr { + margin: 1em 0; +} + +table { + width: 100%; + border-spacing: 0; + border-collapse: collapse; +} + +table thead { + font-weight: bold; + border-bottom: solid 2px #eee; +} + +table tbody tr { + border-bottom: dashed 1px #eee; +} + +table th, table td { + padding: 8px 16px; +} + +table.entity tbody tr td:nth-child(1) { + font-family: Consolas, 'Courier New', Courier, Monaco, monospace; +} + +table.entity tbody tr td:nth-child(2) { + font-style: italic; +} + +table.entity tr td:nth-child(3):after { + margin-left: 8px; + opacity: 0.7; +} + +table.entity tr.nullable td:nth-child(2):after { + content: "?"; + opacity: 0.7; +} +table.entity tr.nullable td:nth-child(3):after { + content: "(Null許容)"; +} + +table.entity tr.optional { + opacity: 0.7; +} +table.entity tr.optional td:nth-child(3):after { + content: "(省略可能)"; +} + +table.entity tr.nullable.optional td:nth-child(3):after { + content: "(Null許容かつ省略可能)"; +} + +pre, code, var, samp, kbd { + font-family: Consolas, 'Courier New', Courier, Monaco, monospace; +} + +code { + display: inline-block; + margin: 0 4px; + padding: 0 8px; + color: #525252; + background: #f8f8f8; + border-radius: 2px; +} + +pre code { + display: block; + overflow: auto; + margin: 0; + padding: 32px; +} 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/about/resources/style.css b/src/web/about/resources/style.css deleted file mode 100644 index 028bffa525..0000000000 --- a/src/web/about/resources/style.css +++ /dev/null @@ -1,208 +0,0 @@ -html { - font-family: sans-serif; -} - -body { - margin: 0; - color: #34495e; -} - -nav { - display: block; - float: left; - width: 210px; -} -nav ul { - display: block; - margin: 0 0 16px 0; - padding: 0 0 0 16px; - list-style: none; -} -nav ul li { - margin: 0; - padding: 0; -} -nav ul li p { - margin: 16px 0 0 0; -} -@media screen and (max-width: 910px) { - nav { - display: none; - } -} - -main { - float: left; - box-sizing: border-box; - padding: 32px; - width: 100%; - max-width: 700px; - overflow-wrap: break-word; -} -@media screen and (max-width: 700px) { - main { - font-size: 8px; - } -} - -footer { - padding: 32px 0 0 0; - margin: 32px 0 0 0; - border-top: solid 1px #eee; -} - -footer .contribution { - margin: 0 0 16px 0; -} - -footer .copyright { - margin: 16px 0 0 0; - color: #aaa; -} - -a { - text-decoration: none; - color: #f76d6c; -} - a:hover { - text-decoration: underline; - } - -hr { - border-top: solid 1px #eee; -} - -section { - margin: 32px 0; -} - -h1 { - margin: 0 0 24px 0; - padding: 16px 0; - font-size: 1.5em; - border-bottom: solid 2px #eee; -} - -h2 { - margin: 0 0 24px 0; - padding: 0 0 16px 0; - font-size: 1.4em; - border-bottom: solid 1px #eee; -} - -h3 { - margin: 0; - padding: 0; - font-size: 1.25em; -} - -h4 { - margin: 0; -} - -p { - margin: 1em 0; - line-height: 1.6em; -} - -p.tip { - position: relative; - padding: 12px 24px 12px 30px; - margin: 1em 0; - font-size: 0.9em; - border-left: 4px solid #f66; - background-color: #f8f8f8; - border-bottom-right-radius: 2px; - border-top-right-radius: 2px; -} - p.tip:before { - position: absolute; - top: 14px; - left: -12px; - background-color: #f66; - color: #fff; - content: "!"; - width: 20px; - height: 20px; - border-radius: 100%; - text-align: center; - line-height: 20px; - font-weight: bold; - font-family: 'Dosis', 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif; - font-size: 14px; - } - -hr { - margin: 1em 0; -} - -table { - width: 100%; - border-spacing: 0; - border-collapse: collapse; -} - -table thead { - font-weight: bold; - border-bottom: solid 2px #eee; -} - -table tbody tr { - border-bottom: dashed 1px #eee; -} - -table th, table td { - padding: 8px 16px; -} - -table.entity tbody tr td:nth-child(1) { - font-family: Consolas, 'Courier New', Courier, Monaco, monospace; -} - -table.entity tbody tr td:nth-child(2) { - font-style: italic; -} - -table.entity tr td:nth-child(3):after { - margin-left: 8px; - opacity: 0.7; -} - -table.entity tr.nullable td:nth-child(2):after { - content: "?"; - opacity: 0.7; -} -table.entity tr.nullable td:nth-child(3):after { - content: "(Null許容)"; -} - -table.entity tr.optional { - opacity: 0.7; -} -table.entity tr.optional td:nth-child(3):after { - content: "(省略可能)"; -} - -table.entity tr.nullable.optional td:nth-child(3):after { - content: "(Null許容かつ省略可能)"; -} - -pre, code, var, samp, kbd { - font-family: Consolas, 'Courier New', Courier, Monaco, monospace; -} - -code { - display: inline-block; - margin: 0 4px; - padding: 0 8px; - color: #525252; - background: #f8f8f8; - border-radius: 2px; -} - -pre code { - display: block; - overflow: auto; - margin: 0; - padding: 32px; -} diff --git a/src/web/app/auth/assets/logo.svg b/src/web/app/auth/assets/logo.svg new file mode 100644 index 0000000000..19b8a2737e --- /dev/null +++ b/src/web/app/auth/assets/logo.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/src/web/app/auth/resources/logo.svg b/src/web/app/auth/resources/logo.svg deleted file mode 100644 index 19b8a2737e..0000000000 --- a/src/web/app/auth/resources/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 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 @@

サインインしてください

-
Misskey
+
Misskey