From f2395accfff5bf67821a3ab638694c463cbd8834 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 19 Feb 2024 23:37:40 +0100 Subject: [PATCH 1/5] Added slogans - Added Navbar hover animations --- frontend/src/app/home/home.component.html | 2 +- frontend/src/app/home/home.component.ts | 4 ++ frontend/src/app/navbar/navbar.component.html | 11 +++-- frontend/src/assets/slogans.ts | 41 +++++++++++++++++++ 4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 frontend/src/assets/slogans.ts diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 748d814..18af64f 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -1,6 +1,6 @@

Welcome to SharePulse

-

Where sharing files is easier than finding a matching sock on laundry day!

+

{{ slogan }}

diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts index 017cf73..7d7fd8d 100644 --- a/frontend/src/app/home/home.component.ts +++ b/frontend/src/app/home/home.component.ts @@ -2,6 +2,7 @@ import {Component, ElementRef, ViewChild} from '@angular/core'; import {RouterLink} from "@angular/router"; import {FormsModule} from "@angular/forms"; import {LegalService} from "../../service/legalService"; +import slogans from "../../assets/slogans"; @Component({ selector: 'app-home', @@ -14,7 +15,10 @@ import {LegalService} from "../../service/legalService"; styleUrl: './home.component.scss' }) export class HomeComponent { + + slogan: string = ""; constructor(private legalService: LegalService) { + this.slogan = slogans[Math.floor(Math.random() * slogans.length)]; } openPrivacyPolicyModal() { diff --git a/frontend/src/app/navbar/navbar.component.html b/frontend/src/app/navbar/navbar.component.html index c50679f..36cae40 100644 --- a/frontend/src/app/navbar/navbar.component.html +++ b/frontend/src/app/navbar/navbar.component.html @@ -1,12 +1,12 @@
diff --git a/frontend/src/app/upload/upload.component.html b/frontend/src/app/upload/upload.component.html index 482a7d7..33a953f 100644 --- a/frontend/src/app/upload/upload.component.html +++ b/frontend/src/app/upload/upload.component.html @@ -44,7 +44,7 @@
- +

Drag and drop files, or click to select the files you want to share.

@@ -99,12 +99,12 @@

Your file is now securely stored on our servers.

- - - + +
From 5956849a49f5a3827e82b59206c3a39cdca55363 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Feb 2024 22:08:20 +0100 Subject: [PATCH 4/5] Create build.yml --- .gitea/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .gitea/workflows/build.yml diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml new file mode 100644 index 0000000..a89b76c --- /dev/null +++ b/.gitea/workflows/build.yml @@ -0,0 +1,31 @@ +name: SharePulse Build + +on: + push: + branches: + - main + +jobs: + build-jar: + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v2 + with: + java-version: '21' + distribution: 'adopt' + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Build .jar with Maven + run: ./gradlew clean bootJar + + - name: Upload Artifact + uses: actions/upload-artifact@v3 + with: + name: jar-artifact + path: build/libs/*.jar \ No newline at end of file From b331ccfbe3afb52b9146018e63d9edc728270987 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Feb 2024 22:32:01 +0100 Subject: [PATCH 5/5] Update upload.component.html - Hide status URL --- frontend/src/app/upload/upload.component.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/upload/upload.component.html b/frontend/src/app/upload/upload.component.html index 33a953f..79fd8aa 100644 --- a/frontend/src/app/upload/upload.component.html +++ b/frontend/src/app/upload/upload.component.html @@ -63,7 +63,7 @@
-
File Name:
+
File name:
{{uploadData.fileName}}
Is password protected:
@@ -77,7 +77,7 @@ {{uploadData.singleDownload ? 'Yes' : 'No'}} -
Download Password:
+
Download password:
{{uploadData.password || 'N/A'}}
File ID:
@@ -86,8 +86,12 @@
Download URL:
+ +