mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-08 22:13:08 +02:00
enhance(sw): オフライン表示のデザインを改善 (#13052)
* enhance(sw): オフライン表示のデザインを改善 * Update Changelog * fix * fix * fix * 言語が取得できなかった場合のフォールバックを追加 * (change) translation key
This commit is contained in:
かっこかり
GitHub
parent
a17251d913
commit
4de77784c9
4 changed files with 30 additions and 4 deletions
|
|
@ -58,6 +58,9 @@
|
||||||
- Fix: ipv4とipv6の両方が利用可能な環境でallowedPrivateNetworksが設定されていた場合プライベートipの検証ができていなかった問題を修正
|
- Fix: ipv4とipv6の両方が利用可能な環境でallowedPrivateNetworksが設定されていた場合プライベートipの検証ができていなかった問題を修正
|
||||||
- Fix: properly handle cc followers
|
- Fix: properly handle cc followers
|
||||||
|
|
||||||
|
### Service Worker
|
||||||
|
- Enhance: オフライン表示のデザインを改善・多言語対応
|
||||||
|
|
||||||
## 2023.12.2
|
## 2023.12.2
|
||||||
|
|
||||||
### General
|
### General
|
||||||
|
|
|
||||||
10
locales/index.d.ts
vendored
10
locales/index.d.ts
vendored
|
|
@ -9554,6 +9554,16 @@ export interface Locale extends ILocale {
|
||||||
*/
|
*/
|
||||||
"lookingForPlayer": string;
|
"lookingForPlayer": string;
|
||||||
};
|
};
|
||||||
|
"_offlineScreen": {
|
||||||
|
/**
|
||||||
|
* オフライン - サーバーに接続できません
|
||||||
|
*/
|
||||||
|
"title": string;
|
||||||
|
/**
|
||||||
|
* サーバーに接続できません
|
||||||
|
*/
|
||||||
|
"header": string;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
declare const locales: {
|
declare const locales: {
|
||||||
[lang: string]: Locale;
|
[lang: string]: Locale;
|
||||||
|
|
|
||||||
|
|
@ -2544,3 +2544,7 @@ _reversi:
|
||||||
timeLimitForEachTurn: "1ターンの時間制限"
|
timeLimitForEachTurn: "1ターンの時間制限"
|
||||||
freeMatch: "フリーマッチ"
|
freeMatch: "フリーマッチ"
|
||||||
lookingForPlayer: "対戦相手を探しています"
|
lookingForPlayer: "対戦相手を探しています"
|
||||||
|
|
||||||
|
_offlineScreen:
|
||||||
|
title: "オフライン - サーバーに接続できません"
|
||||||
|
header: "サーバーに接続できません"
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
import { get } from 'idb-keyval';
|
import { get } from 'idb-keyval';
|
||||||
import * as Misskey from 'misskey-js';
|
import * as Misskey from 'misskey-js';
|
||||||
import type { PushNotificationDataMap } from '@/types.js';
|
import type { PushNotificationDataMap } from '@/types.js';
|
||||||
|
import type { I18n, Locale } from '@/scripts/i18n.js';
|
||||||
import { createEmptyNotification, createNotification } from '@/scripts/create-notification.js';
|
import { createEmptyNotification, createNotification } from '@/scripts/create-notification.js';
|
||||||
import { swLang } from '@/scripts/lang.js';
|
import { swLang } from '@/scripts/lang.js';
|
||||||
import * as swos from '@/scripts/operations.js';
|
import * as swos from '@/scripts/operations.js';
|
||||||
|
|
@ -26,8 +27,15 @@ globalThis.addEventListener('activate', ev => {
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
function offlineContentHTML(): string {
|
async function offlineContentHTML() {
|
||||||
return `<!doctype html>Offline. Service Worker @${_VERSION_} <button onclick="location.reload()">reload</button>`;
|
const i18n = await (swLang.i18n ?? swLang.fetchLocale()) as Partial<I18n<Locale>>;
|
||||||
|
const messages = {
|
||||||
|
title: i18n.ts?._offlineScreen?.title ?? 'Offline - Could not connect to server',
|
||||||
|
header: i18n.ts?._offlineScreen?.header ?? 'Could not connect to server',
|
||||||
|
reload: i18n.ts?.reload ?? 'Reload',
|
||||||
|
};
|
||||||
|
|
||||||
|
return `<!DOCTYPE html><html lang="ja"><head><meta charset="UTF-8"><meta content="width=device-width,initial-scale=1"name="viewport"><title>${messages.title}</title><style>body{background-color:#0c1210;color:#dee7e4;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh;margin:0;padding:24px;box-sizing:border-box}.icon{max-width:120px;width:100%;height:auto;margin-bottom:20px;}.message{text-align:center;font-size:20px;font-weight:700;margin-bottom:20px}.version{text-align:center;font-size:90%;margin-bottom:20px}button{padding:7px 14px;min-width:100px;font-weight:700;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;border-radius:99rem;background-color:#b4e900;color:#192320;border:none;cursor:pointer;-webkit-tap-highlight-color:transparent}button:hover{background-color:#c6ff03}</style></head><body><svg class="icon"fill="none"height="24"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"stroke-width="2"viewBox="0 0 24 24"width="24"xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z"fill="none"stroke="none"/><path d="M9.58 5.548c.24 -.11 .492 -.207 .752 -.286c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99c1.913 0 3.464 1.56 3.464 3.486c0 .957 -.383 1.824 -1.003 2.454m-2.997 1.033h-11.343c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.13 -.582 .37 -1.128 .7 -1.62"/><path d="M3 3l18 18"/></svg><div class="message">${messages.header}</div><div class="version">v${_VERSION_}</div><button onclick="reloadPage()">${messages.reload}</button><script>function reloadPage(){location.reload(!0)}</script></body></html>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
globalThis.addEventListener('fetch', ev => {
|
globalThis.addEventListener('fetch', ev => {
|
||||||
|
|
@ -43,8 +51,9 @@ globalThis.addEventListener('fetch', ev => {
|
||||||
if (!isHTMLRequest) return;
|
if (!isHTMLRequest) return;
|
||||||
ev.respondWith(
|
ev.respondWith(
|
||||||
fetch(ev.request)
|
fetch(ev.request)
|
||||||
.catch(() => {
|
.catch(async () => {
|
||||||
return new Response(offlineContentHTML(), {
|
const html = await offlineContentHTML();
|
||||||
|
return new Response(html, {
|
||||||
status: 200,
|
status: 200,
|
||||||
headers: {
|
headers: {
|
||||||
'content-type': 'text/html',
|
'content-type': 'text/html',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue