+ {row.cells.map((cell: any, idx2: any) => (
|
diff --git a/frontend/src/context/AuthContext.tsx b/frontend/src/context/AuthContext.tsx
index 6002124..60a5c22 100644
--- a/frontend/src/context/AuthContext.tsx
+++ b/frontend/src/context/AuthContext.tsx
@@ -1,10 +1,11 @@
import { ReactNode, createContext, useContext, useState } from "react";
-import { getToken, refreshToken, TokenResponse } from "api/npm";
-import AuthStore from "modules/AuthStore";
-import { useQueryClient } from "react-query";
+import { useQueryClient } from "@tanstack/react-query";
import { useIntervalWhen } from "rooks";
+import { getToken, refreshToken, TokenResponse } from "src/api/npm";
+import AuthStore from "src/modules/AuthStore";
+
// Context
export interface AuthContextType {
authenticated: boolean;
@@ -44,7 +45,7 @@ function AuthProvider({
const logout = () => {
AuthStore.clear();
setAuthenticated(false);
- queryClient.invalidateQueries("user");
+ queryClient.clear();
};
const refresh = async () => {
diff --git a/frontend/src/context/LocaleContext.tsx b/frontend/src/context/LocaleContext.tsx
index 6ad1bfb..4056e52 100644
--- a/frontend/src/context/LocaleContext.tsx
+++ b/frontend/src/context/LocaleContext.tsx
@@ -1,6 +1,6 @@
import { createContext, ReactNode, useContext, useState } from "react";
-import { getLocale } from "locale";
+import { getLocale } from "src/locale";
// Context
export interface LocaleContextType {
diff --git a/frontend/src/hooks/useAccessLists.ts b/frontend/src/hooks/useAccessLists.ts
index 6dac865..2dd0011 100644
--- a/frontend/src/hooks/useAccessLists.ts
+++ b/frontend/src/hooks/useAccessLists.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getAccessLists,
AccessListsResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchAccessLists = (
offset = 0,
@@ -27,15 +28,13 @@ const useAccessLists = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["access-lists", { offset, limit, sortBy, filters }],
- () => fetchAccessLists(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["access-lists", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchAccessLists(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { useAccessLists };
diff --git a/frontend/src/hooks/useCertificate.ts b/frontend/src/hooks/useCertificate.ts
index 5751b60..b6a15a2 100644
--- a/frontend/src/hooks/useCertificate.ts
+++ b/frontend/src/hooks/useCertificate.ts
@@ -1,24 +1,23 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
import {
createCertificate,
getCertificate,
setCertificate,
Certificate,
-} from "api/npm";
-import { useMutation, useQuery, useQueryClient } from "react-query";
+} from "src/api/npm";
const fetchCertificate = (id: any) => {
return getCertificate(id);
};
const useCertificate = (id: number, options = {}) => {
- return useQuery(
- ["certificate", id],
- () => fetchCertificate(id),
- {
- staleTime: 60 * 1000, // 1 minute
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["certificate", id],
+ queryFn: () => fetchCertificate(id),
+ staleTime: 60 * 1000, // 1 minute
+ ...options,
+ });
};
const useSetCertificate = () => {
@@ -44,10 +43,10 @@ const useSetCertificate = () => {
return () =>
queryClient.setQueryData(["certificate", values.id], previousObject);
},
- onError: (error, values, rollback: any) => rollback(),
+ onError: (_, __, rollback: any) => rollback(),
onSuccess: async ({ id }: Certificate) => {
queryClient.invalidateQueries(["certificate", id]);
- queryClient.invalidateQueries("certificates");
+ queryClient.invalidateQueries(["certificates"]);
},
},
);
diff --git a/frontend/src/hooks/useCertificateAuthorities.ts b/frontend/src/hooks/useCertificateAuthorities.ts
index 09fea25..a26309b 100644
--- a/frontend/src/hooks/useCertificateAuthorities.ts
+++ b/frontend/src/hooks/useCertificateAuthorities.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
CertificateAuthoritiesResponse,
getCertificateAuthorities,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchCertificateAuthorities = (
offset = 0,
@@ -27,15 +28,13 @@ const useCertificateAuthorities = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["certificate-authorities", { offset, limit, sortBy, filters }],
- () => fetchCertificateAuthorities(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["certificate-authorities", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchCertificateAuthorities(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { fetchCertificateAuthorities, useCertificateAuthorities };
diff --git a/frontend/src/hooks/useCertificateAuthority.ts b/frontend/src/hooks/useCertificateAuthority.ts
index 598afcf..314ac11 100644
--- a/frontend/src/hooks/useCertificateAuthority.ts
+++ b/frontend/src/hooks/useCertificateAuthority.ts
@@ -1,24 +1,23 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
import {
createCertificateAuthority,
getCertificateAuthority,
setCertificateAuthority,
CertificateAuthority,
-} from "api/npm";
-import { useMutation, useQuery, useQueryClient } from "react-query";
+} from "src/api/npm";
const fetchCertificateAuthority = (id: any) => {
return getCertificateAuthority(id);
};
const useCertificateAuthority = (id: number, options = {}) => {
- return useQuery(
- ["certificate-authority", id],
- () => fetchCertificateAuthority(id),
- {
- staleTime: 60 * 1000, // 1 minute
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["certificate-authority", id],
+ queryFn: () => fetchCertificateAuthority(id),
+ staleTime: 60 * 1000, // 1 minute
+ ...options,
+ });
};
const useSetCertificateAuthority = () => {
@@ -50,10 +49,10 @@ const useSetCertificateAuthority = () => {
previousObject,
);
},
- onError: (error, values, rollback: any) => rollback(),
+ onError: (_, __, rollback: any) => rollback(),
onSuccess: async ({ id }: CertificateAuthority) => {
queryClient.invalidateQueries(["certificate-authority", id]);
- queryClient.invalidateQueries("certificate-authorities");
+ queryClient.invalidateQueries(["certificate-authorities"]);
},
},
);
diff --git a/frontend/src/hooks/useCertificates.ts b/frontend/src/hooks/useCertificates.ts
index b14f858..0e1522c 100644
--- a/frontend/src/hooks/useCertificates.ts
+++ b/frontend/src/hooks/useCertificates.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getCertificates,
CertificatesResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchCertificates = (
offset = 0,
@@ -27,15 +28,13 @@ const useCertificates = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["certificates", { offset, limit, sortBy, filters }],
- () => fetchCertificates(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["certificates", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchCertificates(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { fetchCertificates, useCertificates };
diff --git a/frontend/src/hooks/useDNSProvider.ts b/frontend/src/hooks/useDNSProvider.ts
index 069dc93..50b03fb 100644
--- a/frontend/src/hooks/useDNSProvider.ts
+++ b/frontend/src/hooks/useDNSProvider.ts
@@ -1,24 +1,23 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
import {
createDNSProvider,
getDNSProvider,
setDNSProvider,
DNSProvider,
-} from "api/npm";
-import { useMutation, useQuery, useQueryClient } from "react-query";
+} from "src/api/npm";
const fetchDNSProvider = (id: any) => {
return getDNSProvider(id);
};
const useDNSProvider = (id: number, options = {}) => {
- return useQuery(
- ["dns-provider", id],
- () => fetchDNSProvider(id),
- {
- staleTime: 60 * 1000, // 1 minute
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["dns-provider", id],
+ queryFn: () => fetchDNSProvider(id),
+ staleTime: 60 * 1000, // 1 minute
+ ...options,
+ });
};
const useSetDNSProvider = () => {
@@ -44,10 +43,10 @@ const useSetDNSProvider = () => {
return () =>
queryClient.setQueryData(["dns-provider", values.id], previousObject);
},
- onError: (error, values, rollback: any) => rollback(),
+ onError: (_, __, rollback: any) => rollback(),
onSuccess: async ({ id }: DNSProvider) => {
queryClient.invalidateQueries(["dns-provider", id]);
- queryClient.invalidateQueries("dns-providers");
+ queryClient.invalidateQueries(["dns-providers"]);
},
},
);
diff --git a/frontend/src/hooks/useDNSProviders.ts b/frontend/src/hooks/useDNSProviders.ts
index 053545f..6097d95 100644
--- a/frontend/src/hooks/useDNSProviders.ts
+++ b/frontend/src/hooks/useDNSProviders.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getDNSProviders,
DNSProvidersResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchDNSProviders = (
offset = 0,
@@ -27,15 +28,13 @@ const useDNSProviders = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["dns-providers", { offset, limit, sortBy, filters }],
- () => fetchDNSProviders(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["dns-providers", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchDNSProviders(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { useDNSProviders };
diff --git a/frontend/src/hooks/useDNSProvidersAcmesh.ts b/frontend/src/hooks/useDNSProvidersAcmesh.ts
index ca67a05..c4f1d18 100644
--- a/frontend/src/hooks/useDNSProvidersAcmesh.ts
+++ b/frontend/src/hooks/useDNSProvidersAcmesh.ts
@@ -1,16 +1,15 @@
-import { DNSProvidersAcmesh, getDNSProvidersAcmesh } from "api/npm";
-import { useQuery } from "react-query";
+import { useQuery } from "@tanstack/react-query";
+
+import { DNSProvidersAcmesh, getDNSProvidersAcmesh } from "src/api/npm";
const useDNSProvidersAcmesh = (options = {}) => {
- return useQuery(
- ["dns-providers-acmesh"],
- () => getDNSProvidersAcmesh(),
- {
- keepPreviousData: true,
- staleTime: 60 * 60 * 1000, // 1 hour
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["dns-providers-acmesh"],
+ queryFn: () => getDNSProvidersAcmesh(),
+ keepPreviousData: true,
+ staleTime: 60 * 60 * 1000, // 1 hour
+ ...options,
+ });
};
export { useDNSProvidersAcmesh };
diff --git a/frontend/src/hooks/useHealth.ts b/frontend/src/hooks/useHealth.ts
index 1976e05..91a1771 100644
--- a/frontend/src/hooks/useHealth.ts
+++ b/frontend/src/hooks/useHealth.ts
@@ -1,10 +1,13 @@
-import { getHealth, HealthResponse } from "api/npm";
-import { useQuery } from "react-query";
+import { useQuery } from "@tanstack/react-query";
+
+import { getHealth, HealthResponse } from "src/api/npm";
const fetchHealth = () => getHealth();
const useHealth = (options = {}) => {
- return useQuery("health", fetchHealth, {
+ return useQuery({
+ queryKey: ["health"],
+ queryFn: fetchHealth,
refetchOnWindowFocus: false,
retry: 5,
refetchInterval: 15 * 1000, // 15 seconds
diff --git a/frontend/src/hooks/useHosts.ts b/frontend/src/hooks/useHosts.ts
index a8b6296..9bb6d40 100644
--- a/frontend/src/hooks/useHosts.ts
+++ b/frontend/src/hooks/useHosts.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getHosts,
HostsResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchHosts = (offset = 0, limit = 10, sortBy?: any, filters?: any) => {
return getHosts(
@@ -22,15 +23,13 @@ const useHosts = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["hosts", { offset, limit, sortBy, filters }],
- () => fetchHosts(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["hosts", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchHosts(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { fetchHosts, useHosts };
diff --git a/frontend/src/hooks/useNginxTemplates.ts b/frontend/src/hooks/useNginxTemplates.ts
index 0d98846..bef2ba6 100644
--- a/frontend/src/hooks/useNginxTemplates.ts
+++ b/frontend/src/hooks/useNginxTemplates.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getNginxTemplates,
NginxTemplatesResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchNginxTemplates = (
offset = 0,
@@ -27,15 +28,13 @@ const useNginxTemplates = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["nginx-templates", { offset, limit, sortBy, filters }],
- () => fetchNginxTemplates(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["nginx-templates", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchNginxTemplates(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { fetchNginxTemplates, useNginxTemplates };
diff --git a/frontend/src/hooks/useSettings.ts b/frontend/src/hooks/useSettings.ts
index 0e57a72..5777f06 100644
--- a/frontend/src/hooks/useSettings.ts
+++ b/frontend/src/hooks/useSettings.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getSettings,
SettingsResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchSettings = (offset = 0, limit = 10, sortBy?: any, filters?: any) => {
return getSettings(
@@ -22,15 +23,13 @@ const useSettings = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["settings", { offset, limit, sortBy, filters }],
- () => fetchSettings(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["settings", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchSettings(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { fetchSettings, useSettings };
diff --git a/frontend/src/hooks/useUpstreamNginxConfig.ts b/frontend/src/hooks/useUpstreamNginxConfig.ts
index 8dc28b4..675a4c2 100644
--- a/frontend/src/hooks/useUpstreamNginxConfig.ts
+++ b/frontend/src/hooks/useUpstreamNginxConfig.ts
@@ -1,19 +1,18 @@
-import { getUpstreamNginxConfig } from "api/npm";
-import { useQuery } from "react-query";
+import { useQuery } from "@tanstack/react-query";
+
+import { getUpstreamNginxConfig } from "src/api/npm";
const fetchUpstreamNginxConfig = (id: any) => {
return getUpstreamNginxConfig(id);
};
const useUpstreamNginxConfig = (id: number, options = {}) => {
- return useQuery(
- ["upstream-nginx-config", id],
- () => fetchUpstreamNginxConfig(id),
- {
- staleTime: 30 * 1000, // 30 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["upstream-nginx-config", id],
+ queryFn: () => fetchUpstreamNginxConfig(id),
+ staleTime: 30 * 1000, // 30 seconds
+ ...options,
+ });
};
export { useUpstreamNginxConfig };
diff --git a/frontend/src/hooks/useUpstreams.ts b/frontend/src/hooks/useUpstreams.ts
index 567e2a8..9e7b3ac 100644
--- a/frontend/src/hooks/useUpstreams.ts
+++ b/frontend/src/hooks/useUpstreams.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getUpstreams,
HostsResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchUpstreams = (
offset = 0,
@@ -27,15 +28,13 @@ const useUpstreams = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["upstreams", { offset, limit, sortBy, filters }],
- () => fetchUpstreams(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["upstreams", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchUpstreams(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { fetchUpstreams, useUpstreams };
diff --git a/frontend/src/hooks/useUser.ts b/frontend/src/hooks/useUser.ts
index edd4df9..73bf5dd 100644
--- a/frontend/src/hooks/useUser.ts
+++ b/frontend/src/hooks/useUser.ts
@@ -1,12 +1,15 @@
-import { getUser, setUser, User } from "api/npm";
-import { useMutation, useQuery, useQueryClient } from "react-query";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
+import { getUser, setUser, User } from "src/api/npm";
const fetchUser = (id: any) => {
return getUser(id, { expand: "capabilities" });
};
const useUser = (id: string | number, options = {}) => {
- return useQuery(["user", id], () => fetchUser(id), {
+ return useQuery({
+ queryKey: ["user", id],
+ queryFn: () => fetchUser(id),
staleTime: 60 * 1000, // 1 minute
...options,
});
@@ -26,10 +29,10 @@ const useSetUser = () => {
return () =>
queryClient.setQueryData(["user", values.id], previousObject);
},
- onError: (error, values, rollback: any) => rollback(),
+ onError: (_, __, rollback: any) => rollback(),
onSuccess: async ({ id }: User) => {
queryClient.invalidateQueries(["user", id]);
- queryClient.invalidateQueries("users");
+ queryClient.invalidateQueries(["users"]);
},
});
};
diff --git a/frontend/src/hooks/useUsers.ts b/frontend/src/hooks/useUsers.ts
index cc78597..e64ef14 100644
--- a/frontend/src/hooks/useUsers.ts
+++ b/frontend/src/hooks/useUsers.ts
@@ -1,10 +1,11 @@
+import { useQuery } from "@tanstack/react-query";
+
import {
getUsers,
UsersResponse,
tableSortToAPI,
tableFiltersToAPI,
-} from "api/npm";
-import { useQuery } from "react-query";
+} from "src/api/npm";
const fetchUsers = (offset = 0, limit = 10, sortBy?: any, filters?: any) => {
return getUsers(
@@ -22,15 +23,13 @@ const useUsers = (
filters?: any,
options = {},
) => {
- return useQuery(
- ["users", { offset, limit, sortBy, filters }],
- () => fetchUsers(offset, limit, sortBy, filters),
- {
- keepPreviousData: true,
- staleTime: 15 * 1000, // 15 seconds
- ...options,
- },
- );
+ return useQuery({
+ queryKey: ["users", { offset, limit, sortBy, filters }],
+ queryFn: () => fetchUsers(offset, limit, sortBy, filters),
+ keepPreviousData: true,
+ staleTime: 15 * 1000, // 15 seconds
+ ...options,
+ });
};
export { fetchUsers, useUsers };
diff --git a/frontend/src/index.tsx b/frontend/src/main.tsx
similarity index 85%
rename from frontend/src/index.tsx
rename to frontend/src/main.tsx
index 7f69635..baadc80 100644
--- a/frontend/src/index.tsx
+++ b/frontend/src/main.tsx
@@ -19,10 +19,7 @@ declare global {
}
}
-const root = ReactDOM.createRoot(
- document.getElementById("root") as HTMLElement,
-);
-root.render(
+ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
diff --git a/frontend/src/modals/AccessListCreateModal.tsx b/frontend/src/modals/AccessListCreateModal.tsx
index 1b17e3a..83c228b 100644
--- a/frontend/src/modals/AccessListCreateModal.tsx
+++ b/frontend/src/modals/AccessListCreateModal.tsx
@@ -16,12 +16,13 @@ import {
Stack,
useToast,
} from "@chakra-ui/react";
-import { CertificateAuthority } from "api/npm";
-import { PrettyButton } from "components";
import { Formik, Form, Field } from "formik";
-import { useSetCertificateAuthority } from "hooks";
-import { intl } from "locale";
-import { validateNumber, validateString } from "modules/Validations";
+
+import { CertificateAuthority } from "src/api/npm";
+import { PrettyButton } from "src/components";
+import { useSetCertificateAuthority } from "src/hooks";
+import { intl } from "src/locale";
+import { validateNumber, validateString } from "src/modules/Validations";
interface AccessListCreateModalProps {
isOpen: boolean;
diff --git a/frontend/src/modals/CertificateAuthorityCreateModal.tsx b/frontend/src/modals/CertificateAuthorityCreateModal.tsx
index fd3368c..80332ae 100644
--- a/frontend/src/modals/CertificateAuthorityCreateModal.tsx
+++ b/frontend/src/modals/CertificateAuthorityCreateModal.tsx
@@ -15,12 +15,13 @@ import {
Stack,
useToast,
} from "@chakra-ui/react";
-import { CertificateAuthority } from "api/npm";
-import { PrettyButton } from "components";
import { Formik, Form, Field } from "formik";
-import { useSetCertificateAuthority } from "hooks";
-import { intl } from "locale";
-import { validateNumber, validateString } from "modules/Validations";
+
+import { CertificateAuthority } from "src/api/npm";
+import { PrettyButton } from "src/components";
+import { useSetCertificateAuthority } from "src/hooks";
+import { intl } from "src/locale";
+import { validateNumber, validateString } from "src/modules/Validations";
interface CertificateAuthorityCreateModalProps {
isOpen: boolean;
diff --git a/frontend/src/modals/CertificateAuthorityEditModal.tsx b/frontend/src/modals/CertificateAuthorityEditModal.tsx
index 3a7c9a5..4be82ec 100644
--- a/frontend/src/modals/CertificateAuthorityEditModal.tsx
+++ b/frontend/src/modals/CertificateAuthorityEditModal.tsx
@@ -15,12 +15,13 @@ import {
Stack,
useToast,
} from "@chakra-ui/react";
-import { CertificateAuthority } from "api/npm";
-import { PrettyButton } from "components";
import { Formik, Form, Field } from "formik";
-import { useCertificateAuthority, useSetCertificateAuthority } from "hooks";
-import { intl } from "locale";
-import { validateNumber, validateString } from "modules/Validations";
+
+import { CertificateAuthority } from "src/api/npm";
+import { PrettyButton } from "src/components";
+import { useCertificateAuthority, useSetCertificateAuthority } from "src/hooks";
+import { intl } from "src/locale";
+import { validateNumber, validateString } from "src/modules/Validations";
interface CertificateAuthorityEditModalProps {
editId: number;
diff --git a/frontend/src/modals/CertificateCreateModal/CertificateCreateModal.tsx b/frontend/src/modals/CertificateCreateModal/CertificateCreateModal.tsx
index 98cf8fe..59f4e0b 100644
--- a/frontend/src/modals/CertificateCreateModal/CertificateCreateModal.tsx
+++ b/frontend/src/modals/CertificateCreateModal/CertificateCreateModal.tsx
@@ -10,11 +10,12 @@ import {
Stack,
useToast,
} from "@chakra-ui/react";
-import { Certificate } from "api/npm";
-import { PrettyButton } from "components";
import { Formik, Form } from "formik";
-import { useSetCertificate } from "hooks";
-import { intl } from "locale";
+
+import { Certificate } from "src/api/npm";
+import { PrettyButton } from "src/components";
+import { useSetCertificate } from "src/hooks";
+import { intl } from "src/locale";
import CustomForm from "./CustomForm";
import DNSForm from "./DNSForm";
diff --git a/frontend/src/modals/CertificateCreateModal/Common/CertificateAuthorityField.tsx b/frontend/src/modals/CertificateCreateModal/Common/CertificateAuthorityField.tsx
index 3573bfc..16e9d62 100644
--- a/frontend/src/modals/CertificateCreateModal/Common/CertificateAuthorityField.tsx
+++ b/frontend/src/modals/CertificateCreateModal/Common/CertificateAuthorityField.tsx
@@ -4,10 +4,11 @@ import {
FormLabel,
Select,
} from "@chakra-ui/react";
-import { CertificateAuthority } from "api/npm";
import { Field, useFormikContext } from "formik";
-import { useCertificateAuthorities } from "hooks";
-import { intl } from "locale";
+
+import { CertificateAuthority } from "src/api/npm";
+import { useCertificateAuthorities } from "src/hooks";
+import { intl } from "src/locale";
const fieldName = "certificateAuthorityId";
diff --git a/frontend/src/modals/CertificateCreateModal/Common/DNSProviderField.tsx b/frontend/src/modals/CertificateCreateModal/Common/DNSProviderField.tsx
index c90d45a..9549196 100644
--- a/frontend/src/modals/CertificateCreateModal/Common/DNSProviderField.tsx
+++ b/frontend/src/modals/CertificateCreateModal/Common/DNSProviderField.tsx
@@ -4,10 +4,11 @@ import {
FormLabel,
Select,
} from "@chakra-ui/react";
-import { DNSProvider } from "api/npm";
import { Field, useFormikContext } from "formik";
-import { useDNSProviders } from "hooks";
-import { intl } from "locale";
+
+import { DNSProvider } from "src/api/npm";
+import { useDNSProviders } from "src/hooks";
+import { intl } from "src/locale";
const fieldName = "dnsProviderId";
diff --git a/frontend/src/modals/CertificateCreateModal/Common/DomainNamesField.tsx b/frontend/src/modals/CertificateCreateModal/Common/DomainNamesField.tsx
index 3895eb3..fc6cc21 100644
--- a/frontend/src/modals/CertificateCreateModal/Common/DomainNamesField.tsx
+++ b/frontend/src/modals/CertificateCreateModal/Common/DomainNamesField.tsx
@@ -6,7 +6,8 @@ import {
} from "@chakra-ui/react";
import { CreatableSelect, OptionBase } from "chakra-react-select";
import { Field, useFormikContext } from "formik";
-import { intl } from "locale";
+
+import { intl } from "src/locale";
interface SelectOption extends OptionBase {
label: string;
@@ -16,13 +17,12 @@ interface DomainNamesFieldProps {
maxDomains?: number;
isWildcardPermitted?: boolean;
dnsProviderWildcardSupported?: boolean;
- onChange?: (i: string[]) => any;
+ // onChange?: (i: string[]) => any;
}
function DomainNamesField({
maxDomains,
isWildcardPermitted,
- dnsProviderWildcardSupported,
- onChange,
+ dnsProviderWildcardSupported, // onChange,
}: DomainNamesFieldProps) {
const { values, setFieldValue } = useFormikContext();
@@ -76,7 +76,7 @@ function DomainNamesField({
setFieldValue("domainNames", doms);
};
- let helperTexts: string[] = [];
+ const helperTexts: string[] = [];
if (maxDomains) {
helperTexts.push(
intl.formatMessage({ id: "domain_names.max" }, { count: maxDomains }),
@@ -110,7 +110,7 @@ function DomainNamesField({
/>
{helperTexts.length
? helperTexts.map((i) => {
- return {i};
+ return {i};
})
: null}
{form.errors.domainNames}
diff --git a/frontend/src/modals/CertificateCreateModal/Common/EccField.tsx b/frontend/src/modals/CertificateCreateModal/Common/EccField.tsx
index 0852aa6..543cf8f 100644
--- a/frontend/src/modals/CertificateCreateModal/Common/EccField.tsx
+++ b/frontend/src/modals/CertificateCreateModal/Common/EccField.tsx
@@ -5,7 +5,8 @@ import {
Switch,
} from "@chakra-ui/react";
import { Field } from "formik";
-import { intl } from "locale";
+
+import { intl } from "src/locale";
const fieldName = "isEcc";
diff --git a/frontend/src/modals/CertificateCreateModal/Common/NameField.tsx b/frontend/src/modals/CertificateCreateModal/Common/NameField.tsx
index ef04269..d9652a2 100644
--- a/frontend/src/modals/CertificateCreateModal/Common/NameField.tsx
+++ b/frontend/src/modals/CertificateCreateModal/Common/NameField.tsx
@@ -5,8 +5,9 @@ import {
Input,
} from "@chakra-ui/react";
import { Field } from "formik";
-import { intl } from "locale";
-import { validateString } from "modules/Validations";
+
+import { intl } from "src/locale";
+import { validateString } from "src/modules/Validations";
function NameField() {
return (
diff --git a/frontend/src/modals/CertificateEditModal.tsx b/frontend/src/modals/CertificateEditModal.tsx
index 302575e..842b096 100644
--- a/frontend/src/modals/CertificateEditModal.tsx
+++ b/frontend/src/modals/CertificateEditModal.tsx
@@ -15,12 +15,13 @@ import {
Stack,
useToast,
} from "@chakra-ui/react";
-import { CertificateAuthority } from "api/npm";
-import { PrettyButton } from "components";
import { Formik, Form, Field } from "formik";
-import { useCertificateAuthority, useSetCertificateAuthority } from "hooks";
-import { intl } from "locale";
-import { validateNumber, validateString } from "modules/Validations";
+
+import { CertificateAuthority } from "src/api/npm";
+import { PrettyButton } from "src/components";
+import { useCertificateAuthority, useSetCertificateAuthority } from "src/hooks";
+import { intl } from "src/locale";
+import { validateNumber, validateString } from "src/modules/Validations";
interface CertificateEditModalProps {
editId: number;
diff --git a/frontend/src/modals/ChangePasswordModal.tsx b/frontend/src/modals/ChangePasswordModal.tsx
index 235b47e..e6a2e85 100644
--- a/frontend/src/modals/ChangePasswordModal.tsx
+++ b/frontend/src/modals/ChangePasswordModal.tsx
@@ -14,11 +14,12 @@ import {
Stack,
useToast,
} from "@chakra-ui/react";
-import { setAuth } from "api/npm";
-import { PrettyButton } from "components";
import { Formik, Form, Field } from "formik";
-import { intl } from "locale";
-import { validateString } from "modules/Validations";
+
+import { setAuth } from "src/api/npm";
+import { PrettyButton } from "src/components";
+import { intl } from "src/locale";
+import { validateString } from "src/modules/Validations";
interface ChangePasswordModalProps {
isOpen: boolean;
@@ -75,7 +76,7 @@ function ChangePasswordModal({ isOpen, onClose }: ChangePasswordModalProps) {
}
return errors;
}}>
- {({ isSubmitting, values }: any) => (
+ {({ isSubmitting }: any) => (
|