From 19ce11a6240e54e67742db3b9a6576bc45d9f057 Mon Sep 17 00:00:00 2001 From: sarahmarie1976 Date: Fri, 28 Aug 2020 16:21:44 -0500 Subject: [PATCH 1/2] updating --- essentialism/src/App.js | 1 + essentialism/src/reducer/reducer.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/essentialism/src/App.js b/essentialism/src/App.js index 5b25387..cfc9c1f 100644 --- a/essentialism/src/App.js +++ b/essentialism/src/App.js @@ -23,6 +23,7 @@ export default function App() { + {/* Build a PrivateRoute component that will display Projects when you're authenticated diff --git a/essentialism/src/reducer/reducer.js b/essentialism/src/reducer/reducer.js index 1e00a01..f249cfc 100644 --- a/essentialism/src/reducer/reducer.js +++ b/essentialism/src/reducer/reducer.js @@ -55,7 +55,9 @@ const projectsReducer = (state = initialState, actions) => { return item } else return state.projects }) - } + } + + default: return state From 711cf13ace7c4ec4b084687a0695894c3d2d03cc Mon Sep 17 00:00:00 2001 From: sarahmarie1976 Date: Fri, 28 Aug 2020 20:24:32 -0500 Subject: [PATCH 2/2] trying to pull new master --- essentialism/src/components/Projects.js | 8 -------- essentialism/src/components/TestProjectsFetch.js | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/essentialism/src/components/Projects.js b/essentialism/src/components/Projects.js index f5b421f..3b232df 100644 --- a/essentialism/src/components/Projects.js +++ b/essentialism/src/components/Projects.js @@ -6,14 +6,6 @@ import { axiosWithAuth } from '../utils/axiosWithAuth'; import { POST_DATA, POST_SUCCESS } from '../action/action'; -// const initialProject = { -// project: "", -// "title": "", -// "summary": "", -// "importance": "", -// "values": {value_name: ""} - -// }; const Projects = ({ projectToEdit, setProjectToEdit, editing, setEditing, initialProject}) => { [projectToEdit, setProjectToEdit] = useState(initialProject); diff --git a/essentialism/src/components/TestProjectsFetch.js b/essentialism/src/components/TestProjectsFetch.js index 9547d3a..4fb14ce 100644 --- a/essentialism/src/components/TestProjectsFetch.js +++ b/essentialism/src/components/TestProjectsFetch.js @@ -58,7 +58,7 @@ useEffect(() => {

Importance: {project.importance}

{/*

Value 1: {project.values[0].value_name}

*/}

Value 1: {project.values[0].value_name}

-

Value 1: {project.values[1].value_name}

+

Value 2: {project.values[1].value_name}