Merge pull request #29 from EvanBldy/main

various commits

.eslintrc.json

@@ -9,13 +9,12 @@
     "ecmaVersion": 2021,
     "sourceType": "module"
   },
-  "extends": ["eslint:recommended", "prettier"],
+  "extends": ["eslint:recommended"],
   "globals": {
     "defineProps": "readonly",
     "defineEmits": "readonly",
     "defineExpose": "readonly",
     "withDefaults": "readonly"
   },
-  "ignorePatterns": ["node_modules/**", "**/dist/**"],
-  "plugins": ["prettier"]
+  "ignorePatterns": ["node_modules/**", "**/dist/**"]
 }

README.md

@@ -137,24 +137,28 @@ You need to download the connectors-{version}.zip archive in the [releases](http
   - If Blender is installed with a system package (for example: deb or rpm):
 
     ```console
-    ./install.sh --system
+    bash ./install.sh --system
     ```
 
   - If Blender is an unpacked directory (tar.xz archive):
 
     ```console
-    ./install.sh --unpacked-directory=PATH_TO_YOUR_PORTABLE_BLENDER
+    bash ./install.sh --unpacked-directory=PATH_TO_YOUR_PORTABLE_BLENDER
     ```
 
   - If Blender is installed with a snap package:
 
     ```console
-    ./install.sh --snap
+    bash ./install.sh --snap
     ```
 
 - On macOS:
 
-  - coming soon
+  - If Blender is installed with a dmg image or Homebrew :
+
+    ```console
+    bash ./install.sh --dmg
+    ```
 
 #### Toon Boom Harmony
 

app/main/src/index.js

@@ -160,7 +160,7 @@ const createWindow = async () => {
           codePage = Number(stdout.split(':')[1])
         } catch {
           codePage = undefined
-        }        
+        }
       }
     })
   }

app/renderer/.eslintrc.json

@@ -15,6 +15,7 @@
     "vue/require-explicit-emits": "off",
     "vue/no-use-v-if-with-v-for": "off",
     "vue/multi-word-component-names": "off",
-    "vue/attribute-hyphenation": "off"
+    "vue/attribute-hyphenation": "off",
+    "vue/order-in-components": "off"
   }
 }

app/renderer/src/App.vue

@@ -601,39 +601,6 @@ body {
     background-color: #5e6169;
   }
 
-  .vdp-datepicker__calendar {
-    background-color: #36393f;
-    border-color: #25282e;
-
-    .prev,
-    .next,
-    .day__month_btn,
-    header span:hover {
-      background: #36393f;
-    }
-
-    header .prev::after,
-    header .prev::after {
-      border-right-color: #eee;
-    }
-
-    header .next::after,
-    header .next::after {
-      border-left-color: #eee;
-    }
-
-    header .next.disabled::after,
-    header .next.disabled::after {
-      border-left-color: #666;
-    }
-
-    .cell.year.disabled,
-    .cell.month.disabled,
-    .cell.day.disabled {
-      color: $grey;
-    }
-  }
-
   .hero .control .icon {
     color: #555;
   }
@@ -1697,44 +1664,29 @@ th.validation-cell {
 }
 
 .theme .v3dp__datepicker .v3dp__input_wrapper input {
-  border: 1px solid #dbdbdb;
+  border: 1px solid var(--border);
   border-radius: 3px;
   box-shadow: inset 0 1px 2px rgba(10, 10, 10, 0.1);
   padding: 1em;
   height: 3em;
   width: 110px;
+  background: var(--background);
+  color: var(--text);
+  font-size: 1em;
 
   &:focus {
     border-color: #00b242;
     outline: none;
   }
-
-  .cell.year.selected,
-  .cell.month.selected,
-  .cell.day.selected {
-    background: var(--background-selected);
-  }
-
-  .cell.year.selected:not(.blank):not(.disabled):hover,
-  .cell.month.selected:not(.blank):not(.disabled):hover,
-  .cell.day.selected:not(.blank):not(.disabled):hover {
-    border: 1px solid transparent;
-    background: var(--background-selected);
-  }
-
-  header span:not(.disabled):hover {
-    background: var(--background-selectable);
-  }
 }
 
-.theme .vue-slider-dot-tooltip-inner {
-  background: $purple-strong;
-  border-color: $purple-strong;
+.theme .v3dp__divider{
+  visibility: hidden;
+  margin: 0px;
 }
 
-.dark .vue-slider-dot-tooltip-inner {
-  background: $dark-purple;
-  border-color: $dark-purple;
+.slider {
+  cursor: pointer;
 }
 
 .c-mask {

app/renderer/src/components/cells/DescriptionCell.vue

@@ -1,13 +1,20 @@
 <template>
-  <td class="description-cell" @keyup.esc="onClick" @click="onClick">
+  <td
+    class="description-cell"
+    @keyup.esc="onClick"
+    @click="onClick"
+  >
     <template v-if="full">
       <div
         class="description-shorten-text"
         v-html="compileMarkdown(entry.description || '')"
       />
     </template>
     <template v-else>
-      <div v-if="isOpen" class="c-mask" />
+      <div
+        v-if="isOpen"
+        class="c-mask"
+      />
       <span
         class="description-shorten-text selectable"
         v-html="compileMarkdown(shortenText(entry.description || '', 20))"

app/renderer/src/components/cells/LastCommentCell.vue

@@ -9,7 +9,10 @@
         :font-size="14"
         :person="task.last_comment.person"
       />
-      <span v-else class="no-avatar"> &nbsp; </span>
+      <span
+        v-else
+        class="no-avatar"
+      > &nbsp; </span>
 
       <span
         v-if="commentText && commentText.length > 0"

app/renderer/src/components/cells/PeopleNameCell.vue

@@ -1,8 +1,17 @@
 <template>
-  <th scope="row" class="name datatable-row-header">
+  <th
+    scope="row"
+    class="name datatable-row-header"
+  >
     <div class="people-name">
-      <people-avatar class="avatar" :person="person" />
-      <people-name class="people-name" :person="person" />
+      <people-avatar
+        class="avatar"
+        :person="person"
+      />
+      <people-name
+        class="people-name"
+        :person="person"
+      />
     </div>
   </th>
 </template>

app/renderer/src/components/cells/ProductionNameCell.vue

@@ -45,10 +45,13 @@
           {{ generateAvatar(entry) }}
         </span>
         <span v-else>
-          <img :src="getThumbnailPath(entry)" />
+          <img :src="getThumbnailPath(entry)">
         </span>
       </div>
-      <span v-if="!onlyAvatar" class="flexrow-item">
+      <span
+        v-if="!onlyAvatar"
+        class="flexrow-item"
+      >
         {{ entry.name }}
       </span>
     </div>

app/renderer/src/components/cells/TaskTypeName.vue

@@ -1,6 +1,9 @@
 <template>
   <td class="name">
-    <task-type-name :task-type="taskType" :production-id="productionId" />
+    <task-type-name
+      :task-type="taskType"
+      :production-id="productionId"
+    />
   </td>
 </template>
 

app/renderer/src/components/cells/TimeSliderCell.vue

@@ -7,10 +7,20 @@
       <slider
         v-model="value"
         v-bind="sliderConfiguration"
-        class="flexrow-item slider slider-green"
+        class="flexrow-item slider"
       />
-      <button class="button flexrow-item" @click="setValue(1)">1</button>
-      <button class="button flexrow-item" @click="setValue(4)">4</button>
+      <button
+        class="button flexrow-item"
+        @click="setValue(1)"
+      >
+        1
+      </button>
+      <button
+        class="button flexrow-item"
+        @click="setValue(4)"
+      >
+        4
+      </button>
       <button
         class="button flexrow-item"
         @click="setValue(organisation.hours_by_day || 8)"
@@ -90,15 +100,7 @@ export default {
 }
 
 .slider {
-  cursor: pointer;
   z-index: 0;
   width: 400px;
-  --slider-connect-bg: #00b242;
-  --slider-tooltip-bg: #00b242;
-}
-
-.dark .slider-green {
-  --slider-connect-bg: #008732;
-  --slider-tooltip-bg: #008732;
 }
 </style>

app/renderer/src/components/cells/ValidationCell.vue

@@ -14,7 +14,10 @@
     @mouseout="onMouseOut"
     @click="onClick"
   >
-    <div v-if="!minimized" class="wrapper">
+    <div
+      v-if="!minimized"
+      class="wrapper"
+    >
       <span v-if="task">
         <span
           class="tag"
@@ -26,15 +29,21 @@
         >
           {{ taskStatus.short_name }}
         </span>
-        <span v-if="!isCurrentUserClient" class="priority">
+        <span
+          v-if="!isCurrentUserClient"
+          class="priority"
+        >
           {{ priority }}
         </span>
         <span
           v-if="!isCurrentUserClient && isCastingReady"
           class="casting-status"
           :title="castingTitle"
         >
-          <img src="@/assets/icons/casting-ready.png" width="20" />
+          <img
+            src="@/assets/icons/casting-ready.png"
+            width="20"
+          >
         </span>
         <span
           v-else-if="!isCurrentUserClient"
@@ -64,13 +73,16 @@
           v-lazy="avatarPath(personId)"
           width="20"
           height="20"
-        />
+        >
         <span v-else>
           {{ personMap.get(personId).initials }}
         </span>
       </span>
     </div>
-    <div v-else class="wrapper">
+    <div
+      v-else
+      class="wrapper"
+    >
       <span
         class="tag"
         :style="{

app/renderer/src/components/lists/EntityTaskList.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="data-list">
     <div style="overflow: hidden">
-      <table ref="headerWrapper" class="datatable">
+      <table
+        ref="headerWrapper"
+        class="datatable"
+      >
         <thead class="datatable-head">
           <tr class="datatable-row-header">
             <th class="type">
@@ -28,7 +31,10 @@
       </table>
     </div>
 
-    <table-info :is-loading="isLoading" :is-error="isError" />
+    <table-info
+      :is-loading="isLoading"
+      :is-error="isError"
+    />
 
     <div v-if="entries.length > 0">
       <table class="datatable">