diff --git a/quasar.conf.js b/quasar.conf.js index 095464432..3821428ea 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -50,7 +50,7 @@ module.exports = function (/* ctx */) { vueRouterMode: "history", // available values: 'hash', 'history' env: require("dotenv").config({ path: `.env.${process.env.NODE_ENV}.local` }).parsed, scssLoaderOptions: { - additionalData: '@import "src/css/variables.scss";', + additionalData: "", }, vueCompiler: true, transpile: true, diff --git a/src/App.vue b/src/App.vue index b00f75fe1..c85713a1e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,14 +1,16 @@ + + diff --git a/src/assets/_img/home/shieldmaiden-banner-small.webp b/src/assets/_img/home/shieldmaiden-banner-small.webp new file mode 100644 index 000000000..d4fc063e0 Binary files /dev/null and b/src/assets/_img/home/shieldmaiden-banner-small.webp differ diff --git a/src/assets/_img/home/shieldmaiden-banner.png b/src/assets/_img/home/shieldmaiden-banner.png new file mode 100644 index 000000000..5a38d94fa Binary files /dev/null and b/src/assets/_img/home/shieldmaiden-banner.png differ diff --git a/src/assets/_img/home/shieldmaiden-banner.webp b/src/assets/_img/home/shieldmaiden-banner.webp new file mode 100644 index 000000000..d06ee152d Binary files /dev/null and b/src/assets/_img/home/shieldmaiden-banner.webp differ diff --git a/src/assets/_img/logo/logo-main-icon-left-red.svg b/src/assets/_img/logo/logo-main-icon-left-red.svg new file mode 100644 index 000000000..f157c67fa --- /dev/null +++ b/src/assets/_img/logo/logo-main-icon-left-red.svg @@ -0,0 +1,691 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/_img/shieldmaiden-cropped.webp b/src/assets/_img/shieldmaiden-cropped.webp new file mode 100644 index 000000000..548ffaca6 Binary files /dev/null and b/src/assets/_img/shieldmaiden-cropped.webp differ diff --git a/src/assets/_img/shieldmaiden.webp b/src/assets/_img/shieldmaiden.webp index 4d9fd8c9f..08b227bd2 100644 Binary files a/src/assets/_img/shieldmaiden.webp and b/src/assets/_img/shieldmaiden.webp differ diff --git a/src/components/Header.vue b/src/components/Header.vue deleted file mode 100644 index a6ebce87b..000000000 --- a/src/components/Header.vue +++ /dev/null @@ -1,379 +0,0 @@ - - - - - diff --git a/src/components/PlayerLink.vue b/src/components/PlayerLink.vue index c8fe2f84e..ef23ffd50 100644 --- a/src/components/PlayerLink.vue +++ b/src/components/PlayerLink.vue @@ -139,7 +139,6 @@ export default { } h2 { font-size: 25px; - font-family: $text-written; } small { line-height: initial; diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 52eb6e3ab..56e948930 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -8,8 +8,9 @@ id="sidebar" :class="{ 'side-collapsed': - $store.getters.side_collapsed && !smallScreen && $route.meta.sidebar !== false, - slideIn: $route.meta.sidebar === false, + ($store.getters.side_collapsed && !smallScreen && $route.meta.sidebar !== false) || + ($route.name === 'home' && $store.getters.side_collapsed && !smallScreen), + slideIn: $route.meta.sidebar === false && $route.name !== 'home', }" >
diff --git a/src/components/SignIn.vue b/src/components/SignIn.vue index be583da38..7b2b6d6e8 100644 --- a/src/components/SignIn.vue +++ b/src/components/SignIn.vue @@ -1,50 +1,52 @@ @@ -71,11 +73,6 @@ export default { user: this.$store.getters.user, }; }, - preFetch({ store, redirect }) { - if (store.getters.user) { - redirect("/content"); - } - }, methods: { ...mapActions(["reinitialize", "setUser", "setUserInfo"]), async signIn() { @@ -146,3 +143,14 @@ export default { }, }; + + diff --git a/src/components/SignUp.vue b/src/components/SignUp.vue new file mode 100644 index 000000000..e193fe758 --- /dev/null +++ b/src/components/SignUp.vue @@ -0,0 +1,171 @@ + + + + + diff --git a/src/components/ToolsPage.vue b/src/components/ToolsPage.vue index dab597fad..ecb0a45cf 100644 --- a/src/components/ToolsPage.vue +++ b/src/components/ToolsPage.vue @@ -2,75 +2,70 @@

{{ title }} for D&D 5e

- + +
+
+ D&D {{ title }}
-
- D&D {{ title }} -
- - -
- +
diff --git a/src/components/campaign/Players.vue b/src/components/campaign/Players.vue index 20171caef..91864bb23 100644 --- a/src/components/campaign/Players.vue +++ b/src/components/campaign/Players.vue @@ -871,8 +871,7 @@ export default { font-weight: bold; } .hit-points { - background-color: $neutral-5; - border: solid 1px $neutral-4; + background-color: $neutral-9; border-radius: $border-radius-small; padding: 0 5px; line-height: 33px; diff --git a/src/components/characters/build-type-select.vue b/src/components/characters/build-type-select.vue index c6304a297..3c45640e0 100644 --- a/src/components/characters/build-type-select.vue +++ b/src/components/characters/build-type-select.vue @@ -1,100 +1,101 @@ \ No newline at end of file +} + diff --git a/src/components/characters/computed.vue b/src/components/characters/computed.vue index e95f10428..e66efee4d 100644 --- a/src/components/characters/computed.vue +++ b/src/components/characters/computed.vue @@ -347,7 +347,6 @@ export default { padding: 15px; h4 { - font-family: $text-written !important; font-size: 22px; margin: 0px; } @@ -376,7 +375,6 @@ export default { line-height: 60px; font-size: 30px; font-weight: bold; - font-family: $text-written !important; } } } @@ -405,7 +403,6 @@ export default { line-height: 40px; font-size: 35px; font-weight: bold; - font-family: $text-written !important; } .ft { font-size: 15px; @@ -424,7 +421,6 @@ export default { border-bottom: solid 1px $neutral-3; .value { - font-family: $text-written !important; font-size: 20px; } } diff --git a/src/components/combat/DemoOverlay.vue b/src/components/combat/DemoOverlay.vue index 473a166e7..81dfb81df 100644 --- a/src/components/combat/DemoOverlay.vue +++ b/src/components/combat/DemoOverlay.vue @@ -28,7 +28,9 @@ from there.
- Create Account + Create Account Create custom content
diff --git a/src/components/combat/Finished.vue b/src/components/combat/Finished.vue index 5a7104d97..7e9a7ed23 100644 --- a/src/components/combat/Finished.vue +++ b/src/components/combat/Finished.vue @@ -357,7 +357,6 @@ h2.head { text-shadow: 0 0 8px $black; font-size: 30px !important; text-align: center; - font-family: "Fredericka the Great", cursive; } .xp { diff --git a/src/components/combat/Turns.vue b/src/components/combat/Turns.vue index 2861e4c6b..a7b534b40 100644 --- a/src/components/combat/Turns.vue +++ b/src/components/combat/Turns.vue @@ -108,7 +108,9 @@ {{ encounter.name }} diff --git a/src/components/drawers/characterBuilder/HitPoints.vue b/src/components/drawers/characterBuilder/HitPoints.vue index 62f59d87f..7c9c29d29 100644 --- a/src/components/drawers/characterBuilder/HitPoints.vue +++ b/src/components/drawers/characterBuilder/HitPoints.vue @@ -6,10 +6,13 @@

Classes

-
- Level {{ subclass.level }} {{ subclass.class || "Class" }}: ({{ classHP(classIndex) }}) + Level {{ subclass.level }} {{ subclass.class || "Class" }}: ({{ + classHP(classIndex) + }})

@@ -20,7 +23,9 @@ {{ modifier.name }}
- {{ modifierValue(modifier) > 0 ? `+${modifierValue(modifier)}` : modifierValue(modifier) }} + {{ + modifierValue(modifier) > 0 ? `+${modifierValue(modifier)}` : modifierValue(modifier) + }}
@@ -28,101 +33,104 @@ diff --git a/src/components/encounters/index.vue b/src/components/encounters/index.vue index d5f648990..09f53a723 100644 --- a/src/components/encounters/index.vue +++ b/src/components/encounters/index.vue @@ -12,7 +12,7 @@
-

+

{{ demo ? "Encounter builder for D&D" : encounter.name }}

diff --git a/src/components/header/UserMenu.vue b/src/components/header/UserMenu.vue new file mode 100644 index 000000000..fc050bbbb --- /dev/null +++ b/src/components/header/UserMenu.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/components/header/index.vue b/src/components/header/index.vue new file mode 100644 index 000000000..03b0e8f1d --- /dev/null +++ b/src/components/header/index.vue @@ -0,0 +1,216 @@ + + + + + diff --git a/src/components/hk-components/hk-xp-bar.vue b/src/components/hk-components/hk-xp-bar.vue index d0401a644..2cb55a177 100644 --- a/src/components/hk-components/hk-xp-bar.vue +++ b/src/components/hk-components/hk-xp-bar.vue @@ -1,70 +1,73 @@ diff --git a/src/components/home/Builder.vue b/src/components/home/Builder.vue index a9e508730..9040408ee 100644 --- a/src/components/home/Builder.vue +++ b/src/components/home/Builder.vue @@ -8,29 +8,36 @@
-
\ No newline at end of file +} + diff --git a/src/components/home/Campaign.vue b/src/components/home/Campaign.vue index a4a8e9e85..e6c1e65d0 100644 --- a/src/components/home/Campaign.vue +++ b/src/components/home/Campaign.vue @@ -4,25 +4,35 @@

Campaign Manager

- Our tool started out as a combat tracker for Dungeons & Dragons, but it has grown a lot. Over time it has become so much more than that, but if you simply want to run your encounters it is still perfect for just that. + Our tool started out as a combat tracker for Dungeons & Dragons, but it has grown a lot. + Over time it has become so much more than that, but if you simply want to run your + encounters it is still perfect for just that.
-
-

More than an encounter tool,
if you want it to be.

+

+ More than an encounter tool,
+ if you want it to be. +

- @@ -36,11 +46,10 @@ -
- Start a campaign + Start a campaign
@@ -51,68 +60,72 @@ \ No newline at end of file +} + diff --git a/src/components/home/Carousel.vue b/src/components/home/Carousel.vue index ebdbe4566..094de9344 100644 --- a/src/components/home/Carousel.vue +++ b/src/components/home/Carousel.vue @@ -15,64 +15,65 @@ class="transparent" > + >