diff --git a/twistter-frontend/package-lock.json b/twistter-frontend/package-lock.json index 2fb6aa4..f7ffc91 100644 --- a/twistter-frontend/package-lock.json +++ b/twistter-frontend/package-lock.json @@ -62,9 +62,9 @@ } }, "@material-ui/styles": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.4.3.tgz", - "integrity": "sha512-kNUdHFWsrvWKIEPx8Xy2/qayqsGMrYmCMq+FIiJiYczVZl5hiS8j5+KayonnpVta/O+Dktk+cxWkVcgwtxMrHg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.5.0.tgz", + "integrity": "sha512-O0NSAECHK9f3DZK6wy56PZzp8b/7KSdfpJs8DSC7vnXUAoMPCTtchBKLzMtUsNlijiJFeJjSxNdQfjWXgyur5A==", "requires": { "@babel/runtime": "^7.4.4", "@emotion/hash": "^0.7.1", @@ -74,21 +74,21 @@ "csstype": "^2.5.2", "deepmerge": "^4.0.0", "hoist-non-react-statics": "^3.2.1", - "jss": "10.0.0-alpha.25", - "jss-plugin-camel-case": "10.0.0-alpha.25", - "jss-plugin-default-unit": "10.0.0-alpha.25", - "jss-plugin-global": "10.0.0-alpha.25", - "jss-plugin-nested": "10.0.0-alpha.25", - "jss-plugin-props-sort": "10.0.0-alpha.25", - "jss-plugin-rule-value-function": "10.0.0-alpha.25", - "jss-plugin-vendor-prefixer": "10.0.0-alpha.25", + "jss": "^10.0.0", + "jss-plugin-camel-case": "^10.0.0", + "jss-plugin-default-unit": "^10.0.0", + "jss-plugin-global": "^10.0.0", + "jss-plugin-nested": "^10.0.0", + "jss-plugin-props-sort": "^10.0.0", + "jss-plugin-rule-value-function": "^10.0.0", + "jss-plugin-vendor-prefixer": "^10.0.0", "prop-types": "^15.7.2" } }, "@material-ui/system": { - "version": "4.4.3", - "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.4.3.tgz", - "integrity": "sha512-Cb05vLXsaCzssXD/iZKa0/qC6YOwbFWnYdnOEdkXZ3Fn2Ytz7rsnMgFejUSQV1luVhUBlEIm8DVz40N25WwW7w==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.5.0.tgz", + "integrity": "sha512-vR0PbMTzLnuuVCoYNQ13zyhLa/4s/UA9P9JbNuHBOOkfrHn53ShINiG0v05EgfwizfULLtc7mNvsGAgIyyp/hQ==", "requires": { "@babel/runtime": "^7.4.4", "deepmerge": "^4.0.0", @@ -119,9 +119,9 @@ "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" }, "@types/react": { - "version": "16.9.3", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.3.tgz", - "integrity": "sha512-Ogb2nSn+2qQv5opoCv7Ls5yFxtyrdUYxp5G+SWTrlGk7dmFKw331GiezCgEZj9U7QeXJi1CDtws9pdXU1zUL4g==", + "version": "16.9.4", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.4.tgz", + "integrity": "sha512-ItGNmJvQ0IvWt8rbk5PLdpdQhvBVxAaXI9hDlx7UMd8Ie1iMIuwMNiKeTfmVN517CdplpyXvA22X4zm4jGGZnw==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -5196,9 +5196,9 @@ } }, "jss": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0-alpha.25.tgz", - "integrity": "sha512-zqKnXv181B9vue2yYhmVhc+6ggbbxHF/33rjXfXEjaa22nOvknTI21QDfq3oZ8uCC50kcFp3Z8KU1ghUXdFvIA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0.tgz", + "integrity": "sha512-TPpDFsiBjuERiL+dFDq8QCdiF9oDasPcNqCKLGCo/qED3fNYOQ8PX2lZhknyTiAt3tZrfOFbb0lbQ9lTjPZxsQ==", "requires": { "@babel/runtime": "^7.3.1", "csstype": "^2.6.5", @@ -5207,69 +5207,69 @@ } }, "jss-plugin-camel-case": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.25.tgz", - "integrity": "sha512-J5ZEGDTy9ddqdTUPAF4SJQ25u5kiG1ORP8F+ZPEZAkkiMQJp+/Aol4I7xhTS2aW1Lhg8xNxdhdRfBi5yU7wOvg==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0.tgz", + "integrity": "sha512-yALDL00+pPR4FJh+k07A8FeDvfoPPuXU48HLy63enAubcVd3DnS+2rgqPXglHDGixIDVkCSXecl/l5GAMjzIbA==", "requires": { "@babel/runtime": "^7.3.1", "hyphenate-style-name": "^1.0.3", - "jss": "10.0.0-alpha.25" + "jss": "10.0.0" } }, "jss-plugin-default-unit": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.25.tgz", - "integrity": "sha512-auOG459B+yEqkojgaXH02SYO9+xjmAxlmP+WbzhVpXqOFJ2CN/kaxd8P4NJZLdj3BQxHiM7WIyMVh786StE+EA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0.tgz", + "integrity": "sha512-sURozIOdCtGg9ap18erQ+ijndAfEGtTaetxfU3H4qwC18Bi+fdvjlY/ahKbuu0ASs7R/+WKCP7UaRZOjUDMcdQ==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.0.0-alpha.25" + "jss": "10.0.0" } }, "jss-plugin-global": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.25.tgz", - "integrity": "sha512-cS98Q8X8jwltuaBZd9eYuxMXxkUL+mJGl2Ok3/nmJzH9nLzj6i7kLxSoDtuJNqsRmbP7ogIXVozJUq9lUu2hlQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0.tgz", + "integrity": "sha512-80ofWKSQUo62bxLtRoTNe0kFPtHgUbAJeOeR36WEGgWIBEsXLyXOnD5KNnjPqG4heuEkz9eSLccjYST50JnI7Q==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.0.0-alpha.25" + "jss": "10.0.0" } }, "jss-plugin-nested": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.25.tgz", - "integrity": "sha512-7sk7/6mX1YTgXe+AyeD1zEyKTgIGbbhYtg+wWQcHJlE1flW2JHfcQ5mw84FgHcHQRQ8Dq3l9I3aEY51ev0J1Wg==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0.tgz", + "integrity": "sha512-waxxwl/po1hN3azTyixKnr8ReEqUv5WK7WsO+5AWB0bFndML5Yqnt8ARZ90HEg8/P6WlqE/AB2413TkCRZE8bA==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.0.0-alpha.25", + "jss": "10.0.0", "tiny-warning": "^1.0.2" } }, "jss-plugin-props-sort": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.25.tgz", - "integrity": "sha512-8B/6QLQuUX8cIlZbXdjEm5l0jCX4EgacYMcFJhdKwDKEZYeAghpgQQrCKl0/CYHW7iFge5wim67P+uL6QxMzyw==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0.tgz", + "integrity": "sha512-41mf22CImjwNdtOG3r+cdC8+RhwNm616sjHx5YlqTwtSJLyLFinbQC/a4PIFk8xqf1qpFH1kEAIw+yx9HaqZ3g==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.0.0-alpha.25" + "jss": "10.0.0" } }, "jss-plugin-rule-value-function": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.25.tgz", - "integrity": "sha512-CQQtWO+/OZRGaFRBSGQUgAci9YlVtdoXcWQKBNo70tmpp+kaXKlFNCYaL3jmHbJHMiwKQYG2RYFQNIrwJ9SGmA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0.tgz", + "integrity": "sha512-Jw+BZ8JIw1f12V0SERqGlBT1JEPWax3vuZpMym54NAXpPb7R1LYHiCTIlaJUyqvIfEy3kiHMtgI+r2whGgRIxQ==", "requires": { "@babel/runtime": "^7.3.1", - "jss": "10.0.0-alpha.25" + "jss": "10.0.0" } }, "jss-plugin-vendor-prefixer": { - "version": "10.0.0-alpha.25", - "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.25.tgz", - "integrity": "sha512-5FXpB/TiwckbrkoDCmd27YsWCESl1K4hAX/oro2/geEXgnVQvDgQOf2eWCsjYO2K1lYPPXtskMfws/Q3eKmbYg==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0.tgz", + "integrity": "sha512-qslqvL0MUbWuzXJWdUxpj6mdNUX8jr4FFTo3aZnAT65nmzWL7g8oTr9ZxmTXXgdp7ANhS1QWE7036/Q2isFBpw==", "requires": { "@babel/runtime": "^7.3.1", "css-vendor": "^2.0.6", - "jss": "10.0.0-alpha.25" + "jss": "10.0.0" } }, "jsx-ast-utils": { diff --git a/twistter-frontend/package.json b/twistter-frontend/package.json index bc4672f..003bf65 100644 --- a/twistter-frontend/package.json +++ b/twistter-frontend/package.json @@ -4,6 +4,8 @@ "private": true, "dependencies": { "@material-ui/core": "^4.4.3", + "@material-ui/styles": "^4.5.0", + "@material-ui/system": "^4.5.0", "axios": "^0.19.0", "clsx": "^1.0.4", "create-react-app": "^3.1.2", @@ -36,5 +38,5 @@ "last 1 safari version" ] }, - "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api" + "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api" } diff --git a/twistter-frontend/src/App.css b/twistter-frontend/src/App.css index 0312f35..8189649 100644 --- a/twistter-frontend/src/App.css +++ b/twistter-frontend/src/App.css @@ -47,3 +47,4 @@ max-width: 1200px; color: #1da1f2; } + diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js index e69de29..ccbff92 100644 --- a/twistter-frontend/src/App.js +++ b/twistter-frontend/src/App.js @@ -0,0 +1,48 @@ +/* eslint-disable */ +import React, { Component } from 'react'; + +import './App.css'; +import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider'; +import createMuiTheme from '@material-ui/core/styles/createMuiTheme'; + +import { BrowserRouter as Router } from 'react-router-dom'; +import Route from 'react-router-dom/Route'; +import Navbar from './components/layout/NavBar'; +import themeObject from './util/theme'; + +import home from './pages/Home'; +import register from './pages/Register'; +import login from './pages/Login'; +import user from './pages/user'; + +import writeMicroblog from './Writing_Microblogs.js'; +import edit from './pages/edit.js'; +import userLine from './Userline.js'; + +const theme = createMuiTheme(themeObject); + +class App extends Component { + render() { + return ( + + +
+ +
+
+ + + + + + + +
+ + + + ); + } +} + +export default App; diff --git a/twistter-frontend/src/Userline.js b/twistter-frontend/src/Userline.js index b9e0d9c..aa75716 100644 --- a/twistter-frontend/src/Userline.js +++ b/twistter-frontend/src/Userline.js @@ -5,7 +5,7 @@ import axios from 'axios'; import Box from '@material-ui/core/Box' import {borders} from '@material-ui/system'; import { sizing } from '@material-ui/system'; -var moment = require('moment'); +// var moment = require('moment'); diff --git a/twistter-frontend/src/pages/Login.js b/twistter-frontend/src/pages/Login.js index 76531d2..2b671ce 100644 --- a/twistter-frontend/src/pages/Login.js +++ b/twistter-frontend/src/pages/Login.js @@ -1,26 +1,73 @@ /* eslint-disable */ import React, { Component } from 'react'; import '../App.css'; +import axios from 'axios'; +import PropTypes from 'prop-types'; import logo from '../images/twistter-logo.png'; import TextField from '@material-ui/core/TextField'; class Login extends Component { + constructor() { + super(); + this.state = { + email: '', + password: '', + errors: {} + }; + this.handleChange = this.handleChange.bind(this); + this.handleSubmit = this.handleSubmit.bind(this); +}; +handleSubmit = (event) => { + event.preventDefault(); + const userData = { + email: this.state.email, + password: this.state.password + }; + axios.post('http://localhost:5001/twistter-e4649/us-central1/api/login', userData) + .then(res => { + console.log(res.data); + localStorage.setItem('firebaseIdToken', `Bearer ${res.data.token}`); + this.props.history.push('/home'); + }) + .catch(err => { + this.setState({ + errors: err.response.data + }); + }); +}; +handleChange = (event) => { + this.setState({ + [event.target.name]: event.target.value + }); +}; + render() { + const { classes } = this.props; + const { errors } = this.state; return (
logo

Log in to Twistter

- +
+

- +

+ +
); }; } +Login.propTypes = { + classes: PropTypes.object.isRequired +}; + export default Login; \ No newline at end of file diff --git a/twistter-frontend/src/pages/Register.js b/twistter-frontend/src/pages/Register.js index 3d5db00..d168315 100644 --- a/twistter-frontend/src/pages/Register.js +++ b/twistter-frontend/src/pages/Register.js @@ -2,28 +2,96 @@ import React, { Component } from 'react'; import '../App.css'; import logo from '../images/twistter-logo.png'; +import axios from 'axios'; import TextField from '@material-ui/core/TextField'; +import PropTypes from 'prop-types'; + class Register extends Component { + + constructor() { + super(); + this.state = { + email: '', + handle: '', + password: '', + confirmPassword: '', + errors: {} + }; + + this.handleSubmit = this.handleSubmit.bind(this); + this.handleChange = this.handleChange.bind(this); +}; + + +handleSubmit = (event) => { + const newUserData = { + email: this.state.email, + handle: this.state.handle, + password: this.state.password, + confirmPassword: this.state.confirmPassword + }; + axios.post('http://localhost:5001/twistter-e4649/us-central1/api/signup', newUserData) + .then(res => { + console.log(res.data); + localStorage.setItem('firebaseIdToken', `Bearer ${res.data.token}`); + this.props.history.push('/'); + }) + .catch(err => { + this.setState({ + errors: err.response.data + }); + }); + alert("You successfully registered"); + event.preventDefault(); + this.setState({email: '', handle: '', password: '', confirmPassword: ''}); +}; + + +handleChange = (event) => { + this.setState({ + [event.target.name]: event.target.value + }); +}; + render() { + const { classes } = this.props; + const { errors } = this.state; return (
logo

Create your account

- +
+ +

- +

- +

- +

+ { + errors.general && + (
+ {errors.general} +
) + } +
); } + } +Register.propTypes = { + classes: PropTypes.object.isRequired +}; export default Register; \ No newline at end of file diff --git a/twistter-frontend/src/pages/user.js b/twistter-frontend/src/pages/user.js index 142f9b7..a9faf1b 100644 --- a/twistter-frontend/src/pages/user.js +++ b/twistter-frontend/src/pages/user.js @@ -1,40 +1,35 @@ /* eslint-disable */ import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -import StaticProfile from '../components/profile/StaticProfile'; +//import '../App.css'; +import { makeStyles, styled } from '@material-ui/core/styles'; import Grid from '@material-ui/core/Grid'; +import Card from '@material-ui/core/Card'; +import CardMedia from '@material-ui/core/CardMedia'; +import CardContent from '@material-ui/core/CardContent'; -import PostSkeleton from '../util/PostSkeleton'; - -import { connect } from 'react-redux'; - +const PostCard = styled(Card)({ + background: 'linear-gradient(45deg, #1da1f2 90%)', + border: 3, + borderRadius: 3, + height:225, + width: 645, + padding: '0 30px', +}); class user extends Component { render() { - const postMarkup = PostSkeleton; - + return ( - User page - // - // - // postMarkup - // {postMarkup} - // - // {/* - // - // */} - // +
+

User Profile

+

+ Some card and content +

+
) } } -user.propTypes = { - // getUserData: PropTypes.func.isRequired, - //data: PropTypes.object.isRequired -}; -const mapStateToProps = (state) => ({ - data: state.data -}); -export default connect(user); +export default user; diff --git a/twistter-frontend/src/util/theme.js b/twistter-frontend/src/util/theme.js new file mode 100644 index 0000000..38622a6 --- /dev/null +++ b/twistter-frontend/src/util/theme.js @@ -0,0 +1,97 @@ +export default { + palette: { + primary: { + light: '#1da1f2', + main: '#1da1f2', + dark: '#008394', + contrastText: '#fff' + }, + secondary: { + light: '#ff6333', + main: '#ff3d00', + dark: '#b22a00', + contrastText: '#fff' + } + }, + typography: { + useNextVariants: true + }, + form: { + textAlign: 'center' + }, + image: { + margin: '20px auto 20px auto' + }, + pageTitle: { + margin: '10px auto 10px auto' + }, + textField: { + margin: '10px auto 10px auto' + }, + button: { + marginTop: 20, + position: 'relative' + }, + customError: { + color: 'red', + fontSize: '0.8rem', + marginTop: 10 + }, + progress: { + position: 'absolute' + }, + invisibleSeparator: { + border: 'none', + margin: 4 + }, + visibleSeparator: { + width: '100%', + borderBottom: '1px solid rgba(0,0,0,0.1)', + marginBottom: 20 + }, + paper: { + padding: 20 + }, + profile: { + '& .image-wrapper': { + textAlign: 'center', + position: 'relative', + '& button': { + position: 'absolute', + top: '80%', + left: '70%' + } + }, + '& .profile-image': { + width: 200, + height: 200, + objectFit: 'cover', + maxWidth: '100%', + borderRadius: '50%' + }, + '& .profile-details': { + textAlign: 'center', + '& span, svg': { + verticalAlign: 'middle' + }, + '& a': { + color: '#00bcd4' + } + }, + '& hr': { + border: 'none', + margin: '0 0 10px 0' + }, + '& svg.button': { + '&:hover': { + cursor: 'pointer' + } + } + }, + buttons: { + textAlign: 'center', + '& a': { + margin: '20px 10px' + } + } + };