Merge pull request #109 from CS3219-AY2425S1/kervyn/ivans-fix

Fix add/edit modal
CS3219-AY2425S1 · Nov 13, 2024 · 9fd0418 · 9fd0418
2 parents 3f18483 + 9e27b2b
commit 9fd0418
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/peer-prep-fe/src/add-page/add-page.component.css b/peer-prep-fe/src/add-page/add-page.component.css
@@ -14,6 +14,7 @@
   margin-left: auto;
   margin-right: auto;
   border: 1px solid #ccc;
+  overflow: visible;
 }
 
 
@@ -108,13 +109,14 @@
 
 .dropdown-menu {
   display: none;
-  position: absolute;
-  width: 80%;
+  position: fixed;
+  width: 30%;
+  height: 100%;
   border: 1px solid #ccc;
   max-height: 100px;
   overflow-y: auto;
   box-shadow: 0px 8px 16px rgba(0, 0, 0, 0.1);
-  z-index: 1;
+  z-index: 1000;
   border-radius: 3px;
   background-color: #333333;
 }
@@ -241,4 +243,3 @@ input[type="checkbox"] {
   overflow: hidden;
 } */
 
-
diff --git a/peer-prep-fe/src/app/login/login.component.ts b/peer-prep-fe/src/app/login/login.component.ts
@@ -63,6 +63,7 @@ export class LoginComponent {
     })
       .then((response) => {
         if (!response.ok) {
+          this.isLoading = false;
           if (response.status === 401) {
             alert("Incorrect email or password.")
           }

diff --git a/peer-prep-fe/src/components/question-box/question-box.component.ts b/peer-prep-fe/src/components/question-box/question-box.component.ts
@@ -54,7 +54,7 @@ export class QuestionBoxComponent {
       },
       panelClass: "custom-modalbox",
       width: "800px",
-      height: "600px",
+      height: "400px",
       position: {
         top: "200px"
       },

diff --git a/peer-prep-fe/src/components/search-and-filter/search-and-filter.component.ts b/peer-prep-fe/src/components/search-and-filter/search-and-filter.component.ts
@@ -106,7 +106,7 @@ export class SearchAndFilterComponent {
     const dialogRef = this.dialog.open(AddPageComponent, {
       panelClass: "custom-modalbox",
       width: "800px",
-      height: "600px",
+      height: "400px",
       position: {
         top: "200px"
       },

diff --git a/peer-prep-fe/src/edit-page/edit-page.component.css b/peer-prep-fe/src/edit-page/edit-page.component.css
@@ -13,6 +13,7 @@
   margin-left: auto;
   margin-right: auto;
   border: 1px solid #ccc;
+  overflow: visible;
 }
 
 .question-title {
@@ -100,13 +101,14 @@
 
 .dropdown-menu {
   display: none;
-  position: absolute;
-  width: 80%;
+  position: fixed;
+  width: 30%;
+  height: 100%;
   border: 1px solid #ccc;
   max-height: 100px;
   overflow-y: auto;
   box-shadow: 0px 8px 16px rgba(0, 0, 0, 0.1);
-  z-index: 1;
+  z-index: 1000;
   border-radius: 3px;
   background-color: #333333;