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

Kaitlyn, Rebecca, Emily, Angela - Spruce #17

Open
wants to merge 61 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
f954121
Initialize project using Create React App
rzuick Dec 17, 2021
712d8e9
created base react app and env files
rzuick Dec 17, 2021
c815b47
updated gitignore
rzuick Dec 17, 2021
6b15283
deleted .env
rzuick Dec 20, 2021
29504e4
created components folder with components and their css files
rzuick Dec 22, 2021
eb7f4c4
added more component files
rzuick Dec 22, 2021
d9c17b3
updated components folder
rzuick Dec 22, 2021
82ec8f2
created Board function to display initial board and submit button to …
rzuick Dec 22, 2021
45425b6
working on cards
fan-gela Dec 22, 2021
d965348
fixed merge conflicts
fan-gela Dec 22, 2021
520daea
worked on more board components
rzuick Dec 23, 2021
6539276
fixed merge conflict
rzuick Dec 23, 2021
bbed29a
added new imports
rzuick Dec 23, 2021
babb0ce
updated card files
fan-gela Dec 23, 2021
be2ee4c
fixed merge conflicts
fan-gela Dec 23, 2021
4440ff3
modified app.js
rzuick Dec 23, 2021
e9fcfa6
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
rzuick Dec 23, 2021
fc8587e
created methods for getting and displaying board
rzuick Dec 23, 2021
54affa7
working on errors
fan-gela Dec 23, 2021
217629a
fixed merge conflicts
fan-gela Dec 23, 2021
1d4ae66
updated newboardform.js
rzuick Dec 23, 2021
9515902
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
rzuick Dec 23, 2021
7f8fd34
staging code to pull
fan-gela Dec 23, 2021
7bcd584
fixed merge conflicts
fan-gela Dec 23, 2021
f58a134
updated board display to display in App.js and not separate file. wor…
rzuick Dec 23, 2021
95fb3cd
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
rzuick Dec 23, 2021
2fa5e1a
staging changes
fan-gela Dec 23, 2021
536073c
fixed merge conflicts
fan-gela Dec 23, 2021
7fcb88e
started modifying styling
rzuick Dec 23, 2021
622ed82
updated app.js and board.js
rzuick Jan 3, 2022
1eb3292
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
rzuick Jan 3, 2022
284f754
before pulling changes
fan-gela Jan 3, 2022
530d35b
handled merge conflicts
fan-gela Jan 3, 2022
a90b10e
fixed merge conflicts
fan-gela Jan 3, 2022
a4da95b
made board selection visible in app.js. working on making card visible
rzuick Jan 3, 2022
8c5a335
started styling with CSS for aesthetic. worked on making card interac…
rzuick Jan 4, 2022
553a5c9
fixed merge conflict
rzuick Jan 4, 2022
27df398
fixed merge conflict
rzuick Jan 4, 2022
879fa7e
updated styling with CSS
rzuick Jan 4, 2022
27751f2
added assets to help with css styling of front-end
rzuick Jan 4, 2022
42b5d7c
minor change to card.js to allow current card message and likes to di…
rzuick Jan 4, 2022
3fd72b0
updated board attribute names for more accurate reference
rzuick Jan 5, 2022
4c2e856
add card form works, board list show up
fan-gela Jan 5, 2022
621af36
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
rzuick Jan 5, 2022
eb236ed
things are working!
fan-gela Jan 5, 2022
d00952a
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
rzuick Jan 5, 2022
2f7daf0
deleted package-lock file
fan-gela Jan 5, 2022
e42c081
updated board component to notify if there is missing information
rzuick Jan 5, 2022
084a7dd
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
rzuick Jan 5, 2022
e680ef1
fixed infinity loop with cards
fan-gela Jan 5, 2022
dcc4a13
Merge branch 'master' of https://github.com/kaitlyngore/front-end-ins…
fan-gela Jan 5, 2022
1d36e2c
fixed merge conflict
fan-gela Jan 5, 2022
21f33af
debugging
fan-gela Jan 6, 2022
1673d8a
boards are working, debugging card form
fan-gela Jan 6, 2022
6c85c7e
board and list are displaying
fan-gela Jan 6, 2022
9052c5b
force redeploy
fan-gela Jan 6, 2022
36cd129
working with alerts
fan-gela Jan 6, 2022
1d22315
changed styling with CSS to be more visually pleasing.
rzuick Jan 6, 2022
be0adaa
allowed for scrolling in display board list and display cards
rzuick Jan 6, 2022
38b7255
meets Ansel's requirements
fan-gela Jan 6, 2022
60e72bf
Merge branch 'testingwithansel'
fan-gela Jan 7, 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
25 changes: 1 addition & 24 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,4 @@

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*
yarn-error.log*
70 changes: 70 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,73 @@
This scaffold only includes a `.gitignore` file.

To get started, follow the setup directions described in the project.
# Getting Started with Create React App

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).

## 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)
1 change: 1 addition & 0 deletions git-it-done-inspiration-board
Submodule git-it-done-inspiration-board added at 25034e
40 changes: 40 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "git-it-done",
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
"axios": "^0.24.0",
"axois": "^0.0.1-security",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "5.0.0",
"web-vitals": "^2.1.2"
},
"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:
Binary file added requirements.txt
Binary file not shown.
111 changes: 111 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
.Board-board {
grid-column-start: 1;
grid-row-start: 2;
width: 300px;
background-image: url('/src/assets/Paper_pushpin.jpg');
background-size:cover;
border-style:groove;
border-color: gold;
border-width: 5px;
box-shadow: 5px 10px rgb(168, 161, 119);
}

.Card-board {
grid-column-start: 1;
grid-row-start: 3;
background-image: url('/src/assets/Wide_paper.jpg');
background-size:cover;
border-style: groove;
border-color: gold;
border-width: 5px;
padding: 5px;
box-shadow: 5px 10px rgb(168, 161, 119);
}

.Board fieldset {
margin: 20px 0;
}

div h3 {
text-align: center;
color:rgb(168, 83, 168);
}

header {
grid-column-start: 1;
grid-column-end: 4;
grid-row-start:1;
height: 100px;
text-align: center;
justify-self: center;
font-family: 'Franklin Gothic Medium';
font-style: italic;
color:rgb(151, 102, 151);
}

.Display-board-list {
grid-column-start: 2;
grid-row-start: 2;
width: 300px;
height: 200px;
overflow-y: scroll;
background-image: url('/src/assets/Paper.jpg');
background-size:contain;
border-style: groove;
border-color: gold;
border-width: 5px;
box-shadow: 5px 10px rgb(168, 161, 119);
align-content: center;
padding: 5px 20px;
margin:auto;
}

.board {
grid-column-start: 2;
grid-row-start: 3;
color:rgb(168, 83, 168);
border-style:groove;
border-color: gold;
border-width: 5px;
box-shadow: 5px 10px rgb(168, 161, 119);
text-align: center;
padding:5px 20px;
}

.App-body {
display: grid;
grid-template-columns: repeat( auto-fit, minmax(250px, 1fr) );
grid-template-rows: repeat(3, minmax(200px, 1fr));
font-family: monospace;
font-style: italic;
font-size: large;
gap:30px;
background-color: rgb(206, 238, 220);
background-image: radial-gradient(rgba(0,0,255,0.05), rgba(0,0,0,0.025) 25px, rgba(0, 0, 0, 0.2) 26px, transparent 26px),
radial-gradient(transparent 25px, rgba(226, 136, 222, 0.4) 25px, rgba(227, 169, 250, 0.4) 26px, transparent 26px),
radial-gradient(transparent 50px, rgba(238, 240, 150, 0.25) 50px, rgba(91, 117, 202, 0.25) 51px, transparent 51px),
radial-gradient(rgba(176,196,222,0.5), rgba(176,196,222,0) 50px),
radial-gradient(transparent 25px, rgba(135,206,250,0.35) 25px, rgba(135,206,250,0.35) 26px, transparent 26px);
background-size: 200px 200px;
background-position: -45px, 0, 20px 50px, 25px 55px, 50px 125px;
}

.Card-display {
grid-column-start: 3;
grid-row-start: 2;
grid-row-end: 4;
border-width: 5px;
box-shadow: 5px 10px rgb(168, 161, 119);
overflow-y: scroll;
border-style: groove;
border-color: gold;
}
.card {
border-style:groove;
border-color: gold;
overflow: scroll;
background-color: rgb(218, 162, 218);
width: 250px;
border-width: 5px;
box-shadow: 5px 10px rgb(168, 161, 119);
}
Loading