develop->staging

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ develop ]
   pull_request:
-    branches: [ master ]
+    branches: [ develop ]
 
 # Cancel any in-progress run for the same branch/PR when a newer commit lands.
 concurrency:

README.md

@@ -8,8 +8,7 @@ Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introdu
 
 ## Branch Index
 
-* ```develop``` do your work here
-* ```development``` keep this up to date with the "development" environment / dev tag
+* ```develop``` merge your work here; keep this up to date with the "development" environment / dev tag
 * ```staging``` keep this up to date with the "staging" environment / stage tag
 * ```production``` keep this up to date with the "production" environment / prod tag
 

components/AppSelect.vue

@@ -18,7 +18,11 @@
       <span class="tdei-select-value">
         {{ selectedLabel }}
       </span>
-      <app-icon :variant="isOpen ? 'expand_less' : 'expand_more'" size="20" no-margin />
+      <app-icon
+        :variant="isOpen ? 'expand_less' : 'expand_more'"
+        size="20"
+        no-margin
+      />
     </button>
 
     <div
@@ -33,7 +37,7 @@
         class="tdei-select-option"
         :class="{
           'tdei-select-option-active': index === activeIndex,
-          'tdei-select-option-selected': option.value === model,
+          'tdei-select-option-selected': option.value === model
         }"
         type="button"
         @click="selectOption(option.value)"

components/project-wizard/AoiGeometryMap.vue

@@ -4,13 +4,22 @@
     class="project-wizard-map"
     :class="{
       'project-wizard-map-editable': editable,
-      'project-wizard-map-drawing': drawMode,
+      'project-wizard-map-drawing': drawMode
     }"
   />
 </template>
 
 <script lang="ts">
-import type { StyleSpecification } from 'maplibre-gl';
+import type { StyleSpecification,
+  CircleLayerSpecification,
+  ExpressionSpecification,
+  FillLayerSpecification,
+  GeoJSONSource,
+  LineLayerSpecification,
+  MapLayerMouseEvent,
+  MapMouseEvent,
+  PaddingOptions,
+  SymbolLayerSpecification } from 'maplibre-gl';
 </script>
 
 <script setup lang="ts">
@@ -21,17 +30,6 @@ import type {
   Point,
   Polygon,
 } from 'geojson';
-import type {
-  CircleLayerSpecification,
-  ExpressionSpecification,
-  FillLayerSpecification,
-  GeoJSONSource,
-  LineLayerSpecification,
-  MapLayerMouseEvent,
-  MapMouseEvent,
-  PaddingOptions,
-  SymbolLayerSpecification,
-} from 'maplibre-gl';
 import type {
   ProjectWizardAreaFeature,
   ProjectWizardGeneratedTaskFeatureCollection,
@@ -807,7 +805,6 @@ function syncDraftPolygon() {
   skipNextAoiFit = true;
   emit('update:aoi', draftFeature);
 }
-
 </script>
 
 <style lang="scss" scoped>

components/project-wizard/AssignUsersField.vue

@@ -1,7 +1,10 @@
 <template>
   <section class="project-wizard-assign-users">
     <div class="project-wizard-assign-users-search-shell">
-      <label class="visually-hidden" :for="searchInputId">Search users</label>
+      <label
+        class="visually-hidden"
+        :for="searchInputId"
+      >Search users</label>
       <input
         :id="searchInputId"
         :value="searchQuery"
@@ -10,14 +13,21 @@
         placeholder="Search Users"
         @input="emit('update:search', ($event.target as HTMLInputElement).value)"
       >
-      <app-icon variant="search" size="22" no-margin />
+      <app-icon
+        variant="search"
+        size="22"
+        no-margin
+      />
     </div>
 
     <div
       v-if="loading || shouldShowSearchResults"
       class="project-wizard-assign-users-results"
     >
-      <div v-if="loading" class="project-wizard-assign-users-status">
+      <div
+        v-if="loading"
+        class="project-wizard-assign-users-status"
+      >
         <app-spinner size="sm" />
         <span>Loading users...</span>
       </div>
@@ -31,7 +41,11 @@
           @click="emit('add:user', user)"
         >
           <span class="project-wizard-assign-users-avatar">
-            <app-icon variant="person" size="18" no-margin />
+            <app-icon
+              variant="person"
+              size="18"
+              no-margin
+            />
           </span>
 
           <span class="project-wizard-assign-users-copy">
@@ -44,7 +58,10 @@
           </span>
         </button>
 
-        <p v-if="visibleSearchResults.length === 0" class="project-wizard-assign-users-status">
+        <p
+          v-if="visibleSearchResults.length === 0"
+          class="project-wizard-assign-users-status"
+        >
           No users match your search.
         </p>
       </template>
@@ -57,7 +74,11 @@
         class="project-wizard-assign-users-selected-item"
       >
         <span class="project-wizard-assign-users-avatar">
-          <app-icon variant="person" size="18" no-margin />
+          <app-icon
+            variant="person"
+            size="18"
+            no-margin
+          />
         </span>
 
         <span class="project-wizard-assign-users-copy">
@@ -75,11 +96,18 @@
           :aria-label="`Remove ${user.displayName}`"
           @click="emit('remove:user', user.authUid)"
         >
-          <app-icon variant="delete" size="20" no-margin />
+          <app-icon
+            variant="delete"
+            size="20"
+            no-margin
+          />
         </button>
       </div>
 
-      <p v-if="selectedUsers.length === 0" class="project-wizard-assign-users-status">
+      <p
+        v-if="selectedUsers.length === 0"
+        class="project-wizard-assign-users-status"
+      >
         Search and add users for this project.
       </p>
     </div>

components/project-wizard/RichTextEditor.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="project-wizard-rich-text-editor">
-    <div class="project-wizard-rich-text-editor-toolbar" role="toolbar" aria-label="Instruction formatting">
+    <div
+      class="project-wizard-rich-text-editor-toolbar"
+      role="toolbar"
+      aria-label="Instruction formatting"
+    >
       <button
         v-for="tool in tools"
         :key="tool.id"
@@ -10,11 +14,18 @@
         :aria-label="tool.label"
         @click="applyTool(tool.id)"
       >
-        <app-icon :variant="tool.icon" size="18" no-margin />
+        <app-icon
+          :variant="tool.icon"
+          size="18"
+          no-margin
+        />
       </button>
     </div>
 
-    <editor-content :editor="editor" class="project-wizard-rich-text-editor-content" />
+    <editor-content
+      :editor="editor"
+      class="project-wizard-rich-text-editor-content"
+    />
   </div>
 </template>
 
@@ -25,15 +36,15 @@ import { Link } from '@tiptap/extension-link';
 import { Table, TableCell, TableHeader, TableRow } from '@tiptap/extension-table';
 import { StarterKit } from '@tiptap/starter-kit';
 
-type RichTextToolId =
-  | 'bold'
-  | 'italic'
-  | 'link'
-  | 'bullet-list'
-  | 'numbered-list'
-  | 'image'
-  | 'table'
-  | 'quote';
+type RichTextToolId
+  = | 'bold'
+    | 'italic'
+    | 'link'
+    | 'bullet-list'
+    | 'numbered-list'
+    | 'image'
+    | 'table'
+    | 'quote';
 
 interface Props {
   modelValue: string;

components/project-wizard/StatusDialog.vue

@@ -18,7 +18,11 @@
         aria-label="Close dialog"
         @click="emit('close')"
       >
-        <app-icon variant="close" size="24" no-margin />
+        <app-icon
+          variant="close"
+          size="24"
+          no-margin
+        />
       </button>
 
       <div class="project-wizard-status-dialog-icon-shell">
@@ -31,7 +35,10 @@
         </span>
       </div>
 
-      <h2 :id="titleId" class="project-wizard-status-dialog-title">
+      <h2
+        :id="titleId"
+        class="project-wizard-status-dialog-title"
+      >
         {{ title }}
       </h2>
 
@@ -75,7 +82,7 @@ interface Props {
 
 const props = defineProps<Props>();
 const emit = defineEmits<{
-  close: [];
+  'close': [];
   'primary-action': [];
   'secondary-action': [];
 }>();

components/project-wizard/Stepper.vue

@@ -1,14 +1,20 @@
 <template>
-  <ol class="project-wizard-stepper" aria-label="Project creation steps">
+  <ol
+    class="project-wizard-stepper"
+    aria-label="Project creation steps"
+  >
     <li
       v-for="(step, index) in steps"
       :key="step"
       class="project-wizard-stepper-item"
       :class="{
-        'project-wizard-stepper-item-complete': index <= currentIndex,
+        'project-wizard-stepper-item-complete': index <= currentIndex
       }"
     >
-      <span class="project-wizard-stepper-line" aria-hidden="true" />
+      <span
+        class="project-wizard-stepper-line"
+        aria-hidden="true"
+      />
       <button
         class="project-wizard-stepper-dot"
         type="button"
@@ -43,7 +49,6 @@ defineProps<Props>();
 const stepLabels: Record<ProjectWizardStepId, string> = {
   details: 'Project Details',
   area: 'Area Of Interest',
-  tasks: 'Tasks Generation',
   settings: 'Settings',
   review: 'Review',
 };