Mirroring/my-links
1
0
Fork 0
mirror of https://github.com/Sonny93/my-links.git synced 2025-12-08 14:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow adding links via ip

Browse Source
This commit is contained in:
Sonny
2025-11-09 03:10:51 +01:00
parent 208f2c631f
commit 1c81a6a86f
9 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/links/validators/base_link_validator.ts Normal file
View File

@@ -0,0 +1,9 @@
import vine from '@vinejs/vine';
export const baseLinkValidator = vine.object({
name: vine.string().trim().minLength(1).maxLength(254),
description: vine.string().trim().maxLength(300).optional(),
url: vine.string().url({ require_tld: false }).trim(),
favorite: vine.boolean(),
collectionId: vine.number(),
});

7
app/links/validators/create_link_validator.ts
View File

@@ -1,11 +1,8 @@
import { baseLinkValidator } from '#links/validators/base_link_validator';
import vine from '@vinejs/vine';
export const createLinkValidator = vine.compile(
vine.object({
name: vine.string().trim().minLength(1).maxLength(254),
description: vine.string().trim().maxLength(300).optional(),
url: vine.string().trim(),
favorite: vine.boolean(),
collectionId: vine.number(),
...baseLinkValidator.getProperties(),
})
);

7
app/links/validators/update_link_validator.ts
View File

@@ -1,13 +1,10 @@
import { params } from '#core/validators/params_object';
import { baseLinkValidator } from '#links/validators/base_link_validator';
import vine from '@vinejs/vine';
export const updateLinkValidator = vine.compile(
vine.object({
name: vine.string().trim().minLength(1).maxLength(254),
description: vine.string().trim().maxLength(300).optional(),
url: vine.string().trim(),
favorite: vine.boolean(),
collectionId: vine.number(),
...baseLinkValidator.getProperties(),
params,
})

2
inertia/components/form/form_collection.tsx
View File

@@ -21,7 +21,7 @@ interface FormCollectionProps extends FormLayoutProps {
handleSubmit: () => void;
}
export default function MantineFormCollection({
export function MantineFormCollection({
data,
errors,
disableInputs = false,

4
inertia/components/form/form_link.tsx
View File

@@ -24,7 +24,7 @@ interface FormLinkProps extends FormLayoutProps {
handleSubmit: () => void;
}
export default function MantineFormLink({
export function FormLink({
data,
errors,
collections,
@@ -83,7 +83,7 @@ export default function MantineFormLink({
value: id.toString(),
}))}
onChange={(value) => setData('collectionId', value)}
value={data.collectionId.toString()}
value={data.collectionId?.toString()}
readOnly={disableInputs}
mt="md"
searchable

41
inertia/lib/navigation.ts
View File

@@ -16,15 +16,50 @@ export const appendResourceId = (
) => `${url}${resourceId ? `/${resourceId}` : ''}`;
export function isValidHttpUrl(urlParam: string) {
let url;
const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}(:\d+)?(\/.*)?(\?.*)?(#[^#]*)?$/;
const domainRegex =
/^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}(:\d+)?(\/.*)?(\?.*)?(#[^#]*)?$/;
const simpleDomainRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]$/;
let urlToTest = urlParam.trim();
if (urlToTest.startsWith('http://') || urlToTest.startsWith('https://')) {
try {
url = new URL(urlParam);
const url = new URL(urlToTest);
return url.protocol === 'http:' || url.protocol === 'https:';
} catch (_) {
return false;
}
}
return url.protocol === 'http:' || url.protocol === 'https:';
if (ipv4Regex.test(urlToTest)) {
try {
new URL(`http://${urlToTest}`);
return true;
} catch (_) {
return false;
}
}
if (domainRegex.test(urlToTest)) {
try {
new URL(`http://${urlToTest}`);
return true;
} catch (_) {
return false;
}
}
if (simpleDomainRegex.test(urlToTest)) {
try {
new URL(`http://${urlToTest}`);
return true;
} catch (_) {
return false;
}
}
return false;
}
export const generateShareUrl = (

4
inertia/pages/links/create.tsx
View File

@@ -2,7 +2,7 @@ import { useForm } from '@inertiajs/react';
import { route } from '@izzyjs/route/client';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import MantineFormLink from '~/components/form/form_link';
import { FormLink } from '~/components/form/form_link';
import useSearchParam from '~/hooks/use_search_param';
import { isValidHttpUrl } from '~/lib/navigation';
import { Collection } from '~/types/app';
@@ -38,7 +38,7 @@ export default function CreateLinkPage({
};
return (
<MantineFormLink
<FormLink
title={t('link.create')}
textSubmitButton={t('form.create')}
canSubmit={canSubmit}

4
inertia/pages/links/delete.tsx
View File

@@ -1,7 +1,7 @@
import { useForm } from '@inertiajs/react';
import { route } from '@izzyjs/route/client';
import { useTranslation } from 'react-i18next';
import MantineFormLink from '~/components/form/form_link';
import { FormLink } from '~/components/form/form_link';
import { LinkWithCollection } from '~/types/app';
export default function DeleteLinkPage({ link }: { link: LinkWithCollection }) {
@@ -22,7 +22,7 @@ export default function DeleteLinkPage({ link }: { link: LinkWithCollection }) {
};
return (
<MantineFormLink
<FormLink
title={t('link.delete')}
textSubmitButton={t('form.delete')}
canSubmit={!processing}

4
inertia/pages/links/edit.tsx
View File

@@ -2,7 +2,7 @@ import { useForm } from '@inertiajs/react';
import { route } from '@izzyjs/route/client';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import MantineFormLink from '~/components/form/form_link';
import { FormLink } from '~/components/form/form_link';
import { isValidHttpUrl } from '~/lib/navigation';
import { Collection, Link } from '~/types/app';
@@ -50,7 +50,7 @@ export default function EditLinkPage({
};
return (
<MantineFormLink
<FormLink
title={t('link.edit')}
textSubmitButton={t('form.update')}
canSubmit={canSubmit}