3aa7b8b447
* update selectUserModal.vue
* more updates to selectUserModal.vue, typo fix in subscriber.json
* remove exact sizing for selectUserModal.vue
* update to size for selectUserModal.vue
* added sendGiftModal.vue file
* updates to selectUser & sendGift modals
* making the modals go & position cursor
* working working working
* added a return to method
* avatar display & placeholder profile.name and username
* subscription-options added
* added menu row & started on gem options
* Added selectPage function, have not tested.
* updated habitica-images
* state changes
* bringing in gem counter
* arranging elements
* state changes, gem input boxes
* styling sendGiftModal.vue
* more sendGiftModal.vue styling and new close.svg icon
* more styling!
* and more styling of send own gems part of page
* images update
* more styling of own gems & some attempts to adjust :class on the menu
* styling styling styling
* replace +/- svg, styling
* styling, mostly
* new SVGs
* stylin'
* reverting svg changes
* no more stylin'
* finally got the +/- icons to show up...but they're the wrong color
* solved svg icon color problem! :)
* habitica-images
* working on sendGift part of button
* trying to make it do math, failing
* more attempts at math
* +/- buttons work on gem pages & cost calculation on buyGems
* trying to get hover colors working on +/- svgs
* formatted dollar amount as currency
* css/html for subscription-options & payments-buttons simplified
* swag at payments-buttons parameter (not tested)
* send gems from own balance works!
* working on starting page
* increment gem amount limited to maxGems and not < 0
* uncommented onHide()
* got bg color on sub options to work! yay!
* payment buttons!
* making g1g1 look good
* position modal on page properly & code clean-up
* Changes as requested!
* small color update
* fixed ternary function
* chore(html): indentation and comments
* fix(fn): correct catch for under-0
* chore(json): whitespace
* update gem styling; add linebreak to notifications.vue bc linter
* updating subscriptionOptions
* snackbar css fix
* reverting commit e16c12f
* removing merge conflict markers
* just a little comment
* fixed some navigation, clear input field on selectPage, cleaned up code; another try at subscriptionOption.vue
* merge upstream/develop
* update selectPage() to disable Gems menu items when on 'ownGems' or 'buyGems' states
* working on subscriptionOptions.vue logic
* fix(script): changed props & added updateSubscriptionData()
* fix(script): forgot to call updateSubscriptionData()
* fix(scripts): corrected :userReceivingGift on sendGiftModal.vue
* fix(scripts): correct props userReceivingGift to an Object
* fix(scripts): corrected v-if & revised props
* fix(style/html/whitespace): updated css for close.svg and added missing </div>
* style(radio-buttons): updated focus states and added hover states
* style(radio-buttons): refined focus and hover states
* fix(function): changed buyGemsLink to buyGems; still working on menu
* style(radio buttons): ensured consistent display of radio buttons through-out site; still struggling with hover states
* style(radio buttons): updated focus/active/hover to match design & removed unnecessary code
* fix: set default subscription option to 1 month
* fix(function): add default amounts to gem states when modal selected from user profile
* fix(build): use develop package json
* fix: SCSS commenting & abstracted setGemsDefault()
* fix(packages): revert to develop
* fix: remove unnecessary console.log statement
Co-authored-by: SabreCat <sabe@habitica.com>
214 lines
5.1 KiB
Vue
214 lines
5.1 KiB
Vue
<template>
|
|
<div class="create-group-modal-pages">
|
|
<div
|
|
v-if="activePage === PAGES.CREATE_GROUP"
|
|
class="col-12"
|
|
>
|
|
<h2>{{ $t('nameYourGroup') }}</h2>
|
|
<div class="form-group">
|
|
<label
|
|
class="control-label"
|
|
for="new-group-name"
|
|
>{{ $t('name') }}</label>
|
|
<input
|
|
id="new-group-name"
|
|
v-model="newGroup.name"
|
|
class="form-control input-medium option-content"
|
|
required="required"
|
|
type="text"
|
|
:placeholder="$t('exampleGroupName')"
|
|
>
|
|
</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('exampleGroupDesc')"
|
|
></textarea>
|
|
</div>
|
|
<div
|
|
v-if="newGroup.type === 'guild'"
|
|
class="form-group text-left"
|
|
>
|
|
<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('thisGroupInviteOnly') }}</label>
|
|
</div>
|
|
</div>
|
|
<div class="form-group text-left">
|
|
<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="newGroup.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"
|
|
>
|
|
<h2>{{ $t('choosePaymentMethod') }}</h2>
|
|
<payments-buttons
|
|
:stripe-fn="() => pay(PAYMENTS.STRIPE)"
|
|
:amazon-data="pay(PAYMENTS.AMAZON)"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<style lang="scss" scoped>
|
|
h2 {
|
|
font-family: 'Varela Round', sans-serif;
|
|
font-weight: normal;
|
|
font-size: 29px;
|
|
color: #34313a;
|
|
margin-top: 1em;
|
|
}
|
|
|
|
.box {
|
|
border-radius: 2px;
|
|
background-color: #ffffff;
|
|
box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
|
|
padding: 2em;
|
|
text-align: center;
|
|
vertical-align: bottom;
|
|
height: 100px;
|
|
width: 306px;
|
|
margin: 0 auto;
|
|
margin-bottom: 1em;
|
|
}
|
|
|
|
.box .svg-icon {
|
|
margin: 0 auto;
|
|
}
|
|
|
|
.form-group {
|
|
text-align: left;
|
|
font-weight: bold;
|
|
}
|
|
|
|
.custom-control-input {
|
|
z-index: -1;
|
|
opacity: 0;
|
|
}
|
|
|
|
.box:hover {
|
|
cursor: pointer;
|
|
opacity: 0.7;
|
|
}
|
|
|
|
.btn-block {
|
|
margin-bottom: 1em;
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
import { mapState } from '@/libs/store';
|
|
import paymentsMixin from '../../mixins/payments';
|
|
import paymentsButtons from '@/components/payments/buttons/list';
|
|
|
|
export default {
|
|
components: {
|
|
paymentsButtons,
|
|
},
|
|
mixins: [paymentsMixin],
|
|
data () {
|
|
return {
|
|
amazonPayments: {},
|
|
PAGES: {
|
|
CREATE_GROUP: 'create-group',
|
|
UPGRADE_GROUP: 'upgrade-group',
|
|
PAY: 'pay',
|
|
},
|
|
PAYMENTS: {
|
|
AMAZON: 'amazon',
|
|
STRIPE: 'stripe',
|
|
},
|
|
activePage: 'create-group',
|
|
newGroup: {
|
|
type: 'guild',
|
|
privacy: 'private',
|
|
name: '',
|
|
leaderOnly: {
|
|
challenges: false,
|
|
},
|
|
},
|
|
};
|
|
},
|
|
computed: {
|
|
...mapState({ user: 'user.data' }),
|
|
newGroupIsReady () {
|
|
return Boolean(this.newGroup.name);
|
|
},
|
|
},
|
|
methods: {
|
|
changePage (page) {
|
|
this.activePage = page;
|
|
window.scrollTo(0, 0);
|
|
},
|
|
createGroup () {
|
|
this.changePage(this.PAGES.PAY);
|
|
},
|
|
pay (paymentMethod) {
|
|
const subscriptionKey = 'group_monthly';
|
|
const paymentData = {
|
|
subscription: subscriptionKey,
|
|
coupon: null,
|
|
};
|
|
|
|
if (this.upgradingGroup && this.upgradingGroup._id) {
|
|
paymentData.groupId = this.upgradingGroup._id;
|
|
paymentData.group = this.upgradingGroup;
|
|
} else {
|
|
paymentData.groupToCreate = this.newGroup;
|
|
}
|
|
|
|
this.paymentMethod = paymentMethod;
|
|
if (this.paymentMethod === this.PAYMENTS.STRIPE) {
|
|
this.redirectToStripe(paymentData);
|
|
} else if (this.paymentMethod === this.PAYMENTS.AMAZON) {
|
|
paymentData.type = 'subscription';
|
|
return paymentData;
|
|
}
|
|
|
|
return null;
|
|
},
|
|
},
|
|
};
|
|
</script>
|