evan/deemixer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added deezer unreachable differentiation to the vpn warning

Browse Source
This commit is contained in:
RemixDev 2022-02-12 14:35:44 +01:00
parent fa7cde2f8f
commit d7e05adb24
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app.js
View File

@ -15,7 +15,6 @@ import '@/styles/css/icons.css'
import '@/styles/css/tables.css' import '@/styles/css/tables.css'
import '@/styles/css/typography.css' import '@/styles/css/typography.css'
import App from '@/App.vue' import App from '@/App.vue'
import i18n from '@/plugins/i18n' import i18n from '@/plugins/i18n'
import router from '@/router' import router from '@/router'
@ -48,7 +47,10 @@ async function startApp() {
const connectResponse = await (await fetch('connect')).json() const connectResponse = await (await fetch('connect')).json()
const spotifyStatus = connectResponse.spotifyEnabled ? SPOTIFY_STATUS.ENABLED : SPOTIFY_STATUS.DISABLED const spotifyStatus = connectResponse.spotifyEnabled ? SPOTIFY_STATUS.ENABLED : SPOTIFY_STATUS.DISABLED
if (!connectResponse.deezerAvailable) { if (connectResponse.deezerAvailable === 'no-network') {
document.getElementById('deezer_not_reachable').classList.remove('hide')
}
if (connectResponse.deezerAvailable === 'no') {
document.getElementById('deezer_not_available').classList.remove('hide') document.getElementById('deezer_not_available').classList.remove('hide')
} }

19
src/components/globals/DeezerWarning.vue
View File

@ -1,6 +1,11 @@
<template> <template>
<div id="deezer_not_available" class="hide"> <div>
<i class="material-icons">warning</i> {{ $t('toasts.deezerNotAvailable') }} <div id="deezer_not_available" class="warning hide">
<i class="material-icons">warning</i> {{ $t('toasts.deezerNotAvailable') }}
</div>
<div id="deezer_not_reachable" class="warning hide">
<i class="material-icons">warning</i> {{ $t('toasts.deezerNotReachable') }}
</div>
</div> </div>
</template> </template>
@ -8,16 +13,22 @@
#deezer_not_available { #deezer_not_available {
background-color: hsl(53, 98%, 47%); background-color: hsl(53, 98%, 47%);
color: rgba(0, 0, 0, 0.75); color: rgba(0, 0, 0, 0.75);
}
#deezer_not_reachable {
background-color: hsl(12, 98%, 46%);
color: rgba(255, 255, 255, 0.75);
}
.warning {
padding: 8px 12px; padding: 8px 12px;
margin: -10px 10px 0px; margin: -10px 10px 0px;
display: flex; display: flex;
border-radius: 8px; border-radius: 8px;
align-items: center; align-items: center;
} }
#deezer_not_available i { .warning i {
margin-right: 8px; margin-right: 8px;
} }
#deezer_not_available.hide { .hide {
display: none !important; display: none !important;
} }
</style> </style>

1
src/lang/en.mjs
View File

@ -215,6 +215,7 @@ const en = {
finishConvertingSpotifyPlaylist: 'Spotify playlist converted', finishConvertingSpotifyPlaylist: 'Spotify playlist converted',
loginNeededToDownload: 'You need to log in to download tracks!', loginNeededToDownload: 'You need to log in to download tracks!',
deezerNotAvailable: 'Deezer is not available in your country. You should use a VPN.', deezerNotAvailable: 'Deezer is not available in your country. You should use a VPN.',
deezerNotReachable: "The app can't reach Deezer. Check your internet connection, your firewall or your antivirus.",
startGeneratingItems: 'Processing {n} items...', startGeneratingItems: 'Processing {n} items...',
finishGeneratingItems: 'Generated {n} items.', finishGeneratingItems: 'Generated {n} items.',
noLovedPlaylist: 'No loved tracks playlist!', noLovedPlaylist: 'No loved tracks playlist!',

2
src/lang/it.mjs
View File

@ -215,6 +215,8 @@ const it = {
finishConvertingSpotifyPlaylist: 'Playlist di spotify convertita', finishConvertingSpotifyPlaylist: 'Playlist di spotify convertita',
loginNeededToDownload: 'Devi accedere prima di poter scaricare brani!', loginNeededToDownload: 'Devi accedere prima di poter scaricare brani!',
deezerNotAvailable: 'Deezer non è disponibile nel tuo paese. Dovresti usare una VPN.', deezerNotAvailable: 'Deezer non è disponibile nel tuo paese. Dovresti usare una VPN.',
deezerNotReachable:
"L'applicazione non riesce a contattare Deezer. Controlla la tua connessione internet, il tuo firewall o il tuo antivirus.",
startGeneratingItems: 'Elaborando {n} oggetti...', startGeneratingItems: 'Elaborando {n} oggetti...',
finishGeneratingItems: '{n} oggetti generati.', finishGeneratingItems: '{n} oggetti generati.',
noLovedPlaylist: 'Nessuna playlist "Canzoni del cuore"!', noLovedPlaylist: 'Nessuna playlist "Canzoni del cuore"!',