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

Dev #97

Merged
merged 172 commits into from
Feb 5, 2024
Merged

Dev #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
b71fc92
pending...
Ange230700 Dec 15, 2023
41c707c
pending...
Ange230700 Dec 22, 2023
33bd7b2
pending...
Ange230700 Dec 22, 2023
7a515ae
pending...
Ange230700 Dec 22, 2023
cab7035
commit avant pull dev
Aurelemeriau Jan 5, 2024
9dabb25
Merge branch 'dev' of github.com:Dreallers/WildTube into dev
Ange230700 Jan 10, 2024
2591702
pending...
Ange230700 Jan 10, 2024
92df9e3
Merge branch 'dev' of github.com:Dreallers/WildTube into dev
Ange230700 Jan 12, 2024
28b9cfb
pending...
Ange230700 Jan 12, 2024
591f391
pending...
Ange230700 Jan 12, 2024
bcaba1a
Merge branch 'dev' of github.com:Dreallers/WildTube into dev
Ange230700 Jan 12, 2024
1f8fb8f
pending...
Ange230700 Jan 13, 2024
6048781
pending...
Ange230700 Jan 14, 2024
bccebb3
pending...
Ange230700 Jan 14, 2024
f5ece37
pending...
Ange230700 Jan 15, 2024
61b2f0f
pending...
Ange230700 Jan 15, 2024
63b2bd0
EditVideo
Tony97421 Jan 16, 2024
05a4e38
upload fichiers
Aurelemeriau Jan 16, 2024
7d8a1e3
EditVideo
Tony97421 Jan 16, 2024
b451e46
Merge pull request #64 from Dreallers/s04EditVideo
Ange230700 Jan 16, 2024
aafd376
Merge branch 'dev' into multer
Aurelemeriau Jan 16, 2024
a801a54
pending...
Ange230700 Jan 16, 2024
ea60dc6
pending...
Ange230700 Jan 16, 2024
a29735a
modif et suppression des commentaires
Jan 16, 2024
4693634
pending...
Ange230700 Jan 16, 2024
93f65e0
Merge pull request #65 from Dreallers/multer
Tony97421 Jan 16, 2024
fdbd5ab
Merge branch 'dev' into avatar
Maximedeve Jan 16, 2024
ef1eab0
Merge pull request #66 from Dreallers/avatar
Ange230700 Jan 16, 2024
d16c8c6
amélioration input et Ajout Admin
Tony97421 Jan 16, 2024
4065fca
Merge branch 'dev' into s05AmeliorationInput
Tony97421 Jan 16, 2024
bce3389
pending...
Ange230700 Jan 16, 2024
e553fb8
pending...
Ange230700 Jan 17, 2024
97e32ec
pending...
Ange230700 Jan 17, 2024
8e2338e
pending...
Ange230700 Jan 17, 2024
104d0d3
correction pb table film
Aurelemeriau Jan 17, 2024
5105fcf
ajout film test
Aurelemeriau Jan 17, 2024
7dfcaaf
pending...
Ange230700 Jan 20, 2024
9a56733
pending...
Ange230700 Jan 20, 2024
746ab97
pending...
Ange230700 Jan 20, 2024
af652d9
pending...
Ange230700 Jan 20, 2024
5043555
pending...
Ange230700 Jan 20, 2024
ca1daa1
pending...
Ange230700 Jan 20, 2024
6783fd5
pending...
Ange230700 Jan 20, 2024
26e5655
pending...
Ange230700 Jan 20, 2024
21585be
pending...
Ange230700 Jan 20, 2024
dbbedf1
pending...
Ange230700 Jan 23, 2024
ec80161
pending...
Ange230700 Jan 23, 2024
fe0e5f6
pending...
Ange230700 Jan 23, 2024
780aa06
pending...
Ange230700 Jan 23, 2024
147c5bd
pending...
Ange230700 Jan 23, 2024
a5d8b56
Modification des inputs
Tony97421 Jan 23, 2024
559a677
Modification des inputs
Tony97421 Jan 23, 2024
36746fe
Merge branch 'main' of github.com:Dreallers/WildTube into s05Ameliora…
Tony97421 Jan 23, 2024
858aa13
Modification des inputs
Tony97421 Jan 23, 2024
4dbc6c8
Merge pull request #67 from Dreallers/s05AmeliorationInput
Maximedeve Jan 23, 2024
a0f4289
modification et suppression des com
Jan 24, 2024
3c28c7b
remise en etat de edit video + responsive ok
Tony97421 Jan 24, 2024
534c397
Merge pull request #68 from Dreallers/s04EditVideo
Ange230700 Jan 24, 2024
12948d4
modification et suppression des com
Jan 24, 2024
eeeaf58
Merge branch 'dev' into avatar
Tony97421 Jan 24, 2024
533b4bd
Merge pull request #70 from Dreallers/avatar
Tony97421 Jan 24, 2024
d323116
pending...
Ange230700 Jan 24, 2024
3478891
modification et suppression des comv2
Jan 24, 2024
5c3307f
Merge branch 'avatar' of github.com:Dreallers/WildTube into avatar
Jan 24, 2024
317240f
modification et suppression des comv2
Jan 24, 2024
cc17e2d
Merge pull request #72 from Dreallers/avatar
Dreallers Jan 24, 2024
e69a9d3
pending...
Ange230700 Jan 24, 2024
898b592
pending...
Ange230700 Jan 24, 2024
aabf798
Merge pull request #73 from Dreallers/sprint05-edit-user-info
Dreallers Jan 24, 2024
9a61ce0
merging
Dreallers Jan 24, 2024
4a8d7a7
Merge branch 'dev' of github.com:Dreallers/WildTube into récuperation…
Dreallers Jan 24, 2024
e8e9d04
Redirection du user inscrit ok
Tony97421 Jan 24, 2024
a807434
Merge pull request #74 from Dreallers/s05redirectionInscription
Tony97421 Jan 24, 2024
a63c6b1
Partage en mail de la video ok
Tony97421 Jan 24, 2024
d12741f
correction conflits
Aurelemeriau Jan 25, 2024
7ea9dc0
ajout upload
Aurelemeriau Jan 25, 2024
378d897
Merge pull request #77 from Dreallers/s5
Ange230700 Jan 25, 2024
10528d5
pending...
Ange230700 Jan 25, 2024
2f7d004
pending...
Ange230700 Jan 25, 2024
ec62402
pending...
Ange230700 Jan 25, 2024
8d037a6
publicité pour les visiteurs
Dreallers Jan 25, 2024
b1108f4
Merge branch 'dev' of github.com:Dreallers/WildTube into pop_up_add
Dreallers Jan 25, 2024
efc65ed
fixed version
Dreallers Jan 25, 2024
006c2f1
fin
Dreallers Jan 25, 2024
c90f81c
Merge pull request #78 from Dreallers/pop_up_add
Tony97421 Jan 25, 2024
34d7b70
Merge branch 'dev' into s05PartageVideo
Tony97421 Jan 25, 2024
dad451e
Merge pull request #75 from Dreallers/s05PartageVideo
Tony97421 Jan 25, 2024
e62d224
responsive et sass
Aurelemeriau Jan 25, 2024
f315b88
responsive et sass
Aurelemeriau Jan 25, 2024
e7af682
pending...
Ange230700 Jan 25, 2024
b0cbddd
ajout et modif pour admin commentaire
Jan 26, 2024
12dfea2
Merge pull request #79 from Dreallers/avatar
Dreallers Jan 26, 2024
4029800
Page Edit video ok
Tony97421 Jan 26, 2024
9d161bd
Merge branch 'dev' into s05HoverVideo
Tony97421 Jan 26, 2024
1222f26
Merge pull request #80 from Dreallers/s05HoverVideo
Maximedeve Jan 26, 2024
00a1473
fix connection
Aurelemeriau Jan 26, 2024
9d3ca90
Merge branch 'dev' into s5
Aurelemeriau Jan 26, 2024
c7a314c
Merge pull request #82 from Dreallers/s5
Aurelemeriau Jan 26, 2024
fca0ee2
pending...
Ange230700 Jan 26, 2024
90690dd
pending...
Ange230700 Jan 26, 2024
33a476a
pending...
Ange230700 Jan 26, 2024
f96ff02
pending...
Ange230700 Jan 26, 2024
6bc028e
pending...
Ange230700 Jan 26, 2024
b14bf36
pending...
Ange230700 Jan 27, 2024
f227bc5
pending...
Ange230700 Jan 27, 2024
6d3fd25
pending...
Ange230700 Jan 27, 2024
7b9c5a7
pending...
Ange230700 Jan 27, 2024
5563f72
pending...
Ange230700 Jan 27, 2024
c51f45f
pending...
Ange230700 Jan 27, 2024
08785e8
pending...
Ange230700 Jan 27, 2024
0c06b2a
pending...
Ange230700 Jan 28, 2024
dcd8391
pending...
Ange230700 Jan 28, 2024
63141d5
pending...
Ange230700 Jan 28, 2024
8c4bc31
pending...
Ange230700 Jan 28, 2024
8f53975
pending...
Ange230700 Jan 29, 2024
4e6c87c
Merge pull request #83 from Dreallers/sprint05-edit-user-info
Dreallers Jan 29, 2024
a2ce0d8
rien
Jan 29, 2024
c7a7cfd
Merge branch 'dev' of github.com:Dreallers/WildTube into avatar
Jan 29, 2024
4524b42
sass
Aurelemeriau Jan 29, 2024
c9e75ea
Merge branch 'dev' of github.com:Dreallers/WildTube into s5
Aurelemeriau Jan 29, 2024
b1201f6
correction image
Aurelemeriau Jan 29, 2024
2b0b28c
pending...
Ange230700 Jan 29, 2024
32d4617
Merge branch 'dev' of github.com:Dreallers/WildTube into sprint05-edi…
Ange230700 Jan 29, 2024
f24123f
page Ajout Admin OK
Tony97421 Jan 29, 2024
21e073a
Merge pull request #85 from Dreallers/s05HoverVideo
Ange230700 Jan 29, 2024
3b7c306
sass
Aurelemeriau Jan 29, 2024
38ad327
Merge pull request #84 from Dreallers/sprint05-edit-user-info
Tony97421 Jan 29, 2024
8ca279a
Merge branch 'dev' of github.com:Dreallers/WildTube into s5
Aurelemeriau Jan 29, 2024
c31f01e
Merge pull request #86 from Dreallers/s5
Ange230700 Jan 29, 2024
833a6f0
Modification sass pour page Edit
Tony97421 Jan 29, 2024
cbf0730
Merge pull request #87 from Dreallers/s05HoverVideo
Ange230700 Jan 29, 2024
86c55bd
sass
Aurelemeriau Jan 29, 2024
29972c1
Modification sass pour page Comment_section
Tony97421 Jan 29, 2024
fdbedd6
Merge branch 'dev' of github.com:Dreallers/WildTube into s05HoverVideo
Tony97421 Jan 29, 2024
5e041e1
Merge pull request #88 from Dreallers/s5
Tony97421 Jan 29, 2024
b823ffa
Merge branch 'dev' of github.com:Dreallers/WildTube into s05HoverVideo
Tony97421 Jan 29, 2024
61b2f5c
sass
Aurelemeriau Jan 29, 2024
953c061
sass
Aurelemeriau Jan 29, 2024
a59a07f
pending...
Ange230700 Jan 29, 2024
7e9f06f
pending...
Ange230700 Jan 29, 2024
2f7da89
Merge branch 'dev' of github.com:Dreallers/WildTube into sprint05-edi…
Ange230700 Jan 29, 2024
8fb74ca
pending...
Ange230700 Jan 29, 2024
2780f20
Merge pull request #89 from Dreallers/sprint05-edit-user-info
Aurelemeriau Jan 29, 2024
8518c8b
sass
Aurelemeriau Jan 29, 2024
bd0f039
pending...
Ange230700 Jan 29, 2024
16660d8
pending...
Ange230700 Jan 29, 2024
a2e1576
Merge branch 'dev' of github.com:Dreallers/WildTube into sprint05-edi…
Ange230700 Jan 29, 2024
42eaa7b
pending...
Ange230700 Jan 29, 2024
1ccff1b
Merge pull request #91 from Dreallers/sprint05-edit-user-info
Aurelemeriau Jan 29, 2024
31db340
sass
Aurelemeriau Jan 29, 2024
bd1cd8b
Merge branch 'dev' of github.com:Dreallers/WildTube into s5
Aurelemeriau Jan 29, 2024
7054b6d
Merge branch 'dev' of github.com:Dreallers/WildTube into avatar
Jan 29, 2024
50d6967
sass
Aurelemeriau Jan 29, 2024
080dcce
sass
Aurelemeriau Jan 29, 2024
7f1ab31
homogeneisation en anglais
Jan 29, 2024
3c3e3fb
Merge pull request #92 from Dreallers/avatar
Dreallers Jan 29, 2024
ae35337
sass
Aurelemeriau Jan 29, 2024
2bdf58f
sass
Aurelemeriau Jan 29, 2024
cbafa8a
sass
Aurelemeriau Jan 29, 2024
ec6f4a2
pending...
Ange230700 Jan 30, 2024
d2c7d44
modification page CommentSection
Tony97421 Jan 30, 2024
e94526f
Merge branch 'dev' into s05HoverVideo
Tony97421 Jan 30, 2024
8c2b84d
Merge branch 'dev' into s5
Aurelemeriau Jan 30, 2024
b20da74
Merge pull request #94 from Dreallers/s05HoverVideo
Aurelemeriau Jan 30, 2024
2de8004
pending...
Ange230700 Jan 30, 2024
a62bb84
Merge pull request #95 from Dreallers/s5
Ange230700 Jan 30, 2024
13ff327
pending...
Ange230700 Jan 30, 2024
0ca917b
Merge branch 'dev' of github.com:Dreallers/WildTube into sprint05-edi…
Ange230700 Jan 30, 2024
a88245a
pending...
Ange230700 Jan 31, 2024
456b728
sdhgvgcx j
Ange230700 Feb 5, 2024
6fc98b3
pending...
Ange230700 Feb 5, 2024
6a19aa0
Merge pull request #96 from Dreallers/sprint05-edit-user-info
Aurelemeriau Feb 5, 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
6 changes: 4 additions & 2 deletions backend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
"sourceType": "module"
},
"rules": {
"no-console": "off",
"no-console": 0,
"no-restricted-syntax": [
"error",
{
"selector": "CallExpression[callee.object.name='console'][callee.property.name!=/^(error|warn|info)$/]",
"message": "You can only call the error(), warn() and info() methods from the console object"
}
]
],
"camelcase": "off",
"import/no-extraneous-dependencies": "off"
}
}
1 change: 1 addition & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
coverage
.env
public
2 changes: 1 addition & 1 deletion backend/database/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ client
connection.release();
})
.catch((error) => {
console.warn(
console.error(
"Warning:",
"Failed to establish a database connection.",
"Please check your database credentials in the .env file if you need a database access."
Expand Down
94 changes: 55 additions & 39 deletions backend/database/schema.sql
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
DROP TABLE IF EXISTS `User`;
DROP TABLE IF EXISTS `Avatar`;

CREATE TABLE
`User` (
`Avatar` (
`id` INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
`name` VARCHAR(50) NOT NULL,
`email` VARCHAR(50) NOT NULL,
`naissance` DATE NOT NULL,
`civility` BOOLEAN NOT NULL,
`hashed_password` VARCHAR(150) NOT NULL,
`IsAdmin` BOOLEAN NOT NULL DEFAULT 0,
`avatar` VARCHAR(255)
`avatar_url` VARCHAR(255),
`avatar_filename` VARCHAR(255)
);

DROP TABLE IF EXISTS `Film`;

CREATE TABLE
`Film` (
`id` INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
`miniature` VARCHAR(255) NOT NULL,
`cover` VARCHAR(255) NOT NULL,
`miniature_url` VARCHAR(255) DEFAULT NULL,
`miniature_filename` VARCHAR(255) DEFAULT NULL,
`cover_url` VARCHAR(255) DEFAULT NULL,
`cover_filename` VARCHAR(255) DEFAULT NULL,
`title` VARCHAR(255) NOT NULL,
`videoUrl` VARCHAR(255),
`videoUrl` VARCHAR(255) NOT NULL,
`duration` INT NOT NULL,
`year` VARCHAR(4) NOT NULL,
`description` VARCHAR(700) NOT NULL,
Expand All @@ -35,51 +32,70 @@ CREATE TABLE
`name` VARCHAR(255) NOT NULL
);

-- Join tables

DROP TABLE IF EXISTS `Watchlist`;
DROP TABLE IF EXISTS `User`;

CREATE TABLE
`Watchlist` (
`userId` INT NOT NULL,
`filmId` INT NOT NULL,
CONSTRAINT FK_Watchlist_user_id FOREIGN KEY (`userId`) REFERENCES `User` (`id`),
CONSTRAINT FK_Watchlist_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`),
PRIMARY KEY (`userId`, `filmId`)
`User` (
`id` INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
`name` VARCHAR(50) NOT NULL,
`email` VARCHAR(50) NOT NULL,
`naissance` DATE NOT NULL,
`civility` BOOLEAN NOT NULL,
`hashed_password` VARCHAR(150) NOT NULL,
`IsAdmin` BOOLEAN NOT NULL DEFAULT 0,
`avatarId` INT NOT NULL,
CONSTRAINT FK_User_avatar_id FOREIGN KEY (`avatarId`) REFERENCES `Avatar` (`id`)
);

DROP TABLE IF EXISTS `Favori_film`;

CREATE TABLE
`Favori_film` (
`userId` INT NOT NULL,
`filmId` INT NOT NULL,
CONSTRAINT FK_Favori_Film_user_id FOREIGN KEY (`userId`) REFERENCES `User` (`id`),
CONSTRAINT FK_Favori_Film_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`),
PRIMARY KEY (`userId`, `filmId`)
);
-- Join tables

DROP TABLE IF EXISTS `Categorie_par_film`;

CREATE TABLE
`Categorie_par_film` (
`filmId` INT NOT NULL,
`categorieId` INT NOT NULL,
CONSTRAINT FK_Categorie_Par_Film_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`),
CONSTRAINT FK_Categorie_Par_Film_categorie_id FOREIGN KEY (`categorieId`) REFERENCES `Categorie` (`id`),
`unique_key` VARCHAR(255) NOT NULL,
CONSTRAINT FK_Categorie_Par_Film_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`) ON DELETE CASCADE,
CONSTRAINT FK_Categorie_Par_Film_categorie_id FOREIGN KEY (`categorieId`) REFERENCES `Categorie` (`id`) ON DELETE CASCADE,
PRIMARY KEY (`filmId`, `categorieId`)
);

DROP TABLE IF EXISTS `Commentaire_film`;

CREATE TABLE `Commentaire_film` (
`id` INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
`userId` INT NOT NULL,
`filmId` INT NOT NULL,
`avatarId` INT NOT NULL,
`content` VARCHAR(500) NOT NULL,
`date` DATETIME NOT NULL,
`unique_key` VARCHAR(350) NOT NULL DEFAULT '',
CONSTRAINT FK_Commentaire_Film_user_id FOREIGN KEY (`userId`) REFERENCES `User` (`id`),
CONSTRAINT FK_Commentaire_Film_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`) ON DELETE CASCADE,
CONSTRAINT FK_Commentaire_Film_avatar_id FOREIGN KEY (`avatarId`) REFERENCES `Avatar` (`id`)
);

DROP TABLE IF EXISTS `Watchlist`;

CREATE TABLE
`Commentaire_film` (
`id` INT PRIMARY KEY AUTO_INCREMENT NOT NULL,
`Watchlist` (
`userId` INT NOT NULL,
`filmId` INT NOT NULL,
`content` VARCHAR(500) NOT NULL,
`date` DATETIME NOT NULL,
`unique_key` VARCHAR(255) NOT NULL,
CONSTRAINT FK_Commentaire_Film_user_id FOREIGN KEY (`userId`) REFERENCES `User` (`id`),
CONSTRAINT FK_Commentaire_Film_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`)
CONSTRAINT FK_Watchlist_user_id FOREIGN KEY (`userId`) REFERENCES `User` (`id`),
CONSTRAINT FK_Watchlist_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`) ON DELETE CASCADE,
PRIMARY KEY (`userId`, `filmId`)
);

DROP TABLE IF EXISTS `Favori_film`;

CREATE TABLE
`Favori_film` (
`userId` INT NOT NULL,
`filmId` INT NOT NULL,
`unique_key` VARCHAR(255) NOT NULL,
CONSTRAINT FK_Favori_Film_user_id FOREIGN KEY (`userId`) REFERENCES `User` (`id`),
CONSTRAINT FK_Favori_Film_film_id FOREIGN KEY (`filmId`) REFERENCES `Film` (`id`) ON DELETE CASCADE,
PRIMARY KEY (`userId`, `filmId`)
);
133 changes: 119 additions & 14 deletions backend/package-lock.json

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

5 changes: 3 additions & 2 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"start": "node index.js",
"test": "jest",
"prettier": "npx prettier --write .",
"lint": "npx eslint . --fix",
"lint": "npx eslint .",
"build": "npm run db:migrate ; npm run db:seed"
},
"dependencies": {
Expand All @@ -15,6 +15,7 @@
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"jsonwebtoken": "^9.0.2",
"multer": "^1.4.5-lts.1",
"mysql2": "^3.5.2",
"uuid": "^9.0.1"
Expand All @@ -35,4 +36,4 @@
"*.sql": "prettier --check",
"*.js": "eslint"
}
}
}
File renamed without changes
Loading
Loading