Revert "Dev"

backend/routes/index.js

@@ -1,45 +1,14 @@
+// backend/routes/index.js
 const express = require('express');
 const router = express.Router();
+
 const apiRouter = require('./api');
 
 router.use('/api', apiRouter);
 
-// Static routes
-// Serve React build files in production
-if (process.env.NODE_ENV === "production") {
-    const path = require("path");
-    // Serve the frontend's index.html file at the root route
-    router.get("/", (req, res) => {
-        res.cookie("XSRF-TOKEN", req.csrfToken());
-        return res.sendFile(
-            path.resolve(__dirname, "../../frontend", "build", "index.html")
-        );
-    })
-
-    // Serve the static assets in the frontend's build folder
-    router.use(express.static(path.resolve("../frontend/build")));
-
-    // Serve the frontend's index.html file at all other routes NOT starting with /api
-    router.get(/^(?!\/?api).*/, (req, res) => {
-        res.cookie("XSRF-TOKEN", req.csrfToken());
-        res.sendFile(
-            path.resolve(__dirname, "../../frontend", "build", "index.html")
-        );
-    })
-}
-
-// Add a XSRF-TOKEN cookie in development
-if (process.env.NODE_ENV !== "production") {
-    router.get("/api/csrf/restore", (req, res) => {
-        res.cookie("XSRF-TOKEN", req.csrfToken());
-        return res.json({});
-    })
-}
-
-// for testing purposes
-// router.get('/hello/world', function(req, res) {
-//   res.cookie('XSRF-TOKEN', req.csrfToken());
-//   res.send('Hello World!');
+// router.get('/hello/world', function (req, res) {
+//     res.cookie('XSRF-TOKEN', req.csrfToken());
+//     res.send('Hello World!');
 // });
 
 // Add a XSRF-TOKEN cookie
@@ -50,5 +19,7 @@ router.get("/api/csrf/restore", (req, res) => {
         'XSRF-Token': csrfToken
     });
 });
+// ...
+
 
 module.exports = router;

frontend/package.json

@@ -38,6 +38,5 @@
   },
   "devDependencies": {
     "redux-logger": "^3.0.6"
-  },
-  "proxy": "http://localhost:8000"
+  }
 }

frontend/src/App.js

@@ -1,27 +1,6 @@
-// frontend/src/App.js
-import React, { useState, useEffect } from "react";
-import { useDispatch } from "react-redux";
-import { Route, Switch } from "react-router-dom";
-import LoginFormPage from "./components/LoginFormPage";
-import SignupFormPage from "./components/SignupFormPage";
-import * as sessionActions from "./store/session";
-
 function App() {
-  const dispatch = useDispatch();
-  const [isLoaded, setIsLoaded] = useState(false);
-  useEffect(() => {
-    dispatch(sessionActions.restoreUser()).then(() => setIsLoaded(true));
-  }, [dispatch]);
-
-  return isLoaded && (
-    <Switch>
-      <Route path="/login">
-        <LoginFormPage />
-      </Route>
-      <Route path="/signup">
-        <SignupFormPage />
-      </Route>
-    </Switch>
+  return (
+    <h1>Hello from App</h1>
   );
 }
 

frontend/src/index.js

@@ -5,17 +5,11 @@ import { Provider as ReduxProvider } from 'react-redux';
 import './index.css';
 import App from './App';
 import configureStore from './store';
-import { restoreCSRF, csrfFetch } from './store/csrf';
-import * as sessionActions from './store/session';
 
 const store = configureStore();
 
-if (process.env.NODE_ENV !== 'production') {
-  restoreCSRF();
-
-  window.csrfFetch = csrfFetch;
+if (process.env.NODE_ENV !== "production") {
   window.store = store;
-  window.sessionActions = sessionActions;
 }
 
 function Root() {

frontend/src/store/index.js

@@ -1,10 +1,8 @@
 import { createStore, combineReducers, applyMiddleware, compose } from "redux";
 import thunk from "redux-thunk";
-import sessionReducer from './session';
 
 const rootReducer = combineReducers({
   // add reducer functions here
-  session: sessionReducer,
 });
 
 let enhancer;