-
- Login
-
-
- this.handleLogin(values)}
- >
-
-
-
+ return (
+
+
+ Login
+
+
+ Login(values)}
+ >
+
+
- );
- }
+
+ );
}
-function mapStateToProps(state) {
- const { isLoggedIn } = state.auth;
- return {
- isLoggedIn
- };
-}
-
-export default connect(mapStateToProps)(Login);
+export default Login;
diff --git a/web/src/Pages/Profile.js b/web/src/Pages/Profile.js
index f87559b7..2d9e11da 100644
--- a/web/src/Pages/Profile.js
+++ b/web/src/Pages/Profile.js
@@ -1,7 +1,6 @@
import React from 'react';
import '../App.css';
import './Dashboard.css';
-import { connect } from 'react-redux';
class Profile extends React.Component {
componentDidMount() {
@@ -23,11 +22,4 @@ class Profile extends React.Component {
}
}
-function mapStateToProps(state) {
- const { isLoggedIn } = state.auth;
- return {
- isLoggedIn,
- };
-}
-
-export default connect(mapStateToProps)(Profile);
\ No newline at end of file
+export default Profile;
\ No newline at end of file
diff --git a/web/src/Pages/Register.js b/web/src/Pages/Register.js
index 2c1ed49c..97aaa9a5 100644
--- a/web/src/Pages/Register.js
+++ b/web/src/Pages/Register.js
@@ -3,9 +3,8 @@ import '../App.css';
import './Register.css';
import { Button } from 'reactstrap';
import ScaleLoader from "react-spinners/ScaleLoader";
-import { register } from '../Actions/auth';
+import register from '../Contexts/AuthContextProvider';
import { Formik, Field, Form } from 'formik';
-import { connect } from 'react-redux';
class Register extends React.Component {
constructor(props) {
@@ -115,11 +114,4 @@ class Register extends React.Component {
}
}
-function mapStateToProps(state) {
- const { isLoggedIn } = state.auth;
- return {
- isLoggedIn
- };
-}
-
-export default connect(mapStateToProps)(Register);
+export default Register;
diff --git a/web/src/Pages/Settings.js b/web/src/Pages/Settings.js
index e517b361..1d0ca5e3 100644
--- a/web/src/Pages/Settings.js
+++ b/web/src/Pages/Settings.js
@@ -2,15 +2,6 @@ import React from 'react';
import '../App.css';
import './Settings.css';
-import { useToasts } from 'react-toast-notifications';
-
-function withToast(Component) {
- return function WrappedComponent(props) {
- const toastFuncs = useToasts()
- return
;
- }
-}
-
class Settings extends React.Component {
constructor(props) {
super(props);
@@ -33,4 +24,4 @@ class Settings extends React.Component {
}
}
-export default withToast(Settings);
+export default Settings;
diff --git a/web/src/Reducers/auth.js b/web/src/Reducers/auth.js
deleted file mode 100644
index df75c1e6..00000000
--- a/web/src/Reducers/auth.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import {
- REGISTER_SUCCESS,
- REGISTER_FAIL,
- LOGIN_SUCCESS,
- LOGIN_FAIL,
- LOGOUT,
- } from "../Actions/types";
-
- const user = JSON.parse(localStorage.getItem('user'));
-
- const initialState = user
- ? { isLoggedIn: true, user: user }
- : { isLoggedIn: false, user: null };
-
- export default function authReducer(state = initialState, action) {
- const { type, payload } = action;
-
- switch (type) {
- case REGISTER_SUCCESS:
- return {
- ...state,
- isLoggedIn: false,
- };
- case REGISTER_FAIL:
- return {
- ...state,
- isLoggedIn: false,
- };
- case LOGIN_SUCCESS:
- return {
- ...state,
- isLoggedIn: true,
- user: {
- jwt: payload.jwt,
- uuid: payload.sub,
- exp: payload.exp,
- }
- };
- case LOGIN_FAIL:
- return {
- ...state,
- isLoggedIn: false,
- };
- case LOGOUT:
- return {
- ...state,
- isLoggedIn: false,
- user: null,
- };
- default:
- return state;
- }
- }
diff --git a/web/src/Reducers/index.js b/web/src/Reducers/index.js
deleted file mode 100644
index 3df08848..00000000
--- a/web/src/Reducers/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { combineReducers } from "redux";
-import auth from "./auth";
-
-export default combineReducers({
- auth,
-});
diff --git a/web/src/Services/Actions.js b/web/src/Services/Actions.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/web/src/Services/api.service.js b/web/src/Services/api.service.js
deleted file mode 100644
index 0a202c5a..00000000
--- a/web/src/Services/api.service.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import axios from "axios";
-import authHeader from '../Services/auth-header';
-
-class ApiService {
- async getStats() {
- return axios.get(process.env.REACT_APP_API_URL + "stats");
- }
-
- async getRecentScrobbles(id) {
- return axios.get(process.env.REACT_APP_API_URL + "user/" + id + "/scrobbles", { headers: authHeader() });
- }
-}
-
-export default new ApiService();
\ No newline at end of file
diff --git a/web/src/Services/auth-header.js b/web/src/Services/auth-header.js
deleted file mode 100644
index 75454e14..00000000
--- a/web/src/Services/auth-header.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default function authHeader() {
- const user = JSON.parse(localStorage.getItem('user'));
-
- if (user && user.jwt) {
- return { Authorization: 'Bearer ' + user.jwt };
- } else {
- return {};
- }
-}
diff --git a/web/src/Services/auth.service.js b/web/src/Services/auth.service.js
deleted file mode 100644
index 81ce31a6..00000000
--- a/web/src/Services/auth.service.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import axios from "axios";
-import jwt from 'jwt-decode' // import dependency
-
-class AuthService {
- async login(username, password) {
- return axios
- .post(process.env.REACT_APP_API_URL + "login", { username, password })
- .then((response) => {
- if (response.data.token) {
- let expandedUser = jwt(response.data.token)
- let user = {
- jwt: response.data.token,
- uuid: expandedUser.sub,
- exp: expandedUser.exp,
- }
- localStorage.setItem('user', JSON.stringify(user))
- }
-
- return response.data;
- });
- }
-
- async logout() {
- localStorage.removeItem("user");
- }
-
- async register(username, email, password) {
- return axios
- .post(process.env.REACT_APP_API_URL + "register", {
- username,
- email,
- password,
- })
- .then((response) => {
- console.log(response)
- return response.data;
- });
- }
-}
-
-export default new AuthService();
diff --git a/web/src/Services/user.service.js b/web/src/Services/user.service.js
deleted file mode 100644
index 77b5391a..00000000
--- a/web/src/Services/user.service.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import axios from 'axios';
-import authHeader from './auth-header';
-
-class UserService {
- getPublicContent() {
- return axios.get(process.env.REACT_APP_API_URL + 'all');
- }
-
- getUserBoard() {
- return axios.get(process.env.REACT_APP_API_URL + 'user', { headers: authHeader() });
- }
-
- getAdminBoard() {
- return axios.get(process.env.REACT_APP_API_URL + 'admin', { headers: authHeader() });
- }
-}
-
-export default new UserService();
diff --git a/web/src/index.js b/web/src/index.js
index 03553c32..15dbe6a0 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -3,13 +3,14 @@ import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import { HashRouter } from 'react-router-dom';
+
import { ToastContainer } from 'react-toastify';
-import 'react-toastify/dist/ReactToastify.min.css'
-import { Provider } from 'react-redux';
-import store from "./store";
+import 'react-toastify/dist/ReactToastify.min.css';
+
+import AuthContextProvider from './Contexts/AuthContextProvider';
ReactDOM.render(
-
+
- ,
+ ,
document.getElementById('root')
);
diff --git a/web/src/store.js b/web/src/store.js
deleted file mode 100644
index 03eff2c9..00000000
--- a/web/src/store.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { createStore, applyMiddleware } from "redux";
-import { composeWithDevTools } from "redux-devtools-extension";
-import thunk from "redux-thunk";
-import rootReducer from "./Reducers";
-
-const middleware = [thunk];
-
-const store = createStore(
- rootReducer,
- composeWithDevTools(applyMiddleware(...middleware))
-);
-
-export default store;