diff --git a/src/App.tsx b/src/App.tsx index f2d5271..a359c93 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,5 @@ import React from 'react'; import { HashRouter as Router, Switch, Route } from 'react-router-dom'; -import settings from 'electron-settings'; import './styles/App.global.css'; import Layout from './components/layout/Layout'; import PlaylistList from './components/playlist/PlaylistList'; @@ -14,7 +13,7 @@ import LibraryView from './components/library/LibraryView'; import PlayerBar from './components/player/PlayerBar'; const App = () => { - if (!settings.getSync('server')) { + if (!localStorage.getItem('server')) { return ( { const serverConfig = { - username: settings.getSync('username') || '', - salt: settings.getSync('salt') || '', - hash: settings.getSync('hash') || '', - server: settings.getSync('server') || '', + username: localStorage.getItem('username') || '', + salt: localStorage.getItem('salt') || '', + hash: localStorage.getItem('hash') || '', + server: localStorage.getItem('server') || '', }; return serverConfig; }; + const auth = getAuth(); const API_BASE_URL = `${auth.server}/rest`; diff --git a/src/components/settings/Login.tsx b/src/components/settings/Login.tsx index c921984..4b6b045 100644 --- a/src/components/settings/Login.tsx +++ b/src/components/settings/Login.tsx @@ -48,10 +48,10 @@ const Login = () => { return; } - /* localStorage.setItem('server', cleanServerName); + localStorage.setItem('server', cleanServerName); localStorage.setItem('username', userName); localStorage.setItem('salt', salt); - localStorage.setItem('hash', hash); */ + localStorage.setItem('hash', hash); settings.setSync('server', cleanServerName); settings.setSync('serverBase64', btoa(cleanServerName));