Skip to content

Improves Player Display and Refactors Campaign View #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lakeyzer wants to merge 2 commits into
base: develop
Choose a base branch
from
+39 −19
Open

Improves Player Display and Refactors Campaign View #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5edc1c4
Refactor CampaignOverview and integrate character sync data
Lakeyzer Jun 12, 2026
8b0cef0
Improve player column visibility for unconfigured user general settings
Lakeyzer Jun 12, 2026
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
36 changes: 23 additions & 13 deletions src/components/campaign/Players.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@
<div
class="col header text-center pp"
v-if="
userSettings.general &&
userSettings.general.passive_perception === undefined &&
(!userSettings.general ||
(userSettings.general && userSettings.general.passive_perception === undefined)) &&
!is_medium
"
>
Expand All @@ -145,8 +145,8 @@
<div
class="col header text-center pinv"
v-if="
userSettings.general &&
userSettings.general.passive_investigation === undefined &&
(!userSettings.general ||
(userSettings.general && userSettings.general.passive_investigation === undefined)) &&
!is_medium
"
>
Expand All @@ -156,15 +156,21 @@
<div
class="col header text-center pins"
v-if="
userSettings.general && userSettings.general.passive_insight === undefined && !is_medium
(!userSettings.general ||
(userSettings.general && userSettings.general.passive_insight === undefined)) &&
!is_medium
"
>
<i aria-hidden="true" class="fas fa-lightbulb-on" />
<q-tooltip anchor="top middle" self="center middle"> Passive insight </q-tooltip>
</div>
<div
class="col header text-center save"
v-if="userSettings.general && userSettings.general.save_dc === undefined && !is_medium"
v-if="
(!userSettings.general ||
(userSettings.general && userSettings.general.save_dc === undefined)) &&
!is_medium
"
>
<i aria-hidden="true" class="fas fa-hand-holding-magic" />
<q-tooltip anchor="top middle" self="center middle"> Save DC </q-tooltip>
Expand Down Expand Up @@ -223,8 +229,9 @@
<div
class="col pp"
v-if="
userSettings.general &&
userSettings.general.passive_perception === undefined &&
(!userSettings.general ||
(userSettings.general &&
userSettings.general.passive_perception === undefined)) &&
!is_medium
"
:key="'pp-' + key"
Expand All @@ -234,8 +241,9 @@
<div
class="col pinv"
v-if="
userSettings.general &&
userSettings.general.passive_investigation === undefined &&
(!userSettings.general ||
(userSettings.general &&
userSettings.general.passive_investigation === undefined)) &&
!is_medium
"
:key="'pinv-' + key"
Expand All @@ -245,8 +253,8 @@
<div
class="col pins"
v-if="
userSettings.general &&
userSettings.general.passive_insight === undefined &&
(!userSettings.general ||
(userSettings.general && userSettings.general.passive_insight === undefined)) &&
!is_medium
"
:key="'pins-' + key"
Expand All @@ -256,7 +264,9 @@
<div
class="col save"
v-if="
userSettings.general && userSettings.general.save_dc === undefined && !is_medium
(!userSettings.general ||
(userSettings.general && userSettings.general.save_dc === undefined)) &&
!is_medium
"
:key="'save-' + key"
>
Expand Down
22 changes: 16 additions & 6 deletions src/components/trackCampaign/CampaignOverview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="players">
<h3 class="text-shadow">Campaign Players</h3>
<q-scroll-area :dark="$store.getters.theme === 'dark'" :thumb-style="{ width: '5px' }">
<ViewPlayers
<Players
:userId="userId"
:campaignId="$route.params.campid"
:campaign="campaign"
Expand Down Expand Up @@ -87,11 +87,12 @@

<q-tab-panels v-model="panel" animated swipeable infinite class="transparent-bg">
<q-tab-panel name="players">
<ViewPlayers
<Players
:userId="userId"
:campaignId="$route.params.campid"
:campaign="campaign"
:players="players"
:sync-characters="sync_characters"
/>
</q-tab-panel>
<q-tab-panel name="meters">
Expand All @@ -104,16 +105,19 @@

<script>
import Meters from "src/components/trackCampaign/Meters.vue";
import ViewPlayers from "src/components/campaign/Players.vue";
import Players from "src/components/campaign/Players.vue";
import Sharing from "./Sharing.vue";
import Weather from "src/components/weather";

import { getCharacterSyncStorage } from "src/utils/generalFunctions";
import { mapGetters } from "vuex";

export default {
name: "Players",
name: "CampaignOverview",
props: ["players", "campaign", "width", "shares", "live", "showWeather", "muted"],
components: {
Meters,
ViewPlayers,
Players,
Shares: () => import("./Shares"),
Sharing,
Weather,
Expand All @@ -123,6 +127,7 @@ export default {
userId: this.$route.params.userid,
panel: "players",
showShares: false,
sync_characters: {},
panels: [
{
label: "Campaign players",
Expand All @@ -138,6 +143,7 @@ export default {
};
},
computed: {
...mapGetters(["extensionInstalled"]),
background_image() {
if (this.campaign.temporary_background && this.campaign.temporary_background.image)
return this.campaign.temporary_background.image;
Expand All @@ -157,7 +163,11 @@ export default {
: undefined;
},
},
methods: {},
async mounted() {
if (this.extensionInstalled) {
this.sync_characters = await getCharacterSyncStorage();
}
},
};
</script>

Expand Down
Loading