Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: merge develop

Browse Source
This commit is contained in:
CuriousMagpie
2022-09-20 13:11:43 -04:00
parent 13eef6e4cf
commit 8e9b469d8d
48 changed files with 642 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/components/groups/groupPlan.vue
+148 -52
View File
@@ -1,7 +1,6 @@
<template>
<!-- @TODO: Move to group plans folder-->
<div>
<group-plan-creation-modal />
<div>
<div class="header">
<h1 class="text-center">
@@ -52,7 +51,6 @@
</div>
</div>
</div>
<!-- Upgrading an existing group -->
<div
v-if="upgradingGroup._id"
id="upgrading-group"
@@ -102,53 +100,153 @@
</div>
</div>
</div>
<!-- Create a new group -->
<div
v-if="!upgradingGroup._id"
class="container col-6 offset-3 create-option"
>
<div class="row">
<h1 class="col-12 text-center purple-header">
Create Your Group Today!
Create your Group today!
</h1>
</div>
<div class="row">
<div class="col-12 text-center">
<button
class="btn btn-primary create-group"
@click="launchModal('create-page')"
@click="launchModal('create')"
>
Create Your New Group!
Create Your New Group
</button>
</div>
</div>
<div class="row pricing justify-content-center align-items-center">
<div class="dollar">
$
<div class="row pricing">
<div class="col-5">
<div class="dollar">
$
</div>
<div class="number">
9
</div>
<div class="name">
<div>Group Owner</div>
<div>Subscription</div>
</div>
</div>
<div class="number">
9
<div class="col-1">
<div class="plus">
+
</div>
</div>
<div class="name">
<div>Group Owner</div>
<div>Subscription</div>
</div>
<div class="plus">
+
</div>
<div class="dollar">
$
</div>
<div class="number">
3
</div>
<div class="name">
<div>Each Additional</div>
<div>Member</div>
<div class="col-6">
<div class="dollar">
$
</div>
<div class="number">
3
</div>
<div class="name">
<div>Each Additional</div>
<div>Member</div>
</div>
</div>
</div>
</div>
</div>
<b-modal
id="group-plan-modal"
:title="activePage === PAGES.CREATE_GROUP ? 'Create your Group' : 'Select Payment'"
size="md"
hide-footer="hide-footer"
>
<div
v-if="activePage === PAGES.CREATE_GROUP"
class="col-12"
>
<div class="form-group">
<label
class="control-label"
for="new-group-name"
>Name</label>
<input
id="new-group-name"
v-model="newGroup.name"
class="form-control input-medium option-content"
required="required"
type="text"
placeholder="Name"
>
</div>
<div class="form-group">
<label for="new-group-description">{{ $t('description') }}</label>
<textarea
id="new-group-description"
v-model="newGroup.description"
class="form-control option-content"
cols="3"
:placeholder="$t('description')"
></textarea>
</div>
<div
v-if="type === 'guild'"
class="form-group"
>
<div class="custom-control custom-radio">
<input
v-model="newGroup.privacy"
class="custom-control-input"
type="radio"
name="new-group-privacy"
value="private"
>
<label class="custom-control-label">{{ $t('inviteOnly') }}</label>
</div>
</div>
<div class="form-group">
<div class="custom-control custom-checkbox">
<input
id="create-group-leaderOnlyChallenges-checkbox"
v-model="newGroup.leaderOnly.challenges"
class="custom-control-input"
type="checkbox"
>
<label
class="custom-control-label"
for="create-group-leaderOnlyChallenges-checkbox"
>{{ $t('leaderOnlyChallenges') }}</label>
</div>
</div>
<div
v-if="type === 'party'"
class="form-group"
>
<button
class="btn btn-secondary form-control"
:value="$t('create')"
@click="createGroup()"
></button>
</div>
<div class="form-group">
<button
class="btn btn-primary btn-lg btn-block"
:disabled="!newGroupIsReady"
@click="createGroup()"
>
{{ $t('create') }}
</button>
</div>
</div>
<div
v-if="activePage === PAGES.PAY"
class="col-12"
>
<div class="text-center">
<payments-buttons
:stripe-fn="() => pay(PAYMENTS.STRIPE)"
:amazon-data="pay(PAYMENTS.AMAZON)"
/>
</div>
</div>
</b-modal>
</div>
</template>
@@ -160,8 +258,8 @@
.dollar {
position: absolute;
left: -16px;
top: 16px;
left: -1em;
top: 1em;
}
.purple-box {
@@ -193,9 +291,9 @@
background: #432874;
background: linear-gradient(180deg, #4F2A93 0%, #432874 100%);
color: #fff;
padding: 32px;
padding: 2em;
height: 340px;
margin-bottom: 32px;
margin-bottom: 2em;
margin-left: -12px;
margin-right: -12px;
@@ -219,7 +317,6 @@
.box {
height: 416px;
border-radius: 8px;
}
h2 {
@@ -262,19 +359,17 @@
button.create-group {
width: 330px;
height: 96px;
border-radius: 8px;
font-size: 1.5rem;
}
.purple-header {
color: #6133b4;
font-size: 48px;
margin-top: 16px;
margin-top: 1em;
}
.pricing {
margin-top: 32px;
margin-bottom: 64px;
margin-top: 2em;
margin-bottom: 4em;
.dollar, .number, .name {
display: inline-block;
@@ -283,32 +378,30 @@
}
.plus {
font-size: 2.125rem;
font-size: 34px;
color: #a5a1ac;
margin-left: 16px;
margin-right: 16px;
}
.dollar {
margin-bottom: 24px;
font-size: 2rem;
margin-bottom: 1.5em;
font-size: 32px;
font-weight: bold;
}
.name {
font-size: 1.5rem;
margin-left: 8px;
margin-right: 8px;
font-size: 24px;
margin-bottom: .8em;
margin-left: .5em;
}
.number {
font-size: 4.5rem;
font-size: 72px;
font-weight: bolder;
}
}
.payment-options {
margin-bottom: 64px;
margin-bottom: 4em;
h4 {
color: #34313a;
@@ -317,7 +410,7 @@
.purple-box {
background-color: #4f2a93;
color: #fff;
padding: 8px;
padding: .5em;
border-radius: 8px;
width: 200px;
height: 215px;
@@ -331,7 +424,7 @@
.name {
width: 100px;
margin-left: 4.8px;
margin-left: .3em;
}
.plus {
@@ -356,12 +449,10 @@ import paymentsMixin from '../../mixins/payments';
import { mapState } from '@/libs/store';
import positiveIcon from '@/assets/svg/positive.svg';
import paymentsButtons from '@/components/payments/buttons/list';
import groupPlanCreationModal from '../group-plans/groupPlanCreationModal';
export default {
components: {
paymentsButtons,
groupPlanCreationModal,
},
mixins: [paymentsMixin],
data () {
@@ -410,7 +501,12 @@ export default {
},
methods: {
launchModal () {
this.$root.$emit('bv::show::modal', 'create-group');
this.changePage(this.PAGES.CREATE_GROUP);
this.$root.$emit('bv::show::modal', 'group-plan-modal');
},
changePage (page) {
this.activePage = page;
window.scrollTo(0, 0);
},
createGroup () {
this.changePage(this.PAGES.PAY);
website/client/src/components/static/privacy.vue
+1 -2
View File
@@ -3,7 +3,7 @@
<div class="container-fluid">
<h1>Privacy Notice</h1>
<p class="strong pagemeta">
Last Updated: September 15, 2022
Last Updated September 19, 2022: Removed reference to Facebook login, which is no longer supported.
</p>
<p>
HabitRPG, Inc. (“HabitRPG,” “we,” “us,” or “our”) welcomes you. This privacy notice (the “Privacy
@@ -41,7 +41,6 @@
verify your identity. We also use this information to manage your account, including your transactions. If
you choose to log into your account through Google or Apple, we capture and store the User ID and email
address connected to the respective account, so we can verify your identity when you log in.
(We no longer offer the ability to log in using Facebook's authentication procedure.)
</p>
<h3>User Content</h3>
<p>