From 42ba471be6e3d76dad077e20bbb8fcb33dbf875d Mon Sep 17 00:00:00 2001 From: Viicious Date: Sun, 24 Jun 2018 21:46:30 +0200 Subject: [PATCH] stable version --- src/app/book/book.component.css | 6 ++ src/app/book/book.component.html | 92 +++++++++++++++++++++++++++ src/app/book/book.component.ts | 4 +- src/app/home/home.component.html | 103 +++++++++++++++++++++++++++++-- src/app/home/home.component.scss | 6 ++ src/app/home/home.component.ts | 13 +++- src/app/main/main.component.html | 2 + 7 files changed, 218 insertions(+), 8 deletions(-) diff --git a/src/app/book/book.component.css b/src/app/book/book.component.css index 5dfbaa2..f05affa 100644 --- a/src/app/book/book.component.css +++ b/src/app/book/book.component.css @@ -200,3 +200,9 @@ body { } } +#cookiesModal { + display: flex; + justify-content: center; + align-items: center; +} + diff --git a/src/app/book/book.component.html b/src/app/book/book.component.html index 9ed8153..3d67708 100644 --- a/src/app/book/book.component.html +++ b/src/app/book/book.component.html @@ -394,4 +394,96 @@ + + + + + + + + + diff --git a/src/app/book/book.component.ts b/src/app/book/book.component.ts index f967ae3..b955a9f 100644 --- a/src/app/book/book.component.ts +++ b/src/app/book/book.component.ts @@ -85,6 +85,7 @@ export class BookComponent implements OnInit, OnDestroy { this.test = ''; this.sizeFile = 0; + } copyLink(val) { @@ -199,7 +200,7 @@ export class BookComponent implements OnInit, OnDestroy { } - renameFolder(folderToRename){ + renameFolder(folderToRename) { folderToRename.path = this.mainFolder.path + '/' + folderToRename.name; this.http.post('/api/renameFolderMongo', folderToRename).subscribe(data => { @@ -268,6 +269,7 @@ export class BookComponent implements OnInit, OnDestroy { } else { this.allUserFile = []; } + document.getElementById('openModalButton').click(); }); } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 91aa11f..9ffa870 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -215,9 +215,6 @@ - - -
@@ -389,7 +386,6 @@ -
@@ -417,7 +413,7 @@ @@ -427,4 +423,99 @@ - \ No newline at end of file + + + + + + + + + + + + + diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index a45dee5..31aee63 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -59,3 +59,9 @@ h6 { #rules { margin-left: 1rem; } + +#cookiesModal { + display: flex; + justify-content: center; + align-items: center; +} diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index fcb70dd..982e42f 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -17,6 +17,7 @@ export class HomeComponent implements OnInit { message = ''; messageR = ''; data: any; + test: any; constructor(private http: HttpClient, private router: Router) { this.registerbool = false; @@ -24,7 +25,7 @@ export class HomeComponent implements OnInit { } showregister() { - this.registerbool = !this.registerbool + this.registerbool = !this.registerbool; } toggleCheckbox() { @@ -60,10 +61,20 @@ export class HomeComponent implements OnInit { + showCookies() { + document.getElementById('openModalButton').click(); + } + + + ngOnInit() { + setTimeout(() => + { + this.showCookies();); + }, 1000); } } diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html index 158a6b4..001a087 100644 --- a/src/app/main/main.component.html +++ b/src/app/main/main.component.html @@ -1,6 +1,8 @@ + +