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

Otters - Nikki, Ada, Amel, Roshni #23

Open
wants to merge 43 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f3711ae
Yarn create react app
roshni-patel Jun 27, 2022
0a23e1c
component files created
nikkitorab Jun 28, 2022
8a23118
Board component updated
nikkitorab Jun 28, 2022
75ad634
create NewBoardForm component
amelntamark Jun 28, 2022
756a11e
Card, CardList, and NewCardForm components added
nikkitorab Jun 29, 2022
8ce8056
change variable names in app and add proptypes to NewBoardForm
amelntamark Jun 29, 2022
12c74ca
add props to BoardList
amelntamark Jun 29, 2022
6265b8d
added boardID to CardList
nikkitorab Jun 29, 2022
d53b450
fixed errors
nikkitorab Jun 29, 2022
284b27a
All team members connected to API to get board data and render it
adabarries Jun 30, 2022
43c4a34
Ada added CSS styles. Nikki, Roshni, and Amel worked on adding event …
adabarries Jun 30, 2022
36a1cf3
added some CSS stuff. scrolly boxes yay
adabarries Jun 30, 2022
5d73f8b
Worked together to resolve on select board issue
amelntamark Jul 1, 2022
00ced6a
added getmade API call to get card from selected board.
amelntamark Jul 1, 2022
cc1218c
added functionality to display selectedBoard's cards and newCardForm …
nikkitorab Jul 1, 2022
bcb165d
add button to toggle board visibility that changes state in NewBoardF…
amelntamark Jul 18, 2022
b809dec
Roshni and Nikki worked on NewCardForm
nikkitorab Jul 18, 2022
3e0b745
Merge branch 'main' of https://github.com/roshni-patel/front-end-insp…
nikkitorab Jul 18, 2022
b6eefe4
uncomment return statement in NewBoardForm
amelntamark Jul 18, 2022
3ae8b93
toggle display of NewBoardForm when form is hidden or displayed
amelntamark Jul 18, 2022
32847f2
fixed makeNewCard, adds new card to database and displays it on the s…
nikkitorab Jul 18, 2022
ff6810f
get rid of obsolete commented lines of code
amelntamark Jul 19, 2022
7800154
Add error message for creating card without a message
roshni-patel Jul 19, 2022
5b22ee5
Add error message for creating new board without title and owner
roshni-patel Jul 19, 2022
bb74172
defined like function for cards but it is currently undefined in the …
amelntamark Jul 19, 2022
1f89be4
added delete card functionality
nikkitorab Jul 19, 2022
5fa50bc
Merge branch 'main' of https://github.com/roshni-patel/front-end-insp…
nikkitorab Jul 19, 2022
2d5096e
fix like function being undefined
amelntamark Jul 19, 2022
a1edc55
Remove merge conflict markers from App
roshni-patel Jul 19, 2022
0d0fd43
move addLikeToCard function to Card component file
amelntamark Jul 19, 2022
d5b2ba0
Add back in heroku deployed url for make new board
roshni-patel Jul 19, 2022
b8e1f24
fix merge conflict with main
amelntamark Jul 19, 2022
aef6b31
Added functionality to delete a board
roshni-patel Jul 19, 2022
6c901c8
pass add like function as a callback function and get it working
amelntamark Jul 19, 2022
70fbdf7
display likes count on each card
amelntamark Jul 19, 2022
924545e
merge add_likes branch into main
amelntamark Jul 19, 2022
3e41273
fixed deleteCardFromBoard to delete card without delaty
nikkitorab Jul 19, 2022
9a005c5
card form message returns to default after sub
nikkitorab Jul 19, 2022
cc4da7b
Start working on sorting feature
roshni-patel Jul 20, 2022
31713cf
messed with css.
adabarries Jul 20, 2022
26bd0b2
Fix new board form not clearing after submission
roshni-patel Jul 20, 2022
ca409ba
deleted extra comments
nikkitorab Jul 20, 2022
c9632d5
changed button styling
nikkitorab Jul 20, 2022
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
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,26 @@ yarn-error.log*
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# 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*
71 changes: 68 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,70 @@
# Inspiration Board: Front-end Layer
# Getting Started with Create React App

This scaffold only includes a `.gitignore` file.
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

To get started, follow the setup directions described in the project.
## Available Scripts

In the project directory, you can run:

### `yarn start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.

The page will reload when you make changes.\
You may also see any lint errors in the console.

### `yarn test`

Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.

### `yarn build`

Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.

### `yarn eject`

**Note: this is a one-way operation. Once you `eject`, you can't go back!**

If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.

You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.

## Learn More

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).

### Code Splitting

This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)

### Analyzing the Bundle Size

This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)

### Making a Progressive Web App

This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)

### Advanced Configuration

This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)

### Deployment

This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)

### `yarn build` fails to minify

This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
5 changes: 5 additions & 0 deletions README.old.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Inspiration Board: Front-end Layer

This scaffold only includes a `.gitignore` file.

To get started, follow the setup directions described in the project.
39 changes: 39 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "front-end-inspiration-board",
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^13.0.0",
"@testing-library/user-event": "^13.2.1",
"axios": "^0.27.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.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 public/favicon.ico
Binary file not shown.
43 changes: 43 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!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`.
-->
<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 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 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 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 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:
160 changes: 160 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
/*
Palette:
Spring Green - #6eb247
Pistachio - #8FC672
Celadon - #B6E2B6
Light Cyan - #E0FFFB
Cotton Candy - #FBCBEA
Yellow Crayola - #FFF192
Yellow Orange - #f89822
*/

* {
font-family: Optima,Segoe,Segoe UI,Candara,Calibri,Arial,sans-serif;

}

.App {
display: grid;
grid-template-columns: 2fr 3fr;
grid-template-rows: 0.3fr 4fr 0.3fr;
gap: 20px 26px;
grid-auto-flow: row;
grid-template-areas:
"header header"
"boards card-box"
"footer footer";
background-color: #fff9e0;
background-image: url("https://i.imgur.com/rE03ofO.png");
background-repeat: repeat;
color: #294817;
/*
tiled image from https://transparenttextures.com/
*/
}




button.green-button {
margin: 2px;
padding: 5px;
border-color: #8FC672;
border-radius: 0.5rem;
color: #294817;
background-color: #B6E2B6;
font-weight: bold;
}

button.delete
{
margin: 2px;
padding: 5px;
border-color: #d5a0fd;
border-radius: 0.5rem;
color: #cb70ff;
background-color: #f3dcff;
font-weight: bold;
}

.header {
grid-area: header;
justify-self: center;
border: #8FC672 3px solid;
border-radius: 0.5rem;
color: #294817;
background-color: #B6E2B6;
font-weight: bold;
margin: auto;
padding: 20px;
}

.card-box {
display: grid;
grid-template-columns: 1fr;
grid-template-rows: 0.5fr 5.5fr;
gap: 8px 0px;
grid-template-areas:
"."
"card-list";
grid-area: card-box;
}

.card-box-header {
border: #8FC672 3px solid;
border-radius: 0.5rem;
background-color: #B6E2B6;
text-align: center;
align-self: center;
padding: 5px;
margin: auto;
}
.card-list-header {
text-align: center;
}

.card-list {
display: flex;
flex-wrap: wrap;
gap: 20px;
}

.card {
border: 3px solid #f89822;
margin: 1rem;
border-radius: 0.5rem;
min-height: 150px;
min-width: 150px;
padding: 2rem;
color: #f89822;
background-color: #FFF192;
box-shadow: 12px 6px 10px #eca2d4
}

.boards {
display: grid;
grid-template-columns: 1fr;
grid-template-rows: 0.4fr 0.8fr 3.7fr;
gap: 8px 0px;
grid-template-areas:
"selected-board"
"board-list"
"board-forms";
justify-items: stretch;
grid-area: boards;
}

.selected-board {
grid-area: selected-board;
}

.board-list {
grid-area: board-list;
height: 10em;
overflow-y: scroll;
background-color: #FFF192;
border: 3px #f89822 solid;
border-radius: 0.5rem;
}

.board-forms {
grid-area: board-forms;
align-self: stretch;
padding: 5px;
}

.board-forms h1 {
border: #8FC672 3px solid;
border-radius: 0.5rem;
background-color: #B6E2B6;
padding: 5px;
text-align: center;
}

.footer {
grid-area: footer;
}

p {
color: black;
}
Loading