Skip to content

new merge #221

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

Open
wants to merge 70 commits into
base: 2018
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
99fd443
remove 01 since you start in the catch-of-the-day folder
wesbos Feb 28, 2018
e7dd95f
revert to npm start
wesbos Feb 28, 2018
844a813
revert to npm start
wesbos Feb 28, 2018
6469b54
updated firebase to 4.10.1
ostgals Mar 3, 2018
378c3e4
Add parseFloat to handleChange in EditFish
Steve-Reid Mar 5, 2018
5054105
Fixed small typo
Mar 5, 2018
6be106f
Cleaned up language in the To Start section
chowdhurian Mar 6, 2018
6e674a1
Merge pull request #70 from chowdhurian/patch-1
wesbos Mar 12, 2018
e9eda1c
Merge pull request #69 from heypaulmcgrath/patch-1
wesbos Mar 12, 2018
0a23d2f
Merge pull request #67 from ostgals/master
wesbos Mar 12, 2018
7d8a18b
fix grammatical error in Pacific Halibut description
Mar 22, 2018
0e6c774
Updated package versions to fix npm audit identified vulnerabilities
benwis May 28, 2018
d5d32ea
Second round of npm audit and npm install
benwis May 28, 2018
2b94782
Merge pull request #79 from benwis/master
wesbos Jun 1, 2018
2303f82
add notes about node 10.3
wesbos Jun 1, 2018
0e2f7b9
Update StorePicker.js
aadeshere1 Jul 1, 2018
105bfa2
add Firebase warning FAQ
Jul 29, 2018
3e6acb2
Change "current.value" to use new ref syntax
mattfwood Aug 22, 2018
e3221a4
Merge pull request #87 from mattfwood/patch-1
wesbos Aug 22, 2018
aeee123
change all instances of "value.value"
mattfwood Aug 22, 2018
d0c2d13
Merge pull request #88 from mattfwood/patch-1
wesbos Aug 22, 2018
12c341f
Add FAQ about the login feature after deploying
Putnam14 Oct 14, 2018
33a2a38
added some missing prop-types
sxnaprkhr Nov 4, 2018
e67994b
Merge pull request #85 from skullface/firebase-warning-faq
wesbos Dec 17, 2018
a33a293
update deps which solves issues with newer versions of node
wesbos Dec 17, 2018
317737d
Merge pull request #92 from sxnaprkhr/master
wesbos Dec 17, 2018
81e4056
merge in readme
wesbos Dec 17, 2018
1b025ec
Merge branch 'master' of github.com:wesbos/React-For-Beginners-Starte…
wesbos Dec 17, 2018
c3e6895
Merge pull request #81 from aadeshere1/patch-1
wesbos Dec 17, 2018
9e24d76
Upgrade react and react-scripts
wesbos Dec 17, 2018
7390f51
Merge branch 'master' of github.com:wesbos/React-For-Beginners-Starte…
wesbos Dec 17, 2018
6f8e16a
Merge pull request #73 from paulschreiber/master
wesbos Dec 17, 2018
a165f16
Merge pull request #68 from Steve-Reid/pr/updateFish
wesbos Dec 17, 2018
435b5b5
Update styles:watch command to use -- to prevent duplication
skeltonm Jan 3, 2019
6df144c
revert start command
wesbos Jan 4, 2019
cec064e
Update readme.md
wesbos Jan 4, 2019
f112b5b
Merge branch 'master' of github.com:wesbos/React-For-Beginners-Starte…
wesbos Jan 4, 2019
abfe0c0
Add build folder to gitignore
Feb 2, 2019
ff2d525
Add now.json file and a now-build script to package.json
Feb 2, 2019
ca5802e
Update Finished App for Now
Feb 2, 2019
792f3e4
Updated ReadMe note within To Start section to cover Xcode dependency…
damsalem Feb 7, 2019
a66ce97
Merge pull request #101 from damsalem/Updated-ReadMe
wesbos Feb 7, 2019
09abf1f
Merge pull request #99 from markypython/master
wesbos Feb 8, 2019
b5b4ea4
Removing incompatible browerslist flag
skladany Feb 20, 2019
3361d42
Merge pull request #102 from skladany/master
wesbos Feb 20, 2019
0c3da85
Merge branch 'master' into feature/update-now-config
wesbos Mar 26, 2019
23b054f
Merge pull request #100 from RonanC/feature/update-now-config
wesbos Mar 26, 2019
efa81ee
Styling for total in order col
domgaulton Apr 5, 2019
1f865e4
Update readme.md
wesbos Apr 11, 2019
2609d8e
Add sans-serif fallback to button and input styles
jtylermurphy May 9, 2019
1c3a10f
Updated style for total price
Aug 8, 2019
38956e2
compiled css updated throughout
Aug 8, 2019
3dab11e
complied css
Aug 8, 2019
ea554fe
Upgrade firebase to work with latest node
wesbos Dec 16, 2019
169dbef
Upgrade to React scripts 3
wesbos Dec 16, 2019
1014b8c
Merge pull request #112 from jtylermurphy/patch-1
wesbos Dec 16, 2019
769df66
Upgrades
wesbos Dec 16, 2019
689b5ec
Merge pull request #105 from domgaulton/price-total-update
wesbos Dec 16, 2019
48c6ec5
Update react-scripts to `3.4.1`
Asjas Apr 7, 2020
9d9b0d8
Merge pull request #131 from Asjas/update-react-scripts
wesbos Apr 30, 2020
25307e5
Add missing propTypes property (deleteFish)
patternina Feb 2, 2021
24328c7
Merge pull request #154 from spaceinvadev/patch-1
wesbos Feb 2, 2021
fd444e5
add missing images route for vercel deployments
Asjas Nov 19, 2021
3b3b361
remove empty lock-file in root directory
Asjas Nov 23, 2021
a594076
update starter npm packages and lock-file
Asjas Nov 23, 2021
fe85b50
update finished app npm packages and lock-file
Asjas Nov 23, 2021
843e889
Merge pull request #182 from Asjas/update-npm-packages
wesbos Nov 23, 2021
651924a
create npmrc file
Asjas Jan 7, 2022
5a67f81
Merge pull request #180 from Asjas/add-missing-image-route
wesbos Jan 7, 2022
26dde5d
Merge pull request #183 from Asjas/create-npmrc-file
wesbos 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules/
*.zip
.DS_Store
.idea
notes.md
notes.md
catch-of-the-day/build/
3 changes: 3 additions & 0 deletions catch-of-the-day/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fund=false
audit=false
legacy-peer-deps=true
19 changes: 19 additions & 0 deletions catch-of-the-day/now.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": 2,
"name": "cotd",
"builds": [{ "src": "package.json", "use": "@now/static-build" }],
"routes": [
{ "src": "^/static/(.*)", "dest": "/static/$1" },
{ "src": "^/images/(.*)", "dest": "/images/$1" },
{ "src": "^/favicon.ico", "dest": "/favicon.ico" },
{ "src": "^/asset-manifest.json", "dest": "/asset-manifest.json" },
{ "src": "^/manifest.json", "dest": "/manifest.json" },
{
"src": "^/service-worker.js",
"headers": { "cache-control": "s-maxage=0" },
"dest": "/service-worker.js"
},
{ "src": "^/precache-manifest.(.*)", "dest": "/precache-manifest.$1" },
{ "src": "^/(.*)", "dest": "/index.html" }
]
}
Loading