From 5f3304674f6777e7535c4cfb593112a653c7c132 Mon Sep 17 00:00:00 2001
From: Max <walzen665@web.de>
Date: Tue, 4 Jun 2024 00:34:41 +0200
Subject: [PATCH] Added file disable feature - Redesigned login page

---
 .../src/app/adminui/adminui.component.html    | 11 ++++++++-
 frontend/src/app/adminui/adminui.component.ts | 23 +++++++++++++++++--
 frontend/src/app/login/login.component.html   |  6 ++---
 frontend/src/app/login/login.component.ts     |  6 +----
 .../rest/mappings/Administration.java         | 18 ++++++++++++++-
 .../sharepulse/rest/ro/FileDeleteRequest.java | 14 +++++++++++
 6 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/de/w665/sharepulse/rest/ro/FileDeleteRequest.java

diff --git a/frontend/src/app/adminui/adminui.component.html b/frontend/src/app/adminui/adminui.component.html
index be219f9..27a5447 100644
--- a/frontend/src/app/adminui/adminui.component.html
+++ b/frontend/src/app/adminui/adminui.component.html
@@ -100,7 +100,16 @@
         <td>{{ file.fileName }}</td>
         <td>{{ file.fileSize | formatFileSizePipe }}</td>
         <td>{{ file.singleDownload ? 'true' : 'false' }}</td>
-        <td>{{ file.disabled ? 'true' : 'false' }}</td>
+        <td>
+          <div class="flex flex-row justify-center">
+            {{ file.disabled ? 'true' : 'false' }}
+            <button class="ms-2 btn btn-xs" (click)="disableFile(file.fileId)">
+              <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-ban" viewBox="0 0 16 16">
+                <path d="M15 8a6.97 6.97 0 0 0-1.71-4.584l-9.874 9.875A7 7 0 0 0 15 8M2.71 12.584l9.874-9.875a7 7 0 0 0-9.874 9.874ZM16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0"/>
+              </svg>
+            </button>
+          </div>
+        </td>
         <td>{{ file.uploadDate | date: 'medium' }}</td>
         <td>{{ file.uploadedByIpAddress }}</td>
         <td>{{ file.downloadCount }}</td>
diff --git a/frontend/src/app/adminui/adminui.component.ts b/frontend/src/app/adminui/adminui.component.ts
index 8e26b43..1bc569c 100644
--- a/frontend/src/app/adminui/adminui.component.ts
+++ b/frontend/src/app/adminui/adminui.component.ts
@@ -137,7 +137,7 @@ export class AdminuiComponent {
         }
       });
       this.statistics = response.data;
-      console.log(this.statistics)
+      //console.log(this.statistics)
     } catch (error) {
       console.error(error);
     }
@@ -152,7 +152,26 @@ export class AdminuiComponent {
           'Authorization': 'Bearer ' + await firstValueFrom(this.authStore.token$)
         }
       });
-      console.log(this.statistics)
+      console.log(response.data)
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  async disableFile(fileId: string) {
+    try {
+      const response = await axios({
+        method: 'put',
+        url: this.developmentStore.getBaseUrl() + 'api/v1/secure/files/disable',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer ' + await firstValueFrom(this.authStore.token$)
+        },
+        data: {
+          fileId: fileId
+        }
+      });
+      console.log(response.data)
     } catch (error) {
       console.error(error);
     }
diff --git a/frontend/src/app/login/login.component.html b/frontend/src/app/login/login.component.html
index 2c3bd47..2c5ff3f 100644
--- a/frontend/src/app/login/login.component.html
+++ b/frontend/src/app/login/login.component.html
@@ -1,7 +1,7 @@
 <div class="container mx-auto p-4 mt-20">
   <div class="bg-white shadow-lg rounded-lg p-10 w-full max-w-xl mx-auto">
-    <h2 class="text-3xl font-bold text-gray-800 mb-6 text-center">Login to SharePulse</h2>
-    <form>
+    <h2 class="text-3xl font-bold text-gray-800 mb-10 text-center">Login to SharePulse</h2>
+    <form class="mb-10">
       <div class="mb-5">
         <label class="block text-gray-700 text-sm font-bold mb-2 text-center" for="username">
           Username
@@ -19,7 +19,7 @@
                [ngClass]="{'input-error': loginFailed}"
                (keydown.enter)="tryToLogin()">
       </div>
-      <div class="mb-5">
+      <div class="mb-10">
         <label class="flex items-center justify-center tooltip" data-tip="Storing login sessions is not functional yet">
           <input type="checkbox" class="toggle" checked name="keepSignedIn"/>
           <span class="ml-2 text-gray-700">Keep me signed in</span>
diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/login/login.component.ts
index f22f2da..1c1ead5 100644
--- a/frontend/src/app/login/login.component.ts
+++ b/frontend/src/app/login/login.component.ts
@@ -49,14 +49,10 @@ export class LoginComponent {
           this.authStore.setToken(response.data.token);
           this.authStore.setUsername(this.inputUsername);
 
-          console.log("Login successful");
-          console.log("Token: " + await firstValueFrom(this.authStore.token$));
-          console.log("Username: " + await firstValueFrom(this.authStore.username$));
-
           //timeout
           setTimeout(() => {
             this.router.navigate(['/secure/administration']);
-          }, 1000);
+          }, 500);
         }
       })
       .catch(error => {
diff --git a/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java b/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java
index 267ffad..68b0e89 100644
--- a/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java
+++ b/src/main/java/de/w665/sharepulse/rest/mappings/Administration.java
@@ -1,11 +1,13 @@
 package de.w665.sharepulse.rest.mappings;
 
 import de.w665.sharepulse.SharepulseApplication;
+import de.w665.sharepulse.db.repo.FileUploadRepository;
 import de.w665.sharepulse.db.repo.UserLoginRepository;
 import de.w665.sharepulse.db.repo.UserRepository;
 import de.w665.sharepulse.model.FileUpload;
 import de.w665.sharepulse.model.User;
 import de.w665.sharepulse.rest.SecureApiRestController;
+import de.w665.sharepulse.rest.ro.FileDeleteRequest;
 import de.w665.sharepulse.rest.ro.UserEditRequest;
 import de.w665.sharepulse.service.AuthenticationService;
 import de.w665.sharepulse.service.FileCleanupService;
@@ -27,12 +29,14 @@ public class Administration extends SecureApiRestController {
     private final AuthenticationService authenticationService;
     private final FileCleanupService fileCleanupService;
     private final UserLoginRepository userLoginRepository;
+    private final FileUploadRepository fileUploadRepository;
 
-    public Administration(UserRepository userRepository, AuthenticationService authenticationService, FileCleanupService fileCleanupService, UserLoginRepository userLoginRepository) {
+    public Administration(UserRepository userRepository, AuthenticationService authenticationService, FileCleanupService fileCleanupService, UserLoginRepository userLoginRepository, FileUploadRepository fileUploadRepository) {
         this.userRepository = userRepository;
         this.authenticationService = authenticationService;
         this.fileCleanupService = fileCleanupService;
         this.userLoginRepository = userLoginRepository;
+        this.fileUploadRepository = fileUploadRepository;
     }
 
     @GetMapping("/statistics")
@@ -107,4 +111,16 @@ public class Administration extends SecureApiRestController {
         List<FileUpload> files = fileCleanupService.deleteFiles();
         return ResponseEntity.ok(files);
     }
+
+    @PutMapping("/files/disable")
+    public ResponseEntity<Object> disableFileUploads(@RequestBody FileDeleteRequest fdr, HttpServletRequest request) {
+        Optional<FileUpload> optionalFileUpload = fileUploadRepository.retrieveFileUploadByFileId(fdr.getFileId());
+        if(optionalFileUpload.isEmpty()) {
+            return ResponseEntity.badRequest().body("File not found");
+        }
+        FileUpload fileUpload = optionalFileUpload.get();
+        fileUpload.setDisabled(true);
+        fileUploadRepository.updateFileUpload(fileUpload);
+        return ResponseEntity.ok("File " + fdr.getFileId() + " disabled successfully.");
+    }
 }
diff --git a/src/main/java/de/w665/sharepulse/rest/ro/FileDeleteRequest.java b/src/main/java/de/w665/sharepulse/rest/ro/FileDeleteRequest.java
new file mode 100644
index 0000000..ff6fe18
--- /dev/null
+++ b/src/main/java/de/w665/sharepulse/rest/ro/FileDeleteRequest.java
@@ -0,0 +1,14 @@
+package de.w665.sharepulse.rest.ro;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+public class FileDeleteRequest {
+    private String fileId;
+}