2ee2b05d1c
* feat(security): implement CSP * fix(csp): update helmet version to latest * Squashed commit of the following: commit cc6a35e61db07759c1f32716185543bc48bce760 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 17:27:50 2025 -0600 fix(CSP): more Amazon domains commit 985b86c29af866b2df942c21217d99390a2c6e92 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 17:18:08 2025 -0600 fix(csp): more loggly allowance commit 166bd315272f9c3a42652f3a026c27a88ed1a549 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 17:12:00 2025 -0600 fix(csp): data, inline, some refactoring commit 1a0a6c1806a53d43a7199bb2ef72cff610e908be Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 17:05:44 2025 -0600 fix(CSP): override default script-src commit 023d9886c835989da9c5901c168d66b572097dcf Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 16:56:24 2025 -0600 fix(CSP): unsafe-eval in default-src commit f51f0a0c93b60dfec7ce02be0ecd2587fc882fe0 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 16:52:14 2025 -0600 fix(CSP): move trusted list to default-src commit 83b2ba7688dea38abb651cf5c27482a7a3648374 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 16:38:05 2025 -0600 fix(CSP): explicit habitica/aws in script-src commit d5ca5172d5ad2fd8cec9402d7d2c9452c6ece7a1 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 16:31:38 2025 -0600 fix(CSP): need escaped single quotes commit c677a1ffeff5793b6da228924e68d2c2e47794b2 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 16:27:46 2025 -0600 fix(CSP): unsafe-eval commit 6ef35c3f7281c8426d9c333686be6bb65f00b3a8 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 16:15:07 2025 -0600 fix(CSP): might need to skip entirely in dev but try no 'self' commit 5759fb37d82fa61b474f01e9ce5e2dc461f6ceba Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 12 15:51:26 2025 -0600 fix(csp): permit AWS in default-src commit 9f238abf9373bc29715657b945b2247ef23c9224 Author: Kalista Payne <kalista@habitica.com> Date: Fri Dec 5 17:22:25 2025 -0600 fix(csp): update helmet version to latest commit 9462e90f4f3058f4014137b3178b9751c5280e97 Author: Kalista Payne <kalista@habitica.com> Date: Tue Nov 25 09:27:05 2025 -0600 feat(security): implement CSP commit72539f9ba3Author: Kalista Payne <kalista@habitica.com> Date: Wed Dec 10 14:16:53 2025 -0600 5.42.2 commitdabd466719Author: Kalista Payne <kalista@habitica.com> Date: Wed Dec 10 14:16:48 2025 -0600 Revert "Chat optimization (#15545)" This reverts commit2917955ef0. commit8bf2304330Author: Kalista Payne <kalista@habitica.com> Date: Wed Dec 10 14:15:48 2025 -0600 chore(event): G1G1 date tweaks commit6937dc4e4eAuthor: Kalista Payne <kalista@habitica.com> Date: Mon Dec 8 16:37:04 2025 -0600 fix(subscription): couple more layout tweaks * fix(csp): move unsafe-eval to default? ig? * Revert "fix(csp): move unsafe-eval to default? ig?" This reverts commit 90476cbf6c59132024d4fbaeceb7cdb19a876303. * fix(security): no unsafe! yay! * fix(packages): remove webpack * fix(lint): object destructuring * fix(csp): remove Vue-Fragment * wip(i18n): load Moment locale from cache * fix(gulp): remove unneeded cache task * fix(i18n): add Moment weekday abbrevs to translations * fix(lint): destructuring ...why is this happening here and not develop lol * fix(csp): add amplitude to whitelist --------- Co-authored-by: Phillip Thelen <phillip@thelen.space>
182 lines
4.6 KiB
Vue
182 lines
4.6 KiB
Vue
<template>
|
|
<div class="d-content">
|
|
<tr
|
|
v-if="!mixinData.inlineSettingMixin.modalVisible"
|
|
>
|
|
<td class="settings-label">
|
|
{{ $t("dayStartAdjustment") }}
|
|
</td>
|
|
<td class="settings-value">
|
|
{{ selectedDayStartLabel(user.preferences.dayStart) }}
|
|
</td>
|
|
<td class="settings-button">
|
|
<a
|
|
class="edit-link"
|
|
@click.prevent="openModal()"
|
|
>
|
|
{{ $t('edit') }}
|
|
</a>
|
|
</td>
|
|
</tr>
|
|
<tr
|
|
v-if="mixinData.inlineSettingMixin.modalVisible"
|
|
class="expanded"
|
|
>
|
|
<td colspan="3">
|
|
<div
|
|
v-once
|
|
class="dialog-title"
|
|
>
|
|
{{ $t("dayStartAdjustment") }}
|
|
</div>
|
|
<div
|
|
v-once
|
|
class="dialog-disclaimer"
|
|
v-html="$t('customDayStartInfo1')"
|
|
>
|
|
</div>
|
|
|
|
<div class="input-area">
|
|
<div class="settings-label">
|
|
{{ $t("adjustment") }}
|
|
</div>
|
|
<div class="form-group">
|
|
<select-list
|
|
:items="dayStartOptions"
|
|
:value="newDayStart"
|
|
key-prop="value"
|
|
active-key-prop="value"
|
|
:hide-icon="false"
|
|
@select="changeDayStart($event)"
|
|
>
|
|
<template #item="{ item }">
|
|
<span v-if="item === newDayStart || (!item && newDayStart === 0)">
|
|
{{ selectedDayStartLabel(newDayStart) }}
|
|
</span>
|
|
<span v-else>
|
|
{{ item?.name }}
|
|
</span>
|
|
</template>
|
|
</select-list>
|
|
</div>
|
|
</div>
|
|
|
|
<small
|
|
class="timezone-explain"
|
|
>
|
|
<p v-html="$t('timezoneUTC', {utc: timezoneOffsetToUtc})"></p>
|
|
<p v-html="$t('timezoneInfo')"></p>
|
|
</small>
|
|
|
|
<div class="input-area">
|
|
<save-cancel-buttons
|
|
:disable-save="newDayStart === user.preferences.dayStart"
|
|
@saveClicked="saveDayStart()"
|
|
@cancelClicked="requestCloseModal()"
|
|
/>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
</div>
|
|
</template>
|
|
|
|
<style lang="scss" scoped>
|
|
@import '@/assets/scss/colors.scss';
|
|
|
|
.timezone-explain {
|
|
font-size: 12px;
|
|
line-height: 1.33;
|
|
|
|
color: $gray-100;
|
|
text-align: center;
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
import axios from 'axios';
|
|
import moment from 'moment/moment';
|
|
import getUtcOffset from '@/../../common/script/fns/getUtcOffset';
|
|
import { mapState } from '@/libs/store';
|
|
|
|
import { InlineSettingMixin } from '../components/inlineSettingMixin';
|
|
import SaveCancelButtons from '../components/saveCancelButtons.vue';
|
|
import SelectList from '@/components/ui/selectList.vue';
|
|
|
|
export default {
|
|
components: { SelectList, SaveCancelButtons },
|
|
mixins: [InlineSettingMixin],
|
|
data () {
|
|
const dayStartOptions = [];
|
|
for (let number = 0; number <= 12; number += 1) {
|
|
const meridian = number < 12 ? 'AM' : 'PM';
|
|
const hour = number % 12;
|
|
const timeWithMeridian = `(${hour || 12}:00 ${meridian})`;
|
|
const option = {
|
|
value: number,
|
|
name: `+${number} hours ${timeWithMeridian}`,
|
|
};
|
|
|
|
if (number === 0) {
|
|
option.name = `Default ${timeWithMeridian}`;
|
|
}
|
|
|
|
dayStartOptions.push(option);
|
|
}
|
|
|
|
return {
|
|
newDayStart: 0,
|
|
dayStartOptions,
|
|
};
|
|
},
|
|
mounted () {
|
|
this.newDayStart = this.user.preferences.dayStart;
|
|
},
|
|
computed: {
|
|
...mapState({
|
|
user: 'user.data',
|
|
}),
|
|
timezoneOffsetToUtc () {
|
|
const offsetString = moment().utcOffset(getUtcOffset(this.user)).format('Z');
|
|
return `UTC${offsetString}`;
|
|
},
|
|
dayStart () {
|
|
return this.user.preferences.dayStart;
|
|
},
|
|
},
|
|
methods: {
|
|
changeDayStart ($event) {
|
|
this.newDayStart = $event.value;
|
|
},
|
|
async saveDayStart () {
|
|
this.user.preferences.dayStart = this.newDayStart;
|
|
await axios.post('/api/v4/user/custom-day-start', {
|
|
dayStart: this.newDayStart,
|
|
});
|
|
|
|
this.closeModal();
|
|
},
|
|
selectedDayStartLabel (dayStartValue) {
|
|
if (!this.dayStartOptions) {
|
|
return '';
|
|
}
|
|
|
|
return this.dayStartOptions.find(l => l.value === dayStartValue)?.name ?? '';
|
|
},
|
|
calculateNextCron () {
|
|
let nextCron = moment()
|
|
.hours(this.newDayStart)
|
|
.minutes(0)
|
|
.seconds(0)
|
|
.milliseconds(0);
|
|
|
|
const currentHour = moment().format('H');
|
|
if (currentHour >= this.newDayStart) {
|
|
nextCron = nextCron.add(1, 'day');
|
|
}
|
|
|
|
return nextCron.format(`${this.user.preferences.dateFormat.toUpperCase()} @ h:mm a`);
|
|
},
|
|
},
|
|
};
|
|
</script>
|