mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-07-17 11:32:16 +00:00
fix errors
This commit is contained in:
parent
4fdd064cd6
commit
5ce12d97be
6 changed files with 23 additions and 12 deletions
|
|
@ -358,6 +358,7 @@ export default {
|
|||
|
||||
return response;
|
||||
}, error => { // Set up Error interceptors
|
||||
console.log(error);
|
||||
if (error.response.status >= 400) {
|
||||
const isBanned = this.checkForBannedUser(error);
|
||||
if (isBanned === true) return null; // eslint-disable-line consistent-return
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@
|
|||
</div>
|
||||
|
||||
<div
|
||||
v-if="ENABLE_TIME_TRAVEL && user.permissions.fullAccess"
|
||||
v-if="ENABLE_TIME_TRAVEL && user.permissions && user.permissions.fullAccess"
|
||||
:key="lastTimeJump"
|
||||
>
|
||||
<a
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import Vue from 'vue';
|
||||
import axios from 'axios';
|
||||
import BootstrapVue from 'bootstrap-vue';
|
||||
import Fragment from 'vue-fragment';
|
||||
import AppComponent from './app';
|
||||
|
|
@ -38,13 +39,14 @@ const store = getStore();
|
|||
if (process.env.ENABLE_TIME_TRAVEL) {
|
||||
(async () => {
|
||||
const sinon = await import('sinon');
|
||||
const axios = await import('axios');
|
||||
const response = await axios.get('/api/v4/debug/time-travel-time');
|
||||
const time = new Date(response.data.data.time);
|
||||
Vue.config.clock = sinon.useFakeTimers({
|
||||
now: time,
|
||||
shouldAdvanceTime: true,
|
||||
});
|
||||
if (axios.defaults.headers.common['x-api-user']) {
|
||||
const response = await axios.get('/api/v4/debug/time-travel-time');
|
||||
const time = new Date(response.data.data.time);
|
||||
Vue.config.clock = sinon.useFakeTimers({
|
||||
now: time,
|
||||
shouldAdvanceTime: true,
|
||||
});
|
||||
}
|
||||
})();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ envVars
|
|||
envObject[`process.env.${key}`] = `'${nconf.get(key)}'`;
|
||||
});
|
||||
|
||||
console.log(envObject)
|
||||
|
||||
const webpackPlugins = [
|
||||
new webpack.DefinePlugin(envObject),
|
||||
new webpack.ContextReplacementPlugin(/moment[\\/]locale$/, /^\.\/(NOT_EXISTING)$/),
|
||||
|
|
@ -56,6 +58,11 @@ module.exports = {
|
|||
},
|
||||
],
|
||||
},
|
||||
resolve: {
|
||||
fallback: {
|
||||
"timers": require.resolve("timers-browserify")
|
||||
},
|
||||
},
|
||||
plugins: webpackPlugins,
|
||||
},
|
||||
chainWebpack: config => {
|
||||
|
|
|
|||
|
|
@ -799,6 +799,7 @@ export function assembleScheduledMatchers (date) {
|
|||
}
|
||||
|
||||
let cachedScheduleMatchers = null;
|
||||
let cacheDate = null;
|
||||
|
||||
function makeMatcherClass () {
|
||||
return {
|
||||
|
|
@ -832,10 +833,10 @@ export function getScheduleMatchingGroup (type, date) {
|
|||
}
|
||||
if (!cachedScheduleMatchers) {
|
||||
cacheDate = new Date();
|
||||
const scheduleMatchers = {};
|
||||
cachedScheduleMatchers = {};
|
||||
assembleScheduledMatchers(checkedDate).forEach(matcher => {
|
||||
if (!scheduleMatchers[matcher.type]) {
|
||||
scheduleMatchers[matcher.type] = makeMatcherClass();
|
||||
if (!cachedScheduleMatchers[matcher.type]) {
|
||||
cachedScheduleMatchers[matcher.type] = makeMatcherClass();
|
||||
}
|
||||
if (matcher.matcher instanceof Function) {
|
||||
cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher);
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@ shops.getQuestShopCategories = function getQuestShopCategories (user, language)
|
|||
};
|
||||
|
||||
bundleCategory.items = sortBy(values(content.bundles)
|
||||
.filter(bundle => bundle.type === 'quests' && bundle.canBuy())
|
||||
.filter(bundle => bundle.type === 'quests')
|
||||
.map(bundle => getItemInfo(user, 'bundles', bundle, officialPinnedItems, language)));
|
||||
|
||||
if (bundleCategory.items.length > 0) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue