Merge branch 'master' into develop

This commit is contained in:
2026-01-05 16:08:17 +01:00
4 changed files with 26 additions and 23 deletions

View File

@@ -2,9 +2,9 @@ import { fetchAllLocations } from '@/app/lib/actions/locationActions';
import { fetchAvailableYears } from '@/app/lib/actions/monthActions'; import { fetchAvailableYears } from '@/app/lib/actions/monthActions';
import { getUserSettings } from '@/app/lib/actions/userSettingsActions'; import { getUserSettings } from '@/app/lib/actions/userSettingsActions';
import { BillingLocation, YearMonth } from '@/app/lib/db-types'; import { BillingLocation, YearMonth } from '@/app/lib/db-types';
import { FC, useEffect } from 'react'; import { FC } from 'react';
import { MonthLocationList } from '@/app/ui/MonthLocationList'; import { MonthLocationList } from '@/app/ui/MonthLocationList';
import { redirect } from 'next/navigation'; import { ParamsYearInvalidMessage } from './ParamsYearInvalidMessage';
export interface HomePageProps { export interface HomePageProps {
searchParams?: { searchParams?: {
@@ -13,24 +13,6 @@ export interface HomePageProps {
}; };
} }
const ParamsYearInvalidMessage:FC<{ firstAvailableYear?: number }> = ({ firstAvailableYear }) => {
// Redirect to the first available year after showing the message
useEffect(() => {
if(firstAvailableYear) {
redirect(`/?year=${firstAvailableYear}`);
} else {
redirect(`/`);
}
});
return(
<main className="flex min-h-screen flex-col p-6 bg-base-300">
<p className="text-center text-2xl text-red-500">The year specified in the URL is invalid ... redirecting</p>
</main>
);
};
export const HomePage:FC<HomePageProps> = async ({ searchParams }) => { export const HomePage:FC<HomePageProps> = async ({ searchParams }) => {
/** years found in the DB sorted descending */ /** years found in the DB sorted descending */

View File

@@ -0,0 +1,21 @@
"use client";
import { FC, useEffect } from 'react';
import { redirect } from 'next/navigation';
export const ParamsYearInvalidMessage:FC<{ firstAvailableYear?: number }> = ({ firstAvailableYear }) => {
// Redirect to the first available year after showing the message
useEffect(() => {
if(firstAvailableYear) {
redirect(`/?year=${firstAvailableYear}`);
} else {
redirect(`/`);
}
});
return(
<main className="flex min-h-screen flex-col p-6 bg-base-300">
<p className="text-center text-2xl text-red-500">The year specified in the URL is invalid ... redirecting</p>
</main>
);
};

View File

@@ -1,11 +1,11 @@
{ {
"name": "evidencija-rezija", "name": "evidencija-rezija",
"version": "2.20.0", "version": "2.20.3",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "2.20.0", "version": "2.20.3",
"dependencies": { "dependencies": {
"@emotion/react": "^11.14.0", "@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1", "@emotion/styled": "^11.14.1",

View File

@@ -58,5 +58,5 @@
"engines": { "engines": {
"node": ">=18.17.0" "node": ">=18.17.0"
}, },
"version": "2.20.0" "version": "2.20.3"
} }