diff --git a/app/imports/api/tabletop/methods/shared/tabletopPermissions.ts b/app/imports/api/tabletop/methods/shared/tabletopPermissions.ts index fa0a25f2..a7827390 100644 --- a/app/imports/api/tabletop/methods/shared/tabletopPermissions.ts +++ b/app/imports/api/tabletop/methods/shared/tabletopPermissions.ts @@ -12,9 +12,9 @@ export function assertUserInTabletop(tabletopId, userId) { fields: { gameMasters: 1, players: 1 } }); assertTabletopExists(tabletop); - if (tabletop.gameMasters.includes(userId) && !tabletop.players.includes(userId)) { + if (!tabletop.gameMasters.includes(userId) && !tabletop.players.includes(userId)) { throw new Meteor.Error('Not in tabletop', - 'The user is not the gamemaster or a player in the given tabletop'); + 'The user is not a game master or a player in the given tabletop'); } } diff --git a/app/imports/client/ui/components/HexagonProgress.vue b/app/imports/client/ui/components/HexagonProgress.vue index 500e1fc4..555ce959 100644 --- a/app/imports/client/ui/components/HexagonProgress.vue +++ b/app/imports/client/ui/components/HexagonProgress.vue @@ -10,20 +10,50 @@ @@ -38,8 +68,8 @@ export default { 0% 75%, 0% 25% ); - background: conic-gradient(red var(--p),#0000 0); - background-color: #5e1010; /* adjust the color as needed */ + background: conic-gradient(#0000 var(--p), red var(--p)); + background-color: #5e1010; } .hexagon-content { diff --git a/app/imports/client/ui/components/HexagonProgressStack.vue b/app/imports/client/ui/components/HexagonProgressStack.vue new file mode 100644 index 00000000..23cf796d --- /dev/null +++ b/app/imports/client/ui/components/HexagonProgressStack.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file diff --git a/app/imports/client/ui/tabletop/TabletopCreatureListItem.vue b/app/imports/client/ui/tabletop/TabletopCreatureListItem.vue index d497cf67..f0782788 100644 --- a/app/imports/client/ui/tabletop/TabletopCreatureListItem.vue +++ b/app/imports/client/ui/tabletop/TabletopCreatureListItem.vue @@ -2,44 +2,72 @@
- - - - - + +
- {{ title }} + {{ model.name }}