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

Tigers - Masha, Neema, Thao, and Yael #24

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
7932d22
Initial app setup
mariia-iureva Dec 23, 2022
1f5a6bc
Initializes basic component files
yaelso Jan 17, 2023
37d42b4
Implements first two container elements in App as well as basic heade…
yaelso Jan 18, 2023
7548474
Adjust JSX container hierarchy
yaelso Jan 18, 2023
0cc804e
Applies basic styling to components for first phase of frontend imple…
yaelso Jan 18, 2023
e50ea15
Applies basic positioning of top level components in App and initiali…
yaelso Jan 18, 2023
c2f4abb
Roughly positions all necessary components in App
yaelso Jan 18, 2023
bb39623
Added NewBoardForm and new board form handler in the app.js
mariia-iureva Jan 18, 2023
70ac0fc
Applies basic styling to App with color-coded sections for first phas…
yaelso Jan 18, 2023
814baa4
Imports axios in App
yaelso Jan 18, 2023
1e69c91
Commits rough draft of App for standup discussion-- needs revision
yaelso Jan 18, 2023
94b3c0d
Commits rough draft of Board and CardList for standup discussion-- ne…
yaelso Jan 18, 2023
07a8b05
Final rough draft before 1/18 standup
yaelso Jan 18, 2023
96ddd67
Merge pull request #1 from mariia-iureva/Masha
n2020h Jan 18, 2023
89241de
Adjusts getAllBoards call
yaelso Jan 18, 2023
6f1eeb6
boardlist component finished
thaocodes Jan 18, 2023
8954ce3
Resolves merge conflict
yaelso Jan 18, 2023
6b0a9a9
Merge pull request #2 from mariia-iureva/Yael
n2020h Jan 18, 2023
c3af46a
Merge pull request #3 from mariia-iureva/thao
n2020h Jan 18, 2023
d2c0066
Merges Neema's Card component
yaelso Jan 18, 2023
dc40099
Merges Neema's NewCardForm component
yaelso Jan 18, 2023
0b0b1a4
Implements getAllCards function in App
yaelso Jan 18, 2023
e77699b
Adjusts state naming conventions in App
yaelso Jan 18, 2023
7ce40ea
Merge pull request #4 from mariia-iureva/Yael
yaelso Jan 18, 2023
4122e49
Implements minor style changes to aid in local development
yaelso Jan 18, 2023
04e3dd2
Incorporates Thao's selectBoard logic and extends it via useMemo hook
yaelso Jan 19, 2023
48d6042
Completed card component and likeCard and deleteCard functions in the…
mariia-iureva Jan 19, 2023
3010e7d
Fixes typo
yaelso Jan 19, 2023
a5942b0
Merge pull request #5 from mariia-iureva/Masha
yaelso Jan 19, 2023
156d789
Finializes selectBoard integration and App selectedBoardObj title view
yaelso Jan 19, 2023
e2f825e
Adjusts naming conventions to receive board_id from backend-- transfo…
yaelso Jan 19, 2023
64bf0d1
Merges Masha's PR
yaelso Jan 19, 2023
3a7f0f4
Merge pull request #6 from mariia-iureva/Yael
yaelso Jan 19, 2023
acb60dd
Adds rough selection styling to BoardList and appends owner to App Se…
yaelso Jan 19, 2023
d614684
Unifies naming conventions across Card related components and submits…
yaelso Jan 19, 2023
6d66dde
Merge pull request #8 from mariia-iureva/Yael
yaelso Jan 19, 2023
255f602
Integrates Neema's NewCardForm component
yaelso Jan 19, 2023
75e44ae
Commits for discussion around getAllCards
yaelso Jan 19, 2023
8f5bc23
Fixed cards rendering part
mariia-iureva Jan 19, 2023
fae3cd3
adding addCard function to App
mariia-iureva Jan 19, 2023
2eabc1b
Merge pull request #10 from mariia-iureva/Masha
mariia-iureva Jan 19, 2023
5689c60
Fixed adding new card
mariia-iureva Jan 19, 2023
a6bde2e
Merges Masha's fix for getAllCards
yaelso Jan 19, 2023
cb4a85a
Begins progress on NewCardForm modifications
yaelso Jan 19, 2023
ec1041b
Removes unnecessary import
yaelso Jan 19, 2023
f273d57
Implements Board component visiblity toggle
yaelso Jan 19, 2023
15214f1
Merge pull request #11 from mariia-iureva/Yael
yaelso Jan 19, 2023
3798caf
Fixes logical error in Board visibility toggle
yaelso Jan 19, 2023
3dc017c
Merge pull request #12 from mariia-iureva/Yael
yaelso Jan 19, 2023
33ed2e4
Adjusts function reference for NewCardForm
yaelso Jan 20, 2023
e1dade4
Clears cardsData state on board selection and adjusts container divis…
yaelso Jan 20, 2023
85c994c
Adjusts key conventions for CardList Card component key
yaelso Jan 20, 2023
db96278
Changes Selected Board statement and applies box shadow to Card
yaelso Jan 20, 2023
4b369f3
Implements more basic styling across components
yaelso Jan 20, 2023
7397a5f
Another round of styling additions
yaelso Jan 20, 2023
3cedfe0
Adjusts hide button padding
yaelso Jan 20, 2023
7dd945b
added Procfile for deployment
thaocodes Jan 20, 2023
cd20857
procfile deleted
thaocodes Jan 20, 2023
1cc08c9
Hooks up delete card logic
yaelso Jan 20, 2023
6a1eb79
Merge branch 'main' into Yael
yaelso Jan 20, 2023
25c36ce
Procfile
mariia-iureva Jan 20, 2023
4a87c44
modified Procfile
mariia-iureva Jan 20, 2023
d3c2e2d
experimenting, deleted Procfile
mariia-iureva Jan 20, 2023
3f8b254
removed package-lock.json
mariia-iureva Jan 20, 2023
146b70c
Minor adjustments to some styling
yaelso Jan 20, 2023
3f16ae5
Reorganizes App
yaelso Jan 20, 2023
f83e5e2
Merge pull request #13 from mariia-iureva/Yael
yaelso Jan 20, 2023
15dbc31
Merge branch 'main' into Yael
yaelso Jan 20, 2023
8733c99
changed env variable to the back-end link
mariia-iureva Jan 20, 2023
51b4e16
merge commit
mariia-iureva Jan 20, 2023
a7d5ec1
changed the links
mariia-iureva Jan 20, 2023
1192467
merge commit
mariia-iureva Jan 20, 2023
b15f81f
merge commit
mariia-iureva Jan 20, 2023
9dfc870
merge changes
mariia-iureva Jan 20, 2023
ac166dd
Begins to condense styling
yaelso Jan 20, 2023
d6bdcd3
Commits final style changes for the night
yaelso Jan 20, 2023
69894c7
fixed likes and delete
mariia-iureva Jan 20, 2023
e06f799
Merge pull request #14 from mariia-iureva/Masha
mariia-iureva Jan 20, 2023
e8b6a48
Updated Yarn lockfile
mariia-iureva Jan 20, 2023
fc94cac
Merges Masha's changes
yaelso Jan 20, 2023
5e48f55
Merge pull request #15 from mariia-iureva/Yael
yaelso Jan 20, 2023
7e91bda
Merge branch 'main' of https://github.com/mariia-iureva/front-end-ins…
mariia-iureva Jan 20, 2023
726c477
Adding sorting
mariia-iureva Jan 20, 2023
b61ae0e
merge commit
mariia-iureva Jan 20, 2023
b314f35
Merge pull request #16 from mariia-iureva/Masha
yaelso Jan 20, 2023
881530a
Another round of styling
yaelso Jan 20, 2023
57a6e87
Merge branch 'main' into Yael
yaelso Jan 20, 2023
0cf1cae
More styling
yaelso Jan 20, 2023
994743d
Final styles
yaelso Jan 20, 2023
4d12aef
Merge pull request #17 from mariia-iureva/Yael
mariia-iureva Jan 20, 2023
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:

### `npm 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.

### `npm 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.

### `npm run 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.

### `npm run 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)

### `npm run 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.16.5",
"@testing-library/react": "13.4.0",
"@testing-library/user-event": "14.4.3",
"axios": "1.2.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-scripts": "5.0.1",
"web-vitals": "3.1.1"
},
"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:
10 changes: 10 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
certifi==2022.9.24
charset-normalizer==2.1.1
distlib==0.3.6
filelock==3.8.0
gunicorn==20.1.0
idna==3.4
platformdirs==2.5.2
requests==2.28.1
urllib3==1.26.12
virtualenv==20.16.5
110 changes: 110 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Nunito&display=swap');


body {
color: #454545;
margin: 1rem;
background-color: rgb(233, 230, 225);
font-family: 'Nunito', sans-serif;
}

.page__container {
display: flex;
flex-direction: column;
min-height: 100vh;
}

.content__container {
flex: 1 0 auto;
}

.App-header {
display: flex;
}

h1, h2 {
display: inline-block;
align-items: center;
font-family: 'Roboto';
text-transform: uppercase;
letter-spacing: .1em;
}

h1:hover, h2:hover {
color: #00aa95;
transition: 0.3s all ease-in-out;
}

#hide-btn, .like_button, .delete_button {
background-color: #fff;
padding: .5em;
margin-top: 1em;
margin-bottom: 1em;
}

#hide-btn {
border: 2px solid #000;
}

.boards__container {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
}

footer {
text-align: center;
}

.new-board-form__container, .new-card-form__container {
align-items: flex-start;
display: flex;
flex-direction: column;
}

.new-board-form__form, .new-card-form__form {
display: flex;
flex-direction: column;
margin-bottom: 2em;
width: 100%;
}

input {
box-sizing: initial;
border: 0;
border-radius: 5px;
}

select, input {
padding: .4em;
}

select {
width: 25%;
}

.new-board-form__submit, .new-card-form__submit {
background-color: #fff;
border: 2px solid #000;
padding: .5em;
margin-top: 1em;
}

button:hover, li:hover, #hide-btn:hover {
cursor: pointer;
background-color: lightgrey;
transition: 0.3s all ease-in-out;
color: #555;
box-shadow: rgba(45, 35, 66, 0.4) 0 4px 8px, rgba(45, 35, 66, 0.1) 0 7px 13px -3px;
transform: translateY(-2px);
}

button:active {
box-shadow: #D6D6E7 0 3px 7px inset;
transform: translateY(2px);
}

label {
padding-top: 1em;
padding-bottom: .5em;
}
Loading