Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 116 additions & 0 deletions client-v3/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions client-v3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"@emnapi/core": "1.10.0",
"@emnapi/runtime": "1.10.0",
"@eslint/js": "^10.0.1",
"@iconify-json/mdi": "^1.2.3",
"@types/lodash": "~4.17.24",
"@types/node": ">=22.12.0",
"@typescript-eslint/eslint-plugin": "^8.59.3",
Expand All @@ -72,6 +73,7 @@
"sass": "1.99.0",
"typescript": "^6.0.3",
"typescript-eslint": "^8.59.3",
"unplugin-icons": "^23.0.1",
"unplugin-vue-components": "^32.0.0",
"vite": "^8.0.12",
"vitest": "^4.1.6",
Expand Down
2 changes: 1 addition & 1 deletion client-v3/src/components/config/ConfigSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{{ dirtyByCategory[String(category)] }}
</BBadge>
</span>
<span>{{ expandedState[String(category)] ? '▲' : '▼' }}</span>
<IMdiChevronUp v-if="expandedState[String(category)]" /><IMdiChevronDown v-else />
</div>
</BCardHeader>
<BCollapse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,8 @@
</BButton>
</template>
<template #cell(interval_after)="data">
<svg
v-if="data.item.interval_after"
xmlns="http://www.w3.org/2000/svg"
width="1em"
height="1em"
fill="#06BC8C"
viewBox="0 0 16 16"
>
<path
d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm10.03 4.97a.75.75 0 0 1 .011 1.05l-3.992 4.99a.75.75 0 0 1-1.08.02L4.324 8.384a.75.75 0 1 1 1.06-1.06l2.094 2.093 3.473-4.425a.75.75 0 0 1 1.079-.022z"
/>
</svg>
<svg
v-else
xmlns="http://www.w3.org/2000/svg"
width="1em"
height="1em"
fill="#E74C3C"
viewBox="0 0 16 16"
>
<path
d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm3.354 4.646L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 1 1 .708-.708z"
/>
</svg>
<IMdiCheckboxMarked v-if="data.item.interval_after" style="color: #06bc8c" />
<IMdiCloseBox v-else style="color: #e74c3c" />
</template>
<template #cell(next_act)="data">
<span v-if="data.item.next_act">{{ showStore.actById(data.item.next_act)?.name }}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,7 @@
:disabled="isLineCut"
@click.stop="openNewForm"
>
<svg
xmlns="http://www.w3.org/2000/svg"
width="1em"
height="1em"
fill="#06BC8C"
viewBox="0 0 16 16"
>
<path
d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z"
/>
</svg>
<IMdiPlusBox style="color: #06bc8c" />
</BButton>
</BButtonGroup>
</template>
Expand Down
24 changes: 11 additions & 13 deletions client-v3/src/components/show/config/mics/MicAllocations.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,11 @@
:disabled="micSelectAllDisabledForCharacter(selectedMic, data.item.Character)"
@click.stop="toggleSelectAllAllocation(selectedMic, data.item.Character)"
>
<span
<IMdiCheckCircle
v-if="micSelectedAllForCharacter(selectedMic, data.item.Character)"
class="text-success"
>✓</span
>
<span v-else class="text-danger">✗</span>
style="color: #06bc8c"
/>
<IMdiCloseCircle v-else style="color: #e74c3c" />
</BButton>
</div>
</template>
Expand All @@ -119,12 +118,11 @@
:disabled="micDisabledForCharacter(selectedMic, scene.id, data.item.Character)"
@click.stop="toggleAllocation(selectedMic, scene.id, data.item.Character)"
>
<span
<IMdiCheckCircle
v-if="internalState[selectedMic]?.[scene.id] === data.item.Character"
class="text-success"
>✓</span
>
<span v-else class="text-danger">✗</span>
style="color: #06bc8c"
/>
<IMdiCloseCircle v-else style="color: #e74c3c" />
</BButton>
</template>
<template v-else>
Expand All @@ -135,11 +133,11 @@
:title="getTooltipText(data.item.Character, scene.id)"
>
{{ allocationByCharacter[data.item.Character]?.[scene.id] }}
<span
<IMdiAlert
v-if="getConflictsForCell(data.item.Character, scene.id).length > 0"
class="conflict-icon"
>⚠</span
>
style="color: #f39c12"
/>
</div>
</template>
</template>
Expand Down
2 changes: 1 addition & 1 deletion client-v3/src/components/show/config/mics/MicTimeline.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</BButton>
</BButtonGroup>
<BButton size="sm" variant="outline-secondary" title="Export as PNG" @click="handleExport">
Export
<IMdiDownload /> Export
</BButton>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<template #cell(revision_id)="data">
<span>
{{ data.item.revision }}
<span v-if="data.item.revision_id === showStore.currentRevision" class="text-success ms-1"
>✓</span
>
<IMdiCheckboxMarked
v-if="data.item.revision_id === showStore.currentRevision"
style="color: #06bc8c; margin-left: 0.25rem"
/>
</span>
</template>
<template #cell(btn)="data">
Expand Down
12 changes: 9 additions & 3 deletions client-v3/src/components/show/config/script/RevisionGraph.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,15 @@
</svg>
<div class="zoom-controls">
<BButtonGroup vertical>
<BButton size="sm" variant="outline-secondary" @click="zoomIn">+</BButton>
<BButton size="sm" variant="outline-secondary" @click="zoomOut">-</BButton>
<BButton size="sm" variant="outline-secondary" @click="resetZoom">↺</BButton>
<BButton size="sm" variant="outline-secondary" @click="zoomIn"
><IMdiMagnifyPlus
/></BButton>
<BButton size="sm" variant="outline-secondary" @click="zoomOut"
><IMdiMagnifyMinus
/></BButton>
<BButton size="sm" variant="outline-secondary" @click="resetZoom"
><IMdiRefresh
/></BButton>
</BButtonGroup>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@
/>
</template>
<BCol v-else cols="10" style="text-align: right">
<BButton v-b-tooltip.hover.top="'Add line part'" @click="addLinePart">+</BButton>
<BButton v-b-tooltip.hover.top="'Add line part'" @click="addLinePart"
><IMdiPlusBox
/></BButton>
</BCol>
</template>
<template v-else>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
style="margin-left: 0.5em; float: right"
@click="$emit('add-line-part')"
>
+
<IMdiPlusBox />
</BButton>
</BCol>
</BRow>
Expand Down
Loading
Loading