Skip to content

Fix Holiday Animations #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2022
Merged

Fix Holiday Animations #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"migrate:latest": "knex --knexfile server/knexfile.cjs migrate:latest",
"migrate:rollback": "knex --knexfile server/knexfile.cjs migrate:rollback",
"release": "node server/scripts/newRelease.js",
"prettier:check": "prettier --check \"**/*.{js,jsx}\"",
"prettier:fix": "prettier --write \"**/*.{js,jsx}\"",
"prettier:check": "prettier --check \"**/*.{css,html,js,jsx}\"",
"prettier:fix": "prettier --write \"**/*.{css,html,js,jsx}\"",
"eslint:check": "eslint \"**/*.{js,jsx}\"",
"eslint:fix": "eslint \"**/*.{js,jsx}\" --fix"
},
Expand Down
144 changes: 84 additions & 60 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,89 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no"
/>
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>Map</title>
</head>

<head>
<meta charset="UTF-8" />
<meta name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" />
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<title>Map</title>
</head>

<body>
<div id="loader" class="loader-flex">
<div class="progress-root color-primary progress-indeterminate" role="progressbar"
style="width: 40px; height: 40px;">
<svg class="progress-svg" viewBox="22 22 44 44">
<circle class="progress-circle circle-indeterminate" cx="44" cy="44" r="20.2" fill="none" stroke-width="3.6">
</circle>
</svg>
<body>
<div id="loader" class="loader-flex">
<div
class="progress-root color-primary progress-indeterminate"
role="progressbar"
style="width: 40px; height: 40px"
>
<svg class="progress-svg" viewBox="22 22 44 44">
<circle
class="progress-circle circle-indeterminate"
cx="44"
cy="44"
r="20.2"
fill="none"
stroke-width="3.6"
></circle>
</svg>
</div>
<div style="height: 10px"></div>
<h4 id="loading-text" class="loading-text"></h4>
<noscript>
<h4 class="loading-text">This app requires JavaScript</h4>
</noscript>
</div>
<div style="height: 10px"></div>
<h4 id="loading-text" class="loading-text"></h4>
<noscript>
<h4 class="loading-text">
This app requires JavaScript
</h4>
</noscript>
</div>
<script>
const locales = {
de: 'Map wird geladen',
en: 'Loading Map',
es: 'Cargando Mapa',
fr: 'Chargement de la Map',
it: 'Caricamento Mappa',
ja: 'マップを読み込み中',
ko: '맵 로딩 중',
nl: 'Map word geladen',
pl: 'Ładowanie mapy',
'pt-br': 'Carregando Mapa',
ru: 'Загрузка карты',
sv: 'Laddar karta',
th: 'กำลังโหลดแผนที่',
'zh-tw': '載入地圖中'
}
const locale = window?.localStorage?.getItem('i18nextLng') || 'en'
const element = document.getElementById('loading-text')
if (element) element.innerText = locales[locale.toLowerCase()];
</script>
<div id="root"></div>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
crossorigin="anonymous" />
<link rel="stylesheet" href="https://unpkg.com/react-leaflet-markercluster/dist/styles.min.css" />
<link rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/leaflet.locatecontrol@0.73.0/dist/L.Control.Locate.min.css" />

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.7/css/all.css">

</body>
<canvas id="holiday-canvas"></canvas>
<script>
const locales = {
de: 'Map wird geladen',
en: 'Loading Map',
es: 'Cargando Mapa',
fr: 'Chargement de la Map',
it: 'Caricamento Mappa',
ja: 'マップを読み込み中',
ko: '맵 로딩 중',
nl: 'Map word geladen',
pl: 'Ładowanie mapy',
'pt-br': 'Carregando Mapa',
ru: 'Загрузка карты',
sv: 'Laddar karta',
th: 'กำลังโหลดแผนที่',
'zh-tw': '載入地圖中',
}
const locale = window?.localStorage?.getItem('i18nextLng') || 'en'
const element = document.getElementById('loading-text')
if (element) element.innerText = locales[locale.toLowerCase()]
</script>
<div id="root"></div>
<link
rel="stylesheet"
href="https://unpkg.com/leaflet@1.6.0/dist/leaflet.css"
integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ=="
crossorigin="anonymous"
/>
<link
rel="stylesheet"
href="https://unpkg.com/react-leaflet-markercluster/dist/styles.min.css"
/>
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/leaflet.locatecontrol@0.73.0/dist/L.Control.Locate.min.css"
/>

</html>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
/>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/icon?family=Material+Icons"
/>
<link
rel="stylesheet"
href="https://use.fontawesome.com/releases/v5.0.7/css/all.css"
/>
</body>
</html>
8 changes: 5 additions & 3 deletions src/assets/css/holiday.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
.snow--near {
-webkit-animation-duration: 10s;
animation-duration: 10s;
background-image: url("https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-large-075d267ecbc42e3564c8ed43516dd557.png");
background-image: url('https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-large-075d267ecbc42e3564c8ed43516dd557.png');
background-size: contain;
}
.snow--near + .snow--alt {
Expand All @@ -38,7 +38,7 @@
.snow--mid {
-webkit-animation-duration: 20s;
animation-duration: 20s;
background-image: url("https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-medium-0b8a5e0732315b68e1f54185be7a1ad9.png");
background-image: url('https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-medium-0b8a5e0732315b68e1f54185be7a1ad9.png');
background-size: contain;
}
.snow--mid + .snow--alt {
Expand All @@ -48,7 +48,7 @@
.snow--far {
-webkit-animation-duration: 30s;
animation-duration: 30s;
background-image: url("https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-small-1ecd03b1fce08c24e064ff8c0a72c519.png");
background-image: url('https://dl6rt3mwcjzxg.cloudfront.net/assets/snow/snow-small-1ecd03b1fce08c24e064ff8c0a72c519.png');
background-size: contain;
}
.snow--far + .snow--alt {
Expand Down Expand Up @@ -428,6 +428,8 @@

#holiday-canvas {
position: absolute;
height: '100vh';
width: '100vw';
top: 0;
left: 0;
z-index: 1000;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/loading.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

.loading-text {
font-size: 1.5625rem;
font-family: "Roboto", "Helvetica", "Arial", sans-serif;
font-family: 'Roboto', 'Helvetica', 'Arial', sans-serif;
font-weight: 400;
line-height: 1.235;
letter-spacing: 0.00735em;
Expand Down
1 change: 0 additions & 1 deletion src/components/Config.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ export default function Config() {
serverSettings={serverSettings}
getServerSettings={getServerSettings}
/>
<canvas id="holiday-canvas" />
<HolidayEffects
mapSettings={
serverSettings?.config?.map ? serverSettings.config.map : {}
Expand Down