diff --git a/twistter-frontend/package-lock.json b/twistter-frontend/package-lock.json
index 87a9f7e..5f52e79 100644
--- a/twistter-frontend/package-lock.json
+++ b/twistter-frontend/package-lock.json
@@ -2016,6 +2016,43 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
"integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
},
+ "axios": {
+ "version": "0.19.0",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+ "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+ "requires": {
+ "follow-redirects": "1.5.10",
+ "is-buffer": "^2.0.2"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "follow-redirects": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+ "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+ "requires": {
+ "debug": "=3.1.0"
+ }
+ },
+ "is-buffer": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+ "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+ }
+ }
+ },
"axobject-query": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
diff --git a/twistter-frontend/package.json b/twistter-frontend/package.json
index 868e46d..b18ef34 100644
--- a/twistter-frontend/package.json
+++ b/twistter-frontend/package.json
@@ -4,6 +4,7 @@
"private": true,
"dependencies": {
"@material-ui/core": "^4.4.3",
+ "axios": "^0.19.0",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-router-dom": "^5.0.1",
@@ -27,5 +28,6 @@
"last 1 firefox version",
"last 1 safari version"
]
- }
+ },
+ "proxy": "https://us-central1-socialape-2619.cloudfunctions.net/api"
}
diff --git a/twistter-frontend/public/index.html b/twistter-frontend/public/index.html
index 6ecde9e..fd60d3a 100644
--- a/twistter-frontend/public/index.html
+++ b/twistter-frontend/public/index.html
@@ -5,6 +5,13 @@
Twistter
+
diff --git a/twistter-frontend/src/App.css b/twistter-frontend/src/App.css
index e39c325..0e73541 100644
--- a/twistter-frontend/src/App.css
+++ b/twistter-frontend/src/App.css
@@ -37,7 +37,4 @@
.authInput {
background-color: #eee;
width:500px;
- height:40px;
- border: 0px;
- padding: 10px;
}
\ No newline at end of file
diff --git a/twistter-frontend/src/App.js b/twistter-frontend/src/App.js
index 92e76e0..2b04b9b 100644
--- a/twistter-frontend/src/App.js
+++ b/twistter-frontend/src/App.js
@@ -13,16 +13,12 @@ class App extends Component {
return (
-
-
-
-
);
}
diff --git a/twistter-frontend/src/Home.js b/twistter-frontend/src/Home.js
index 9c462ab..7371429 100644
--- a/twistter-frontend/src/Home.js
+++ b/twistter-frontend/src/Home.js
@@ -3,6 +3,7 @@ import './App.css';
import logo from './twistter-logo.png';
+
class Home extends Component {
render() {
return (
@@ -23,7 +24,7 @@ class Home extends Component {
-
+
diff --git a/twistter-frontend/src/Login.js b/twistter-frontend/src/Login.js
index 87a0e5c..86c8d98 100644
--- a/twistter-frontend/src/Login.js
+++ b/twistter-frontend/src/Login.js
@@ -2,6 +2,9 @@ import React, { Component } from 'react';
import './App.css';
import logo from './twistter-logo.png';
+import TextField from '@material-ui/core/TextField';
+
+import axios from 'axios';
class Login extends Component {
render() {
@@ -11,14 +14,14 @@ class Login extends Component {
Log in to Twistter
-
+
-
+
-
+
);
- }
+ };
}
export default Login;
\ No newline at end of file
diff --git a/twistter-frontend/src/Register.js b/twistter-frontend/src/Register.js
index de94663..a04dde4 100644
--- a/twistter-frontend/src/Register.js
+++ b/twistter-frontend/src/Register.js
@@ -2,6 +2,9 @@ import React, { Component } from 'react';
import './App.css';
import logo from './twistter-logo.png';
+import TextField from '@material-ui/core/TextField';
+
+//import axios from 'axios';
class Register extends Component {
render() {
@@ -11,13 +14,13 @@ class Register extends Component {
Create your account
-
+
-
+
-
+
-
+
diff --git a/twistter-frontend/src/index.css b/twistter-frontend/src/index.css
deleted file mode 100644
index b4cc725..0000000
--- a/twistter-frontend/src/index.css
+++ /dev/null
@@ -1,5 +0,0 @@
-body {
- margin: 0;
- padding: 0;
- font-family: sans-serif;
-}
diff --git a/twistter-frontend/src/index.js b/twistter-frontend/src/index.js
index b79978e..5b9a1ed 100644
--- a/twistter-frontend/src/index.js
+++ b/twistter-frontend/src/index.js
@@ -1,7 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
-import './index.css';
ReactDOM.render(
,