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

Sept 25 fixes (#9076)

Browse Source 
* Fixed amazon config

* Added breakpoint for fixed footer

* Fixed some minor sorting bugs
This commit is contained in:
Keith Holliday
2017-09-25 17:26:23 -05:00
committed by GitHub
parent 2a43df34c0
commit 2db5ab2352
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webpack/config/prod.env.js
View File

@@ -23,12 +23,15 @@ nconf.set('IS_TEST', nconf.get('NODE_ENV') === 'test');
// 'AMAZON_PAYMENTS', 'STRIPE_PUB_KEY', 'AMPLITUDE_KEY', // 'AMAZON_PAYMENTS', 'STRIPE_PUB_KEY', 'AMPLITUDE_KEY',
// 'worldDmg', 'mods', 'IS_MOBILE', 'PUSHER:KEY', 'PUSHER:ENABLED']; // 'worldDmg', 'mods', 'IS_MOBILE', 'PUSHER:KEY', 'PUSHER:ENABLED'];
const AMAZON_SELLER_ID = nconf.get('AMAZON_PAYMENTS:SELLER_ID') || nconf.get('AMAZON_PAYMENTS_SELLER_ID');
const AMAZON_CLIENT_ID = nconf.get('AMAZON_PAYMENTS:CLIENT_ID') || nconf.get('AMAZON_PAYMENTS_CLIENT_ID');
let env = { let env = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
// clientVars: CLIENT_VARS, // clientVars: CLIENT_VARS,
AMAZON_PAYMENTS: { AMAZON_PAYMENTS: {
SELLER_ID: `"${nconf.get('AMAZON_PAYMENTS:SELLER_ID')}"`, SELLER_ID: `"${AMAZON_SELLER_ID}"`,
CLIENT_ID: `"${nconf.get('AMAZON_PAYMENTS:CLIENT_ID')}"`, CLIENT_ID: `"${AMAZON_CLIENT_ID}"`,
}, },
EMAILS: { EMAILS: {
COMMUNITY_MANAGER_EMAIL: `"${nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL')}"`, COMMUNITY_MANAGER_EMAIL: `"${nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL')}"`,

11
website/client/components/auth/registerLogin.vue
View File

@@ -79,6 +79,15 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~client/assets/scss/colors.scss'; @import '~client/assets/scss/colors.scss';
@media only screen and (min-height: 1080px) {
#bottom-wrap {
margin-top: 6em;
position: fixed !important;
width: 100%;
bottom: 0;
}
}
.form-wrapper { .form-wrapper {
background-color: $purple-200; background-color: $purple-200;
background: $purple-200; /* For browsers that do not support gradients */ background: $purple-200; /* For browsers that do not support gradients */
@@ -184,7 +193,7 @@
#bottom-wrap { #bottom-wrap {
margin-top: 6em; margin-top: 6em;
position: fixed; position: static;
width: 100%; width: 100%;
bottom: 0; bottom: 0;
} }

10
website/client/components/tasks/taskModal.vue
View File

@@ -577,7 +577,7 @@ export default {
methods: { methods: {
...mapActions({saveTask: 'tasks:save', destroyTask: 'tasks:destroy', createTask: 'tasks:create'}), ...mapActions({saveTask: 'tasks:save', destroyTask: 'tasks:destroy', createTask: 'tasks:create'}),
sortedChecklist (data) { sortedChecklist (data) {
let sorting = clone(this.checklist); let sorting = clone(this.task.checklist);
let movingItem = sorting[data.oldIndex]; let movingItem = sorting[data.oldIndex];
sorting.splice(data.oldIndex, 1); sorting.splice(data.oldIndex, 1);
sorting.splice(data.newIndex, 0, movingItem); sorting.splice(data.newIndex, 0, movingItem);
@@ -591,12 +591,14 @@ export default {
} }
}, },
addChecklistItem (e) { addChecklistItem (e) {
this.task.checklist.push({ let checkListItem = {
id: uuid.v4(), id: uuid.v4(),
text: this.newChecklistItem, text: this.newChecklistItem,
completed: false, completed: false,
}); };
this.checklist = clone(this.task.checklist); this.task.checklist.push(checkListItem);
// @TODO: managing checklist separately to help with sorting on the UI
this.checklist.push(checkListItem);
this.newChecklistItem = null; this.newChecklistItem = null;
if (e) e.preventDefault(); if (e) e.preventDefault();
}, },