diff --git a/package.json b/package.json index 26c431c..64eaaf3 100644 --- a/package.json +++ b/package.json @@ -27,13 +27,13 @@ "react-scripts": "1.0.7" }, "scripts": { + "express": "node ./src/server/server.js", + "start-js": "react-scripts start", "start": "npm-run-all -p watch-css start-js express", "build": "npm run build-css && react-scripts build", "test": "react-scripts test --env=jsdom", "eject": "react-scripts eject", - "start-js": "react-scripts start", "build-css": "node-sass-chokidar src/client/styles/sass -o src/client/styles/", - "watch-css": "npm run build-css && node-sass-chokidar src/client/styles/sass -o src/client/styles/ --watch --recursive", - "express": "node ./src/server/server.js" + "watch-css": "npm run build-css && node-sass-chokidar src/client/styles/sass -o src/client/styles/ --watch --recursive" } } diff --git a/public/LetsCode2.svg b/public/LetsCode2.svg new file mode 100644 index 0000000..529f6c2 --- /dev/null +++ b/public/LetsCode2.svg @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LET S + + + + + + + + + + + + + + + + + + + + + + + + + + + +LET S +CODE + + diff --git a/src/client/App.js b/src/client/App.js index 2b23d52..1090321 100644 --- a/src/client/App.js +++ b/src/client/App.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import {BrowserRouter as Router, Route, Switch} from 'react-router-dom' +import { Router, Route, Switch} from 'react-router-dom' import {createBrowserHistory} from 'history' import './App.css'; import registerServiceWorker from './registerServiceWorker' diff --git a/src/client/components/Auth/LoginForm.js b/src/client/components/Auth/LoginForm.js index 1d2ef6e..91f12e9 100644 --- a/src/client/components/Auth/LoginForm.js +++ b/src/client/components/Auth/LoginForm.js @@ -20,7 +20,7 @@ class LoginForm extends Component { this.handlePasswordChange = this.handlePasswordChange.bind(this); } - handleEmailChange (evt) { + handleEmailChange(evt) { this.setState({ user: evt.target.value }); @@ -43,32 +43,38 @@ class LoginForm extends Component { password: this.state.password }) .done((data) => { - localStorage.setItem("odslearncode", data.token); - window.location.replace('/dashboard'); - }) + localStorage.setItem("odslearncode", data.token); + window.location.replace('/dashboard'); + }) .fail( this.show('blurring') ); } - show = (dimmer) => () => this.setState({ dimmer, open: true }) - close = () => this.setState({ open: false, requestActive: false }) + show = (dimmer) => () => this.setState({dimmer, open: true}) + close = () => this.setState({open: false, requestActive: false}) render() { - const { open, dimmer } = this.state + const {open, dimmer} = this.state // Hide overflow of body document.getElementsByTagName('body')[0].style.overflow = 'hidden' return (
- +
+ +

Sign in

- - - Forgot Password? + + + Forgot + Password?

Not registered?

@@ -82,7 +88,8 @@ class LoginForm extends Component { -
diff --git a/src/client/components/_pages/AuthPage.js b/src/client/components/_pages/AuthPage.js index 5eca9c4..a4c88f5 100644 --- a/src/client/components/_pages/AuthPage.js +++ b/src/client/components/_pages/AuthPage.js @@ -30,8 +30,8 @@ class AuthPage extends Component {
-

localhorst:3000

-

Learn to code - even if your name in not Horst

+

let's code

+

Learn to code the modern way
diff --git a/src/client/styles/AuthPage.css b/src/client/styles/AuthPage.css index 253f3e1..4500e56 100644 --- a/src/client/styles/AuthPage.css +++ b/src/client/styles/AuthPage.css @@ -23,3 +23,4 @@ .titleIcon { font-size: 4em !important; } + diff --git a/src/server/server.js b/src/server/server.js index 026fb58..ab5904e 100644 --- a/src/server/server.js +++ b/src/server/server.js @@ -24,7 +24,7 @@ app.use(cors({ console.log(path.join(__dirname, '../../build')); -app.use(express.static(path.join(__dirname, '../../build'))) +app.use(express.static(path.join(__dirname, '../../build'))); // Middleware: all routes behind API require an auth! app.use('/api', authMiddleware); @@ -39,7 +39,20 @@ var port = process.env.port || 8080; var config = require('./config'); -mongoose.connect(config.database); +const options = { + useMongoClient: true, + //autoIndex: false, // Don't build indexes + reconnectTries: Number.MAX_VALUE, // Never stop trying to reconnect + reconnectInterval: 500, // Reconnect every 500ms + poolSize: 10, // Maintain up to 10 socket connections + // If not connected, return errors immediately rather than waiting for reconnect + bufferMaxEntries: 0 +}; +//mongoose.connect(uri, options); + +mongoose.connect(config.database, options); +//mongoose.createConnection()(config.database); + app.listen(port);