Clean up directory structure

src/client/apis/radioi-api.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 
 import { serverUrl } from '../config';
 
-import authService from '../services/authentication';
+import authService from 'Services/authentication';
 
 const logOut = () => {
   const accessToken = authService.getAccessToken();

src/client/apis/spotify-web-api.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 
-import authService from '../services/authentication';
+import authService from 'Services/authentication';
 
 const baseURL = 'https://api.spotify.com';
 const version = '/v1';

src/client/apis/subscriptions-api.js

@@ -1,6 +1,6 @@
 import config from '../config';
 
-import { generateRandomString, delay } from '../utils';
+import { generateRandomString, delay } from 'Utils';
 
 const types = {
   SUBSCRIBE: 'subscribe',

src/client/app.js

@@ -1,25 +1,20 @@
 import React, { Suspense, lazy } from 'react';
 import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
 
-import Spinner from './common-components/spinner';
-
-import { AuthenticationProvider as Authentication } from './main-components/authentication';
-import Header from './main-components/header';
-import NotFound from './main-components/not-found/not-found';
-const Radio = lazy(() =>
-  import(/* webpackChunkName: "radio" */ './main-components/radio')
-);
-const Home = lazy(() =>
-  import(/* webpackChunkName: "home" */ './main-components/home')
-);
+import Spinner from 'Components/spinner';
+import Header from 'Components/header';
+import NotFound from 'Pages/not-found/not-found';
+const Radio = lazy(() => import(/* webpackChunkName: "radio" */ 'Pages/radio'));
+const Home = lazy(() => import(/* webpackChunkName: "home" */ 'Pages/home'));
+import { AuthenticationProvider } from 'Context/authentication';
 
 import './css/normalize.css';
 import './css/grid.css';
 import './app.css';
 
 const App = () => (
   <Router>
-    <Authentication>
+    <AuthenticationProvider>
       <Header />
       <Suspense fallback={<Spinner />}>
         <Switch>
@@ -34,7 +29,7 @@ const App = () => (
           </Route>
         </Switch>
       </Suspense>
-    </Authentication>
+    </AuthenticationProvider>
   </Router>
 );
 

src/client/main-components/header/header.js → src/client/components/header/header.js

@@ -1,11 +1,13 @@
 import React, { useCallback } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 
-import storage from '../../services/storage';
+import SpotifyButton from 'Components/spotify-button';
+import { useAuthentication } from 'Context/authentication';
+import storage from 'Services/storage';
+
 import { serverUrl } from '../../config';
-import { useAuthentication } from '../authentication';
-import UserDropdown from '../../common-components/user-dropdown';
-import SpotifyButton from '../../common-components/spotify-button';
+
+import UserDropdown from './user-dropdown';
 
 import './styles.css';
 

src/client/common-components/user-dropdown/user-dropdown.js → src/client/components/header/user-dropdown/user-dropdown.js

@@ -1,8 +1,8 @@
 import React, { useCallback, useState, Fragment } from 'react';
 
-import { useAuthentication } from '../../main-components/authentication/authentication';
+import { useAuthentication } from 'Context/authentication';
 
-import { withLastClickInside } from '../with-last-click-inside';
+import { withLastClickInside } from '../../with-last-click-inside';
 
 import './styles.css';
 

src/client/main-components/authentication/authentication.js → src/client/context/authentication/authentication.js

@@ -8,12 +8,13 @@ import React, {
 import { useHistory } from 'react-router-dom';
 import sha256 from 'crypto-js/sha256';
 
-import storage from '../../services/storage';
-import useRefreshAccessToken from '../../hooks/use-refresh-access-token';
-import authService from '../../services/authentication';
-import spotifyWebApi from '../../apis/spotify-web-api';
-import radioiApi from '../../apis/radioi-api';
-import subscriptionsApi from '../../apis/subscriptions-api';
+import spotifyWebApi from 'Apis/spotify-web-api';
+import radioiApi from 'Apis/radioi-api';
+import subscriptionsApi from 'Apis/subscriptions-api';
+import authService from 'Services/authentication';
+import storage from 'Services/storage';
+
+import useRefreshAccessToken from './use-refresh-access-token';
 
 const authentication = React.createContext({});
 

src/client/hooks/use-refresh-access-token.js → src/client/context/authentication/use-refresh-access-token.js

@@ -1,9 +1,8 @@
 import { useCallback, useState } from 'react';
 
-import authService from '../services/authentication';
-
-import radioiApi from '../apis/radioi-api';
-import useInterval from './use-interval';
+import radioiApi from 'Apis/radioi-api';
+import useInterval from 'Hooks/use-interval';
+import authService from 'Services/authentication';
 
 const FIVE_MINUTES = 5 * 60 * 1000; // ms
 const HALF_HOUR = 30 * 60 * 1000; // 30 minutes