diff --git a/src/app/beforeConnexion/register/page-register/page-register.component.scss b/src/app/beforeConnexion/register/page-register/page-register.component.scss
index e3f4d3a..5f0dc53 100644
--- a/src/app/beforeConnexion/register/page-register/page-register.component.scss
+++ b/src/app/beforeConnexion/register/page-register/page-register.component.scss
@@ -31,3 +31,17 @@ mat-stepper {
padding: 0px 0px 0px 5px;
margin: 0px;
}
+
+
+// -------------------------------------------------------------------------
+
+
+::ng-deep .mat-radio-inner-circle {
+ color: black !important;
+ background-color: black !important;
+}
+
+::ng-deep .mat-radio-outer-circle{
+ color: black !important;
+ border: solid 1px gray !important;
+}
diff --git a/src/app/beforeConnexion/register/page-register/page-register.component.ts b/src/app/beforeConnexion/register/page-register/page-register.component.ts
index 0a0911d..8191d33 100644
--- a/src/app/beforeConnexion/register/page-register/page-register.component.ts
+++ b/src/app/beforeConnexion/register/page-register/page-register.component.ts
@@ -34,6 +34,7 @@ export class PageRegisterComponent
gender: "man",
interests: [],
isActive: false,
+ isAccepted: false,
createdAt: new Date(),
updatedAt: new Date(),
};
diff --git a/src/app/beforeConnexion/register/popup-confirmation/popup-confirmation.component.ts b/src/app/beforeConnexion/register/popup-confirmation/popup-confirmation.component.ts
index fdb461c..4828dfc 100644
--- a/src/app/beforeConnexion/register/popup-confirmation/popup-confirmation.component.ts
+++ b/src/app/beforeConnexion/register/popup-confirmation/popup-confirmation.component.ts
@@ -1,4 +1,4 @@
-import {Component, Inject, OnInit} from '@angular/core';
+import {Component, Inject} from '@angular/core';
import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
@Component({
diff --git a/src/app/user/history/page-history-user/page-history-user.component.html b/src/app/user/history/page-history-user/page-history-user.component.html
index 34b223c..8d252f7 100644
--- a/src/app/user/history/page-history-user/page-history-user.component.html
+++ b/src/app/user/history/page-history-user/page-history-user.component.html
@@ -16,45 +16,43 @@
- | Aperçu |
-
+ | Aperçu |
+
|
-
+
Titre |
-
- {{watchedVideo.title}}
- |
+ {{video.title}} |
- Date |
-
- {{ watchedVideo.date | date:'dd/LL/YYYY à HH:mm:ss' }}
+ | Date |
+
+
+ {{date0 | date:'dd/LL/YYYY à HH:mm:ss'}}
+
|
Source |
-
- {{getSourceByUrl(watchedVideo.url)}}
- |
+ {{video.source}} |
- Action |
-
- |
+
+
+
diff --git a/src/app/user/history/page-history-user/page-history-user.component.scss b/src/app/user/history/page-history-user/page-history-user.component.scss
index 1c4bfe8..fd80cbc 100644
--- a/src/app/user/history/page-history-user/page-history-user.component.scss
+++ b/src/app/user/history/page-history-user/page-history-user.component.scss
@@ -5,23 +5,33 @@
}
table {
+ width: 80%;
margin: 0 auto;
}
+/*
+mat-paginator {
+ width: 30%;
+ text-align: center;
+}
+*/
+
th.mat-sort-header-sorted {
color: black;
}
+/*
.lightTheme td {
padding: 10px 30px 5px 5px;
}
-
.darkTheme td {
background-color: #646464;
color: white;
padding: 10px 30px 5px 5px;
}
+*/
input {
- width: 25%;
+ width: 35%;
+ font-size: large;
}
diff --git a/src/app/user/history/page-history-user/page-history-user.component.ts b/src/app/user/history/page-history-user/page-history-user.component.ts
index 9776efd..c0dccaa 100644
--- a/src/app/user/history/page-history-user/page-history-user.component.ts
+++ b/src/app/user/history/page-history-user/page-history-user.component.ts
@@ -1,13 +1,13 @@
-import {Component, OnInit, ViewChild} from '@angular/core';
+import {AfterViewInit, Component, ViewChild} from '@angular/core';
import {ThemeService} from "../../../utils/services/theme/theme.service";
import {MessageService} from "../../../utils/services/message/message.service";
import {FictitiousDatasService} from "../../../utils/services/fictitiousDatas/fictitious-datas.service";
-import {WatchedVideo} from "../../../utils/interfaces/watchedVideo";
import {MatTableDataSource} from "@angular/material/table";
import {MatSort} from "@angular/material/sort";
import {VideoUrlService} from "../../../utils/services/videoUrl/video-url.service";
import {UserHistoryService} from "../../../utils/services/userHistory/userHistory.service";
-
+import {Video} from "../../../utils/interfaces/video";
+import {MatPaginator} from "@angular/material/paginator";
@@ -16,11 +16,12 @@ import {UserHistoryService} from "../../../utils/services/userHistory/userHistor
templateUrl: './page-history-user.component.html',
styleUrls: ['./page-history-user.component.scss']
})
-export class PageHistoryUserComponent implements OnInit
+export class PageHistoryUserComponent implements AfterViewInit
{
- displayedColumns: string[] = [ 'aperçu', 'titre', 'date', 'source', 'action' ];
+ displayedColumns: string[] = [ 'aperçu', 'title', 'date', 'source', 'action' ];
dataSource ;
@ViewChild(MatSort) sort: MatSort;
+ @ViewChild(MatPaginator) paginator: MatPaginator;
constructor( public themeService: ThemeService,
@@ -30,14 +31,32 @@ export class PageHistoryUserComponent implements OnInit
private userHistoryService: UserHistoryService ) { }
- ngOnInit(): void
+ // charge la page
+ ngAfterViewInit(): void
{
this.userHistoryService.clearTabVideoUrlClicked();
// --- FAUX CODE ---
- const tabWatchedVideo = this.fictitiousDatasService.getTabWatchedVideo(8);
- this.dataSource = new MatTableDataSource(tabWatchedVideo);
+ const tabVideo: Video[] = this.fictitiousDatasService.getTabVideo(8);
+
+ const tabVideoChanged = [];
+ for(let video of tabVideo)
+ {
+ tabVideoChanged.push({
+ _id: video._id,
+ url: video.url,
+ title: video.title,
+ description: video.description,
+ views: video.views,
+ watched: video.watched,
+ source: this.getSourceByUrl(video.url)
+ });
+ }
+
+ this.dataSource = new MatTableDataSource(tabVideoChanged);
this.dataSource.sort = this.sort;
+ this.dataSource.paginator = this.paginator;
+ this.dataSource = this.dataSource;
// --- VRAI CODE ---
/*
@@ -55,13 +74,15 @@ export class PageHistoryUserComponent implements OnInit
}
- applyFilter(event: Event)
+ // Applique le filtre
+ applyFilter(event: Event): void
{
const filterValue = (event.target as HTMLInputElement).value;
this.dataSource.filter = filterValue.trim().toLowerCase();
}
+ // Retourne la source de la video en fonction de l'url
getSourceByUrl(url: string): string
{
if(url.includes("youtu")) return "Youtube" ;
@@ -70,10 +91,11 @@ export class PageHistoryUserComponent implements OnInit
}
- onDelete(watchedVideo: WatchedVideo): void
+ // Supprime la video
+ onDelete(video: Video): void
{
// --- FAUX CODE ---
- const index = this.dataSource.data.indexOf(watchedVideo);
+ const index = this.dataSource.data.indexOf(video);
this.dataSource.data.splice(index, 1);
this.dataSource.data = this.dataSource.data;
this.dataSource = this.dataSource;
@@ -96,10 +118,11 @@ export class PageHistoryUserComponent implements OnInit
}
- onIframeClick(watchedVideo: WatchedVideo)
+ // Ajoute la date actuelle dans watched.video
+ onIframeClick(video: Video): void
{
- console.log("onIframeClick: " + watchedVideo.title);
- this.userHistoryService.addWatchedVideoToHistorique(watchedVideo);
+ console.log("onIframeClick: " + video.title);
+ this.userHistoryService.addVideoToHistoque(video);
}
}
diff --git a/src/app/user/myProfil/input-interests-profil/input-interests-profil.component.scss b/src/app/user/myProfil/input-interests-profil/input-interests-profil.component.scss
index c7acb4b..8451d71 100644
--- a/src/app/user/myProfil/input-interests-profil/input-interests-profil.component.scss
+++ b/src/app/user/myProfil/input-interests-profil/input-interests-profil.component.scss
@@ -1,3 +1,16 @@
mat-form-field {
width: 100%;
+ font-size: small;
+}
+
+mat-chip {
+ font-size: small;
+}
+
+input {
+ font-size: small;
+}
+
+mat-option {
+ font-size: small;
}
diff --git a/src/app/user/myProfil/page-profil-user/page-profil-user.component.ts b/src/app/user/myProfil/page-profil-user/page-profil-user.component.ts
index 36ed7d5..1f06645 100644
--- a/src/app/user/myProfil/page-profil-user/page-profil-user.component.ts
+++ b/src/app/user/myProfil/page-profil-user/page-profil-user.component.ts
@@ -33,7 +33,7 @@ export class PageProfilUserComponent implements OnInit
onModifier()
{
const config = {
- width: '25%',
+ width: '35%',
data: { user: this.user }
};
this.dialog
diff --git a/src/app/user/myProfil/popup-update-user/popup-update-user.component.scss b/src/app/user/myProfil/popup-update-user/popup-update-user.component.scss
index 8d72179..8db0898 100644
--- a/src/app/user/myProfil/popup-update-user/popup-update-user.component.scss
+++ b/src/app/user/myProfil/popup-update-user/popup-update-user.component.scss
@@ -1,3 +1,11 @@
+.boite {
+ font-size: small;
+}
+
+button {
+ font-size: small;
+}
+
img {
margin: 0px 0px 10px 0px;
width: 5vw;
@@ -6,3 +14,32 @@ img {
border-radius: 50%;
font-size: xxx-large;
}
+
+// -------------------------------------------------------------------------
+
+// aura
+::ng-deep .mat-checkbox-ripple .mat-ripple-element {
+ background-color: grey !important;
+}
+
+// contenu coche
+::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background {
+ background-color: black !important;
+}
+
+// indeterminate
+::ng-deep .mat-checkbox .mat-checkbox-frame {
+ background-color: white !important;
+}
+
+// -------------------------------------------------------------------------
+
+::ng-deep .mat-radio-inner-circle {
+ color: black !important;
+ background-color: black !important;
+}
+
+::ng-deep .mat-radio-outer-circle{
+ color: black !important;
+ border: solid 1px gray !important;
+}
diff --git a/src/app/user/myProfil/popup-update-user/popup-update-user.component.ts b/src/app/user/myProfil/popup-update-user/popup-update-user.component.ts
index 6b2adc9..15c38bb 100644
--- a/src/app/user/myProfil/popup-update-user/popup-update-user.component.ts
+++ b/src/app/user/myProfil/popup-update-user/popup-update-user.component.ts
@@ -40,6 +40,7 @@ export class PopupUpdateUserComponent implements OnInit
gender: user0.gender,
interests: [],
isActive: user0.isActive,
+ isAccepted: user0.isAccepted,
createdAt: user0.createdAt,
updatedAt: user0.updatedAt,
};
diff --git a/src/app/user/navbar-user/navbar-user.component.scss b/src/app/user/navbar-user/navbar-user.component.scss
index cd9cc96..a78eea8 100644
--- a/src/app/user/navbar-user/navbar-user.component.scss
+++ b/src/app/user/navbar-user/navbar-user.component.scss
@@ -1,7 +1,7 @@
.navbar {
background-color: black;
- height: 75px;
- font-size: x-large;
+ height: 50px;
+ font-size: medium;
color: white;
}
@@ -17,9 +17,8 @@
.navbar-brand {
font-family: cursive;
font-weight: bold;
- //font-style: oblique 90deg;
- font-size: xxx-large;
- margin-left: 30px;
+ font-size: x-large;
+ margin-left: 15px;
color: white;
}
@@ -35,7 +34,7 @@
// Bonton deconnexion
.btnDeconnexion {
- font-size: x-large;
+ font-size: medium;
margin: 0px 10px 0px 10px
}
.btnDeconnexion:hover {
@@ -52,8 +51,8 @@ img {
border: solid 2px white;
border-radius: 50px;
margin: 0px 10px 0px 15px;
- width: 50px;
- height: 50px;
+ width: 40px;
+ height: 40px;
}
img:hover {
cursor: pointer;
diff --git a/src/app/user/search/video-cell/video-cell.component.ts b/src/app/user/search/video-cell/video-cell.component.ts
index 77892a3..2973699 100644
--- a/src/app/user/search/video-cell/video-cell.component.ts
+++ b/src/app/user/search/video-cell/video-cell.component.ts
@@ -1,16 +1,13 @@
-import {
- Component,
- Input,
- OnInit,
-} from '@angular/core';
+import {Component, Input, OnInit } from '@angular/core';
import {VideoUrlService} from "../../../utils/services/videoUrl/video-url.service";
import {AddVideoToPlaylistsService} from "../../../utils/services/addVideoToPlaylists/add-video-to-playlists.service";
import {Video} from "../../../utils/interfaces/video";
import {ThemeService} from "../../../utils/services/theme/theme.service";
-import {WatchedVideo} from "../../../utils/interfaces/watchedVideo";
import {MessageService} from "../../../utils/services/message/message.service";
import {UserHistoryService} from "../../../utils/services/userHistory/userHistory.service";
+
+
@Component({
selector: 'app-video-cell',
templateUrl: './video-cell.component.html',
diff --git a/src/app/utils/interfaces/user.ts b/src/app/utils/interfaces/user.ts
index 8471280..11eb36f 100644
--- a/src/app/utils/interfaces/user.ts
+++ b/src/app/utils/interfaces/user.ts
@@ -13,6 +13,7 @@ export interface User
gender: string,
interests: string[],
isActive: boolean,
+ isAccepted: boolean,
createdAt: Date,
updatedAt: Date,
}
diff --git a/src/app/utils/interfaces/video.ts b/src/app/utils/interfaces/video.ts
index 1d6f375..226670a 100644
--- a/src/app/utils/interfaces/video.ts
+++ b/src/app/utils/interfaces/video.ts
@@ -4,5 +4,6 @@ export interface Video
url: string,
title: string,
description: string,
- views: number
+ views: number,
+ watched: Date[]
}
diff --git a/src/app/utils/interfaces/watchedVideo.ts b/src/app/utils/interfaces/watchedVideo.ts
deleted file mode 100644
index 2e8fa66..0000000
--- a/src/app/utils/interfaces/watchedVideo.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface WatchedVideo
-{
- _id: string,
- url: string,
- title: string,
- date: Date
-}
diff --git a/src/app/utils/services/fictitiousDatas/fictitious-datas.service.ts b/src/app/utils/services/fictitiousDatas/fictitious-datas.service.ts
index c1a168a..0a69908 100644
--- a/src/app/utils/services/fictitiousDatas/fictitious-datas.service.ts
+++ b/src/app/utils/services/fictitiousDatas/fictitious-datas.service.ts
@@ -2,18 +2,18 @@ import { Injectable } from '@angular/core';
import {Video} from "../../interfaces/video";
import {Playlist} from "../../interfaces/playlist";
import {Advert} from "../../interfaces/advert";
-import {WatchedVideo} from "../../interfaces/watchedVideo";
import {User} from "../../interfaces/user";
-const TAB_VIDEO = [
+const TAB_VIDEO: Video[] = [
{
_id: "Mowgli",
url: "https://www.youtube.com/watch?v=medPORJ8KO0",
title: "PNL - Mowgli",
description: "dans l'album Que la famille",
views: 11,
+ watched: []
},
{
_id: "Mexico",
@@ -21,6 +21,7 @@ const TAB_VIDEO = [
title: "PNL - Mexico",
description: "dans l'album Monde chico",
views: 22,
+ watched: []
},
{
_id: "Luz de luna",
@@ -28,6 +29,7 @@ const TAB_VIDEO = [
title: "PNL - Luz de luna",
description: "dans l'album Dans la legende",
views: 33,
+ watched: []
},
{
_id: "Blanka",
@@ -35,6 +37,7 @@ const TAB_VIDEO = [
title: "PNL - Blanka",
description: "dans l'album Deux frères",
views: 44,
+ watched: []
},
{
_id: "Mowgli 2",
@@ -42,6 +45,7 @@ const TAB_VIDEO = [
title: "PNL - Mowgli",
description: "exclu",
views: 55,
+ watched: []
},
{
_id: "Etre humain",
@@ -49,6 +53,7 @@ const TAB_VIDEO = [
title: "Nekfeu - Etre humain",
description: "dans l'album feu",
views: 66,
+ watched: []
},
{
_id: "Humanoide",
@@ -56,6 +61,7 @@ const TAB_VIDEO = [
title: "Nekfeu - Humanoide",
description: "dans l'album Cyborg",
views: 77,
+ watched: []
},
{
_id: "Dernier soupir",
@@ -63,6 +69,7 @@ const TAB_VIDEO = [
title: "Nekfeu - Dernier soupir",
description: "dans l'album Les etoiles vagabondes",
views: 88,
+ watched: []
},
{
_id: "Dernier soupir",
@@ -70,6 +77,7 @@ const TAB_VIDEO = [
title: "Nekfeu - Dernier soupir",
description: "dans l'album Les etoiles vagabondes",
views: 99,
+ watched: []
},
{
_id: "Les prélis",
@@ -77,6 +85,7 @@ const TAB_VIDEO = [
title: "Columbine - Les prélis",
description: "dans l'album Enfant terrible",
views: 100,
+ watched: []
},
{
_id: "Pierre feuille ciseau",
@@ -84,6 +93,7 @@ const TAB_VIDEO = [
title: "Columbine - Pierre feuille ciseau",
description: "exclu",
views: 111,
+ watched: []
},
]
@@ -136,20 +146,34 @@ export class FictitiousDatasService
{
let res = '';
const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
- for( let i = 0; i < length; i++ )
- {
+ for( let i = 0; i < length; i++ ) {
const k = Math.floor(Math.random() * characters.length);
res += characters.charAt(k);
}
return res;
}
+ private randomDate(start, end): Date
+ {
+ return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
+ }
+
getVideo(): Video
{
- const idx = Math.floor(Math.random() * TAB_VIDEO.length);
- let video = Object.assign({}, TAB_VIDEO[idx]);
+ const index = Math.floor(Math.random() * TAB_VIDEO.length);
+ let video: Video = Object.assign({}, TAB_VIDEO[index]);
+
+ // id
video._id = video._id + this.makeid(5);
+
+ // watched
+ const nbWatched = 1 + Math.floor(Math.random() * 2);
+ const start = new Date(2021, 0, 1);
+ const end = new Date();
+ video.watched = [];
+ for(let i=0 ; i
+ 
+