Merge branch 'develop' of https://github.com/Real-Dev-Squad/website-my …

…into develop
Real-Dev-Squad · Mar 15, 2024 · d4556bf · d4556bf
2 parents a843f67 + b6aac58
commit d4556bf
Show file tree

Hide file tree

Showing 19 changed files with 207 additions and 680 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/progress-bar.hbs b/app/components/progress-bar.hbs
@@ -12,40 +12,15 @@
     step='10'
     {{on 'change' this.onChange}}
     {{on 'input' this.onInput}}
-    disabled={{not this.isEditable}}
   />
   <button
     data-test-progress-bar-button
-    {{on 'click' this.turnEditModeOn}}
     class='progress-slider__button
       {{unless this.isEditable "progress-slider__button--hover"}}'
     type='button'
   >
-    {{#if this.isEditable}}
-      <span class='progress-slider__button__text'>{{@value}}</span>
-    {{else}}
-      <svg
-        class='progress-slider__button__edit-icon'
-        viewBox='0 0 24 24'
-        fill='none'
-        xmlns='http://www.w3.org/2000/svg'
-      >
-        <path
-          class='progress-slider__button__edit-icon__inner'
-          opacity='0.5'
-          d='M4 20H8L18 10L14 6L4 16V20Z'
-          fill='#000000'
-        />
-        <path
-          class='progress-slider__button__edit-icon__outer'
-          d='M18 10L21 7L17 3L14 6M18 10L8 20H4V16L14 6M18 10L14 6'
-          stroke='#000000'
-          stroke-width='1.5'
-          stroke-linecap='round'
-          stroke-linejoin='round'
-        />
-      </svg>
-    {{/if}}
+    <span class='progress-slider__button__text'>{{@value}}</span>
+
   </button>
 
 </div>
diff --git a/app/components/progress-bar.js b/app/components/progress-bar.js
@@ -4,37 +4,16 @@ import { action } from '@ember/object';
 import { debounce } from '@ember/runloop';
 
 export default class ProgressBarComponent extends Component {
-  @tracked isEditable = false;
   @tracked value = this.args.value;
-  lastEditTime = null;
-
-  @action turnEditModeOn() {
-    this.isEditable = true;
-    this.lastEditTime = Date.now();
-    this.setEditableToFalse();
-  }
-
-  setEditableToFalse() {
-    setTimeout(() => {
-      const timeDelta = Date.now() - this.lastEditTime;
-      if (this.isEditable && timeDelta >= 5000) {
-        this.isEditable = false;
-      } else if (this.isEditable) {
-        this.setEditableToFalse();
-      }
-    }, 5000);
-  }
 
   @action onInput(e) {
-    this.lastEditTime = Date.now();
     this.value = e.target.value;
     if (this.args.onInput) {
       this.args.onInput(this.value);
     }
   }
 
   @action onChange(e) {
-    this.lastEditTime = Date.now();
     if (this.args.onChange) {
       debounce(this, this.debouncedChange, e, 600);
     }

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)}}