diff --git a/frontend/index.html b/frontend/index.html index 3d2bfe9..c411fd4 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -39,7 +39,6 @@
diff --git a/frontend/js/views/login.js b/frontend/js/views/login.js index f64fa98..a0b444f 100644 --- a/frontend/js/views/login.js +++ b/frontend/js/views/login.js @@ -62,8 +62,7 @@ export async function render(container) {
${logoHtml} -

${brandEsc(brandName)}

-

+

${isSetup ? t('auth.subtitle_setup') : t('auth.subtitle_signin')}

${!isSetup && canRegister ? `

${t('auth.trial_notice')}

` : ''} diff --git a/server/db/remote_display.db-client_wal_index b/server/db/remote_display.db-client_wal_index index f1a4a4b..c4e1bd8 100644 Binary files a/server/db/remote_display.db-client_wal_index and b/server/db/remote_display.db-client_wal_index differ diff --git a/server/lib/branding.js b/server/lib/branding.js index 035e38e..e804d6b 100644 --- a/server/lib/branding.js +++ b/server/lib/branding.js @@ -21,12 +21,12 @@ const PLATFORM_DEFAULT_ID = 'platform-default'; const HARDCODED_BRANDING = { - brand_name: 'GoldenSignage', - logo_url: '/assets/logoswift.png', + brand_name: 'SwiftDisplay', + logo_url: '/assets/logowhiteswift.png', favicon_url: '/assets/pwa-icon.png', primary_color: '#ff6b00', secondary_color: '#1E293B', - bg_color: '#111827', + bg_color: '#1c1c1e', custom_css: null, hide_branding: 0, }; diff --git a/server/package-lock.json b/server/package-lock.json index c2898a2..13cef47 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -12,6 +12,7 @@ "archiver": "^7.0.1", "bcryptjs": "^3.0.3", "cors": "^2.8.5", + "dotenv": "^17.4.2", "express": "^4.18.2", "express-rate-limit": "^8.3.1", "google-auth-library": "^10.6.2", @@ -1409,6 +1410,18 @@ "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==", "license": "MIT" }, + "node_modules/dotenv": { + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz", + "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", diff --git a/server/package.json b/server/package.json index 8ed1209..1c3160e 100644 --- a/server/package.json +++ b/server/package.json @@ -13,6 +13,7 @@ "archiver": "^7.0.1", "bcryptjs": "^3.0.3", "cors": "^2.8.5", + "dotenv": "^17.4.2", "express": "^4.18.2", "express-rate-limit": "^8.3.1", "google-auth-library": "^10.6.2", diff --git a/server/server.js b/server/server.js index d60cd4c..8c0eccc 100644 --- a/server/server.js +++ b/server/server.js @@ -1,3 +1,4 @@ +require('dotenv').config(); const express = require('express'); const http = require('http'); const https = require('https'); diff --git a/server/wipe_cache.js b/server/wipe_cache.js new file mode 100644 index 0000000..3fc0b70 --- /dev/null +++ b/server/wipe_cache.js @@ -0,0 +1,3 @@ +const { db } = require('./db/database'); +db.prepare('DELETE FROM white_labels').run(); +console.log('Cache cleared');