Dev to main Sync

app/components/progress-bar.hbs

@@ -0,0 +1,51 @@
+<div ...attributes class='progress-slider'>
+  <input
+    {{focus-when this.isEditable}}
+    aria-label='progress slider for IN-Progress tasks'
+    data-test-progress-bar
+    class='progress-slider__input-slider'
+    id='progress-slider-input'
+    type='range'
+    value={{@value}}
+    min='0'
+    max='100'
+    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}}
+  </button>
+
+</div>

app/components/progress-bar.js

@@ -0,0 +1,47 @@
+import Component from '@glimmer/component';
+import { tracked } from '@glimmer/tracking';
+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);
+    }
+  }
+
+  async debouncedChange(e) {
+    await this.args.onChange(e);
+    this.isEditable = false;
+  }
+}

app/components/task-details.hbs

@@ -2,22 +2,38 @@
   <div class='task-details__title-container'>
     <p class='task-details__title'>{{@task.title}}</p>
     <div class='task-card__progress-bar-container'>
-      <div class='task-card__progress-bar-container__progress-bar'>
-        <Input
-          data-test-task-progress-bar
-          class='progress-bar__input {{@progressBarClass}}'
-          id='input'
-          type='range'
-          name='percentCompleted'
-          value={{@percentCompleted}}
-          min='0'
-          max='100'
-          step='10'
-          {{on 'change' @onPercentageChange}}
-          {{on 'change' (fn @onTaskUpdate @task.id)}}
-          disabled={{@isProgressBarDisabled}}
-        />
-        {{@percentCompleted}}%
+      <div
+        class='{{unless
+            @dev
+            "task-card__progress-bar-container__progress-bar"
+          }}'
+      >
+        {{#if @dev}}
+          {{#if (eq @task.status 'IN_PROGRESS')}}
+            <ProgressBar
+              class='{{@progressBarClass}}'
+              @value={{@percentCompleted}}
+              @onChange={{@onPercentageChange}}
+              @onInput={{@onInputChange}}
+            />
+          {{/if}}
+        {{else}}
+          <Input
+            data-test-task-progress-bar
+            class='progress-bar__input {{@progressBarClass}}'
+            id='input'
+            type='range'
+            name='percentCompleted'
+            value={{@percentCompleted}}
+            min='0'
+            max='100'
+            step='10'
+            {{on 'change' @onPercentageChange}}
+            disabled={{@isProgressBarDisabled}}
+          />
+          {{@percentCompleted}}%
+        {{/if}}
+
       </div>
     </div>
   </div>

app/components/task/holder.hbs

@@ -7,6 +7,8 @@
     @percentCompleted={{this.percentCompleted}}
     @progressBarClass={{this.progressBarClass}}
     @isProgressBarDisabled={{this.isProgressBarDisabled}}
+    @onInputChange={{this.progressBarInputChange}}
+    @dev={{@dev}}
   />
 
   <div class='task-card__status-update-container'>
@@ -27,7 +29,6 @@
           data-test-task-status-select
           id='task-update'
           {{on 'change' this.onStatusChange}}
-          {{on 'change' (fn this.onUpdate @task.id)}}
         >
           {{#each this.availabletaskStatusList as |taskStatus|}}
             {{#if (not-eq taskStatus.key this.TASK_KEYS.ALL)}}

app/components/task/holder.js

@@ -66,18 +66,23 @@ export default class TasksHolderComponent extends Component {
     return 'progress-bar-yellow';
   }
 
+  @action progressBarInputChange(value) {
+    this.percentCompleted = value;
+  }
+
   get isProgressBarDisabled() {
     return this.args.task.status !== TASK_KEYS.IN_PROGRESS;
   }
 
   @action
-  onPercentageChange(e) {
+  async onPercentageChange(e) {
     const { value } = e.target;
     this.percentCompleted = value;
     this.args.onTaskChange('percentCompleted', value);
     if (value === TASK_PERCENTAGE.completedPercentage) {
       this.percentCompleted = this.args.task.percentCompleted;
     }
+    await this.onUpdate(this.args.task.id);
   }
 
   @action
@@ -95,6 +100,7 @@ export default class TasksHolderComponent extends Component {
     const { value } = e.target;
     this.status = value;
     this.args.onTaskChange('status', value);
+    this.onUpdate(this.args.task.id);
   }
 
   @action

app/components/tasks.hbs

@@ -23,6 +23,7 @@
           @onTaskUpdate={{@onTaskUpdate}}
           @userSelectedTask={{@userSelectedTask}}
           @disabled={{@disabled}}
+          @dev={{@dev}}
         />
       </div>
     {{/each}}

app/modifiers/focus-when.js

@@ -0,0 +1,7 @@
+import { modifier } from 'ember-modifier';
+
+export default modifier(function focusWhen(element, [isFocused]) {
+  if (isFocused) {
+    element.focus();
+  }
+});

app/styles/app.css

@@ -17,6 +17,7 @@
 @import 'card.css';
 @import 'discord.css';
 @import 'qrcode.css';
+@import 'progress-bar.css';
 
 html,
 body {

app/styles/progress-bar.css

@@ -0,0 +1,81 @@
+:root {
+  --progress-bar-color: rgba(0, 128, 0, 0.9);
+  --light-grey: rgba(128, 128, 128, 0.5);
+  --black: black;
+  --white: white;
+}
+.progress-slider {
+  display: flex;
+  gap: 4px;
+}
+
+.progress-slider__button {
+  width: 1.5rem;
+  height: 1.1rem;
+  border: 2px solid var(--black);
+  border-radius: 4px;
+  background-color: transparent;
+  display: flex;
+  align-items: center;
+  justify-items: center;
+}
+
+.progress-slider__button__text {
+  font-size: 0.6em;
+  font-weight: bolder;
+  margin: auto;
+}
+
+.progress-slider__button__edit-icon {
+  width: 1rem;
+  height: 1rem;
+  margin: 3px;
+}
+.progress-slider__input-slider {
+  -webkit-appearance: none;
+  appearance: none;
+  width: 90%;
+  height: 1.1rem;
+  cursor: pointer;
+  outline: none;
+  overflow: hidden;
+  border: 2px solid var(--black);
+  border-radius: 4px;
+}
+
+.progress-slider__input-slider:focus {
+  box-shadow: 0 0 0 2px var(--progress-bar-color);
+}
+.progress-slider__input-slider:disabled {
+  cursor: auto;
+}
+
+.progress-slider__input-slider::-webkit-slider-thumb {
+  -webkit-appearance: none;
+  width: 0;
+  box-shadow: -20rem 0 0 20rem var(--progress-bar-color);
+}
+
+.progress-slider__input-slider::-moz-range-thumb {
+  border: none;
+  width: 0;
+  box-shadow: -20rem 0 0 20rem var(--progress-bar-color);
+}
+
+.progress-slider__input-slider[step] {
+  background-color: transparent;
+  background: repeating-linear-gradient(
+    to right,
+    var(--white),
+    var(--white) calc(10.05% - 1.5px),
+    var(--black) 10.05%
+  );
+}
+
+.progress-slider__button--hover:hover {
+  background-color: var(--light-grey);
+}
+
+.progress-slider__button__edit-icon__inner {
+  fill: var(--progress-bar-color);
+}

app/styles/tasks.css

@@ -18,17 +18,17 @@
 }
 
 .progress-bar-red {
-  --progress-bar-color: red;
+  --progress-bar-color:rgba(255, 0, 0, 0.8);
 }
 .progress-bar-yellow {
-  --progress-bar-color: #ecef08;
+  --progress-bar-color: rgba(255, 255, 0, 0.9);
 }
 
 .progress-bar-green {
-  --progress-bar-color: green;
+  --progress-bar-color: rgba(0, 128, 0, 0.9);
 }
 .progress-bar-orange {
-  --progress-bar-color: orange;
+  --progress-bar-color: rgba(255, 165, 0,0.9);
 }
 
 .tasks-page {
@@ -83,8 +83,9 @@
 }
 
 .task-card__progress-bar-container {
-  padding: 1em;
-  width: 15rem;
+  padding-right: 0.5em;
+  padding-bottom: 0.5em;
+  width: 14.5rem;
   flex-shrink: 0;
 }
 

package.json

@@ -32,10 +32,10 @@
     "dotenv": "^16.0.1",
     "ember-cli-qrcode": "^2.1.0",
     "ember-click-outside": "^5.0.1",
+    "ember-resources": "^5.6.0",
     "mixpanel-browser": "^2.43.0",
     "webpack": "^5.74.0",
-    "webpack-5": "^0.0.0",
-    "ember-resources": "^5.6.0"
+    "webpack-5": "^0.0.0"
   },
   "devDependencies": {
     "@ember/jquery": "^2.0.0",
@@ -57,12 +57,14 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.3.2",
     "ember-cli-inject-live-reload": "^2.0.2",
+    "ember-cli-mirage": "^2.4.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.1",
     "ember-data": "~3.25.0",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-modifier": "^4.1.0",
     "ember-page-title": "^6.2.1",
     "ember-qunit": "^5.1.3",
     "ember-resolver": "^8.0.2",
@@ -85,7 +87,6 @@
     "qunit": "^2.14.0",
     "qunit-dom": "^1.6.0",
     "toastr": "^2.1.4",
-    "ember-cli-mirage": "^2.4.0",
     "tracked-maps-and-sets": "^3.0.2"
   },
   "engines": {