Merge pull request #539 from COS301-SE-2023/codecov

Codecov -> toets
COS301-SE-2023 · Oct 16, 2023 · 62298b8 · 62298b8
2 parents 4d43334 + 6f0c7ea
commit 62298b8
Show file tree

Hide file tree

Showing 20 changed files with 15 additions and 14 deletions.
diff --git a/frontend/src/app/camera/camera.component.html b/frontend/src/app/camera/camera.component.html
@@ -68,10 +68,10 @@
   <div class="footer" [ngClass]="{ 'notVisible': !captured }">
     <div style="display:flex; margin:auto">
       <p-checkbox class="checkbox" [(ngModel)]="isAsset" [binary]="true" label="Extract Text"
-      styleClass="p-button" [disabled]="isTable"></p-checkbox>
+       [disabled]="isTable"></p-checkbox>
       <div style="width:20px"></div>
       <p-checkbox class="checkbox" [(ngModel)]="isTable" [binary]="true" label="Extract Table"
-      styleClass="p-button" (click)="isAsset=isTable"></p-checkbox>
+       (click)="isAsset=isTable"></p-checkbox>
     </div>
     <input class="assetName" pInputText type="text" label="hi" title="Enter Asset Name" [(ngModel)]="assetName"
       placeholder="Enter Asset Name" />

diff --git a/frontend/src/app/landing-page/landing-page.component.html b/frontend/src/app/landing-page/landing-page.component.html
@@ -4,7 +4,7 @@
 
 <div class="header">
     <div class="logoWrapper navItemWrapper" [style.backgroundImage]="'url(assets/Logos/WriteToPdf_Logo_white.png)'"
-        (click)="scrollToSection('aboutSection')">
+        (click)="scrollToSection('aboutSection')" title="About Us">
         <!-- <img class="logo" src="assets/Logos/WriteToPdf_Logo_white.png" alt=""> -->
         <!-- <div style="display:grid;margin:auto;">
             <p-button label="Login"
@@ -15,16 +15,16 @@
                 (click)="navigateToSignup()"></p-button>
         </div> -->
     </div>
-    <div class="navItemWrapper" [style.backgroundImage]="'url(assets/MockData/folder.png)'"
-        (click)="scrollToSection('fileSection')">
+    <div class="navItemWrapper" [style.backgroundImage]="'url(assets/Icons/landingPageIcons/folder-tree.png)'"
+        (click)="scrollToSection('fileSection')" title="High Speed Document Management">
         <!-- <p class="noSelect">High Speed File Management</p> -->
     </div>
-    <div class="navItemWrapper" [style.backgroundImage]="'url(assets/MockData/editing.png)'"
-        (click)="scrollToSection('editSection')">
+    <div class="navItemWrapper" [style.backgroundImage]="'url(assets/Icons/landingPageIcons/editing.png)'"
+        (click)="scrollToSection('editSection')" title="Intuitive Document editing">
         <!-- <p class="noSelect">Intuitive Document Editing</p> -->
     </div>
-    <div class="navItemWrapper" [style.backgroundImage]="'url(assets/MockData/scan.png)'"
-        (click)="scrollToSection('ocrSection')">
+    <div class="navItemWrapper" [style.backgroundImage]="'url(assets/Icons/landingPageIcons/ocrIcon.png)'"
+        (click)="scrollToSection('ocrSection')" title="Accurate Handwritten Text Conversion">
         <!-- <p class="noSelect">Accurate Handwritten text conversion</p> -->
     </div>
 

diff --git a/frontend/src/app/login/login.component.scss b/frontend/src/app/login/login.component.scss
@@ -29,7 +29,7 @@
     background-position: center;
     /* Center the background image */
 
-    background-image: linear-gradient(rgba(100, 100, 100, 0.7), rgba(100, 100, 100, 0.7)), url(/assets/MockData/BGIW.jpg);
+    background-image: url(/assets/MockData/BGIW.jpg);
 }
 
 .loginWrapper {
@@ -50,7 +50,7 @@
     max-height: 95svh;
     overflow-y: auto;
     margin: auto;
-    background-color: rgba($light-grey, 0.6);
+    background-color: rgba($light-grey, 0.9);
 
     border-radius: 33px;
 
@@ -235,4 +235,5 @@ hr {
 
 .forgotEmail {
     width:100%;
-}
+}
+
diff --git a/frontend/src/app/signup/signup.component.scss b/frontend/src/app/signup/signup.component.scss
@@ -17,7 +17,7 @@
     max-height: 95svh;
     overflow-y: auto;
     margin: auto;
-    background-color: rgba($light-grey, 0.6);
+    background-color: rgba($light-grey, 0.85);
 
     border-radius: 33px;
 
@@ -37,7 +37,7 @@
     background-size: cover;
     background-position: center;
     /* Center the background image */
-    background-image: linear-gradient(rgba(100, 100, 100, 0.7), rgba(100, 100, 100, 0.7)), url(/assets/MockData/BGIW.jpg);
+    background-image: url(/assets/MockData/BGIW.jpg);
 }
 
 .signupForm {

diff --git a/frontend/src/assets/Icons/landingPageIcons/editing.png b/frontend/src/assets/Icons/landingPageIcons/editing.png
diff --git a/frontend/src/assets/Icons/landingPageIcons/folder-tree.png b/frontend/src/assets/Icons/landingPageIcons/folder-tree.png
diff --git a/frontend/src/assets/Icons/landingPageIcons/ocrIcon.png b/frontend/src/assets/Icons/landingPageIcons/ocrIcon.png
diff --git a/frontend/src/assets/MockData/BGI.jpg b/frontend/src/assets/MockData/BGI.jpg
diff --git a/frontend/src/assets/MockData/Grain.jpg b/frontend/src/assets/MockData/Grain.jpg
diff --git a/frontend/src/assets/MockData/bg1.jpg b/frontend/src/assets/MockData/bg1.jpg
diff --git a/frontend/src/assets/MockData/bg2.jpg b/frontend/src/assets/MockData/bg2.jpg
diff --git a/frontend/src/assets/MockData/bg4.jpg b/frontend/src/assets/MockData/bg4.jpg
diff --git a/frontend/src/assets/MockData/doodle.jpg b/frontend/src/assets/MockData/doodle.jpg
diff --git a/frontend/src/assets/MockData/download.jpg b/frontend/src/assets/MockData/download.jpg
diff --git a/frontend/src/assets/MockData/editing.png b/frontend/src/assets/MockData/editing.png
diff --git a/frontend/src/assets/MockData/fileMan.jpg b/frontend/src/assets/MockData/fileMan.jpg
diff --git a/frontend/src/assets/MockData/folder.png b/frontend/src/assets/MockData/folder.png
diff --git a/frontend/src/assets/MockData/handWritten.jpg b/frontend/src/assets/MockData/handWritten.jpg
diff --git a/frontend/src/assets/MockData/home.png b/frontend/src/assets/MockData/home.png
diff --git a/frontend/src/assets/MockData/scan.png b/frontend/src/assets/MockData/scan.png