iio/pingvin-share
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: run formatter

Browse Source
This commit is contained in:
Elias Schneider
2025-01-04 01:28:05 +01:00
parent b3ea96c191
commit bf1b2633c8
9 changed files with 99 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/auth/auth.service.ts
View File

@@ -345,7 +345,9 @@ export class AuthService {
if (refreshToken) { if (refreshToken) {
const now = moment(); const now = moment();
const sessionDuration = this.config.get("general.sessionDuration"); const sessionDuration = this.config.get("general.sessionDuration");
const maxAge = moment(now).add(sessionDuration.value, sessionDuration.unit).diff(now); const maxAge = moment(now)
.add(sessionDuration.value, sessionDuration.unit)
.diff(now);
response.cookie("refresh_token", refreshToken, { response.cookie("refresh_token", refreshToken, {
path: "/api/auth/token", path: "/api/auth/token",
httpOnly: true, httpOnly: true,

3
backend/src/config/config.service.ts
View File

@@ -36,8 +36,7 @@ export class ConfigService extends EventEmitter {
if (configVariable.type == "boolean") return value == "true"; if (configVariable.type == "boolean") return value == "true";
if (configVariable.type == "string" || configVariable.type == "text") if (configVariable.type == "string" || configVariable.type == "text")
return value; return value;
if (configVariable.type == "timespan") if (configVariable.type == "timespan") return stringToTimespan(value);
return stringToTimespan(value);
} }
async getByCategory(category: string) { async getByCategory(category: string) {

4
backend/src/share/share.service.ts
View File

@@ -61,9 +61,7 @@ export class ShareService {
maxExpiration.value !== 0 && maxExpiration.value !== 0 &&
(expiresNever || (expiresNever ||
parsedExpiration > parsedExpiration >
moment() moment().add(maxExpiration.value, maxExpiration.unit).toDate())
.add(maxExpiration.value, maxExpiration.unit)
.toDate())
) { ) {
throw new BadRequestException( throw new BadRequestException(
"Expiration date exceeds maximum expiration date", "Expiration date exceeds maximum expiration date",

4
frontend/src/components/admin/configuration/AdminConfigInput.tsx
View File

@@ -96,7 +96,9 @@ const AdminConfigInput = ({
{configVariable.type == "timespan" && ( {configVariable.type == "timespan" && (
<TimespanInput <TimespanInput
value={stringToTimespan(configVariable.value)} value={stringToTimespan(configVariable.value)}
onChange={(timespan) => onValueChange(configVariable, timespanToString(timespan))} onChange={(timespan) =>
onValueChange(configVariable, timespanToString(timespan))
}
w={201} w={201}
/> />
)} )}

149
frontend/src/components/core/TimespanInput.tsx
View File

@@ -3,81 +3,86 @@ import { Timespan } from "../../types/timespan.type";
import { NativeSelect, NumberInput } from "@mantine/core"; import { NativeSelect, NumberInput } from "@mantine/core";
import useTranslate from "../../hooks/useTranslate.hook"; import useTranslate from "../../hooks/useTranslate.hook";
const TimespanInput = ({ label, value, onChange, ...restProps }: { const TimespanInput = ({
label?: string, label,
value: Timespan, value,
onChange: (timespan: Timespan) => void, onChange,
[key: string]: any, ...restProps
}: {
label?: string;
value: Timespan;
onChange: (timespan: Timespan) => void;
[key: string]: any;
}) => { }) => {
const [unit, setUnit] = useState(value.unit); const [unit, setUnit] = useState(value.unit);
const [inputValue, setInputValue] = useState(value.value); const [inputValue, setInputValue] = useState(value.value);
const t = useTranslate(); const t = useTranslate();
const version = inputValue == 1 ? "singular" : "plural"; const version = inputValue == 1 ? "singular" : "plural";
const unitSelect = ( const unitSelect = (
<NativeSelect <NativeSelect
data={[ data={[
{ {
value: "minutes", value: "minutes",
label: t(`upload.modal.expires.minute-${version}`), label: t(`upload.modal.expires.minute-${version}`),
}, },
{ {
value: "hours", value: "hours",
label: t(`upload.modal.expires.hour-${version}`), label: t(`upload.modal.expires.hour-${version}`),
}, },
{ {
value: "days", value: "days",
label: t(`upload.modal.expires.day-${version}`), label: t(`upload.modal.expires.day-${version}`),
}, },
{ {
value: "weeks", value: "weeks",
label: t(`upload.modal.expires.week-${version}`), label: t(`upload.modal.expires.week-${version}`),
}, },
{ {
value: "months", value: "months",
label: t(`upload.modal.expires.month-${version}`), label: t(`upload.modal.expires.month-${version}`),
}, },
{ {
value: "years", value: "years",
label: t(`upload.modal.expires.year-${version}`), label: t(`upload.modal.expires.year-${version}`),
}, },
]} ]}
value={unit} value={unit}
rightSectionWidth={28} rightSectionWidth={28}
styles={{ styles={{
input: { input: {
fontWeight: 500, fontWeight: 500,
borderTopLeftRadius: 0, borderTopLeftRadius: 0,
borderBottomLeftRadius: 0, borderBottomLeftRadius: 0,
width: 120, width: 120,
marginRight: -2, marginRight: -2,
}, },
}} }}
onChange={event => { onChange={(event) => {
const unit = event.currentTarget.value as Timespan["unit"]; const unit = event.currentTarget.value as Timespan["unit"];
setUnit(unit); setUnit(unit);
onChange({ value: inputValue, unit }); onChange({ value: inputValue, unit });
}} }}
/> />
); );
return ( return (
<NumberInput <NumberInput
label={label} label={label}
value={inputValue} value={inputValue}
min={0} min={0}
max={999999} max={999999}
precision={0} precision={0}
rightSection={unitSelect} rightSection={unitSelect}
rightSectionWidth={120} rightSectionWidth={120}
onChange={value => { onChange={(value) => {
const inputVal = value || 0; const inputVal = value || 0;
setInputValue(inputVal); setInputValue(inputVal);
onChange({ value: inputVal, unit }); onChange({ value: inputVal, unit });
}} }}
{...restProps} {...restProps}
/> />
); );
}; };
export default TimespanInput; export default TimespanInput;

5
frontend/src/components/upload/modals/showCreateUploadModal.tsx
View File

@@ -184,7 +184,10 @@ const CreateUploadModalBody = ({
options.maxExpiration.value != 0 && options.maxExpiration.value != 0 &&
(form.values.never_expires || (form.values.never_expires ||
expirationDate.isAfter( expirationDate.isAfter(
moment().add(options.maxExpiration.value, options.maxExpiration.unit), moment().add(
options.maxExpiration.value,
options.maxExpiration.unit,
),
)) ))
) { ) {
form.setFieldError( form.setFieldError(

3
frontend/src/services/config.service.ts
View File

@@ -31,8 +31,7 @@ const get = (key: string, configVariables: Config[]): any => {
if (configVariable.type == "boolean") return value == "true"; if (configVariable.type == "boolean") return value == "true";
if (configVariable.type == "string" || configVariable.type == "text") if (configVariable.type == "string" || configVariable.type == "text")
return value; return value;
if (configVariable.type == "timespan") if (configVariable.type == "timespan") return stringToTimespan(value);
return stringToTimespan(value);
}; };
const finishSetup = async (): Promise<AdminConfig[]> => { const finishSetup = async (): Promise<AdminConfig[]> => {

8
frontend/src/types/timespan.type.ts
View File

@@ -1,2 +1,8 @@
export type TimeUnit = "minutes" | "hours" | "days" | "weeks" | "months" | "years"; export type TimeUnit =
| "minutes"
| "hours"
| "days"
| "weeks"
| "months"
| "years";
export type Timespan = { value: number; unit: TimeUnit }; export type Timespan = { value: number; unit: TimeUnit };

2
frontend/src/utils/date.util.ts
View File

@@ -34,7 +34,7 @@ export const getExpirationPreview = (
export const timespanToString = (timespan: Timespan) => { export const timespanToString = (timespan: Timespan) => {
return `${timespan.value} ${timespan.unit}`; return `${timespan.value} ${timespan.unit}`;
} };
export const stringToTimespan = (value: string): Timespan => { export const stringToTimespan = (value: string): Timespan => {
return { return {