fix: merge with master

Author: kuehlein

client/components/PopupMain/index.jsx

@@ -2,16 +2,20 @@
 
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
+import { Login, Signup } from '../auth-form'
+import { me } from '../../store'
+import { UserHome } from '../'
 import $ from 'jquery'
 
+
 class PopupMain extends Component {
-constructor(){
-  super()
-  this.state = {
-    buttonToggle: true
+  constructor(){
+    super()
+    this.state = {
+      buttonToggle: true
+    }
+    this.handleClick = this.handleClick.bind(this)
   }
-  this.handleClick = this.handleClick.bind(this)
-}
 
   componentDidMount () {
     this.props.loadInitialData()
@@ -34,7 +38,9 @@ constructor(){
 
     return (
       <div>
-          <button id = "toggle" type="button" onClick={ this.handleClick }>toggle popup</button>
+          <button id = "toggle" type="button" onClick={ this.handleClick }>
+            toggle popup
+          </button>
         {
             isLoggedIn
             ? <UserHome />

client/components/QuestionMenu/MapQuestions.jsx

@@ -6,7 +6,6 @@ import { setQuestion } from '../../store'
 //import react-semantic-ui?
 
 
-<<<<<<< HEAD
 const MapQuestions = props => {
   const sortedQuestions = props.questions && props.questions.sort((q1, q2) => q1.id - q2.id)
 
@@ -16,28 +15,6 @@ const MapQuestions = props => {
         <div key={ question.id }>
           <button onClick={ () => props.setQuestion(question) }>
               <div className="content">{ question.description }</div>
-=======
-class MapQuestions extends Component {
-  constructor(props) {
-    super(props)
-  }
-
-  componentDidMount () {
-    this.props.fetchQuestions() // whatever the url is here
-
-  }
-
-  render() {
-    const sortedQuestions = this.props.questions.sort((q1, q2) => q1.id - q2.id)
-    return (
-
-      <div>
-      { this.props.questions &&
-        sortedQuestions.map(question => (
-          <div key={ question.id }>
-          <button onClick={() => this.props.handleClick(question, question.boilerplate)}>Question { question.id }</button>
-            <div className="content">
->>>>>>> master
               <div className="metadata">
                 {/* <Rating
                       icon="star"
@@ -46,23 +23,10 @@ class MapQuestions extends Component {
                       disabled
                 /> */}
               </div>
-<<<<<<< HEAD
           </button>
         </div>
     ))
   )
-=======
-              <div className="text">{ /* virtual field for snippet */ }</div>
-            </div>
-          </div>
-        ))
-      }
-      </div>
-
-    )
-  }
-
->>>>>>> master
 }
 
 const mapDispatch = dispatch => ({

client/components/Repl/example/index.jsx

@@ -6,7 +6,7 @@ import { withRouter } from 'react-router-dom'
 import { render } from 'react-dom'
 import AceEditor from '../src/ace.jsx'
 import 'brace/mode/jsx'
-import { fetchInput, postInput, fetchQuestions } from '../../../store'
+import { fetchInput, postInput, getQuestion } from '../../../store'
 
 const debounce = require('lodash.debounce')
 const languages= ['javascript']
@@ -24,7 +24,7 @@ import 'brace/ext/language_tools'
 import 'brace/ext/searchbox'
 
 
-class AppClass extends Component {
+class App extends Component {
   onChange (newValue) {
     this.setState({ value: newValue })
     //this.setChromeStorage()
@@ -55,13 +55,9 @@ class AppClass extends Component {
       showLineNumbers: true,
       result: ''
     }
-    this.setTheme = this.setTheme.bind(this)
-    this.setMode = this.setMode.bind(this)
     this.onChange = this.onChange.bind(this)
     this.setFontSize = this.setFontSize.bind(this)
-    this.setBoolean = this.setBoolean.bind(this)
     this.handleClick = this.handleClick.bind(this)
-    this.handleSave = this.handleSave.bind(this)
     this.handleClear = this.handleClear.bind(this)
     this.setChromeStorage = this.setChromeStorage.bind(this)
     this.getChromeStorage = this.getChromeStorage.bind(this)

server/index.js

@@ -28,17 +28,17 @@ passport.deserializeUser((id, done) =>
 
 const createApp = () => {
 
-  // logging middleware
+ // logging middleware
   app.use(morgan('dev'))
 
-  // body parsing middleware
+ // body parsing middleware
   app.use(bodyParser.json())
   app.use(bodyParser.urlencoded({ extended: true }))
 
-  // compression middleware
+ // compression middleware
   app.use(compression())
 
-  // session middleware with passport
+ // session middleware with passport
   app.use(session({
     secret: process.env.SESSION_SECRET || 'my best friend is Cody',
     store: sessionStore,
@@ -48,25 +48,21 @@ const createApp = () => {
   app.use(passport.initialize())
   app.use(passport.session())
 
-  // auth and api routes
+ // auth and api routes
   app.use('/auth', require('./auth'))
   app.use('/api', require('./api'))
 
-  // static file-serving middleware
+ // static file-serving middleware
   app.use(express.static(path.join(__dirname, '..', 'chrome/js')))
 
-  // sends index.html
+ // sends index.html
   app.use('*', (req, res) => {
     res.sendFile(path.join(__dirname, '..', 'chrome/views/index.html'))
   })
 
-  // any remaining requests with an extension (.js, .css, etc.) send 404
-<<<<<<< HEAD
+ // any remaining requests with an extension (.js, .css, etc.) send 404
   .use((req, res, next) => {
     console.log(req.path)
-=======
-  app.use((req, res, next) => {
->>>>>>> master
     if (path.extname(req.path).length) {
       const err = new Error('Not found')
       err.status = 404
@@ -76,7 +72,7 @@ const createApp = () => {
     }
   })
 
-  // error handling endware
+ // error handling endware
   app.use((err, req, res, next) => {
     console.error(err)
     console.error(err.stack)
@@ -87,8 +83,6 @@ const createApp = () => {
 const startListening = () => {
   // start listening (and create a 'server' object representing our server)
   const server = app.listen(PORT, () => console.log(`Havin a party on port ${ PORT }`))
-
-
 }
 
 const syncDb = () => db.sync()