Compare commits

...

6 Commits

Author SHA1 Message Date
Gregor Vostrak
1e7de6022a fix css variables not updating correctly when system theme changes 2025-06-08 15:47:25 +02:00
Constantin Graf
4de7868851 Add postgres version matrix to phpunit tests 2025-06-04 21:43:35 +02:00
dependabot[bot]
ffc016a1ec Bump codecov/codecov-action from 5.4.2 to 5.4.3
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.4.2 to 5.4.3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v5.4.2...v5.4.3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-22 18:32:13 +02:00
Constantin Graf
be69626970 Add permissions to all GitHub actions 2025-05-22 11:04:37 +02:00
Gregor Vostrak
f1dce88dab fix time zone issue in daterangepicker 2025-05-21 12:34:02 -07:00
Constantin Graf
15411ec0c8 Add resend verification email to filament resource 2025-05-19 11:50:40 +02:00
22 changed files with 155 additions and 62 deletions

View File

@@ -10,6 +10,8 @@ on:
- '.github/workflows/build-private.yml' - '.github/workflows/build-private.yml'
- 'docker/prod/**' - 'docker/prod/**'
workflow_dispatch: workflow_dispatch:
permissions:
contents: read
name: Build - Private name: Build - Private
jobs: jobs:
@@ -17,6 +19,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 20 timeout-minutes: 20
steps: steps:
- name: "Check out code" - name: "Check out code"
uses: actions/checkout@v4 uses: actions/checkout@v4

View File

@@ -11,6 +11,12 @@ on:
- 'docker/prod/**' - 'docker/prod/**'
workflow_dispatch: workflow_dispatch:
permissions:
packages: write
contents: read
attestations: write
id-token: write
env: env:
DOCKERHUB_REPO: solidtime/solidtime DOCKERHUB_REPO: solidtime/solidtime
GHCR_REPO: ghcr.io/solidtime-io/solidtime GHCR_REPO: ghcr.io/solidtime-io/solidtime
@@ -26,11 +32,6 @@ jobs:
- runs-on: "ubuntu-24.04" - runs-on: "ubuntu-24.04"
platform: "linux/amd64" platform: "linux/amd64"
runs-on: ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }}
permissions:
packages: write
contents: read
attestations: write
id-token: write
timeout-minutes: 90 timeout-minutes: 90
steps: steps:
@@ -163,11 +164,6 @@ jobs:
merge: merge:
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
packages: write
contents: read
attestations: write
id-token: write
timeout-minutes: 90 timeout-minutes: 90
needs: needs:
- build - build

View File

@@ -3,6 +3,9 @@ on:
push: push:
branches: branches:
- main - main
permissions:
contents: read
jobs: jobs:
api_docs: api_docs:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@@ -1,6 +1,8 @@
name: NPM Build name: NPM Build
on: [push] on: [push]
permissions:
contents: read
jobs: jobs:
build: build:

View File

@@ -1,6 +1,8 @@
name: NPM Lint name: NPM Lint
on: [push] on: [push]
permissions:
contents: read
jobs: jobs:
build: build:

View File

@@ -1,6 +1,8 @@
name: Publish API package to NPM name: Publish API package to NPM
on: on:
workflow_dispatch workflow_dispatch
permissions:
contents: read
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@@ -1,6 +1,8 @@
name: Publish UI package to NPM name: Publish UI package to NPM
on: on:
workflow_dispatch workflow_dispatch
permissions:
contents: read
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@@ -1,7 +1,8 @@
name: NPM Typecheck name: NPM Typecheck
on: [push] on: [push]
permissions:
contents: read
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@@ -1,5 +1,7 @@
name: Static code analysis (PHPStan) name: Static code analysis (PHPStan)
on: push on: push
permissions:
contents: read
jobs: jobs:
phpstan: phpstan:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@@ -1,13 +1,18 @@
name: PHPUnit Tests name: PHPUnit Tests
on: push on: push
permissions:
contents: read
jobs: jobs:
phpunit: phpunit:
runs-on: ubuntu-latest runs-on: ubuntu-latest
timeout-minutes: 10 timeout-minutes: 10
strategy:
matrix:
postgres_version: [ 15, 16, 17 ]
services: services:
pgsql_test: pgsql_test:
image: postgres:15 image: postgres:${{ matrix.postgres_version }}
env: env:
PGPASSWORD: 'root' PGPASSWORD: 'root'
POSTGRES_DB: 'laravel' POSTGRES_DB: 'laravel'
@@ -63,7 +68,7 @@ jobs:
run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
- name: "Upload coverage reports to Codecov" - name: "Upload coverage reports to Codecov"
uses: codecov/codecov-action@v5.4.2 uses: codecov/codecov-action@v5.4.3
with: with:
token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.CODECOV_TOKEN }}
slug: solidtime-io/solidtime slug: solidtime-io/solidtime

View File

@@ -1,5 +1,7 @@
name: PHP Linting name: PHP Linting
on: push on: push
permissions:
contents: read
jobs: jobs:
pint: pint:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@@ -1,5 +1,7 @@
name: Playwright Tests name: Playwright Tests
on: [push] on: [push]
permissions:
contents: read
jobs: jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View File

@@ -23,6 +23,7 @@ use Filament\Tables;
use Filament\Tables\Filters\TernaryFilter; use Filament\Tables\Filters\TernaryFilter;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent; use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
@@ -207,6 +208,14 @@ class UserResource extends Resource
}), }),
]) ])
->bulkActions([ ->bulkActions([
Tables\Actions\BulkAction::make('Resend verification email')
->icon('heroicon-o-paper-airplane')
->action(function (Collection $records): void {
foreach ($records as $user) {
/** @var User $user */
$user->sendEmailVerificationNotification();
}
}),
]); ]);
} }

View File

@@ -17,7 +17,7 @@ import {
TooltipComponent, TooltipComponent,
} from 'echarts/components'; } from 'echarts/components';
import type { AggregatedTimeEntries, Organization } from '@/packages/api/src'; import type { AggregatedTimeEntries, Organization } from '@/packages/api/src';
import { useCssVar } from '@vueuse/core'; import { useCssVariable } from '@/utils/useCssVariable';
use([ use([
CanvasRenderer, CanvasRenderer,
@@ -47,8 +47,10 @@ const xAxisLabels = computed(() => {
formatDate(el.key ?? '', organization?.value?.date_format) formatDate(el.key ?? '', organization?.value?.date_format)
); );
}); });
const accentColor = useCssVar('--theme-color-chart', null, { observe: true }); const accentColor = useCssVariable('--theme-color-chart');
const labelColor = useCssVar('--color-text-secondary', null, { observe: true }); const labelColor = useCssVariable('--color-text-secondary');
const markLineColor = useCssVariable('--color-border-secondary');
const splitLineColor = useCssVariable('--color-border-tertiary');
const seriesData = computed(() => { const seriesData = computed(() => {
return props?.groupedData?.map((el) => { return props?.groupedData?.map((el) => {
@@ -111,7 +113,7 @@ const option = computed(() => ({
data: xAxisLabels.value, data: xAxisLabels.value,
markLine: { markLine: {
lineStyle: { lineStyle: {
color: 'rgba(125,156,188,0.1)', color: markLineColor.value,
type: 'dashed', type: 'dashed',
}, },
}, },
@@ -135,9 +137,13 @@ const option = computed(() => ({
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
axisLabel: {
color: labelColor.value,
fontFamily: 'Outfit, sans-serif',
},
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: 'rgba(125,156,188,0.2)', // Set desired color here color: splitLineColor.value,
}, },
}, },
}, },

View File

@@ -11,7 +11,7 @@ import {
TooltipComponent, TooltipComponent,
} from 'echarts/components'; } from 'echarts/components';
import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time'; import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
import { useCssVar } from '@vueuse/core'; import { useCssVariable } from '@/utils/useCssVariable';
import type { Organization } from '@/packages/api/src'; import type { Organization } from '@/packages/api/src';
use([ use([
@@ -36,7 +36,7 @@ type ReportingChartDataEntry = {
const props = defineProps<{ const props = defineProps<{
data: ReportingChartDataEntry | null; data: ReportingChartDataEntry | null;
}>(); }>();
const labelColor = useCssVar('--color-text-secondary', null, { observe: true }); const labelColor = useCssVariable('--color-text-secondary');
const seriesData = computed(() => { const seriesData = computed(() => {
return props.data?.map((el) => { return props.data?.map((el) => {

View File

@@ -19,7 +19,7 @@ import {
formatHumanReadableDuration, formatHumanReadableDuration,
getDayJsInstance, getDayJsInstance,
} from '@/packages/ui/src/utils/time'; } from '@/packages/ui/src/utils/time';
import { useCssVar } from '@vueuse/core'; import { useCssVariable } from '@/utils/useCssVariable';
import { useQuery } from '@tanstack/vue-query'; import { useQuery } from '@tanstack/vue-query';
import { getCurrentOrganizationId } from '@/utils/useUser'; import { getCurrentOrganizationId } from '@/utils/useUser';
import { api, type Organization } from '@/packages/api/src'; import { api, type Organization } from '@/packages/api/src';
@@ -64,12 +64,9 @@ const max = computed(() => {
} }
}); });
const backgroundColor = useCssVar('--color-card-background', null, { const backgroundColor = useCssVariable('--theme-color-card-background');
observe: true, const itemBackgroundColor = useCssVariable('--color-bg-tertiary');
}); const borderColor = useCssVariable('--color-border');
const itemBackgroundColor = useCssVar('--color-bg-tertiary', null, {
observe: true,
});
const option = computed(() => { const option = computed(() => {
return { return {
@@ -120,7 +117,7 @@ const option = computed(() => {
[], [],
itemStyle: { itemStyle: {
borderRadius: 5, borderRadius: 5,
borderColor: 'rgba(255,255,255,0.05)', borderColor: borderColor.value,
borderWidth: 1, borderWidth: 1,
}, },
tooltip: { tooltip: {

View File

@@ -1,13 +1,14 @@
<script setup lang="ts"> <script setup lang="ts">
import VChart from 'vue-echarts'; import VChart from 'vue-echarts';
import { computed, ref } from 'vue'; import { computed } from 'vue';
import { useCssVar } from '@vueuse/core'; import { useCssVariable } from '@/utils/useCssVariable';
const props = defineProps<{ const props = defineProps<{
history: number[]; history: number[];
}>(); }>();
const accentColor = useCssVar('--theme-color-chart', null, { observe: true }); const accentColor = useCssVariable('--theme-color-chart');
const markLineColor = useCssVariable('--color-border-secondary');
const seriesData = computed(() => props.history.map((el) => { const seriesData = computed(() => props.history.map((el) => {
return { return {
@@ -22,7 +23,7 @@ const seriesData = computed(() => props.history.map((el) => {
}, },
}; };
})); }));
const option = ref({ const option = computed(() => ({
grid: { grid: {
top: 0, top: 0,
right: 0, right: 0,
@@ -35,7 +36,7 @@ const option = ref({
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
markLine: { markLine: {
lineStyle: { lineStyle: {
color: 'rgba(125,156,188,0.1)', color: markLineColor.value,
type: 'dashed', type: 'dashed',
}, },
}, },
@@ -66,11 +67,11 @@ const option = ref({
}, },
series: [ series: [
{ {
data: seriesData, data: seriesData.value,
type: 'bar', type: 'bar',
}, },
], ],
}); }));
</script> </script>
<template> <template>

View File

@@ -11,7 +11,7 @@ import {
TooltipComponent, TooltipComponent,
} from 'echarts/components'; } from 'echarts/components';
import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time'; import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
import { useCssVar } from "@vueuse/core"; import { useCssVariable } from '@/utils/useCssVariable';
import type { Organization } from "@/packages/api/src"; import type { Organization } from "@/packages/api/src";
use([ use([
@@ -24,7 +24,7 @@ use([
]); ]);
provide(THEME_KEY, 'dark'); provide(THEME_KEY, 'dark');
const labelColor = useCssVar('--color-text-secondary', null, { observe: true }); const labelColor = useCssVariable('--color-text-secondary');
const props = defineProps<{ const props = defineProps<{
weeklyProjectOverview: { weeklyProjectOverview: {

View File

@@ -18,7 +18,7 @@ import ProjectsChartCard from '@/Components/Dashboard/ProjectsChartCard.vue';
import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time'; import { formatHumanReadableDuration } from '@/packages/ui/src/utils/time';
import { formatCents } from '@/packages/ui/src/utils/money'; import { formatCents } from '@/packages/ui/src/utils/money';
import { getWeekStart } from '@/packages/ui/src/utils/settings'; import { getWeekStart } from '@/packages/ui/src/utils/settings';
import { useCssVar } from '@vueuse/core'; import { useCssVariable } from '@/utils/useCssVariable';
import { getOrganizationCurrencyString } from '@/utils/money'; import { getOrganizationCurrencyString } from '@/utils/money';
import { useQuery } from '@tanstack/vue-query'; import { useQuery } from '@tanstack/vue-query';
import { getCurrentOrganizationId } from '@/utils/useUser'; import { getCurrentOrganizationId } from '@/utils/useUser';
@@ -60,7 +60,7 @@ const weekdays = computed(() => {
} }
}); });
const accentColor = useCssVar('--theme-color-chart', null, { observe: true }); const accentColor = useCssVariable('--theme-color-chart');
// Get the organization ID using the utility function // Get the organization ID using the utility function
const organizationId = computed(() => getCurrentOrganizationId()); const organizationId = computed(() => getCurrentOrganizationId());
@@ -176,10 +176,8 @@ const seriesData = computed(() => {
}); });
}); });
const markLineColor = useCssVar('--color-border-secondary', null, { const markLineColor = useCssVariable('--color-border-secondary');
observe: true, const labelColor = useCssVariable('--color-text-secondary');
});
const labelColor = useCssVar('--color-text-secondary', null, { observe: true });
const option = computed(() => { const option = computed(() => {
return { return {
tooltip: { tooltip: {
@@ -215,6 +213,10 @@ const option = computed(() => {
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
axisLabel: {
color: labelColor.value,
fontFamily: 'Outfit, sans-serif',
},
splitLine: { splitLine: {
lineStyle: { lineStyle: {
color: markLineColor.value, color: markLineColor.value,

View File

@@ -5,10 +5,7 @@ import {
PopoverTrigger, PopoverTrigger,
} from '@/Components/ui/popover'; } from '@/Components/ui/popover';
import { RangeCalendar } from '@/Components/ui/range-calendar'; import { RangeCalendar } from '@/Components/ui/range-calendar';
import { import { CalendarDate } from '@internationalized/date';
CalendarDate,
getLocalTimeZone,
} from '@internationalized/date';
import { CalendarIcon } from 'lucide-vue-next'; import { CalendarIcon } from 'lucide-vue-next';
import { computed, ref, inject, type ComputedRef, watch } from 'vue'; import { computed, ref, inject, type ComputedRef, watch } from 'vue';
import { twMerge } from 'tailwind-merge'; import { twMerge } from 'tailwind-merge';
@@ -16,8 +13,9 @@ import {
getDayJsInstance, getDayJsInstance,
getLocalizedDayJs, getLocalizedDayJs,
} from '@/packages/ui/src/utils/time'; } from '@/packages/ui/src/utils/time';
import { formatDateLocalized } from '@/packages/ui/src/utils/time';
import { type Organization } from '@/packages/api/src'; import { type Organization } from '@/packages/api/src';
import { getUserTimezone } from '@/packages/ui/src/utils/settings';
import { formatDate } from '@/packages/ui/src/utils/time';
const props = defineProps<{ const props = defineProps<{
start: string; start: string;
@@ -59,12 +57,13 @@ const modelValue = computed<CalendarDateRange>({
}), }),
set: (newValue) => { set: (newValue) => {
if (newValue.start) { if (newValue.start) {
const date = newValue.start.toDate(getLocalTimeZone()); console.log(newValue.start);
emit('update:start', getDayJsInstance()(date).format('YYYY-MM-DD')); const date = newValue.start.toDate(getUserTimezone());
emit('update:start', getLocalizedDayJs(date.toString()).format());
} }
if (newValue.end) { if (newValue.end) {
const date = newValue.end.toDate(getLocalTimeZone()); const date = newValue.end.toDate(getUserTimezone());
emit('update:end', getDayJsInstance()(date).format('YYYY-MM-DD')); emit('update:end', getLocalizedDayJs(date.toString()).format());
} }
}, },
}); });
@@ -219,12 +218,27 @@ watch(open, (value) => {
<CalendarIcon class="mr-2 h-4 w-4" /> <CalendarIcon class="mr-2 h-4 w-4" />
<template v-if="modelValue.start"> <template v-if="modelValue.start">
<template v-if="modelValue.end"> <template v-if="modelValue.end">
{{ formatDateLocalized(modelValue.start.toString(), organization?.date_format) }} {{
formatDate(
modelValue.start.toString(),
organization?.date_format
)
}}
- -
{{ formatDateLocalized(modelValue.end.toString(), organization?.date_format) }} {{
formatDate(
modelValue.end.toString(),
organization?.date_format
)
}}
</template> </template>
<template v-else> <template v-else>
{{ formatDateLocalized(modelValue.start.toString(), organization?.date_format) }} {{
formatDate(
modelValue.start.toString(),
organization?.date_format
)
}}
</template> </template>
</template> </template>
<template v-else> Pick a date </template> <template v-else> Pick a date </template>

View File

@@ -3,13 +3,6 @@ import { computed, watch } from "vue";
type themeOption = "system" | "light" | "dark"; type themeOption = "system" | "light" | "dark";
const themeSetting = useStorage<themeOption>("theme", "system"); const themeSetting = useStorage<themeOption>("theme", "system");
// reload page when themeSettingChanges
watch(
themeSetting,
() => {
location.reload();
}
)
const preferredColor = usePreferredColorScheme(); const preferredColor = usePreferredColorScheme();
const theme = computed(() => { const theme = computed(() => {
if(themeSetting.value === "system"){ if(themeSetting.value === "system"){

View File

@@ -0,0 +1,49 @@
import { ref, onMounted, onUnmounted } from 'vue'
export function useCssVariable(variableName: string) {
const value = ref('')
let observer: MutationObserver | null = null
let mediaQuery: MediaQueryList | null = null
const updateValue = () => {
const computedStyle = getComputedStyle(document.documentElement)
const cssValue = computedStyle.getPropertyValue(variableName).trim()
value.value = cssValue
}
onMounted(() => {
// Initialize with current value
updateValue()
// Watch for class changes on document.documentElement (where theme classes are applied)
observer = new MutationObserver((mutations) => {
mutations.forEach((mutation) => {
if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
updateValue()
}
})
})
observer.observe(document.documentElement, {
attributes: true,
attributeFilter: ['class']
})
// Also watch for system color scheme changes
if (window.matchMedia) {
mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
mediaQuery.addEventListener('change', updateValue)
}
})
onUnmounted(() => {
if (observer) {
observer.disconnect()
}
if (mediaQuery) {
mediaQuery.removeEventListener('change', updateValue)
}
})
return value
}