From 38ac68c2df4a6359b6d9c1847159bf495ffe45a0 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sat, 7 Sep 2024 17:22:20 -0700 Subject: [PATCH 1/7] Rough in new layout --- src/module/actor/sheets/sitesheet.ts | 2 +- src/module/vue/site-sheet.vue | 158 ++++++++++++++++----------- 2 files changed, 93 insertions(+), 67 deletions(-) diff --git a/src/module/actor/sheets/sitesheet.ts b/src/module/actor/sheets/sitesheet.ts index f27c9a6d4..e83aa0840 100644 --- a/src/module/actor/sheets/sitesheet.ts +++ b/src/module/actor/sheets/sitesheet.ts @@ -4,7 +4,7 @@ import siteSheetVue from '../../vue/site-sheet.vue' export class IronswornSiteSheet extends VueActorSheet { static get defaultOptions() { return foundry.utils.mergeObject(super.defaultOptions, { - width: 750, + width: 600, height: 700, rootComponent: siteSheetVue }) as any diff --git a/src/module/vue/site-sheet.vue b/src/module/vue/site-sheet.vue index 22543d632..e31470cb1 100644 --- a/src/module/vue/site-sheet.vue +++ b/src/module/vue/site-sheet.vue @@ -3,9 +3,87 @@
+
-
+ +
+
+ +
+
THEME 1
+
THEME 2
+
+
DOMAIN
+ +
+ + +
+ + + + + + + + +

Features

 +

Dangers

 + +

+ + + +

+
+ + + + + + + + + + + + +
+ + + +
+ + +
+
- -
-
- -
-
- -
-
- -
-

- {{ $t('IRONSWORN.DELVESITE.Denizens') }} - - -

-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
-
@@ -137,6 +153,12 @@ import IronBtn from './components/buttons/iron-btn.vue' import type { IronswornActor } from '../actor/actor' import { ChallengeRank } from '../fields/ChallengeRank' +import TabSet from 'component:tabs/tab-set.vue' +import TabList from 'component:tabs/tab-list.vue' +import TabPanels from 'component:tabs/tab-panels.vue' +import TabPanel from 'component:tabs/tab-panel.vue' +import Tab from 'component:tabs/tab.vue' + const props = defineProps<{ data: { actor: ActorSource<'site'> } }>() @@ -205,6 +227,11 @@ function saveDescription() { gap: 0.5em; } +.progress { + margin: 0.5rem; + margin-top: 0; +} + .progressTopRow { gap: var(--ironsworn-spacer-lg); } @@ -232,13 +259,12 @@ function saveDescription() { } .rightCol { - flex-basis: 14em; - max-height: 440px; + max-height: 30em; } .leftCol { - flex-basis: 20em; gap: 1em; + min-height: 30em; } .heading { From c8347406f72b86bc3b1e8ef756c10e5c6717f579 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 8 Sep 2024 14:55:09 -0700 Subject: [PATCH 2/7] Layout for single theme/domain dropareaas --- .../vue/components/site/site-droparea.vue | 75 +++++++++---------- src/module/vue/site-sheet.vue | 42 +++++------ 2 files changed, 54 insertions(+), 63 deletions(-) diff --git a/src/module/vue/components/site/site-droparea.vue b/src/module/vue/components/site/site-droparea.vue index 8be0ad4cf..d4e7c8d84 100644 --- a/src/module/vue/components/site/site-droparea.vue +++ b/src/module/vue/components/site/site-droparea.vue @@ -1,53 +1,28 @@ + + diff --git a/src/module/vue/site-sheet.vue b/src/module/vue/site-sheet.vue index e31470cb1..fedcb5e53 100644 --- a/src/module/vue/site-sheet.vue +++ b/src/module/vue/site-sheet.vue @@ -7,35 +7,27 @@
-
+
-
THEME 1
-
THEME 2
+ +
+
+
-
DOMAIN
- -
Date: Mon, 9 Sep 2024 06:20:04 -0700 Subject: [PATCH 3/7] Squarical tabs --- src/module/vue/site-sheet.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/module/vue/site-sheet.vue b/src/module/vue/site-sheet.vue index fedcb5e53..f301dd778 100644 --- a/src/module/vue/site-sheet.vue +++ b/src/module/vue/site-sheet.vue @@ -31,7 +31,7 @@
@@ -269,6 +269,10 @@ function saveDescription() { font-weight: bold; } +.tabs { + border: var(--ironsworn-border-width-md) solid var(--ironsworn-color-border); +} + .featureBtn { text-transform: uppercase; } From 896d984b1d1c0569d1505632042bed6a5246357b Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 9 Sep 2024 21:08:34 -0700 Subject: [PATCH 4/7] Halfway to a new denizens version --- .../vue/components/site/site-denizenrow.vue | 16 ++++ src/module/vue/site-sheet.vue | 73 +++++++++++++++---- 2 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 src/module/vue/components/site/site-denizenrow.vue diff --git a/src/module/vue/components/site/site-denizenrow.vue b/src/module/vue/components/site/site-denizenrow.vue new file mode 100644 index 000000000..fc51e71e7 --- /dev/null +++ b/src/module/vue/components/site/site-denizenrow.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/module/vue/site-sheet.vue b/src/module/vue/site-sheet.vue index f301dd778..17818bed8 100644 --- a/src/module/vue/site-sheet.vue +++ b/src/module/vue/site-sheet.vue @@ -46,14 +46,37 @@

- -

+ + + + + + + + + + + +
+ + + Denizen + +
@@ -130,26 +153,28 @@ + + diff --git a/src/module/vue/site-sheet.vue b/src/module/vue/site-sheet.vue index 17818bed8..9df0cbe52 100644 --- a/src/module/vue/site-sheet.vue +++ b/src/module/vue/site-sheet.vue @@ -48,6 +48,10 @@ + + + +
@@ -73,24 +77,12 @@
-
- - - - - - - - - - - - -
@@ -190,7 +182,7 @@ const $actor = inject($ActorKey) as IronswornActor<'site'> // Local reactive copy of denizen values const denizens = reactive(new Array(12).fill('')) $actor.system.denizens.forEach((d, i) => { - denizens[i] = d.text + denizens[i] = d }) watch( denizens, @@ -225,7 +217,7 @@ function markProgress() { $actor?.update({ 'system.current': newValue }) } -const denizenRefs = ref<{ [k: number]: any }>({}) +const denizenRefs = ref([]) async function randomDenizen() { if ($actor?.system.denizens == null) return From 97114b188e128f00bb54895705886da21f94469b Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Wed, 11 Sep 2024 07:45:58 -0700 Subject: [PATCH 6/7] Text editing works --- src/module/vue/components/site/site-denizenrow.vue | 3 +-- src/module/vue/site-sheet.vue | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/module/vue/components/site/site-denizenrow.vue b/src/module/vue/components/site/site-denizenrow.vue index f51fd7eca..9e1450845 100644 --- a/src/module/vue/components/site/site-denizenrow.vue +++ b/src/module/vue/components/site/site-denizenrow.vue @@ -12,9 +12,8 @@ ref="description" type="text" :class="{ highlight: focused, [$style.input]: true }" - :value="denizen.text" + v-model="denizen.text" :placeholder="frequencyLabel" - @input="input" /> diff --git a/src/module/vue/site-sheet.vue b/src/module/vue/site-sheet.vue index 9df0cbe52..ae9404318 100644 --- a/src/module/vue/site-sheet.vue +++ b/src/module/vue/site-sheet.vue @@ -186,11 +186,13 @@ $actor.system.denizens.forEach((d, i) => { }) watch( denizens, - (newVal) => { - const newDenizens = foundry.utils.deepClone($actor.system.denizens) - $actor.update({ - 'system.denizens': newVal.map((text) => ({ text })) + (newDenizens) => { + const oldDenizens = foundry.utils.deepClone($actor.system.denizens) + oldDenizens.forEach((od, i) => { + const nd = newDenizens[i] + od.text = nd.text }) + $actor.update({ 'system.denizens': oldDenizens }) }, { deep: true } ) From 41f33cdbbcf57921e8018aeea3abe56a48ab9f78 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sat, 21 Sep 2024 08:40:33 -0700 Subject: [PATCH 7/7] Layout cleanup --- src/module/vue/site-sheet.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/module/vue/site-sheet.vue b/src/module/vue/site-sheet.vue index ae9404318..3515f6f3a 100644 --- a/src/module/vue/site-sheet.vue +++ b/src/module/vue/site-sheet.vue @@ -44,10 +44,7 @@

Features

Dangers

 -

- -

- +
@@ -312,6 +309,11 @@ function saveDescription() { border: var(--ironsworn-border-width-md) solid var(--ironsworn-color-border); } +.table { + margin: 0; + border-width: 0 !important; +} + .featureBtn { text-transform: uppercase; }