Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rhiannon stanford #815

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ Topics:

#### Initialize Project

* Run `npm install` inside the root directory of this project to install dependencies for the API server.
* Run `npm start` to start the API server.
[x] Run `npm install` inside the root directory of this project to install dependencies for the API server.
[x] Run `npm start` to start the API server.
* Run `npx create-react-app friends --use-npm` in a separate terminal window in the root directory of the project to create your starter application.
* If you experience issues with `npx`, you may create your starter application by running `create-react-app friends --use-npm`.
* `cd` into the _friends_ folder and type `npm install axios react-router-dom` which will install the needed dependencies.
[x] If you experience issues with `npx`, you may create your starter application by running `create-react-app friends --use-npm`.
[x] `cd` into the _friends_ folder and type `npm install axios react-router-dom` which will install the needed dependencies.

### Task 2: MVP

Expand Down
23 changes: 23 additions & 0 deletions friends/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
16,895 changes: 16,895 additions & 0 deletions friends/package-lock.json

Large diffs are not rendered by default.

42 changes: 42 additions & 0 deletions friends/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"name": "friends",
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.5",
"@testing-library/user-event": "^12.8.3",
"axios": "^0.21.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"web-vitals": "^1.1.0"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
Binary file added friends/public/favicon.ico
Binary file not shown.
44 changes: 44 additions & 0 deletions friends/public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
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`.
-->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" />
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
Binary file added friends/public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added friends/public/logo512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions friends/public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 3 additions & 0 deletions friends/public/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
64 changes: 64 additions & 0 deletions friends/src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
.App {
text-align: center;
box-sizing: border-box;
}

.app-background-container {
background-image: url("./assets/john-fowler-RsRTIofe0HE-unsplash.jpg");
/* background-attachment: fixed; */
background-position: center;
background-repeat: no-repeat;
background-size: cover;
height: 100vh;
}

.login-container {
display: flex;
height: 40vh;
justify-content: center;
align-items: flex-end;
}

.addfriend-container {
display: flex;
height: 40vh;
justify-content: center;
align-items: flex-end;
}

.friendList-container {
padding: 3rem;
display: flex;
flex-flow: row wrap;
justify-content: space-around;
}

.friend-card-container {
margin: 1rem;
}



.App-header {

min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}

.App-link {
color: #61dafb;
}

@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
30 changes: 30 additions & 0 deletions friends/src/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

import './App.css';
import { Route, Link, Switch } from 'react-router-dom';

import PrivateRoute from "./components/PrivateRoute.js";
import Login from "./components/Login";
import Header from "./components/Header";
import FriendList from "./components/FriendList";
import AddFriend from "./components/AddFriend";


function App() {
return (
<div className="App">
<Header />
<div className="app-background-container">

<Switch>
<PrivateRoute exact path="/protected" component={FriendList} />
<Route path="/login" component={Login} />
<Route path="/addfriend" component={AddFriend} />
<Route exact path="/"/>
</Switch>

</div>
</div>
);
}

export default App;
8 changes: 8 additions & 0 deletions friends/src/App.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { render, screen } from '@testing-library/react';
import App from './App';

test('renders learn react link', () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
114 changes: 114 additions & 0 deletions friends/src/components/AddFriend.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
import React, { useState } from 'react';
import '../App.css';
import { makeStyles } from '@material-ui/core/styles';
import { TextField, Button } from '@material-ui/core/';

import axios from "axios";
import { useHistory } from "react-router-dom";
import { axiosWithAuth } from "../utils/axiosWithAuth";



const useStyles = makeStyles((theme) => ({
root: {
'& > *': {
margin: theme.spacing(1),
width: '25ch',
background: 'white',
opacity: ".6",
borderRadius: 3,
},
},
button: {
background: 'linear-gradient(45deg, #FE6B8B 30%, #FF8E53 90%)',
// border: 0,
borderRadius: 3,
boxShadow: '0 3px 5px 2px rgba(255, 105, 135, .3)',
color: 'white',
height: 56,
padding: '0 30px',
}
}));


const initialNewFriendValue = {
name: "",
age: "",
email: "",
}

const AddFriend = () => {
const classes = useStyles();

const [newFriend, setNewFriend] = useState(initialNewFriendValue);

const history = useHistory();

const handleChange = e => {
const userNewFriendInfo = {...newFriend, [e.target.name]: e.target.value}
setNewFriend(userNewFriendInfo);
};

const addNewFriend = (props) => {
console.log("addNewFriend fired")
console.log("newFriend: ", newFriend)
// console.log("props", props)
axiosWithAuth().post("/friends", newFriend)
.then(res => {
console.log(res);
// redirect to logged in homepage
history.push("/protected");
})
.catch(err => console.log(err));
}

const handleSubmit = (e) => {
console.log("handleSubmit fired")
e.preventDefault();
addNewFriend(newFriend);
};

return (
<div className="addfriend-container">

<form className={classes.root} onSubmit={handleSubmit}>
<TextField
id="name"
label="Name"
variant="filled"
name="name"
value={newFriend.name}
onChange={handleChange}
/>
<TextField
id="age"
label="Age"
variant="filled"
name="age"
value={newFriend.age}
onChange={handleChange}
/>
<TextField
id="email"
label="Email"
variant="filled"
name="email"
value={newFriend.email}
onChange={handleChange}
/>
<Button
variant="contained"
className={classes.button}
size="large"
type="submit"
>
Add Friend
</Button>
</form>

</div>
)
};

export default AddFriend;

Loading