-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/recaptcha-google
# Conflicts: # app.js # src/common/index.ejs
- Loading branch information
Showing
15 changed files
with
154 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,126 @@ | ||
| document.addEventListener('DOMContentLoaded', () => { | ||
| const baseURL = '<%= protocol %>://<%= domainC %><% if (isPortPresent) { %>:<%= port %><% } %>/personalization'; | ||
| const pageContainer = document.getElementById('theme-container'); | ||
| const themeSwitcher = document.getElementById('dark-mode-switch'); | ||
| const errorMessages = document.getElementById('status-message'); | ||
| const loadButton = document.getElementById('load-button'); | ||
| const toggleContainer = document.querySelector('.dark-mode-toggle'); | ||
| const isIframe = window.self !== window.top; | ||
| const containerClass = isIframe ? 'h-screen flex items-center justify-center' : 'flex items-center justify-center'; | ||
| let hasStorageAccess = false; | ||
|
|
||
| document.hasStorageAccess().then(result => { | ||
| hasStorageAccess = result; | ||
| if ( hasStorageAccess ) { | ||
| updateUserPreference(); | ||
| } | ||
| }) | ||
|
|
||
| async function updateUserPreference() { | ||
| if ( hasStorageAccess ) { | ||
| fetchAndApplyTheme(); | ||
| } else { | ||
| try { | ||
| await document.requestStorageAccess(); | ||
| toggleContainer.classList.remove('hidden'); | ||
| loadButton.classList.add('hidden'); | ||
| fetchAndApplyTheme(); | ||
| } catch (error) { | ||
| errorMessages.textContent = error?.message; | ||
| } | ||
| } | ||
| (() => { | ||
| let baseURL, | ||
| pageContainer, | ||
| themeSwitcher, | ||
| errorMessages, | ||
| loadButton, | ||
| toggleContainer, | ||
| isIframe, | ||
| containerClass, | ||
| hasStorageAccess; | ||
|
|
||
| async function fetchAndApplyTheme() { | ||
| try { | ||
| const response = await fetch(`${baseURL}/get-personalization`, { | ||
| method: 'GET', | ||
| credentials: 'include', | ||
| }); | ||
|
|
||
| if (!response.ok) { | ||
| throw new Error('Network response was not ok'); | ||
| errorMessages.textContent = `Network response was not ok ${response.status} - ${response.statusText}`; | ||
| } | ||
|
|
||
| const data = await response.json(); | ||
| pageContainer.className = `${containerClass} ${data.theme}`; | ||
| if (data.theme === 'dark') { | ||
| themeSwitcher.checked = true; | ||
| } | ||
| } catch (error) { | ||
| errorMessages.textContent = error?.message; | ||
| } | ||
| } | ||
|
|
||
| async function updateUserPreference() { | ||
| errorMessages.textContent = ''; | ||
| if (hasStorageAccess) { | ||
| fetchAndApplyTheme(); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| await document.requestStorageAccess(); | ||
| hasStorageAccess = await document.hasStorageAccess(); | ||
|
|
||
| if (!hasStorageAccess) { | ||
| errorMessages.textContent = 'User denied storage access'; | ||
| return; | ||
| } | ||
|
|
||
| toggleContainer.classList.remove('hidden'); | ||
| loadButton.classList.add('hidden'); | ||
|
|
||
| fetchAndApplyTheme(); | ||
| } catch (error) { | ||
| errorMessages.textContent = error?.message; | ||
| } | ||
| } | ||
|
|
||
| async function fetchSetPersonalization() { | ||
| try { | ||
| const response = await fetch(`${baseURL}/set-personalization`, { | ||
| method: 'POST', | ||
| credentials: 'include', | ||
| headers: { 'Content-Type': 'application/json' }, | ||
| body: JSON.stringify({ | ||
| theme: themeSwitcher?.checked ? 'dark' : 'light', | ||
| }), | ||
| }); | ||
| const data = await response.json(); | ||
|
|
||
| function fetchAndApplyTheme() { | ||
| fetch(`${baseURL}/get-personalization`, { | ||
| method: 'GET', | ||
| credentials: 'include' | ||
| }) | ||
| .then(response => { | ||
| if (!response.ok) { | ||
| throw new Error('Network response was not ok'); | ||
| errorMessages.textContent = `Network response was not ok ${response.status} - ${response.statusText}`; | ||
| } | ||
| return response.json(); | ||
| }) | ||
| .then(data => { | ||
| const theme = data.theme; | ||
| pageContainer.className = `${containerClass} ${data.theme}` | ||
| if (theme === 'dark') { | ||
| themeSwitcher.checked = true; | ||
| } | ||
| }) | ||
| .catch(error => { | ||
| errorMessages.textContent = error?.message; | ||
| }); | ||
| pageContainer.className = `${containerClass} ${data.theme}`; | ||
| } catch (error) { | ||
| errorMessages.textContent = error?.message; | ||
| } | ||
| } | ||
|
|
||
| async function toggleTheme() { | ||
| errorMessages.textContent = ''; | ||
|
|
||
| function fetchSetPersonalization() { | ||
| fetch( `${baseURL}/set-personalization`, { | ||
| method: 'POST', | ||
| credentials: 'include', | ||
| headers: { 'Content-Type': 'application/json' }, | ||
| body: JSON.stringify({ theme: themeSwitcher?.checked ? 'dark' : 'light' }) | ||
| }) | ||
| .then(response => response.json()) | ||
| .then(data => { | ||
| pageContainer.className = `${containerClass} ${data.theme}`; | ||
| }); | ||
| if (hasStorageAccess) { | ||
| fetchSetPersonalization(); | ||
| return; | ||
| } | ||
|
|
||
| async function toggleTheme() { | ||
| hasStorageAccess = await document.hasStorageAccess(); | ||
|
|
||
| if( hasStorageAccess ) { | ||
| fetchSetPersonalization(); | ||
| } else { | ||
| try { | ||
| await document.requestStorageAccess(); | ||
| if ( await document.hasStorageAccess() ) { | ||
| fetchSetPersonalization(); | ||
| } else { | ||
| errorMessages.textContent = 'User denied storage access'; | ||
| } | ||
| } catch (error) { | ||
| errorMessages.textContent = `The request to storage access API was denied because the user never interacted with the top-level site context or the permission wasn't grant by the user`; | ||
| } | ||
| } | ||
| try { | ||
| await document.requestStorageAccess(); | ||
| hasStorageAccess = await document.hasStorageAccess(); | ||
|
|
||
| if (!hasStorageAccess) { | ||
| errorMessages.textContent = 'User denied storage access'; | ||
| return; | ||
| } | ||
|
|
||
| fetchSetPersonalization(); | ||
| } catch (error) { | ||
| errorMessages.textContent = error?.message; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| // Main start point | ||
| document.addEventListener('DOMContentLoaded', async () => { | ||
| baseURL = | ||
| '<%= protocol %>://<%= domainC %><% if (isPortPresent) { %>:<%= port %><% } %>/personalization'; | ||
| pageContainer = document.getElementById('theme-container'); | ||
| themeSwitcher = document.getElementById('dark-mode-switch'); | ||
| errorMessages = document.getElementById('status-message'); | ||
| loadButton = document.getElementById('load-button'); | ||
| toggleContainer = document.querySelector('.dark-mode-toggle'); | ||
| isIframe = window.self !== window.top; | ||
| containerClass = isIframe | ||
| ? 'h-screen flex items-center justify-center' | ||
| : 'flex items-center justify-center'; | ||
| let hasStorageAccess = await document.hasStorageAccess(); | ||
|
|
||
| if (hasStorageAccess) { | ||
| updateUserPreference(); | ||
| } | ||
|
|
||
| window.toggleTheme = toggleTheme; | ||
| if (isIframe && !hasStorageAccess) { | ||
| toggleContainer.classList.add('hidden'); | ||
| loadButton.classList.remove('hidden'); | ||
| loadButton.addEventListener('click', updateUserPreference); | ||
| toggleContainer.classList.add('hidden'); | ||
| loadButton.classList.remove('hidden'); | ||
| loadButton.addEventListener('click', updateUserPreference); | ||
| } | ||
| }); | ||
| }); | ||
| })(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <%- include(commonPath + '/header.ejs') %> | ||
|
|
||
| <%- include(commonPath + '/internal-page/header.ejs', {containerType: 'sm'}) %> | ||
| <iframe style="border-radius:12px" src="https://open.spotify.com/embed/episode/7makk4oTQel546B0PZlDM5?utm_source=generator" width="100%" height="352" frameBorder="0" allowfullscreen="" allow="autoplay; clipboard-write; encrypted-media; fullscreen; picture-in-picture" loading="lazy"></iframe> | ||
| <%- include(commonPath + '/internal-page/footer.ejs') %> | ||
| <%- include(commonPath + '/footer.ejs') %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| const express = require('express'); | ||
| const path = require('path'); | ||
| const router = express.Router(); | ||
|
|
||
| router.get('/', (req, res) => { | ||
| // Send the default page | ||
| const currentDomain = req.get('host'); | ||
| res.render(path.join(__dirname,'index'), { | ||
| title: 'Spotify Player' | ||
| }); | ||
| }); | ||
|
|
||
| module.exports = router; |