diff --git a/dump-folder/polynotfound/ads.bson b/dump-folder/polynotfound/ads.bson
new file mode 100644
index 0000000..e69de29
diff --git a/dump-folder/polynotfound/ads.metadata.json b/dump-folder/polynotfound/ads.metadata.json
new file mode 100644
index 0000000..f1a7451
--- /dev/null
+++ b/dump-folder/polynotfound/ads.metadata.json
@@ -0,0 +1 @@
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_"}],"uuid":"f9864709869549bfbc1b1ec367f5fa02"}
\ No newline at end of file
diff --git a/dump-folder/polynotfound/playlists.bson b/dump-folder/polynotfound/playlists.bson
new file mode 100644
index 0000000..e69de29
diff --git a/dump-folder/polynotfound/playlists.metadata.json b/dump-folder/polynotfound/playlists.metadata.json
new file mode 100644
index 0000000..c147d08
--- /dev/null
+++ b/dump-folder/polynotfound/playlists.metadata.json
@@ -0,0 +1 @@
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_"}],"uuid":"666ca4f24afb452da1676bf59b8a8305"}
\ No newline at end of file
diff --git a/dump-folder/polynotfound/users.bson b/dump-folder/polynotfound/users.bson
new file mode 100644
index 0000000..e69de29
diff --git a/dump-folder/polynotfound/users.metadata.json b/dump-folder/polynotfound/users.metadata.json
new file mode 100644
index 0000000..3919528
--- /dev/null
+++ b/dump-folder/polynotfound/users.metadata.json
@@ -0,0 +1 @@
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_"}],"uuid":"bc2e321e20bc47f4b48e6dae54975c3d"}
\ No newline at end of file
diff --git a/dump-folder/polynotfound/videos.bson b/dump-folder/polynotfound/videos.bson
new file mode 100644
index 0000000..e69de29
diff --git a/dump-folder/polynotfound/videos.metadata.json b/dump-folder/polynotfound/videos.metadata.json
new file mode 100644
index 0000000..29d211a
--- /dev/null
+++ b/dump-folder/polynotfound/videos.metadata.json
@@ -0,0 +1 @@
+{"options":{},"indexes":[{"v":2,"key":{"_id":1},"name":"_id_"}],"uuid":"b63ee8164a2c45c0b7e2f2b831197a48"}
\ No newline at end of file
diff --git a/src/app/admin/myProfil/page-profil-admin/page-profil-admin.component.ts b/src/app/admin/myProfil/page-profil-admin/page-profil-admin.component.ts
index 3aaf319..75e599f 100644
--- a/src/app/admin/myProfil/page-profil-admin/page-profil-admin.component.ts
+++ b/src/app/admin/myProfil/page-profil-admin/page-profil-admin.component.ts
@@ -48,7 +48,7 @@ export class PageProfilAdminComponent implements OnInit
ngOnInit(): void
{
this.messageService
- .get( "user/findOne/"+this.profilService.id)
+ .get( "user/findOne/"+this.profilService.getId())
.subscribe( retour => this.ngOnInitCallback(retour), err => this.ngOnInitCallback(err) )
}
@@ -60,7 +60,6 @@ export class PageProfilAdminComponent implements OnInit
}
else {
this.admin = retour.data;
- this.profilService.id = retour.data.id;
}
}
diff --git a/src/app/admin/myProfil/popup-update-admin/popup-update-admin.component.ts b/src/app/admin/myProfil/popup-update-admin/popup-update-admin.component.ts
index e184b1b..39bb3f0 100644
--- a/src/app/admin/myProfil/popup-update-admin/popup-update-admin.component.ts
+++ b/src/app/admin/myProfil/popup-update-admin/popup-update-admin.component.ts
@@ -67,7 +67,7 @@ export class PopupUpdateAdminComponent implements OnInit
profileImageUrl: this.adminCopy.profileImageUrl,
};
this.messageService
- .put("user/update/"+this.profilService.id, data)
+ .put("user/update/"+this.profilService.getId(), data)
.subscribe( ret => this.onValiderCallback(ret), err => this.onValiderCallback(err) );
}
}
@@ -80,6 +80,7 @@ export class PopupUpdateAdminComponent implements OnInit
this.dialogRef.close(null);
}
else {
+ this.profilService.setProfileImageUrl(this.adminCopy.profileImageUrl);
this.dialogRef.close(this.adminCopy);
}
}
diff --git a/src/app/admin/utils/navbar-admin/navbar-admin.component.html b/src/app/admin/utils/navbar-admin/navbar-admin.component.html
index a69004d..a73059e 100644
--- a/src/app/admin/utils/navbar-admin/navbar-admin.component.html
+++ b/src/app/admin/utils/navbar-admin/navbar-admin.component.html
@@ -23,7 +23,7 @@
-
diff --git a/src/app/advertiser/myProfil/page-profil-advertiser/page-profil-advertiser.component.ts b/src/app/advertiser/myProfil/page-profil-advertiser/page-profil-advertiser.component.ts
index ec86cdf..de60d59 100644
--- a/src/app/advertiser/myProfil/page-profil-advertiser/page-profil-advertiser.component.ts
+++ b/src/app/advertiser/myProfil/page-profil-advertiser/page-profil-advertiser.component.ts
@@ -48,7 +48,7 @@ export class PageProfilAdvertiserComponent implements OnInit
ngOnInit(): void
{
this.messageService
- .get( "user/findOne/"+this.profilService.id)
+ .get( "user/findOne/"+this.profilService.getId())
.subscribe( retour => this.ngOnInitCallback(retour), err => this.ngOnInitCallback(err) )
}
@@ -60,7 +60,6 @@ export class PageProfilAdvertiserComponent implements OnInit
}
else {
this.advertiser = retour.data;
- this.profilService.id = retour.data.id;
}
}
diff --git a/src/app/advertiser/myProfil/popup-update-advertiser/popup-update-advertiser.component.ts b/src/app/advertiser/myProfil/popup-update-advertiser/popup-update-advertiser.component.ts
index 1517582..8d4de8a 100644
--- a/src/app/advertiser/myProfil/popup-update-advertiser/popup-update-advertiser.component.ts
+++ b/src/app/advertiser/myProfil/popup-update-advertiser/popup-update-advertiser.component.ts
@@ -68,7 +68,7 @@ export class PopupUpdateAdvertiserComponent implements OnInit
company: this.advertiserCopy.company
};
this.messageService
- .put("user/update/"+this.profilService.id, data)
+ .put("user/update/"+this.profilService.getId(), data)
.subscribe( ret => this.onValiderCallback(ret), err => this.onValiderCallback(err) );
}
}
@@ -81,6 +81,7 @@ export class PopupUpdateAdvertiserComponent implements OnInit
this.dialogRef.close(null);
}
else {
+ this.profilService.setProfileImageUrl(this.advertiserCopy.profileImageUrl);
this.dialogRef.close(this.advertiserCopy);
}
}
diff --git a/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html b/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html
index 69ae5ad..da5e898 100644
--- a/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html
+++ b/src/app/advertiser/utils/navbar-advertiser/navbar-advertiser.component.html
@@ -27,7 +27,7 @@
-
diff --git a/src/app/beforeConnexion/login/page-login/page-login.component.ts b/src/app/beforeConnexion/login/page-login/page-login.component.ts
index f80cfe3..6ee3e78 100644
--- a/src/app/beforeConnexion/login/page-login/page-login.component.ts
+++ b/src/app/beforeConnexion/login/page-login/page-login.component.ts
@@ -58,8 +58,8 @@ export class PageLoginComponent implements OnInit
this.hasError = true;
}
else {
- this.profilService.id = retour.data.id;
- this.profilService.profileImageUrl = retour.data.profileImageUrl;
+ this.profilService.setId(retour.data.id);
+ this.profilService.setProfileImageUrl(retour.data.profileImageUrl);
if(retour.data.role.name === "user") this.router.navigateByUrl( '/user/search');
else if(retour.data.role.name === "advertiser") this.router.navigateByUrl( '/advertiser/adList');
else if(retour.data.role.name === "admin" || retour.data.role.name === "superAdmin") this.router.navigateByUrl( '/admin/userList');
diff --git a/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.html b/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.html
index e724412..c92a060 100644
--- a/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.html
+++ b/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.html
@@ -25,9 +25,7 @@
diff --git a/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts b/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts
index 6f76196..877dde8 100644
--- a/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts
+++ b/src/app/user/myPlaylists/page-my-playlists/page-my-playlists.component.ts
@@ -2,9 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {ThemeService} from "../../../utils/services/theme/theme.service";
import {Advert} from "../../../utils/interfaces/advert";
import {MessageService} from "../../../utils/services/message/message.service";
-import {PlaylistDB} from "../../../utils/interfaces/playlist";
import {HttpParams} from "@angular/common/http";
-import {subscribeOn} from "rxjs/operators";
@@ -35,7 +33,7 @@ export class PageMyPlaylistsComponent implements OnInit
adCallback(retour: any): void
{
- if(retour !== "success") {
+ if(retour.status !== "success") {
console.log(retour);
}
else {
diff --git a/src/app/user/myPlaylists/playlist-list/playlist-list.component.ts b/src/app/user/myPlaylists/playlist-list/playlist-list.component.ts
index 84a78f4..f97fa1e 100644
--- a/src/app/user/myPlaylists/playlist-list/playlist-list.component.ts
+++ b/src/app/user/myPlaylists/playlist-list/playlist-list.component.ts
@@ -96,8 +96,6 @@ export class PlaylistListComponent implements OnInit
// click sur update playlist
onUpdatePlaylist(playlistToUpdate: PlaylistDB): void
{
- console.log(playlistToUpdate);
-
const config = {
data: {
action: "update",
@@ -111,8 +109,6 @@ export class PlaylistListComponent implements OnInit
.afterClosed()
.subscribe(newName => {
- console.log("nn:" + newName);
-
const config = { duration: 1500, panelClass: "custom-class" };
if((newName === null) || (newName === undefined)) {
this.snackBar.open("Opération annulée", "", config);
@@ -123,6 +119,8 @@ export class PlaylistListComponent implements OnInit
index = this.tabPlaylist.findIndex( elt => (elt._id === playlistToUpdate._id));
this.tabPlaylist[index].name = newName;
this.snackBar.open(`La playlist '${playlistToUpdate.name}' a bien été mise à jour ✔`, "", config);
+ this.eventEmitter.emit(this.tabPlaylist[index]);
+ this.playlistFocusedOn = this.tabPlaylist[index]
}
});
}
diff --git a/src/app/user/myPlaylists/video-list/video-list.component.ts b/src/app/user/myPlaylists/video-list/video-list.component.ts
index 504884e..2976d98 100644
--- a/src/app/user/myPlaylists/video-list/video-list.component.ts
+++ b/src/app/user/myPlaylists/video-list/video-list.component.ts
@@ -29,8 +29,6 @@ export class VideoListComponent implements OnChanges
ngOnChanges(changes: SimpleChanges): void
{
- console.log("ngOnChanges:");
- console.log(this.playlist);
if((this.playlist !== null) && (this.playlist !== undefined)) this.videosInPlaylist = this.playlist.videos;
}
@@ -57,11 +55,8 @@ export class VideoListComponent implements OnChanges
onDeleteCallback(retour: any, indexVideo: number): void
{
- console.log("onDeleteCallback:" );
- console.log(retour);
-
if(retour.status !== "success") {
- //console.log(retour);
+ console.log(retour);
}
else {
this.playlist.videos.splice(indexVideo, 1);
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 6c72125..33ed891 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
@@ -48,7 +48,7 @@ export class PageProfilUserComponent implements OnInit
ngOnInit(): void
{
this.messageService
- .get( "user/findOne/"+this.profilService.id)
+ .get( "user/findOne/"+this.profilService.getId())
.subscribe( retour => this.ngOnInitCallback(retour), err => this.ngOnInitCallback(err) )
}
@@ -60,7 +60,6 @@ export class PageProfilUserComponent implements OnInit
}
else {
this.user = retour.data;
- this.profilService.id = retour.data.id;
}
}
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 589c23f..0e1c5d3 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
@@ -70,7 +70,7 @@ export class PopupUpdateUserComponent implements OnInit
interests: this.userCopy.interests,
};
this.messageService
- .put("user/update/"+this.profilService.id, data)
+ .put("user/update/"+this.profilService.getId(), data)
.subscribe( ret => this.onValiderCallback(ret), err => this.onValiderCallback(err) );
}
}
@@ -83,6 +83,7 @@ export class PopupUpdateUserComponent implements OnInit
this.dialogRef.close(null);
}
else {
+ this.profilService.setProfileImageUrl(this.userCopy.profileImageUrl);
this.dialogRef.close(this.userCopy);
}
}
diff --git a/src/app/user/search/page-search/page-search.component.ts b/src/app/user/search/page-search/page-search.component.ts
index 7d48734..6994b3a 100644
--- a/src/app/user/search/page-search/page-search.component.ts
+++ b/src/app/user/search/page-search/page-search.component.ts
@@ -45,9 +45,6 @@ export class PageSearchComponent implements OnInit
adCallback(retour: any): void
{
- console.log("adCallback retour:");
- console.log(retour);
-
if(retour.status !== "success") {
//console.log(retour);
}
diff --git a/src/app/user/utils/components/advert/advert.component.scss b/src/app/user/utils/components/advert/advert.component.scss
index f675374..ab03155 100644
--- a/src/app/user/utils/components/advert/advert.component.scss
+++ b/src/app/user/utils/components/advert/advert.component.scss
@@ -11,6 +11,7 @@
max-height: 100%;
border: solid 3px black;
vertical-align: middle;
+ cursor: pointer;
}
.helper {
@@ -27,6 +28,7 @@
border: solid 3px black;
position: fixed;
left: 1vw;
+ cursor: pointer;
}
#imgFromWatchingRight {
@@ -35,4 +37,5 @@
border: solid 3px black;
position: fixed;
right: 1vw;
+ cursor: pointer;
}
diff --git a/src/app/user/utils/components/advert/advert.component.ts b/src/app/user/utils/components/advert/advert.component.ts
index 8008745..00b8b44 100644
--- a/src/app/user/utils/components/advert/advert.component.ts
+++ b/src/app/user/utils/components/advert/advert.component.ts
@@ -32,7 +32,9 @@ export class AdvertComponent implements OnChanges
onClick(): void
{
- if(this.ad.url !== "") document.location.href = this.ad.url;
+ if((this.ad.url !== "") && (this.ad.url !== null) && (this.ad.url !== undefined)) {
+ document.location.href = this.ad.url;
+ }
}
}
diff --git a/src/app/user/utils/components/navbar-user/navbar-user.component.html b/src/app/user/utils/components/navbar-user/navbar-user.component.html
index 98c0404..605e192 100644
--- a/src/app/user/utils/components/navbar-user/navbar-user.component.html
+++ b/src/app/user/utils/components/navbar-user/navbar-user.component.html
@@ -27,7 +27,7 @@
-
diff --git a/src/app/utils/services/profil/profil.service.ts b/src/app/utils/services/profil/profil.service.ts
index e4d2e2b..86ed4a2 100644
--- a/src/app/utils/services/profil/profil.service.ts
+++ b/src/app/utils/services/profil/profil.service.ts
@@ -1,10 +1,30 @@
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
+
@Injectable({
- providedIn: 'root'
+ providedIn: 'root'
})
export class ProfilService
{
- public id: string = "" ;
- public profileImageUrl: string = "";
+
+ getId(): string
+ {
+ return localStorage.getItem('id');
+ }
+
+ getProfileImageUrl(): string
+ {
+ return localStorage.getItem('profileImageUrl');
+ }
+
+ setId(id: string): void
+ {
+ localStorage.setItem('id', id);
+ }
+
+ setProfileImageUrl(profileImageUrl: string): void
+ {
+ localStorage.setItem('profileImageUrl', profileImageUrl);
+ }
+
}