krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Client Fixes (#9050)

Browse Source 
* reset yesterdailies array after cron has run

* start to fix gifting

* remove unused code, move encodegift

* wip

* fix styles and bugs

* fix error if amazon is slow to load its script

* fix error notifications not showing up
This commit is contained in:
Matteo Pagliazzi
2017-09-20 15:04:35 +02:00
committed by GitHub
parent dd0c95f051
commit c0f159a8a5
15 changed files with 179 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/client/components/settings/api.vue
View File

@@ -70,8 +70,6 @@ import { mapState } from 'client/libs/store';
import uuid from '../../../common/script/libs/uuid';
// @TODO: env.EMAILS.TECH_ASSISTANCE_EMAIL
const TECH_ASSISTANCE_EMAIL = 'admin@habitica.com';
let AUTH_SETTINGS = localStorage.getItem('habit-mobile-settings');
AUTH_SETTINGS = JSON.parse(AUTH_SETTINGS);
export default {
data () {
@@ -83,9 +81,9 @@ export default {
};
},
computed: {
...mapState({user: 'user.data'}),
...mapState({user: 'user.data', credentials: 'credentials'}),
apiToken () {
return AUTH_SETTINGS.auth.apiToken;
return this.credentials.API_TOKEN;
},
},
methods: {