Skip to content

Commit 4298888

Browse files
jeffmakijeffmaki
authored
develop->staging (#81)
2 parents d88b684 + ab3b4f1 commit 4298888

46 files changed

Lines changed: 1005 additions & 523 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ develop ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ develop ]
88

99
# Cancel any in-progress run for the same branch/PR when a newer commit lands.
1010
concurrency:

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introdu
88

99
## Branch Index
1010

11-
* ```develop``` do your work here
12-
* ```development``` keep this up to date with the "development" environment / dev tag
11+
* ```develop``` merge your work here; keep this up to date with the "development" environment / dev tag
1312
* ```staging``` keep this up to date with the "staging" environment / stage tag
1413
* ```production``` keep this up to date with the "production" environment / prod tag
1514

‎components/AppSelect.vue‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
<span class="tdei-select-value">
1919
{{ selectedLabel }}
2020
</span>
21-
<app-icon :variant="isOpen ? 'expand_less' : 'expand_more'" size="20" no-margin />
21+
<app-icon
22+
:variant="isOpen ? 'expand_less' : 'expand_more'"
23+
size="20"
24+
no-margin
25+
/>
2226
</button>
2327

2428
<div
@@ -33,7 +37,7 @@
3337
class="tdei-select-option"
3438
:class="{
3539
'tdei-select-option-active': index === activeIndex,
36-
'tdei-select-option-selected': option.value === model,
40+
'tdei-select-option-selected': option.value === model
3741
}"
3842
type="button"
3943
@click="selectOption(option.value)"

‎components/project-wizard/AoiGeometryMap.vue‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,22 @@
44
class="project-wizard-map"
55
:class="{
66
'project-wizard-map-editable': editable,
7-
'project-wizard-map-drawing': drawMode,
7+
'project-wizard-map-drawing': drawMode
88
}"
99
/>
1010
</template>
1111

1212
<script lang="ts">
13-
import type { StyleSpecification } from 'maplibre-gl';
13+
import type { StyleSpecification,
14+
CircleLayerSpecification,
15+
ExpressionSpecification,
16+
FillLayerSpecification,
17+
GeoJSONSource,
18+
LineLayerSpecification,
19+
MapLayerMouseEvent,
20+
MapMouseEvent,
21+
PaddingOptions,
22+
SymbolLayerSpecification } from 'maplibre-gl';
1423
</script>
1524

1625
<script setup lang="ts">
@@ -21,17 +30,6 @@ import type {
2130
Point,
2231
Polygon,
2332
} from 'geojson';
24-
import type {
25-
CircleLayerSpecification,
26-
ExpressionSpecification,
27-
FillLayerSpecification,
28-
GeoJSONSource,
29-
LineLayerSpecification,
30-
MapLayerMouseEvent,
31-
MapMouseEvent,
32-
PaddingOptions,
33-
SymbolLayerSpecification,
34-
} from 'maplibre-gl';
3533
import type {
3634
ProjectWizardAreaFeature,
3735
ProjectWizardGeneratedTaskFeatureCollection,
@@ -807,7 +805,6 @@ function syncDraftPolygon() {
807805
skipNextAoiFit = true;
808806
emit('update:aoi', draftFeature);
809807
}
810-
811808
</script>
812809

813810
<style lang="scss" scoped>

‎components/project-wizard/AssignUsersField.vue‎

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
<template>
22
<section class="project-wizard-assign-users">
33
<div class="project-wizard-assign-users-search-shell">
4-
<label class="visually-hidden" :for="searchInputId">Search users</label>
4+
<label
5+
class="visually-hidden"
6+
:for="searchInputId"
7+
>Search users</label>
58
<input
69
:id="searchInputId"
710
:value="searchQuery"
@@ -10,14 +13,21 @@
1013
placeholder="Search Users"
1114
@input="emit('update:search', ($event.target as HTMLInputElement).value)"
1215
>
13-
<app-icon variant="search" size="22" no-margin />
16+
<app-icon
17+
variant="search"
18+
size="22"
19+
no-margin
20+
/>
1421
</div>
1522

1623
<div
1724
v-if="loading || shouldShowSearchResults"
1825
class="project-wizard-assign-users-results"
1926
>
20-
<div v-if="loading" class="project-wizard-assign-users-status">
27+
<div
28+
v-if="loading"
29+
class="project-wizard-assign-users-status"
30+
>
2131
<app-spinner size="sm" />
2232
<span>Loading users...</span>
2333
</div>
@@ -31,7 +41,11 @@
3141
@click="emit('add:user', user)"
3242
>
3343
<span class="project-wizard-assign-users-avatar">
34-
<app-icon variant="person" size="18" no-margin />
44+
<app-icon
45+
variant="person"
46+
size="18"
47+
no-margin
48+
/>
3549
</span>
3650

3751
<span class="project-wizard-assign-users-copy">
@@ -44,7 +58,10 @@
4458
</span>
4559
</button>
4660

47-
<p v-if="visibleSearchResults.length === 0" class="project-wizard-assign-users-status">
61+
<p
62+
v-if="visibleSearchResults.length === 0"
63+
class="project-wizard-assign-users-status"
64+
>
4865
No users match your search.
4966
</p>
5067
</template>
@@ -57,7 +74,11 @@
5774
class="project-wizard-assign-users-selected-item"
5875
>
5976
<span class="project-wizard-assign-users-avatar">
60-
<app-icon variant="person" size="18" no-margin />
77+
<app-icon
78+
variant="person"
79+
size="18"
80+
no-margin
81+
/>
6182
</span>
6283

6384
<span class="project-wizard-assign-users-copy">
@@ -75,11 +96,18 @@
7596
:aria-label="`Remove ${user.displayName}`"
7697
@click="emit('remove:user', user.authUid)"
7798
>
78-
<app-icon variant="delete" size="20" no-margin />
99+
<app-icon
100+
variant="delete"
101+
size="20"
102+
no-margin
103+
/>
79104
</button>
80105
</div>
81106

82-
<p v-if="selectedUsers.length === 0" class="project-wizard-assign-users-status">
107+
<p
108+
v-if="selectedUsers.length === 0"
109+
class="project-wizard-assign-users-status"
110+
>
83111
Search and add users for this project.
84112
</p>
85113
</div>

‎components/project-wizard/RichTextEditor.vue‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<template>
22
<div class="project-wizard-rich-text-editor">
3-
<div class="project-wizard-rich-text-editor-toolbar" role="toolbar" aria-label="Instruction formatting">
3+
<div
4+
class="project-wizard-rich-text-editor-toolbar"
5+
role="toolbar"
6+
aria-label="Instruction formatting"
7+
>
48
<button
59
v-for="tool in tools"
610
:key="tool.id"
@@ -10,11 +14,18 @@
1014
:aria-label="tool.label"
1115
@click="applyTool(tool.id)"
1216
>
13-
<app-icon :variant="tool.icon" size="18" no-margin />
17+
<app-icon
18+
:variant="tool.icon"
19+
size="18"
20+
no-margin
21+
/>
1422
</button>
1523
</div>
1624

17-
<editor-content :editor="editor" class="project-wizard-rich-text-editor-content" />
25+
<editor-content
26+
:editor="editor"
27+
class="project-wizard-rich-text-editor-content"
28+
/>
1829
</div>
1930
</template>
2031

@@ -25,15 +36,15 @@ import { Link } from '@tiptap/extension-link';
2536
import { Table, TableCell, TableHeader, TableRow } from '@tiptap/extension-table';
2637
import { StarterKit } from '@tiptap/starter-kit';
2738
28-
type RichTextToolId =
29-
| 'bold'
30-
| 'italic'
31-
| 'link'
32-
| 'bullet-list'
33-
| 'numbered-list'
34-
| 'image'
35-
| 'table'
36-
| 'quote';
39+
type RichTextToolId
40+
= | 'bold'
41+
| 'italic'
42+
| 'link'
43+
| 'bullet-list'
44+
| 'numbered-list'
45+
| 'image'
46+
| 'table'
47+
| 'quote';
3748
3849
interface Props {
3950
modelValue: string;

‎components/project-wizard/StatusDialog.vue‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
aria-label="Close dialog"
1919
@click="emit('close')"
2020
>
21-
<app-icon variant="close" size="24" no-margin />
21+
<app-icon
22+
variant="close"
23+
size="24"
24+
no-margin
25+
/>
2226
</button>
2327

2428
<div class="project-wizard-status-dialog-icon-shell">
@@ -31,7 +35,10 @@
3135
</span>
3236
</div>
3337

34-
<h2 :id="titleId" class="project-wizard-status-dialog-title">
38+
<h2
39+
:id="titleId"
40+
class="project-wizard-status-dialog-title"
41+
>
3542
{{ title }}
3643
</h2>
3744

@@ -75,7 +82,7 @@ interface Props {
7582
7683
const props = defineProps<Props>();
7784
const emit = defineEmits<{
78-
close: [];
85+
'close': [];
7986
'primary-action': [];
8087
'secondary-action': [];
8188
}>();

‎components/project-wizard/Stepper.vue‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<template>
2-
<ol class="project-wizard-stepper" aria-label="Project creation steps">
2+
<ol
3+
class="project-wizard-stepper"
4+
aria-label="Project creation steps"
5+
>
36
<li
47
v-for="(step, index) in steps"
58
:key="step"
69
class="project-wizard-stepper-item"
710
:class="{
8-
'project-wizard-stepper-item-complete': index <= currentIndex,
11+
'project-wizard-stepper-item-complete': index <= currentIndex
912
}"
1013
>
11-
<span class="project-wizard-stepper-line" aria-hidden="true" />
14+
<span
15+
class="project-wizard-stepper-line"
16+
aria-hidden="true"
17+
/>
1218
<button
1319
class="project-wizard-stepper-dot"
1420
type="button"
@@ -43,7 +49,6 @@ defineProps<Props>();
4349
const stepLabels: Record<ProjectWizardStepId, string> = {
4450
details: 'Project Details',
4551
area: 'Area Of Interest',
46-
tasks: 'Tasks Generation',
4752
settings: 'Settings',
4853
review: 'Review',
4954
};

0 commit comments

Comments
 (0)