From 43f6de432ef7fd9562625fba02d0aa8229147c8c Mon Sep 17 00:00:00 2001 From: Charlie Wyman Date: Thu, 4 Oct 2018 15:32:15 -0400 Subject: [PATCH 001/137] amended API_ROOT to disable https on the back-end --- src/agent.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/agent.js b/src/agent.js index adfbd7254..419ffc372 100644 --- a/src/agent.js +++ b/src/agent.js @@ -3,7 +3,8 @@ import _superagent from 'superagent'; const superagent = superagentPromise(_superagent, global.Promise); -const API_ROOT = 'https://conduit.productionready.io/api'; +//POINTING API_ROOT AT HTTPS:// SERVICE WITHOUT HAVING HTTPS:// INITIALIZED ON OUR END CAUSES USE HEADACHES INVOLVED +const API_ROOT = 'http://conduit.productionready.io/api'; const encode = encodeURIComponent; const responseBody = res => res.body; From 9184f79eea19e2f24453a638d2e904fe70901db2 Mon Sep 17 00:00:00 2001 From: Charlie Wyman Date: Thu, 4 Oct 2018 17:10:50 -0400 Subject: [PATCH 002/137] added logout button to header --- src/components/Header.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/Header.js b/src/components/Header.js index 63641b8ce..7552a0583 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -1,5 +1,8 @@ import React from 'react'; import { Link } from 'react-router-dom'; +import { connect } from 'react-redux'; +import { LOGOUT } from "../constants/actionTypes"; + const LoggedOutView = props => { if (!props.currentUser) { @@ -33,7 +36,7 @@ const LoggedOutView = props => { const LoggedInView = props => { if (props.currentUser) { return ( -