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

Avatar #58

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
26f3dd8
merging
Dreallers Dec 18, 2023
3ff1c4b
ok
Dreallers Dec 18, 2023
cd232bd
turbo merging d'apres vacances
Dreallers Jan 4, 2024
e5e1f42
end
Dreallers Jan 4, 2024
e848408
pending...
Ange230700 Jan 4, 2024
315e92a
modal inscription
Aurelemeriau Jan 4, 2024
523a52b
pourtony
Jan 4, 2024
0b9f9db
Merge pull request #45 from Dreallers/recupConnexion
Tony97421 Jan 4, 2024
3812b1a
Merge pull request #44 from Dreallers/avatar
Tony97421 Jan 4, 2024
5114700
début de la page admin
Tony97421 Jan 4, 2024
aa1f2ee
crud commentaire film et serie fonctionnel
Dreallers Jan 4, 2024
15434f1
Merge branch 'dev' of github.com:Dreallers/WildTube into s03connectio…
Tony97421 Jan 4, 2024
6456197
avatarchange
Jan 5, 2024
1c0a397
Co-authored-by: Alexandre nicoud <[email protected]>
Jan 5, 2024
e6faa00
done
Dreallers Jan 5, 2024
f9493ae
pagesAregarderPlusTard_userProfil
Aurelemeriau Jan 5, 2024
868355b
cette fois c'est la bonne
Dreallers Jan 5, 2024
180b1f2
Merge branch 'dev' into pagePlusTard
Aurelemeriau Jan 5, 2024
170a50f
Merge pull request #49 from Dreallers/CRUD_commentaireFilm_et_Serie
Dreallers Jan 5, 2024
032fa07
Merge pull request #48 from Dreallers/pagePlusTard
Aurelemeriau Jan 5, 2024
7fe9948
Merge branch 'dev' of github.com:Dreallers/WildTube into avatar
Jan 5, 2024
b0a1611
page admin + icon navbar ok
Tony97421 Jan 5, 2024
4f4de5d
Merge branch 'dev' into s03connectionAdmin
Tony97421 Jan 5, 2024
761007f
Merge pull request #51 from Dreallers/avatar
Maximedeve Jan 5, 2024
c52d847
Merge branch 'dev' into s03connectionAdmin
Tony97421 Jan 5, 2024
fecc8d6
Merge pull request #52 from Dreallers/s03connectionAdmin
Aurelemeriau Jan 5, 2024
5ef3356
pending...
Ange230700 Jan 5, 2024
c4057fc
fixing...
Ange230700 Jan 5, 2024
5e124c4
pending...
Ange230700 Jan 6, 2024
a0badcc
pending...
Ange230700 Jan 7, 2024
1a4dbd4
pending...
Ange230700 Jan 8, 2024
7486609
pending...
Ange230700 Jan 8, 2024
fa965e7
Merge pull request #53 from Dreallers/sprint04-favourites-and-watchlist
Tony97421 Jan 8, 2024
48fdeac
pour pull
Jan 10, 2024
59c37a9
commit3
Jan 10, 2024
74b2fa5
avatarback
Jan 11, 2024
c3b935c
avatarchoices
Jan 11, 2024
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
962 changes: 408 additions & 554 deletions backend/database/schema.sql

Large diffs are not rendered by default.

5,888 changes: 128 additions & 5,760 deletions backend/package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"build": "node migrate.js",
"start": "node index.js",
"test": "jest",
"prettier": "npx prettier --write ."
"prettier": "npx prettier --write .",
"lint": "npx eslint . --fix"
},
"dependencies": {
"cookie-parser": "^1.4.6",
Expand Down
97 changes: 97 additions & 0 deletions backend/public/FemaleAvatar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 79 additions & 0 deletions backend/public/FemaleAvatar2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading