updated env variables

spencersmb · spencersmb · commit ee02fa3f4210 · 2017-05-08T23:05:21.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .next/
 node_modules/
-env-config.js
+config.json
+.env
diff --git a/components/Page.js b/components/Page.js
@@ -1,11 +1,20 @@
 import { connect } from 'react-redux'
 import Header from './Header'
+import styled from 'styled-components'
 
-export default connect(state => state)(({ title, linkTo, lastUpdate, light, url }) => {
+const Other = styled.h2`${{
+  color: 'green',
+  fontSize: '40px',
+  fontFamily: 'Open Sans',
+  '> a': {
+    fontSize: '18px'
+  }
+}}`
+export default connect(state => state)(({ title, linkTo, lastUpdate, light}) => {
   return (
     <div>
-      <Header url={url} />
-      <h1>{title}</h1>
+      <Other>{title}</Other>
+      <p>Simple Page template</p>
       <div>
         <p><a href='http://redux.js.org/docs/basics/Reducers.html'>Reducers</a> are at the heart of Redux, and they give us a clean and predictable way to change the state of our application. When using Reducers, we need to make sure that no data gets mutated. This gives us the benefit of being able to inspect every previous state of the data in our app, and it’s an important concept in Redux.</p>
       </div>
diff --git a/pages/_document.js b/pages/_document.js
@@ -12,6 +12,7 @@ class MyDocument extends Document {
     return (
       <html>
         <Head>
+          <link async href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'></link>
           <title>My page</title>
           {styleTags}
         </Head>
diff --git a/pages/index.js b/pages/index.js
@@ -7,6 +7,13 @@ import TodoList from '../components/todo/todoList'
 import defaultPage from '../hocs/defaultPage'
 import styled from 'styled-components'
 import TodoInput from '../components/todo/todoInput'
+import { injectGlobal } from 'styled-components';
+
+injectGlobal`
+	body {
+		margin: 0;
+	}
+`;
 
 // const rule1 = {
 //   backgroundColor: 'blue',
@@ -28,6 +35,7 @@ import TodoInput from '../components/todo/todoInput'
 const Title = styled.h1`${{
   color: 'red',
   fontSize: '50px',
+  fontFamily: 'Open Sans',
   '> a': {
     fontSize: '18px'
   }
diff --git a/pages/other.js b/pages/other.js
@@ -1,6 +1,7 @@
 import React from 'react'
 import { initStore } from '../store'
 import withRedux from 'next-redux-wrapper'
+import defaultPage from '../hocs/defaultPage'
 import Page from '../components/Page'
 
 class Counter extends React.Component {
@@ -19,4 +20,4 @@ class Counter extends React.Component {
   }
 }
 
-export default withRedux(initStore)(Counter)
+export default withRedux(initStore)(defaultPage(Counter))
diff --git a/store.js b/store.js
@@ -1,5 +1,6 @@
 import { createStore, applyMiddleware, combineReducers } from 'redux'
 import thunkMiddleware from 'redux-thunk'
+import { composeWithDevTools } from 'redux-devtools-extension'
 import { todosReducer } from './reducers/todosReducer'
 import { authReducer } from './reducers/authReducer'
 import { jokesReducer } from './reducers/jokesReducer'
@@ -15,12 +16,10 @@ export const initStore = (initialState = {}) => {
     form: formReducer
   })
 
+  
   let env = process.env.NODE_ENV || 'development'
 
   if (typeof window !== 'undefined' && env === 'development' ) {
-
-    const composeWithDevTools = require('redux-devtools-extension')
-    
     // const composeEnhancers = composeWithDevTools({
     //   // Specify here name, actionsBlacklist, actionsCreators and other options if needed
     //   actionsBlacklist: ['TICK']
diff --git a/utils/lock.js b/utils/lock.js
@@ -1,11 +1,14 @@
-/* global AUTH0_CLIENT_ID */
-/* global AUTH0_CLIENT_DOMAIN */
+let env = process.env.NODE_ENV || 'development'
 
 const getLock = (options) => {
   const config = require('../config.json')
   const Auth0Lock = require('auth0-lock').default
-  return new Auth0Lock(config.AUTH0_CLIENT_ID, config.AUTH0_CLIENT_DOMAIN, options)
-  // return new Auth0Lock(AUTH0_CLIENT_ID, AUTH0_CLIENT_DOMAIN, options)
+
+  if(env === 'development' || env === 'test'){
+    return new Auth0Lock(config.AUTH0_CLIENT_ID, config.AUTH0_CLIENT_DOMAIN, options)
+  }
+  
+  return new Auth0Lock(process.env.AUTH0_CLIENT_ID, process.env.AUTH0_CLIENT_DOMAIN, options)
 }
 
 const getBaseUrl = () => `${window.location.protocol}//${window.location.host}`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import React from 'react'`
`2`	`2`	`import { initStore } from '../store'`
`3`	`3`	`import withRedux from 'next-redux-wrapper'`
	`4`	`+import defaultPage from '../hocs/defaultPage'`
`4`	`5`	`import Page from '../components/Page'`
`5`	`6`
`6`	`7`	`class Counter extends React.Component {`
`@@ -19,4 +20,4 @@ class Counter extends React.Component {`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`
`22`		`-export default withRedux(initStore)(Counter)`
	`23`	`+export default withRedux(initStore)(defaultPage(Counter))`