adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-14 19:22:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

respect organization time format settings in api tokens section

Browse Source
This commit is contained in:
Gregor Vostrak
2025-05-14 16:21:37 +02:00
parent 2e3a517502
commit 9a2af2e743
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/css/app.css
View File

@@ -44,7 +44,7 @@
--theme-color-input-select-active: rgb(var(--color-accent-300)); --theme-color-input-select-active: rgb(var(--color-accent-300));
--theme-color-input-select-active-hover: rgb(var(--color-accent-200)); --theme-color-input-select-active-hover: rgb(var(--color-accent-200));
--color-accent-default: rgb(var(--color-accent-900)); --color-accent-default: rgba(var(--color-accent-300), 0.2);
--color-accent-foreground: rgb(var(--color-accent-100)); --color-accent-foreground: rgb(var(--color-accent-100));
} }

9
resources/js/Pages/Profile/Partials/ApiTokensForm.vue
View File

@@ -1,7 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import FormSection from '@/Components/FormSection.vue'; import FormSection from '@/Components/FormSection.vue';
import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue'; import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
import {computed, ref} from 'vue'; import {computed, ref, inject, type ComputedRef} from 'vue';
import InputLabel from '@/packages/ui/src/Input/InputLabel.vue'; import InputLabel from '@/packages/ui/src/Input/InputLabel.vue';
import { import {
api, api,
@@ -23,6 +23,7 @@ import {useNotificationsStore} from "@/utils/notification";
import {useClipboard} from "@vueuse/core"; import {useClipboard} from "@vueuse/core";
import { formatDateTimeLocalized} from "../../../packages/ui/src/utils/time"; import { formatDateTimeLocalized} from "../../../packages/ui/src/utils/time";
import {ClockIcon} from "@heroicons/vue/20/solid"; import {ClockIcon} from "@heroicons/vue/20/solid";
import type { Organization } from '@/packages/api/src';
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@@ -34,6 +35,8 @@ const newToken = ref('');
const { copy, copied, isSupported } = useClipboard(); const { copy, copied, isSupported } = useClipboard();
const organization = inject<ComputedRef<Organization>>('organization');
async function createApiToken(){ async function createApiToken(){
await handleApiRequestNotifications( await handleApiRequestNotifications(
() => () =>
@@ -213,10 +216,10 @@ const revokeApiTokenMutation = useMutation({
<div>{{ token.name }}</div> <div>{{ token.name }}</div>
<div class="text-sm text-text-tertiary space-x-3"> <div class="text-sm text-text-tertiary space-x-3">
<span v-if="token.created_at"> <span v-if="token.created_at">
Created at {{ formatDateTimeLocalized(token.created_at) }} Created at {{ formatDateTimeLocalized(token.created_at, organization?.date_format, organization?.time_format) }}
</span> </span>
<span v-if="token.expires_at"> <span v-if="token.expires_at">
Expires at {{ formatDateTimeLocalized(token.expires_at) }} Expires at {{ formatDateTimeLocalized(token.expires_at, organization?.date_format, organization?.time_format) }}
</span> </span>
<span v-if="token.revoked"> <span v-if="token.revoked">
Revoked Revoked

5
resources/js/packages/ui/src/utils/time.ts
View File

@@ -146,8 +146,9 @@ export function formatDateLocalized(date: string, format: DateFormat = 'point-se
return getLocalizedDayJs(date).format(dateFormatMap[format]); return getLocalizedDayJs(date).format(dateFormatMap[format]);
} }
export function formatDateTimeLocalized(date: string): string { export function formatDateTimeLocalized(date: string, dateFormat?: DateFormat, timeFormat?: TimeFormat): string {
return getLocalizedDayJs(date).format('DD.MM.YYYY HH:mm'); const format = `${dateFormatMap[dateFormat ?? 'point-separated-d-m-yyyy']} ${timeFormat === '12-hours' ? 'hh:mm A' : 'HH:mm'}`;
return getLocalizedDayJs(date).format(format);
} }
export function formatWeek(date: string | null): string { export function formatWeek(date: string | null): string {