Skip to content

Solution: Alvaro Merino and Miguel Perez #3

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 56 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b1ef144
first commit
alvaromergar May 19, 2021
b1728de
first commit
MiguelPerezMartinez May 19, 2021
32cb9f4
second changes
MiguelPerezMartinez May 19, 2021
2e13b0f
structure
MiguelPerezMartinez May 19, 2021
7d16980
structure
MiguelPerezMartinez May 19, 2021
b3c0162
structure made
alvaromergar May 19, 2021
b289424
'header
MiguelPerezMartinez May 19, 2021
65db268
construc list
alvaromergar May 19, 2021
fd00587
some changes
MiguelPerezMartinez May 19, 2021
374aa45
first merge
MiguelPerezMartinez May 19, 2021
1f595da
more changes
MiguelPerezMartinez May 19, 2021
8c78d3b
Delete src/components directory
MiguelPerezMartinez May 19, 2021
857de2a
input delete
MiguelPerezMartinez May 19, 2021
40e15e8
Merge branch 'test' into main
MiguelPerezMartinez May 19, 2021
7fb9a3a
change folder names
MiguelPerezMartinez May 19, 2021
1cd4c5f
redo
MiguelPerezMartinez May 19, 2021
3dffdc1
app class and local storage
MiguelPerezMartinez May 19, 2021
1d0dd18
completed icons
alvaromergar May 20, 2021
eafbd5c
prueba camelcase
alvaromergar May 20, 2021
1f85258
case sensitive
MiguelPerezMartinez May 20, 2021
a9b8c5c
Merge branch 'styleIcons' of https://github.com/MiguelPerezMartinez/r…
MiguelPerezMartinez May 20, 2021
5427a90
pull
MiguelPerezMartinez May 20, 2021
6307cc9
more changes
MiguelPerezMartinez May 20, 2021
f9498de
mergin styleIcons
MiguelPerezMartinez May 20, 2021
f16c236
todos const to todolist
MiguelPerezMartinez May 20, 2021
73b0fa9
todos to todolist
MiguelPerezMartinez May 20, 2021
6856e6f
new todo and router links started
MiguelPerezMartinez May 20, 2021
09cebc1
container list todo
alvaromergar May 20, 2021
64aea0b
main router structure
MiguelPerezMartinez May 20, 2021
787efca
merge
MiguelPerezMartinez May 20, 2021
ca19841
MERGE
MiguelPerezMartinez May 20, 2021
b41e7a3
npm
MiguelPerezMartinez May 20, 2021
0e1ad7a
newtodo and todolist done
MiguelPerezMartinez May 20, 2021
b8e7890
start
alvaromergar May 20, 2021
0612a71
footer ready. Todo left, links, clearComponents
MiguelPerezMartinez May 20, 2021
034d7c2
ok
alvaromergar May 20, 2021
0c354c6
pull
alvaromergar May 20, 2021
ca96e5d
footer progress
alvaromergar May 21, 2021
c64e33f
some changes
MiguelPerezMartinez May 21, 2021
50bc270
Merge branch 'develop' of https://github.com/MiguelPerezMartinez/reac…
MiguelPerezMartinez May 21, 2021
6cd1f62
finish delet onu list and no exit list
alvaromergar May 21, 2021
042cbe6
Edit todos and fix small bugs
MiguelPerezMartinez May 21, 2021
2469ebf
errors
alvaromergar May 21, 2021
6c135d0
merge
MiguelPerezMartinez May 23, 2021
2bf1a98
newtodo input and todo input fixed and hashtag display flex fixed
MiguelPerezMartinez May 23, 2021
99bc8f7
some changes
MiguelPerezMartinez May 24, 2021
3a96bab
class and edit css finish
alvaromergar May 24, 2021
e511e73
modification merge
MiguelPerezMartinez May 24, 2021
a65daf1
24/05/21 merge
MiguelPerezMartinez May 24, 2021
0420504
some changes
MiguelPerezMartinez May 24, 2021
eca7b62
Merge branch 'hashtag' into develop
MiguelPerezMartinez May 24, 2021
3461de2
hashtag working, some style changes
MiguelPerezMartinez May 24, 2021
887faff
develop update
alvaromergar May 24, 2021
1988c76
dark mode and las changes
MiguelPerezMartinez May 24, 2021
766a973
Merge branch 'develop' of https://github.com/MiguelPerezMartinez/reac…
MiguelPerezMartinez May 24, 2021
194a726
last changes
MiguelPerezMartinez May 24, 2021
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
7 changes: 6 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ module.exports = {
},
],
rules: {
"prettier/prettier": "error",
"prettier/prettier": [
"error",
{
endOfLine: "auto",
},
],
"react/jsx-filename-extension": "off",
"import/prefer-default-export": "off",
"prefer-destructuring": "off",
Expand Down
113 changes: 111 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@
"private": true,
"main": "src/index.js",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-regular-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.6",
"@testing-library/user-event": "^13.1.5",
"bootstrap": "^4.6.0",
"formik": "^2.2.7",
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand All @@ -25,7 +31,9 @@
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
"sass": "^1.32.11",
"web-vitals": "^1.1.1"
"uuid": "^8.3.2",
"web-vitals": "^1.1.1",
"yup": "^0.32.9"
},
"devDependencies": {
"@babel/core": "^7.13.16",
Expand Down
Loading