mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 23:27:26 +01:00
fix(home): remove FB signup, fix app footer outside of user context
This commit is contained in:
@@ -13,7 +13,7 @@ import {
|
||||
} from '../../../helpers/common.helper';
|
||||
|
||||
describe('shared.ops.purchase', () => {
|
||||
const SEASONAL_FOOD = 'Candy_Base';
|
||||
const SEASONAL_FOOD = moment().isBefore('2021-11-02T20:00-04:00') ? 'Candy_Base' : 'Meat';
|
||||
let user;
|
||||
const goldPoints = 40;
|
||||
const analytics = { track () {} };
|
||||
|
||||
@@ -1,21 +1,5 @@
|
||||
<template>
|
||||
<div class="form-wrapper">
|
||||
<div
|
||||
v-if="forgotPassword && preOutage"
|
||||
class="warning-banner d-flex"
|
||||
>
|
||||
<div class="warning-box ml-auto my-auto mr-2 d-flex">
|
||||
<div
|
||||
class="svg-icon exclamation m-auto"
|
||||
v-html="icons.exclamation"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mr-auto my-auto">
|
||||
Habitica emails will be temporarily unavailable on <strong>January 11, 2020</strong> from
|
||||
<strong>1:00 - 7:00 AM EST</strong>.
|
||||
</div>
|
||||
</div>
|
||||
<div id="top-background">
|
||||
<div class="seamless_stars_varied_opacity_repeat"></div>
|
||||
</div>
|
||||
@@ -35,7 +19,10 @@
|
||||
></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row text-center">
|
||||
<div
|
||||
class="form-group row text-center"
|
||||
v-if="!registering"
|
||||
>
|
||||
<div class="col-12 col-md-12">
|
||||
<div
|
||||
class="btn btn-secondary social-button"
|
||||
@@ -48,9 +35,7 @@
|
||||
<div
|
||||
class="text"
|
||||
>
|
||||
{{ registering
|
||||
? $t('signUpWithSocial', {social: 'Facebook'})
|
||||
: $t('loginWithSocial', {social: 'Facebook'}) }}
|
||||
{{ $t('loginWithSocial', {social: 'Facebook'}) }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -648,7 +633,6 @@
|
||||
<script>
|
||||
import axios from 'axios';
|
||||
import hello from 'hellojs';
|
||||
import moment from 'moment';
|
||||
import debounce from 'lodash/debounce';
|
||||
import isEmail from 'validator/lib/isEmail';
|
||||
import { buildAppleAuthUrl } from '../../libs/auth';
|
||||
@@ -738,9 +722,6 @@ export default {
|
||||
|| this.passwordInvalid
|
||||
|| this.passwordConfirmInvalid;
|
||||
},
|
||||
preOutage () {
|
||||
return moment.utc().isBefore('2020-01-12');
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
$route: {
|
||||
|
||||
@@ -106,16 +106,6 @@
|
||||
<span>{{ $t('or') }}</span>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<button
|
||||
class="social-button"
|
||||
@click="socialAuth('facebook')"
|
||||
>
|
||||
<div
|
||||
class="svg-icon social-icon"
|
||||
v-html="icons.facebookIcon"
|
||||
></div>
|
||||
<span>{{ $t('signUpWithSocial', {social: 'Facebook'}) }}</span>
|
||||
</button>
|
||||
<button
|
||||
class="social-button"
|
||||
@click="socialAuth('google')"
|
||||
|
||||
@@ -5,6 +5,9 @@ export default {
|
||||
...mapState({ user: 'user.data' }),
|
||||
bugReportMailto () {
|
||||
let subscriptionInfo = 'Not Subscribed';
|
||||
if (!this.user) {
|
||||
return 'mailto:admin@habitica.com?subject=Habitica Web Bug Report';
|
||||
}
|
||||
if (this.user.purchased.plan.customerId) {
|
||||
subscriptionInfo = `
|
||||
Subscription: ${this.user.purchased.plan.planId}%0d%0a
|
||||
|
||||
Reference in New Issue
Block a user