fix boot.js color with new branding

This commit is contained in:
AntoineÐ 2023-11-27 17:22:03 +01:00 committed by Laura Hausmann
parent 4a90408386
commit d0e995639b
2 changed files with 157 additions and 159 deletions

View file

@ -13,130 +13,130 @@
// ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので // ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので
(async () => { (async () => {
window.onerror = (e) => { window.onerror = (e) => {
console.error(e); console.error(e);
renderError("SOMETHING_HAPPENED", e); renderError("SOMETHING_HAPPENED", e);
}; };
window.onunhandledrejection = (e) => { window.onunhandledrejection = (e) => {
console.error(e); console.error(e);
renderError("SOMETHING_HAPPENED_IN_PROMISE", e); renderError("SOMETHING_HAPPENED_IN_PROMISE", e);
}; };
//#region Detect language & fetch translations //#region Detect language & fetch translations
const v = localStorage.getItem("v") || VERSION; const v = localStorage.getItem("v") || VERSION;
const supportedLangs = LANGS; const supportedLangs = LANGS;
let lang = localStorage.getItem("lang"); let lang = localStorage.getItem("lang");
if (lang == null || !supportedLangs.includes(lang)) { if (lang == null || !supportedLangs.includes(lang)) {
if (supportedLangs.includes(navigator.language)) { if (supportedLangs.includes(navigator.language)) {
lang = navigator.language; lang = navigator.language;
} else { } else {
lang = supportedLangs.find((x) => x.split("-")[0] === navigator.language); lang = supportedLangs.find((x) => x.split("-")[0] === navigator.language);
// Fallback // Fallback
if (lang == null) lang = "en-US"; if (lang == null) lang = "en-US";
} }
} }
const res = await fetch(`/assets/locales/${lang}.${v}.json`); const res = await fetch(`/assets/locales/${lang}.${v}.json`);
if (res.status === 200) { if (res.status === 200) {
localStorage.setItem("lang", lang); localStorage.setItem("lang", lang);
localStorage.setItem("locale", await res.text()); localStorage.setItem("locale", await res.text());
localStorage.setItem("localeVersion", v); localStorage.setItem("localeVersion", v);
} else { } else {
await checkUpdate(); await checkUpdate();
renderError("LOCALE_FETCH"); renderError("LOCALE_FETCH");
return; return;
} }
//#endregion //#endregion
//#region Script //#region Script
function importAppScript() { function importAppScript() {
import(`/assets/${CLIENT_ENTRY}`).catch(async (e) => { import(`/assets/${CLIENT_ENTRY}`).catch(async (e) => {
await checkUpdate(); await checkUpdate();
console.error(e); console.error(e);
renderError("APP_IMPORT", e); renderError("APP_IMPORT", e);
}); });
} }
// タイミングによっては、この時点でDOMの構築が済んでいる場合とそうでない場合とがある // タイミングによっては、この時点でDOMの構築が済んでいる場合とそうでない場合とがある
if (document.readyState !== "loading") { if (document.readyState !== "loading") {
importAppScript(); importAppScript();
} else { } else {
window.addEventListener("DOMContentLoaded", () => { window.addEventListener("DOMContentLoaded", () => {
importAppScript(); importAppScript();
}); });
} }
//#endregion //#endregion
//#region Theme //#region Theme
const theme = localStorage.getItem("theme"); const theme = localStorage.getItem("theme");
if (theme) { if (theme) {
for (const [k, v] of Object.entries(JSON.parse(theme))) { for (const [k, v] of Object.entries(JSON.parse(theme))) {
document.documentElement.style.setProperty(`--${k}`, v.toString()); document.documentElement.style.setProperty(`--${k}`, v.toString());
// HTMLの theme-color 適用 // HTMLの theme-color 適用
if (k === "htmlThemeColor") { if (k === "htmlThemeColor") {
for (const tag of document.head.children) { for (const tag of document.head.children) {
if ( if (
tag.tagName === "META" && tag.tagName === "META" &&
tag.getAttribute("name") === "theme-color" tag.getAttribute("name") === "theme-color"
) { ) {
tag.setAttribute("content", v); tag.setAttribute("content", v);
break; break;
} }
} }
} }
} }
} }
const colorSchema = localStorage.getItem("colorSchema"); const colorSchema = localStorage.getItem("colorSchema");
if (colorSchema) { if (colorSchema) {
document.documentElement.style.setProperty("color-schema", colorSchema); document.documentElement.style.setProperty("color-schema", colorSchema);
} }
//#endregion //#endregion
let fontSize = localStorage.getItem("fontSize"); let fontSize = localStorage.getItem("fontSize");
if (fontSize) { if (fontSize) {
if (fontSize < 10) { if (fontSize < 10) {
// need to do this for now, as values before were 1, 2, 3 depending on the option // need to do this for now, as values before were 1, 2, 3 depending on the option
localStorage.setItem("fontSize", null); localStorage.setItem("fontSize", null);
fontSize = localStorage.getItem("fontSize"); fontSize = localStorage.getItem("fontSize");
} }
document.documentElement.style.fontSize = `${fontSize}px`; document.documentElement.style.fontSize = `${fontSize}px`;
} }
if (["ja-JP", "ja-KS", "ko-KR", "zh-CN", "zh-TW"].includes(lang)) { if (["ja-JP", "ja-KS", "ko-KR", "zh-CN", "zh-TW"].includes(lang)) {
document.documentElement.classList.add("useCJKFont"); document.documentElement.classList.add("useCJKFont");
} }
const useSystemFont = localStorage.getItem("useSystemFont"); const useSystemFont = localStorage.getItem("useSystemFont");
if (useSystemFont) { if (useSystemFont) {
document.documentElement.classList.add("useSystemFont"); document.documentElement.classList.add("useSystemFont");
} }
const wallpaper = localStorage.getItem("wallpaper"); const wallpaper = localStorage.getItem("wallpaper");
if (wallpaper) { if (wallpaper) {
document.documentElement.style.backgroundImage = `url(${wallpaper})`; document.documentElement.style.backgroundImage = `url(${wallpaper})`;
} }
const customCss = localStorage.getItem("customCss"); const customCss = localStorage.getItem("customCss");
if (customCss && customCss.length > 0) { if (customCss && customCss.length > 0) {
const style = document.createElement("style"); const style = document.createElement("style");
style.innerHTML = customCss; style.innerHTML = customCss;
document.head.appendChild(style); document.head.appendChild(style);
} }
async function addStyle(styleText) { async function addStyle(styleText) {
const css = document.createElement("style"); const css = document.createElement("style");
css.appendChild(document.createTextNode(styleText)); css.appendChild(document.createTextNode(styleText));
document.head.appendChild(css); document.head.appendChild(css);
} }
function renderError(code, details) { function renderError(code, details) {
let errorsElement = document.getElementById("errors"); let errorsElement = document.getElementById("errors");
if (!errorsElement) { if (!errorsElement) {
document.body.innerHTML = ` document.body.innerHTML = `
<svg class="icon-warning" xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-alert-triangle" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"> <svg class="icon-warning" xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-alert-triangle" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path> <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
<path d="M12 9v2m0 4v.01"></path> <path d="M12 9v2m0 4v.01"></path>
@ -170,19 +170,19 @@
<br> <br>
<div id="errors"></div> <div id="errors"></div>
`; `;
errorsElement = document.getElementById("errors"); errorsElement = document.getElementById("errors");
} }
const detailsElement = document.createElement("details"); const detailsElement = document.createElement("details");
detailsElement.innerHTML = ` detailsElement.innerHTML = `
<br> <br>
<summary> <summary>
<code>ERROR CODE: ${code}</code> <code>ERROR CODE: ${code}</code>
</summary> </summary>
<code>${JSON.stringify(details)}</code>`; <code>${JSON.stringify(details)}</code>`;
errorsElement.appendChild(detailsElement); errorsElement.appendChild(detailsElement);
addStyle(` addStyle(`
* { * {
font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif; font-family: Roboto,HelveticaNeue,Arial,sans-serif;
} }
#iceshrimp_app, #iceshrimp_app,
@ -192,8 +192,8 @@
body, body,
html { html {
background-color: #191724; background-color: #3b364c;
color: #e0def4; color: rgb(231, 237, 255);
justify-content: center; justify-content: center;
margin: auto; margin: auto;
padding: 10px; padding: 10px;
@ -209,38 +209,38 @@
} }
.button-big { .button-big {
background: linear-gradient(-45deg, rgb(196, 167, 231), rgb(235, 188, 186)); background: linear-gradient(-45deg, rgb(154, 146, 255), rgb(131, 114, 245));
line-height: 50px; line-height: 50px;
} }
.button-big:hover { .button-big:hover {
background: rgb(49, 116, 143); background: rgb(201, 197, 255);
} }
.button-small { .button-small {
background: #444; background: #544d77;
line-height: 40px; line-height: 40px;
} }
.button-small:hover { .button-small:hover {
background: #555; background: #504967;
} }
.button-label-big { .button-label-big {
color: #191724; color: #3b364c;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
padding: 12px; padding: 12px;
} }
.button-label-small { .button-label-small {
color: rgb(156, 207, 216); color: rgb(231, 237, 255);
font-size: 16px; font-size: 16px;
padding: 12px; padding: 12px;
} }
a { a {
color: rgb(156, 207, 216); color: rgb(255, 123, 114);
text-decoration: none; text-decoration: none;
} }
@ -255,7 +255,7 @@
} }
.icon-warning { .icon-warning {
color: #f6c177; color: rgb(236, 182, 55);
height: 4rem; height: 4rem;
padding-top: 2rem; padding-top: 2rem;
} }
@ -269,7 +269,7 @@
} }
details { details {
background: #1f1d2e; background: #423c55;
margin-bottom: 2rem; margin-bottom: 2rem;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
width: 40rem; width: 40rem;
@ -291,39 +291,39 @@
width: 50%; width: 50%;
} }
`); `);
} }
async function checkUpdate() { async function checkUpdate() {
try { try {
const res = await fetch("/api/meta", { const res = await fetch("/api/meta", {
method: "POST", method: "POST",
cache: "no-cache", cache: "no-cache",
}); });
const meta = await res.json(); const meta = await res.json();
if (meta.version != v) { if (meta.version != v) {
localStorage.setItem("v", meta.version); localStorage.setItem("v", meta.version);
refresh(); refresh();
} }
} catch (e) { } catch (e) {
console.error(e); console.error(e);
renderError("UPDATE_CHECK", e); renderError("UPDATE_CHECK", e);
throw e; throw e;
} }
} }
function refresh() { function refresh() {
// Clear cache (service worker) // Clear cache (service worker)
try { try {
navigator.serviceWorker.controller.postMessage("clear"); navigator.serviceWorker.controller.postMessage("clear");
navigator.serviceWorker.getRegistrations().then((registrations) => { navigator.serviceWorker.getRegistrations().then((registrations) => {
registrations.forEach((registration) => registration.unregister()); registrations.forEach((registration) => registration.unregister());
}); });
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
location.reload(); location.reload();
} }
})(); })();

View file

@ -67,8 +67,6 @@ html
body body
noscript: p noscript: p
| JavaScriptを有効にしてください
br
| Please turn on your JavaScript | Please turn on your JavaScript
div#splash div#splash
img#splashIcon(src= splashIcon || `/static-assets/splash.png?${ timestamp }`) img#splashIcon(src= splashIcon || `/static-assets/splash.png?${ timestamp }`)