Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/next' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
daniluk4000 committed Nov 13, 2024
2 parents 6096030 + 7d19622 commit 87822be
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 114 deletions.
6 changes: 3 additions & 3 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ export default defineNuxtConfig({
},
manifest: {
name: 'VATSIM Radar',
short_name: 'VR',
short_name: 'VATSIM Radar',
description: 'VATSIM Traffic Monitoring Service',
theme_color: '#3B6CEC',
theme_color: '???',
orientation: 'portrait',
display: 'standalone',
// @ts-expect-error tabbed not supported here
display_override: ['window-controls-overlay', 'tabbed', 'minimal-ui', 'standalone'],
display_override: ['window-controls-overlay', 'tabbed', 'standalone'],
start_url: '/',
dir: 'ltr',
lang: 'en',
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"adm-zip": "^0.5.16",
"aws-sdk": "^2.1692.0",
"chardet": "^2.0.0",
"cron": "^3.1.9",
"cron": "^3.2.1",
"croner": "^9.0.0",
"discord.js": "^14.16.3",
"idb": "^8.0.0",
Expand All @@ -45,7 +45,7 @@
"sharp": "^0.33.5",
"sqlite3": "^5.1.7",
"svgo": "^3.3.2",
"ua-parser-js": "2.0.0-rc.2",
"ua-parser-js": "2.0.0-rc.3",
"vite-plugin-pwa": "^0.20.5",
"vite-svg-loader": "^5.1.0",
"vue": "^3.5.12",
Expand All @@ -65,9 +65,9 @@
"@types/ws": "^8.5.13",
"eslint": "^9.14.0",
"fast-xml-parser": "^4.5.0",
"postcss": "^8.4.47",
"postcss": "^8.4.49",
"postcss-html": "^1.7.0",
"sass-embedded": "^1.80.6",
"sass-embedded": "^1.80.7",
"stylelint": "^16.10.0",
"stylelint-config-clean-order": "^6.1.0",
"stylelint-config-recommended-scss": "^14.1.0",
Expand Down
10 changes: 10 additions & 0 deletions src/layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ useHead(() => {
.map(([key, value]) => `--${ key.replace('Rgb', '') }: ${ (value as number[]).join(',') }`)
.join(';');
const themeColor = getCurrentThemeHexColor('darkgray1000');
return {
titleTemplate(title) {
if (!title) return 'VATSIM Radar';
Expand All @@ -131,6 +133,14 @@ useHead(() => {
name: 'keywords',
content: 'vatsim, vatspy, simaware, vatglasses, ватсим, vatsim traffic, vatsim tracker',
},
{
name: 'msapplication-TileColor',
content: themeColor,
},
{
name: 'theme-color',
content: themeColor,
},
],
htmlAttrs: {
lang: 'en',
Expand Down
Loading

0 comments on commit 87822be

Please sign in to comment.