From 2e7421f342c699e2cb4e1c0d83109008e24f9ddc Mon Sep 17 00:00:00 2001 From: mjrode Date: Fri, 5 Apr 2019 21:38:47 -0500 Subject: [PATCH] Add modal and plex token form --- client/package-lock.json | 82 ++++++++++++----- client/public/favicon.ico | Bin 3870 -> 15406 bytes client/public/index.html | 2 +- client/src/actions/index.js | 3 +- client/src/components/App.js | 32 +++---- client/src/components/CreateAccount.css | 7 ++ client/src/components/CreateAccount.js | 116 ++++++++++++++++++++++++ client/src/components/Dashboard.js | 8 -- client/src/components/Header.js | 16 +--- client/src/components/Hero.js | 102 +++++++++++++++++++++ client/src/components/Landing.js | 12 --- client/src/components/Modal.js | 111 +++++++++++++++++++++++ client/src/components/css.js | 60 ++++++++++++ client/src/components/plex/PlexForm.js | 82 +++++++++-------- client/src/components/plex/PlexNew.js | 6 +- client/src/index.js | 1 + server/index.js | 1 + server/services/auth/passport.js | 2 +- 18 files changed, 527 insertions(+), 116 deletions(-) mode change 100644 => 100755 client/public/favicon.ico create mode 100644 client/src/components/CreateAccount.css create mode 100644 client/src/components/CreateAccount.js delete mode 100644 client/src/components/Dashboard.js create mode 100644 client/src/components/Hero.js delete mode 100644 client/src/components/Landing.js create mode 100644 client/src/components/Modal.js create mode 100644 client/src/components/css.js diff --git a/client/package-lock.json b/client/package-lock.json index 2634d62..82ea81f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -2657,7 +2657,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2675,11 +2676,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2692,15 +2695,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2803,7 +2809,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2813,6 +2820,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2825,17 +2833,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -2852,6 +2863,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2924,7 +2936,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2934,6 +2947,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3009,7 +3023,8 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3039,6 +3054,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3056,6 +3072,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3094,11 +3111,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true + "bundled": true, + "optional": true } } }, @@ -5720,7 +5739,8 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5738,11 +5758,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5755,15 +5777,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5866,7 +5891,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5876,6 +5902,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5888,17 +5915,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -5915,6 +5945,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5987,7 +6018,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5997,6 +6029,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6072,7 +6105,8 @@ }, "safe-buffer": { "version": "5.1.1", - "bundled": true + "bundled": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -6102,6 +6136,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -6119,6 +6154,7 @@ "strip-ansi": { "version": "3.0.1", "bundled": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -6157,11 +6193,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "optional": true }, "yallist": { "version": "3.0.2", - "bundled": true + "bundled": true, + "optional": true } } }, diff --git a/client/public/favicon.ico b/client/public/favicon.ico old mode 100644 new mode 100755 index a11777cc471a4344702741ab1c8a588998b1311a..2a87841ac6cf40ad87fa0475bd77c25acc0156d4 GIT binary patch literal 15406 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 b8u9*y*%uvu_u{|}a(~9`!~dWEw@2VV1wG^d literal 3870 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 baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@ diff --git a/client/public/index.html b/client/public/index.html index 476d00b..c7036ba 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -32,7 +32,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + PlexRex diff --git a/client/src/actions/index.js b/client/src/actions/index.js index 8b35777..d06cda0 100644 --- a/client/src/actions/index.js +++ b/client/src/actions/index.js @@ -1,8 +1,9 @@ import axios from 'axios'; import {FETCH_USER, FETCH_PLEX_TOKEN} from './types'; +// Action Creators export const fetchUser = () => async dispatch => { - const res = await axios.get('/auth/current_user'); + const res = await axios.get('/api/auth/current_user'); dispatch({type: FETCH_USER, payload: res.data}); }; diff --git a/client/src/components/App.js b/client/src/components/App.js index 99b792a..2eea422 100644 --- a/client/src/components/App.js +++ b/client/src/components/App.js @@ -1,27 +1,19 @@ import React, {Component} from 'react'; import {BrowserRouter, Route} from 'react-router-dom'; +import {connect} from 'react-redux'; import axios from 'axios'; +import * as actions from '../actions'; import Header from './Header'; -import Landing from './Landing'; -import Dashboard from './Dashboard'; +import Hero from './Hero'; +import CreateAccount from './CreateAccount'; import PlexForm from './plex/PlexForm'; -// const Dashboard = () =>

Dashboard

; -// const SurveyNew = () =>

SurveyNew

; class App extends Component { - state = {user: {}}; componentDidMount() { - this.fetchUser(); + this.props.fetchUser(); } - fetchUser = async () => { - const res = await axios.get('/auth/current_user'); - this.setState({user: res.data}); - console.log(res.data); - return res; - }; - render() { return (
@@ -29,13 +21,10 @@ class App extends Component {
- - + - } - /> + +
@@ -44,4 +33,7 @@ class App extends Component { } } -export default App; +export default connect( + null, + actions, +)(App); diff --git a/client/src/components/CreateAccount.css b/client/src/components/CreateAccount.css new file mode 100644 index 0000000..ff94e8f --- /dev/null +++ b/client/src/components/CreateAccount.css @@ -0,0 +1,7 @@ +.no-bottom-margin { + margin-bottom: 0px; +} + +.margin-spacing { + margin: 3em 0; +} diff --git a/client/src/components/CreateAccount.js b/client/src/components/CreateAccount.js new file mode 100644 index 0000000..0f86c21 --- /dev/null +++ b/client/src/components/CreateAccount.js @@ -0,0 +1,116 @@ +import React from 'react'; +import axios from 'axios'; +import PropTypes from 'prop-types'; +import CssBaseline from '@material-ui/core/CssBaseline'; +import {connect} from 'react-redux'; +import {withStyles} from '@material-ui/core/styles'; +import './CreateAccount.css'; +import Modal from './Modal'; +import styles from './css'; + +class CreateAccount extends React.Component { + state = {email: '', password: '', section_data: ''}; + + onFormSubmit = event => { + event.preventDefault(); + this.getPlexToken(this.state); + }; + + getPlexToken = async params => { + const res = await axios.get('/plex/auth', {params}); + return res; + }; + + fetchSections = async params => { + const res = await axios.get('/plex/library/sections'); + console.log(res); + this.setState({section_data: res.data}); + }; + + render() { + const {classes} = this.props; + return ( + + +
+
+
+

Fetch Plex Token

+
+ +
+
+
+
+
+
+
+

Plex Email

+ this.setState({email: e.target.value})} + /> +
+
+
+
+

Plex Server URL

+ this.setState({email: e.target.value})} + /> +
+
+
+
+

Plex Password

+ + this.setState({password: e.target.value}) + } + /> +
+
+
+
+
+ +
+
+
+
+
+
+
+
+ + ); + } +} + +CreateAccount.propTypes = { + classes: PropTypes.object.isRequired, +}; + +function mapStateToProps({auth}) { + return {auth}; +} + +export default connect(mapStateToProps)(withStyles(styles)(CreateAccount)); diff --git a/client/src/components/Dashboard.js b/client/src/components/Dashboard.js deleted file mode 100644 index 2bf08a5..0000000 --- a/client/src/components/Dashboard.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from 'react'; -// import {Link} from 'react-router-dom'; - -const Dashboard = () => { - return
Dashboard
; -}; - -export default Dashboard; diff --git a/client/src/components/Header.js b/client/src/components/Header.js index fdfb1a5..055340a 100644 --- a/client/src/components/Header.js +++ b/client/src/components/Header.js @@ -4,28 +4,20 @@ import {Link} from 'react-router-dom'; class Header extends Component { renderContent() { + console.log('this.props.auth', this.props.auth); switch (this.props.auth) { case null: return; case false: return (
  • - Login With Google + Login With Google
    • ); default: - if (!this.props.auth.plexToken) { - return ( -
  • - - live_tvImport Plex - -
    • - ); - } return (
  • - Logout + Logout
    • ); } @@ -35,7 +27,7 @@ class Header extends Component {