diff --git a/website/client/assets/images/presskit/Boss/Basi-List.png b/website/client/assets/images/presskit/Boss/Basi-List.png new file mode 100644 index 0000000000..eedc25917d Binary files /dev/null and b/website/client/assets/images/presskit/Boss/Basi-List.png differ diff --git a/website/client/assets/images/presskit/Boss/Battling the Ghost Stag.png b/website/client/assets/images/presskit/Boss/Battling the Ghost Stag.png new file mode 100644 index 0000000000..8c1288ab82 Binary files /dev/null and b/website/client/assets/images/presskit/Boss/Battling the Ghost Stag.png differ diff --git a/website/client/assets/images/presskit/Boss/Dread Drag'on of Dilatory.png b/website/client/assets/images/presskit/Boss/Dread Drag'on of Dilatory.png new file mode 100644 index 0000000000..5fd8d2297b Binary files /dev/null and b/website/client/assets/images/presskit/Boss/Dread Drag'on of Dilatory.png differ diff --git a/website/client/assets/images/presskit/Boss/Laundromancer.png b/website/client/assets/images/presskit/Boss/Laundromancer.png new file mode 100644 index 0000000000..b80a9b2beb Binary files /dev/null and b/website/client/assets/images/presskit/Boss/Laundromancer.png differ diff --git a/website/client/assets/images/presskit/Boss/Necro-Vice.png b/website/client/assets/images/presskit/Boss/Necro-Vice.png new file mode 100644 index 0000000000..97558406e5 Binary files /dev/null and b/website/client/assets/images/presskit/Boss/Necro-Vice.png differ diff --git a/website/client/assets/images/presskit/Boss/SnackLess Monster.png b/website/client/assets/images/presskit/Boss/SnackLess Monster.png new file mode 100644 index 0000000000..23a27b4b55 Binary files /dev/null and b/website/client/assets/images/presskit/Boss/SnackLess Monster.png differ diff --git a/website/client/assets/images/presskit/Boss/Stagnant Dishes.png b/website/client/assets/images/presskit/Boss/Stagnant Dishes.png new file mode 100644 index 0000000000..a23a0c68bb Binary files /dev/null and b/website/client/assets/images/presskit/Boss/Stagnant Dishes.png differ diff --git a/website/client/assets/images/presskit/Habitica - Gamify Your Life.mp4 b/website/client/assets/images/presskit/Habitica - Gamify Your Life.mp4 new file mode 100644 index 0000000000..be3ca2a703 Binary files /dev/null and b/website/client/assets/images/presskit/Habitica - Gamify Your Life.mp4 differ diff --git a/website/client/assets/images/presskit/Logo/Android.png b/website/client/assets/images/presskit/Logo/Android.png new file mode 100644 index 0000000000..302c0965c0 Binary files /dev/null and b/website/client/assets/images/presskit/Logo/Android.png differ diff --git a/website/client/assets/images/presskit/Logo/Habitica Gryphon.png b/website/client/assets/images/presskit/Logo/Habitica Gryphon.png new file mode 100644 index 0000000000..92d7f6daec Binary files /dev/null and b/website/client/assets/images/presskit/Logo/Habitica Gryphon.png differ diff --git a/website/client/assets/images/presskit/Logo/Icon with Text.png b/website/client/assets/images/presskit/Logo/Icon with Text.png new file mode 100644 index 0000000000..fb7c21eda7 Binary files /dev/null and b/website/client/assets/images/presskit/Logo/Icon with Text.png differ diff --git a/website/client/assets/images/presskit/Logo/Icon.png b/website/client/assets/images/presskit/Logo/Icon.png new file mode 100644 index 0000000000..a90f684be2 Binary files /dev/null and b/website/client/assets/images/presskit/Logo/Icon.png differ diff --git a/website/client/assets/images/presskit/Logo/Text.png b/website/client/assets/images/presskit/Logo/Text.png new file mode 100644 index 0000000000..d4478c5cf2 Binary files /dev/null and b/website/client/assets/images/presskit/Logo/Text.png differ diff --git a/website/client/assets/images/presskit/Logo/iOS.png b/website/client/assets/images/presskit/Logo/iOS.png new file mode 100644 index 0000000000..c55d9a3af2 Binary files /dev/null and b/website/client/assets/images/presskit/Logo/iOS.png differ diff --git a/website/client/assets/images/presskit/Promo/Promo - Thin.png b/website/client/assets/images/presskit/Promo/Promo - Thin.png new file mode 100644 index 0000000000..695b8c34cf Binary files /dev/null and b/website/client/assets/images/presskit/Promo/Promo - Thin.png differ diff --git a/website/client/assets/images/presskit/Promo/Promo.png b/website/client/assets/images/presskit/Promo/Promo.png new file mode 100644 index 0000000000..a89c38d626 Binary files /dev/null and b/website/client/assets/images/presskit/Promo/Promo.png differ diff --git a/website/client/assets/images/presskit/Samples/Android/Level Up.png b/website/client/assets/images/presskit/Samples/Android/Level Up.png new file mode 100644 index 0000000000..01311acc78 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Android/Level Up.png differ diff --git a/website/client/assets/images/presskit/Samples/Android/Party.png b/website/client/assets/images/presskit/Samples/Android/Party.png new file mode 100644 index 0000000000..4cbf54efbc Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Android/Party.png differ diff --git a/website/client/assets/images/presskit/Samples/Android/Reward.png b/website/client/assets/images/presskit/Samples/Android/Reward.png new file mode 100644 index 0000000000..cfaa2aef98 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Android/Reward.png differ diff --git a/website/client/assets/images/presskit/Samples/Android/Tasks Page.png b/website/client/assets/images/presskit/Samples/Android/Tasks Page.png new file mode 100644 index 0000000000..87e998a325 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Android/Tasks Page.png differ diff --git a/website/client/assets/images/presskit/Samples/Android/Tavern.png b/website/client/assets/images/presskit/Samples/Android/Tavern.png new file mode 100644 index 0000000000..04e9a88ca2 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Android/Tavern.png differ diff --git a/website/client/assets/images/presskit/Samples/Android/User.png b/website/client/assets/images/presskit/Samples/Android/User.png new file mode 100644 index 0000000000..ab5b95f39d Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Android/User.png differ diff --git a/website/client/assets/images/presskit/Samples/Website/Challenges.png b/website/client/assets/images/presskit/Samples/Website/Challenges.png new file mode 100644 index 0000000000..672b209ed5 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Website/Challenges.png differ diff --git a/website/client/assets/images/presskit/Samples/Website/Equipment.png b/website/client/assets/images/presskit/Samples/Website/Equipment.png new file mode 100644 index 0000000000..67635ac508 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Website/Equipment.png differ diff --git a/website/client/assets/images/presskit/Samples/Website/Guilds.png b/website/client/assets/images/presskit/Samples/Website/Guilds.png new file mode 100644 index 0000000000..af4dea8378 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Website/Guilds.png differ diff --git a/website/client/assets/images/presskit/Samples/Website/Market.png b/website/client/assets/images/presskit/Samples/Website/Market.png new file mode 100644 index 0000000000..dafd5cac8f Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Website/Market.png differ diff --git a/website/client/assets/images/presskit/Samples/Website/Tasks Page.png b/website/client/assets/images/presskit/Samples/Website/Tasks Page.png new file mode 100644 index 0000000000..c50055c899 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/Website/Tasks Page.png differ diff --git a/website/client/assets/images/presskit/Samples/iOS/Boss.png b/website/client/assets/images/presskit/Samples/iOS/Boss.png new file mode 100644 index 0000000000..0c0adbb39b Binary files /dev/null and b/website/client/assets/images/presskit/Samples/iOS/Boss.png differ diff --git a/website/client/assets/images/presskit/Samples/iOS/Level Up.png b/website/client/assets/images/presskit/Samples/iOS/Level Up.png new file mode 100644 index 0000000000..01d7fdd2d3 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/iOS/Level Up.png differ diff --git a/website/client/assets/images/presskit/Samples/iOS/Party.png b/website/client/assets/images/presskit/Samples/iOS/Party.png new file mode 100644 index 0000000000..40bfdba8dd Binary files /dev/null and b/website/client/assets/images/presskit/Samples/iOS/Party.png differ diff --git a/website/client/assets/images/presskit/Samples/iOS/Pets.png b/website/client/assets/images/presskit/Samples/iOS/Pets.png new file mode 100644 index 0000000000..171131954e Binary files /dev/null and b/website/client/assets/images/presskit/Samples/iOS/Pets.png differ diff --git a/website/client/assets/images/presskit/Samples/iOS/Tasks Page.png b/website/client/assets/images/presskit/Samples/iOS/Tasks Page.png new file mode 100644 index 0000000000..b5862496b0 Binary files /dev/null and b/website/client/assets/images/presskit/Samples/iOS/Tasks Page.png differ diff --git a/website/client/assets/images/presskit/presskit.zip b/website/client/assets/images/presskit/presskit.zip new file mode 100644 index 0000000000..016ea50f78 Binary files /dev/null and b/website/client/assets/images/presskit/presskit.zip differ diff --git a/website/client/components/appHeader.vue b/website/client/components/appHeader.vue index 3c1035883d..f104aa306c 100644 --- a/website/client/components/appHeader.vue +++ b/website/client/components/appHeader.vue @@ -3,11 +3,12 @@ div create-party-modal #app-header.row(:class="{'hide-header': $route.name === 'groupPlan'}") members-modal(:hide-badge="true") - member-details(:member="user") + .col-6 + member-details(:member="user") .view-party(v-if="user.party && user.party._id && partyMembers && partyMembers.length > 1") // TODO button should open the party members modal button.btn.btn-primary(@click='openPartyModal()') {{ $t('viewParty') }} - .party-members.d-flex( + .party-members.col-6.d-flex( v-if="partyMembers && partyMembers.length > 1", v-resize="1500", @resized="setPartyMembersWidth($event)" @@ -21,7 +22,7 @@ div @onHover="expandMember(member._id)", :expanded="member._id === expandedMember", ) - .no-party.d-flex.justify-content-center.text-center(v-else) + .no-party.col-6.d-flex.justify-content-center.text-center(v-else) .align-self-center(v-once) h3 {{ $t('battleWithFriends') }} span.small-text(v-html="$t('inviteFriendsParty')") diff --git a/website/client/components/appMenu.vue b/website/client/components/appMenu.vue index c6d360dcba..6ac734cff6 100644 --- a/website/client/components/appMenu.vue +++ b/website/client/components/appMenu.vue @@ -105,6 +105,12 @@ div padding: .5em !important; } } + + .dropdown-menu { + position: absolute !important; + left: -10em; + top: -.5em; + } } @media only screen and (max-width : 1224px) and (min-width: 1200px) { @@ -133,6 +139,12 @@ div } } + @media only screen and (max-width: 1280px) { + .nav-link { + padding: .8em 1em !important; + } + } + nav.navbar { background: $purple-100 url(~assets/svg/for-css/bits.svg) right no-repeat; padding-left: 25px; diff --git a/website/client/components/auth/registerLogin.vue b/website/client/components/auth/registerLogin.vue index 216a6a70ba..953031d221 100644 --- a/website/client/components/auth/registerLogin.vue +++ b/website/client/components/auth/registerLogin.vue @@ -279,6 +279,11 @@ export default { }, methods: { async register () { + if (!this.email) { + alert('Email is required'); + return; + } + if (this.password !== this.passwordConfirm) { alert('Passwords must match'); return; @@ -314,6 +319,11 @@ export default { window.location.href = '/'; }, async login () { + if (!this.username) { + alert('Email is required'); + return; + } + await this.$store.dispatch('auth:login', { username: this.username, // email: this.email, diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index e7b1d733ac..820fe477c6 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -18,9 +18,9 @@ span(:class="'chair_' + member.preferences.chair") span(:class="getGearClass('back')") span(:class="skinClass") - span.head_0 span(:class="member.preferences.size + '_shirt_' + member.preferences.shirt") span(:class="member.preferences.size + '_' + getGearClass('armor')") + span.head_0 span(:class="getGearClass('back_collar')") span(:class="getGearClass('body')") template(v-for="type in ['base', 'bangs', 'mustache', 'beard']") diff --git a/website/client/components/memberDetails.vue b/website/client/components/memberDetails.vue index ba5b3cf219..46d758c3d6 100644 --- a/website/client/components/memberDetails.vue +++ b/website/client/components/memberDetails.vue @@ -1,6 +1,5 @@