Skip to content

Commit

Permalink
Merge branch 'hotfix/2.20.10' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Feb 2, 2024
2 parents 72ed8d1 + 2084293 commit 8cbf3e1
Show file tree
Hide file tree
Showing 14 changed files with 244 additions and 102 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.20.8",
"version": "2.20.10",
"name": "harmless_key",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Harmless Key",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/_img/homebrew-creation.webp
Binary file not shown.
Binary file not shown.
7 changes: 4 additions & 3 deletions src/components/ContentSideRight.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</hk-card>

<!-- HOMEBREW CREATION -->
<hk-card v-if="false">
<hk-card>
<div
slot="image"
class="card-image"
Expand All @@ -82,15 +82,16 @@
</div>
<div class="card-body">
<p class="text-center">
Need a free adventure template, or help forming the basic idea of your adventure?
Need a free adventure template, homebrew content or DMing inspiration?
</p>
<a
class="btn btn-block btn-sm"
href="http://homebrewcreation.com"
rel="noopener"
target="_blank"
>Start creating</a
>
Checkout HBC <hk-icon icon="fas fa-external-link" class="ml-2" />
</a>
</div>
</hk-card>

Expand Down
1 change: 1 addition & 0 deletions src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<li><router-link to="/tools/encounter-builder">Encounter builder</router-link></li>
<li><router-link to="/tools/monster-creator">Monster creator</router-link></li>
<li><router-link to="/tools/spell-creator">Spell creator</router-link></li>
<li><router-link to="/tools/character-sync">Character sync</router-link></li>
</ul>
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion src/components/ToolsPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
D&D {{ title }}
</div>
<div class="card-body">
<SignedIn v-if="user" />
<SignedIn v-if="user && showSignedIn" />
<slot />
</div>
<div slot="footer" class="card-footer">
Expand All @@ -29,6 +29,10 @@
props: {
title: String,
bg_img: String,
showSignedIn: {
type: Boolean,
default: true
}
},
computed: {
...mapGetters(["user"]),
Expand Down
11 changes: 11 additions & 0 deletions src/router/routes.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

const Sitemap = () => import("src/views/Pages/Sitemap.vue");
const Privacy = () => import("src/views/Pages/Privacy.vue");
const Documentation = () => import("src/views/Pages/Documentation.vue");
Expand Down Expand Up @@ -769,6 +770,16 @@ const routes = [
"An advanced character builder for D&D 5e. Create a character sheet for you character.",
},
},
{
path: "homebrew-creation",
name: "ToolsHomebrewCreation",
component: () => import("src/views/Tools/HomebrewCreation"),
meta: {
title: "Homebrew Creation",
description:
"Homebrew Creation. Because the secret of D&D is: you can create everything yourself",
},
},
],
},

Expand Down
6 changes: 5 additions & 1 deletion src/views/Tools/CharacterSync.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<template>
<ToolsPage title="Character Sync" bg_img="character-sync-tool-header.png">
<ToolsPage
title="Character Sync"
bg_img="character-sync-tool-header.png"
:showSignedIn="false"
>
<template v-slot:action_btn="{ btn_classes }">
<q-btn
color="primary"
Expand Down
2 changes: 1 addition & 1 deletion src/views/Tools/EncounterBuilder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<section class="d-lg-flex justify-between mt-5">
<div>
<h2>Difficulty</h2>
<h2>Encounter Difficulty Calculator</h2>
<p>
One of the features of our encounter builder is the built-in difficulty calculator. This
tool uses the official rules to analyze your encounter and calculate its difficulty level
Expand Down
94 changes: 94 additions & 0 deletions src/views/Tools/HomebrewCreation.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<template>
<ToolsPage
title="Homebrew Creation"
bg_img="homebrew-creation-tool-header.png"
:showSignedIn="false"
>
<template v-slot:action_btn="{ btn_classes }">
<q-btn
color="primary"
:class="btn_classes"
no-caps push target="_blank"
rel="noopener"
href="https://homebrewcreation.com/">
Checkout HBC <hk-icon icon="fas fa-external-link" class="ml-2" />
</q-btn>
</template>
<section id="hbc">
<h2>Adventure templates, homebrew content and DMing inspiration</h2>
<p>
One of our friends created a platform to offer several tools that are helpful for both beginning and experienced DMs.
</p>

<p>
His philosophy: "The secret of D&D is: you can create everything yourself"
</p>

<h3 class="text-bold mb-1">Adventure creation</h3>
<p>
A three step solution to help you create a one-shot or campaign. We've tried it ourselves and honestly, it was never easier or quicker to fully create a custom one-shot.
By answering a few questions your idea becomes a reality in no time.
</p>
<p>
<a href="https://homebrewcreation.com/" rel="noopener" target="_blank">Checkout the adventure creation templates</a>
</p>

<h3 class="text-bold mb-1">Homebrew content</h3>
<p>
He shares his own homebrew content including rules, monsters and classes as an inspiration to help other create their custom content.
</p>
<p>
<a href="https://homebrewcreation.com/dnd-homebrew/" rel="noopener" target="_blank">See all shared homebrew creations</a>
</p>

<h3 class="text-bold mb-1">Articles</h3>
<p>
Besides sharing his own homebrew creations, he also writes articles. Both guides and opinionated pieces are shared, all about D&D and focussed on DMing.
</p>
<p>
<a href="https://homebrewcreation.com/articles/" rel="noopener" target="_blank">Check the articles</a>
</p>
</section>
</ToolsPage>
</template>

<script>
import { mapGetters } from "vuex";
import ToolsPage from "src/components/ToolsPage.vue";
export default {
name: "ToolsMonsterCreator",
components: {
ToolsPage,
},
computed: {
...mapGetters(["user"]),
},
};
</script>

<style lang="scss" scoped>
.q-img {
display: block;
margin: 30px auto;
width: 100%;
&::v-deep .q-img__content {
> div {
background: none;
}
}
&.res-vul {
width: 50%;
max-width: 300px;
}
&.action {
max-width: 600px;
cursor: pointer;
}
&.small {
max-width: 600px;
border-radius: $border-radius;
}
}
</style>
Loading

0 comments on commit 8cbf3e1

Please sign in to comment.