axios conversion

jordanchristie · Sep 6, 2018 · 2cf1280 · 2cf1280
1 parent 6411c1c
commit 2cf1280
Show file tree

Hide file tree

Showing 45 changed files with 15 additions and 20 deletions.
diff --git a/server/.gitignore → .gitignore b/server/.gitignore → .gitignore
diff --git a/server/client/.gitignore → client/.gitignore b/server/client/.gitignore → client/.gitignore
diff --git a/server/client/README.md → client/README.md b/server/client/README.md → client/README.md
diff --git a/server/client/build/asset-manifest.json → client/build/asset-manifest.json b/server/client/build/asset-manifest.json → client/build/asset-manifest.json
diff --git a/server/client/build/favicon.ico → client/build/favicon.ico b/server/client/build/favicon.ico → client/build/favicon.ico
diff --git a/server/client/build/index.html → client/build/index.html b/server/client/build/index.html → client/build/index.html
diff --git a/server/client/build/manifest.json → client/build/manifest.json b/server/client/build/manifest.json → client/build/manifest.json
diff --git a/server/client/build/service-worker.js → client/build/service-worker.js b/server/client/build/service-worker.js → client/build/service-worker.js
diff --git a/...client/build/static/css/main.ce9fe566.css → client/build/static/css/main.ce9fe566.css b/...client/build/static/css/main.ce9fe566.css → client/build/static/css/main.ce9fe566.css
diff --git a/...nt/build/static/css/main.ce9fe566.css.map → ...nt/build/static/css/main.ce9fe566.css.map b/...nt/build/static/css/main.ce9fe566.css.map → ...nt/build/static/css/main.ce9fe566.css.map
diff --git a/...r/client/build/static/js/main.86b4c592.js → client/build/static/js/main.86b4c592.js b/...r/client/build/static/js/main.86b4c592.js → client/build/static/js/main.86b4c592.js
diff --git a/...ient/build/static/js/main.86b4c592.js.map → client/build/static/js/main.86b4c592.js.map b/...ient/build/static/js/main.86b4c592.js.map → client/build/static/js/main.86b4c592.js.map
diff --git a/server/client/package.json → client/package.json b/server/client/package.json → client/package.json
diff --git a/server/client/public/favicon.ico → client/public/favicon.ico b/server/client/public/favicon.ico → client/public/favicon.ico
diff --git a/server/client/public/index.html → client/public/index.html b/server/client/public/index.html → client/public/index.html
diff --git a/server/client/public/manifest.json → client/public/manifest.json b/server/client/public/manifest.json → client/public/manifest.json
diff --git a/server/client/src/App.test.js → client/src/App.test.js b/server/client/src/App.test.js → client/src/App.test.js
diff --git a/server/client/src/actions/index.js → client/src/actions/index.js b/server/client/src/actions/index.js → client/src/actions/index.js
@@ -7,40 +7,34 @@ import { FETCH_USER,
 
 export const fetchUser = (user) => {
     return dispatch => {
-        fetch('/api/user', {credentials: 'include'})
-            .then(res => res.json())
+        axios.get('/api/user', {withCredentials: 'include'})
+            .then(res => res.data)
             .then(user => dispatch({ type: FETCH_USER, payload: user}))
             .catch(err => console.log(err))
     }
 }
 
 export const fetchExploreQuotes = () => {
     return dispatch => {
-        fetch(QUOTE_URL)
-            .then(res => res.json())
+        axios.get(QUOTE_URL, {headers: {'Access-Control-Allow-Origin': '*'}})
+            .then(res => res.data)
             .then(data => dispatch({type: FETCH_EXPLORE_QUOTES, payload: data}))
             .catch(err => console.log(err))
     } 
 }
 
 export const saveQuoteToProfile = (quote) => {
     return dispatch => {
-        fetch('/api/saved', {
-            headers: {
-              'Content-Type': 'application/json'
-            },
-            method: 'post',
-            body: JSON.stringify(quote)
-        })
-            .then(data => dispatch({type: SAVE_QUOTE_TO_PROFILE, payload: data}))
+        axios.post('/api/saved', quote)
+            .then(data => dispatch({ type: SAVE_QUOTE_TO_PROFILE, payload: data }))
             .catch(err => console.log(err))
     }
 }
 
 export const removeQuoteFromProfile = (id) => {
     return dispatch => {
         axios.delete(`/api/saved/${id}`)
-            .then(data => dispatch({ type: REMOVE_QUOTE_FROM_PROFILE, payload: data}))
+            .then(data => dispatch({ type: REMOVE_QUOTE_FROM_PROFILE, payload: data }))
             .catch(err => console.log(err))
     }
 }
diff --git a/server/client/src/background.jpg → client/src/background.jpg b/server/client/src/background.jpg → client/src/background.jpg
diff --git a/server/client/src/components/App.js → client/src/components/App.js b/server/client/src/components/App.js → client/src/components/App.js
diff --git a/server/client/src/components/Card.js → client/src/components/Card.js b/server/client/src/components/Card.js → client/src/components/Card.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { FacebookShareButton, TwitterShareButton } from 'react-share';
+// import { FacebookShareButton, TwitterShareButton } from 'react-share';
 
 import { saveQuoteToProfile, removeQuoteFromProfile } from '../actions/index';
 
@@ -45,8 +45,7 @@ class Card extends Component {
                   Save Quote 
                 </a>
               } 
-              <FacebookShareButton />
-              <TwitterShareButton />
+
               <a href=""><i className="fa fa-facebook right"></i></a>
               <a href=""><i className="fa fa-twitter right"></i></a>
             </div>

diff --git a/server/client/src/components/Dashboard.js → client/src/components/Dashboard.js b/server/client/src/components/Dashboard.js → client/src/components/Dashboard.js
@@ -20,6 +20,7 @@ class Dashboard extends Component {
     }
 
     render() {
+        console.log(this.props)
         const { user } = this.props;
       return (
         <div id="dashboard-page">

diff --git a/server/client/src/components/ExplorePage.js → client/src/components/ExplorePage.js b/server/client/src/components/ExplorePage.js → client/src/components/ExplorePage.js
@@ -14,6 +14,7 @@ class ExplorePage extends Component {
     }
 
     render() {
+        console.log(this.props)
         return (
             <div>
                 <h1>Explore</h1>

diff --git a/server/client/src/components/Header.js → client/src/components/Header.js b/server/client/src/components/Header.js → client/src/components/Header.js
diff --git a/server/client/src/components/LandingPage.js → client/src/components/LandingPage.js b/server/client/src/components/LandingPage.js → client/src/components/LandingPage.js
diff --git a/server/client/src/constants/constants.js → client/src/constants/constants.js b/server/client/src/constants/constants.js → client/src/constants/constants.js
diff --git a/server/client/src/index.css → client/src/index.css b/server/client/src/index.css → client/src/index.css
diff --git a/server/client/src/index.js → client/src/index.js b/server/client/src/index.js → client/src/index.js
diff --git a/server/client/src/reducers/authReducer.js → client/src/reducers/authReducer.js b/server/client/src/reducers/authReducer.js → client/src/reducers/authReducer.js
@@ -3,6 +3,7 @@ import { FETCH_USER } from '../constants/constants';
 export const authReducer = (state = {}, action) => {
     switch (action.type) {
         case FETCH_USER:
+        console.log(action.payload)
             return action.payload || null;
         default:
             return state;

diff --git a/server/client/src/reducers/index.js → client/src/reducers/index.js b/server/client/src/reducers/index.js → client/src/reducers/index.js
diff --git a/server/client/src/reducers/quotesReducer.js → client/src/reducers/quotesReducer.js b/server/client/src/reducers/quotesReducer.js → client/src/reducers/quotesReducer.js
@@ -3,14 +3,13 @@ import { FETCH_EXPLORE_QUOTES,
          REMOVE_QUOTE_FROM_PROFILE } from '../constants/constants';
 
 
+
 export const quotesReducer = (state = [], action) => {
     switch (action.type) {
         case FETCH_EXPLORE_QUOTES:
-            return action.payload;
-        case SAVE_QUOTE_TO_PROFILE:
-            return [...state, action.payload ];
+        case SAVE_QUOTE_TO_PROFILE:     
         case REMOVE_QUOTE_FROM_PROFILE:
-            return [...state, action.payload];
+            return action.payload;
         default:
             return state
     }

diff --git a/server/client/src/registerServiceWorker.js → client/src/registerServiceWorker.js b/server/client/src/registerServiceWorker.js → client/src/registerServiceWorker.js
diff --git a/server/config/keys.js → config/keys.js b/server/config/keys.js → config/keys.js
diff --git a/server/config/prod.js → config/prod.js b/server/config/prod.js → config/prod.js
diff --git a/server/index.js → index.js b/server/index.js → index.js
diff --git a/server/models/Quote.js → models/Quote.js b/server/models/Quote.js → models/Quote.js
diff --git a/server/models/User.js → models/User.js b/server/models/User.js → models/User.js
diff --git a/server/package.json → package.json b/server/package.json → package.json
diff --git a/server/routes/facebookRoutes.js → routes/facebookRoutes.js b/server/routes/facebookRoutes.js → routes/facebookRoutes.js
diff --git a/server/routes/genRoutes.js → routes/genRoutes.js b/server/routes/genRoutes.js → routes/genRoutes.js
diff --git a/server/routes/googleRoutes.js → routes/googleRoutes.js b/server/routes/googleRoutes.js → routes/googleRoutes.js
diff --git a/server/routes/quotesRoutes.js → routes/quotesRoutes.js b/server/routes/quotesRoutes.js → routes/quotesRoutes.js
diff --git a/server/routes/twitterRoutes.js → routes/twitterRoutes.js b/server/routes/twitterRoutes.js → routes/twitterRoutes.js
diff --git a/server/.DS_Store b/server/.DS_Store
diff --git a/server/services/passport.js → services/passport.js b/server/services/passport.js → services/passport.js