Merge branch 'develop' into fix/remove-pop-ups

Real-Dev-Squad · Feb 18, 2024 · fc3373c · fc3373c
2 parents f40dfe1 + 9901f9b
commit fc3373c
Show file tree

Hide file tree

Showing 13 changed files with 161 additions and 599 deletions.
diff --git a/app/components/profile-field.hbs b/app/components/profile-field.hbs
@@ -10,6 +10,7 @@
       placeholder={{@placeholder}} 
       class="profile-field-input"
       required={{@required}}
+      disabled={{@isDeveloper}}
       {{on 'input' (fn this.inputFieldChanged)}}
       {{on 'blur' (fn this.checkInputValidation)}}
     />

diff --git a/app/components/task/extension-form.hbs b/app/components/task/extension-form.hbs
diff --git a/app/components/task/extension-form.js b/app/components/task/extension-form.js
diff --git a/app/components/task/holder.hbs b/app/components/task/holder.hbs
@@ -15,21 +15,12 @@
   <div class='task-card__status-update-container'>
 
     {{#if this.extensionFormOpened}}
-      {{#if @dev}}
-        <Task::MultipleExtensionForm
-          @task={{@task}}
-          @closeForm={{this.closeExtensionForm}}
-          @title='Extension Details'
-          @closeModel={{this.closeExtensionModel}}
-        />
-      {{else}}
-        <Task::ExtensionForm
-          @task={{@task}}
-          @closeForm={{this.closeExtensionForm}}
-          @title='Form for extension Request'
-          @closeModel={{this.closeExtensionModel}}
-        />
-      {{/if}}
+      <Task::MultipleExtensionForm
+        @task={{@task}}
+        @closeForm={{this.closeExtensionForm}}
+        @title='Extension Details'
+        @closeModel={{this.closeExtensionModel}}
+      />
     {{/if}}
 
     {{#if (not-eq this.status this.TASK_KEYS.VERIFIED)}}

diff --git a/app/routes/profile.js b/app/routes/profile.js
@@ -8,13 +8,18 @@ export default class ProfileRoute extends Route {
   @service toast;
   async model() {
     try {
+      const res = await fetch(`${ENV.BASE_API_URL}/users/isDeveloper`, {
+        credentials: 'include',
+      });
+      const { developerRoleExistsOnUser } = await res.json();
       const response = await fetch(`${ENV.BASE_API_URL}/users/self`, {
         credentials: 'include',
       });
       const userData = await response.json();
       if (response.status === 401) {
         throw new Error('You are not logged in. Please login to continue.');
       }
+      userData.isDeveloper = developerRoleExistsOnUser;
       return userData;
     } catch (error) {
       console.error(error.message);

diff --git a/app/styles/identity.css b/app/styles/identity.css
@@ -454,3 +454,32 @@
     font-size: 12px;
   }
 }
+
+@media (max-height: 870px) and (min-width: 460px) {
+  .identity-rds-logo {
+    width: 174px;
+    margin-top: 3%;
+  }
+
+  .identity-heading {
+    font-size: 24px;
+  }
+
+  .identity-box {
+    height: 202px;
+  }
+
+  .identity-box-heading {
+    font-size: 22px;
+  }
+
+  .identity-box-desc {
+    font-size: 18px;
+  }
+
+  .identity-box-button {
+    padding: 10px;
+    font-size: 16px;
+    margin-top: 18px;
+  }
+}
diff --git a/app/styles/profile.css b/app/styles/profile.css
@@ -39,13 +39,24 @@
   border-color: var(--profile-input-outline-clr);
 }
 
+.profile-page-error {
+  text-align: center; 
+  color: red;
+}
+
 .profile-field-input {
   padding: 0 1.25rem;
   border: none;
   background: none;
   outline: none;
 }
 
+.profile-field-input:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  pointer-events: none;
+}
+
 .profile-field-input:active {
   border-color: var(--profile-input-outline-clr);
 }

diff --git a/app/styles/tasks.css b/app/styles/tasks.css
@@ -182,6 +182,24 @@
   justify-content: space-between;
   align-items: center;
 }
+.task-details__title-container a {
+  max-width: 18.5rem;
+}
+@media screen and (min-width: 900px) {
+  .task-details__title-container a {
+    max-width: 18.3rem;
+  }
+}
+@media screen and ((max-width: 900px) and (min-width: 720px)) {
+  .task-details__title-container a {
+    max-width: 18.3rem;
+  }
+}
+@media screen and (max-width: 720px) {
+  .task-details__title-container a {
+    max-width: 100%;
+  }
+}
 
 #task-update {
   border: 1px solid var(--tasks-page--text);