diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 946575a66..dfaed6f6d 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -52,6 +52,7 @@ module.exports = { ], // Packages `react` related packages ['^react', '^next', '^@?\\w'], + ['^@app'], // Internal packages. ['^~(/.*|$)'], // Relative imports diff --git a/frontend/src/components/RouteGuard.tsx b/frontend/src/components/RouteGuard.tsx index a1154ee5c..3b755341e 100644 --- a/frontend/src/components/RouteGuard.tsx +++ b/frontend/src/components/RouteGuard.tsx @@ -1,5 +1,6 @@ import { ReactNode, useEffect, useState } from 'react'; import { useRouter } from 'next/router'; + import { publicPaths } from '@app/const'; import checkAuth from '@app/pages/api/auth/CheckAuth'; diff --git a/frontend/src/components/basic/Layout.tsx b/frontend/src/components/basic/Layout.tsx index 3ccd80afe..19a7fbc93 100644 --- a/frontend/src/components/basic/Layout.tsx +++ b/frontend/src/components/basic/Layout.tsx @@ -7,14 +7,6 @@ import { useEffect, useMemo, useState } from 'react'; import Link from 'next/link'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; -import getOrganizations from '@app/pages/api/organization/getOrgs'; -import getOrganizationUserProjects from '@app/pages/api/organization/GetOrgUserProjects'; -import getOrganizationUsers from '@app/pages/api/organization/GetOrgUsers'; -import getUser from '@app/pages/api/user/getUser'; -import addUserToWorkspace from '@app/pages/api/workspace/addUserToWorkspace'; -import createWorkspace from '@app/pages/api/workspace/createWorkspace'; -import getWorkspaces from '@app/pages/api/workspace/getWorkspaces'; -import uploadKeys from '@app/pages/api/workspace/uploadKeys'; import { faBookOpen, faFileLines, @@ -27,6 +19,15 @@ import { } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import getOrganizations from '@app/pages/api/organization/getOrgs'; +import getOrganizationUserProjects from '@app/pages/api/organization/GetOrgUserProjects'; +import getOrganizationUsers from '@app/pages/api/organization/GetOrgUsers'; +import getUser from '@app/pages/api/user/getUser'; +import addUserToWorkspace from '@app/pages/api/workspace/addUserToWorkspace'; +import createWorkspace from '@app/pages/api/workspace/createWorkspace'; +import getWorkspaces from '@app/pages/api/workspace/getWorkspaces'; +import uploadKeys from '@app/pages/api/workspace/uploadKeys'; + import NavBarDashboard from '../navigation/NavBarDashboard'; import onboardingCheck from '../utilities/checks/OnboardingCheck'; import { tempLocalStorage } from '../utilities/checks/tempLocalStorage'; diff --git a/frontend/src/components/basic/dialog/AddApiKeyDialog.tsx b/frontend/src/components/basic/dialog/AddApiKeyDialog.tsx index 911cb35e3..6956b9a7c 100644 --- a/frontend/src/components/basic/dialog/AddApiKeyDialog.tsx +++ b/frontend/src/components/basic/dialog/AddApiKeyDialog.tsx @@ -1,10 +1,11 @@ import { Fragment, useState } from 'react'; import { useTranslation } from 'next-i18next'; -import addAPIKey from '@app/pages/api/apiKey/addAPIKey'; import { faCheck, faCopy } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Dialog, Transition } from '@headlessui/react'; +import addAPIKey from '@app/pages/api/apiKey/addAPIKey'; + import Button from '../buttons/Button'; import InputField from '../InputField'; import ListBox from '../Listbox'; diff --git a/frontend/src/components/basic/dialog/AddIncidentContactDialog.tsx b/frontend/src/components/basic/dialog/AddIncidentContactDialog.tsx index 4d8416501..dddcfa30f 100644 --- a/frontend/src/components/basic/dialog/AddIncidentContactDialog.tsx +++ b/frontend/src/components/basic/dialog/AddIncidentContactDialog.tsx @@ -1,8 +1,9 @@ import { Fragment, useState } from 'react'; import { useTranslation } from 'next-i18next'; -import addIncidentContact from '@app/pages/api/organization/addIncidentContact'; import { Dialog, Transition } from '@headlessui/react'; +import addIncidentContact from '@app/pages/api/organization/addIncidentContact'; + import Button from '../buttons/Button'; import InputField from '../InputField'; diff --git a/frontend/src/components/basic/dialog/AddServiceTokenDialog.tsx b/frontend/src/components/basic/dialog/AddServiceTokenDialog.tsx index b0322e49a..646b5bf4e 100644 --- a/frontend/src/components/basic/dialog/AddServiceTokenDialog.tsx +++ b/frontend/src/components/basic/dialog/AddServiceTokenDialog.tsx @@ -2,12 +2,13 @@ import crypto from 'crypto'; import { Fragment, useState } from 'react'; import { useTranslation } from 'next-i18next'; -import addServiceToken from '@app/pages/api/serviceToken/addServiceToken'; -import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; import { faCheck, faCopy } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Dialog, Transition } from '@headlessui/react'; +import addServiceToken from '@app/pages/api/serviceToken/addServiceToken'; +import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; + import { decryptAssymmetric, encryptSymmetric, diff --git a/frontend/src/components/basic/table/ApiKeyTable.tsx b/frontend/src/components/basic/table/ApiKeyTable.tsx index 19327088d..800ea7356 100644 --- a/frontend/src/components/basic/table/ApiKeyTable.tsx +++ b/frontend/src/components/basic/table/ApiKeyTable.tsx @@ -1,6 +1,7 @@ -import { useNotificationContext } from '@app/components/context/Notifications/NotificationProvider'; import { faX } from '@fortawesome/free-solid-svg-icons'; +import { useNotificationContext } from '@app/components/context/Notifications/NotificationProvider'; + import deleteAPIKey from '../../../pages/api/apiKey/deleteAPIKey'; import guidGenerator from '../../utilities/randomId'; import Button from '../buttons/Button'; diff --git a/frontend/src/components/basic/table/ServiceTokenTable.tsx b/frontend/src/components/basic/table/ServiceTokenTable.tsx index 73dd2a4ee..2fa7bb439 100644 --- a/frontend/src/components/basic/table/ServiceTokenTable.tsx +++ b/frontend/src/components/basic/table/ServiceTokenTable.tsx @@ -1,6 +1,7 @@ -import { useNotificationContext } from '@app/components/context/Notifications/NotificationProvider'; import { faX } from '@fortawesome/free-solid-svg-icons'; +import { useNotificationContext } from '@app/components/context/Notifications/NotificationProvider'; + import deleteServiceToken from '../../../pages/api/serviceToken/deleteServiceToken'; import guidGenerator from '../../utilities/randomId'; import Button from '../buttons/Button'; diff --git a/frontend/src/components/basic/table/UserTable.tsx b/frontend/src/components/basic/table/UserTable.tsx index ad997ca1a..a9700832b 100644 --- a/frontend/src/components/basic/table/UserTable.tsx +++ b/frontend/src/components/basic/table/UserTable.tsx @@ -1,11 +1,12 @@ import { useEffect, useState } from 'react'; import { useRouter } from 'next/router'; +import { faX } from '@fortawesome/free-solid-svg-icons'; + import deleteUserFromOrganization from '@app/pages/api/organization/deleteUserFromOrganization'; import changeUserRoleInWorkspace from '@app/pages/api/workspace/changeUserRoleInWorkspace'; import deleteUserFromWorkspace from '@app/pages/api/workspace/deleteUserFromWorkspace'; import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; import uploadKeys from '@app/pages/api/workspace/uploadKeys'; -import { faX } from '@fortawesome/free-solid-svg-icons'; import { decryptAssymmetric, encryptAssymmetric } from '../../utilities/cryptography/crypto'; import guidGenerator from '../../utilities/randomId'; diff --git a/frontend/src/components/billing/Plan.tsx b/frontend/src/components/billing/Plan.tsx index ea3d59006..692157923 100644 --- a/frontend/src/components/billing/Plan.tsx +++ b/frontend/src/components/billing/Plan.tsx @@ -1,4 +1,5 @@ import React from 'react'; + import StripeRedirect from '@app/pages/api/organization/StripeRedirect'; import { tempLocalStorage } from '../utilities/checks/tempLocalStorage'; diff --git a/frontend/src/components/dashboard/SideBar.tsx b/frontend/src/components/dashboard/SideBar.tsx index 7ccbb6e40..5f67808f1 100644 --- a/frontend/src/components/dashboard/SideBar.tsx +++ b/frontend/src/components/dashboard/SideBar.tsx @@ -2,10 +2,11 @@ import { useState } from 'react'; import Image from 'next/image'; import { useTranslation } from 'next-i18next'; -import SecretVersionList from '@app/ee/components/SecretVersionList'; import { faX } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import SecretVersionList from '@app/ee/components/SecretVersionList'; + import Button from '../basic/buttons/Button'; import Toggle from '../basic/Toggle'; import CommentField from './CommentField'; diff --git a/frontend/src/components/integrations/Integration.tsx b/frontend/src/components/integrations/Integration.tsx index dc7344cad..62b44d420 100644 --- a/frontend/src/components/integrations/Integration.tsx +++ b/frontend/src/components/integrations/Integration.tsx @@ -1,13 +1,14 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { useEffect, useState } from 'react'; import { useRouter } from 'next/router'; -import Button from '@app/components/basic/buttons/Button'; -import ListBox from '@app/components/basic/Listbox'; import { faArrowRight, faRotate, faX } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; // TODO: This needs to be moved from public folder import { contextNetlifyMapping, reverseContextNetlifyMapping } from 'public/data/frequentConstants'; +import Button from '@app/components/basic/buttons/Button'; +import ListBox from '@app/components/basic/Listbox'; + import deleteIntegration from '../../pages/api/integrations/DeleteIntegration'; import getIntegrationApps from '../../pages/api/integrations/GetIntegrationApps'; import updateIntegration from '../../pages/api/integrations/updateIntegration'; diff --git a/frontend/src/components/navigation/NavBarDashboard.tsx b/frontend/src/components/navigation/NavBarDashboard.tsx index 4f67f89cc..d681930ac 100644 --- a/frontend/src/components/navigation/NavBarDashboard.tsx +++ b/frontend/src/components/navigation/NavBarDashboard.tsx @@ -4,7 +4,6 @@ import { Fragment, useEffect, useMemo, useState } from 'react'; import Image from 'next/image'; import { useRouter } from 'next/router'; import { TFunction, useTranslation } from 'next-i18next'; -import logout from '@app/pages/api/auth/Logout'; import { faGithub, faSlack } from '@fortawesome/free-brands-svg-icons'; import { faCircleQuestion } from '@fortawesome/free-regular-svg-icons'; import { @@ -19,6 +18,8 @@ import { import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Menu, Transition } from '@headlessui/react'; +import logout from '@app/pages/api/auth/Logout'; + import getOrganization from '../../pages/api/organization/GetOrg'; import getOrganizations from '../../pages/api/organization/getOrgs'; import getUser from '../../pages/api/user/getUser'; diff --git a/frontend/src/components/navigation/NavHeader.tsx b/frontend/src/components/navigation/NavHeader.tsx index 115bba26b..c550d46e9 100644 --- a/frontend/src/components/navigation/NavHeader.tsx +++ b/frontend/src/components/navigation/NavHeader.tsx @@ -1,10 +1,11 @@ import { useEffect, useState } from 'react'; import { useRouter } from 'next/router'; -import getOrganization from '@app/pages/api/organization/GetOrg'; -import getProjectInfo from '@app/pages/api/workspace/getProjectInfo'; import { faAngleRight } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import getOrganization from '@app/pages/api/organization/GetOrg'; +import getProjectInfo from '@app/pages/api/workspace/getProjectInfo'; + /** * This is the component at the top of almost every page. * It shows how to navigate to a certain page. diff --git a/frontend/src/components/signup/CodeInputStep.tsx b/frontend/src/components/signup/CodeInputStep.tsx index 6a9301083..67b4e530c 100644 --- a/frontend/src/components/signup/CodeInputStep.tsx +++ b/frontend/src/components/signup/CodeInputStep.tsx @@ -2,6 +2,7 @@ import React, { useState } from 'react'; import ReactCodeInput from 'react-code-input'; import { useTranslation } from 'next-i18next'; + import sendVerificationEmail from '@app/pages/api/auth/SendVerificationEmail'; import Button from '../basic/buttons/Button'; diff --git a/frontend/src/components/signup/EnterEmailStep.tsx b/frontend/src/components/signup/EnterEmailStep.tsx index 3b6a4c62c..d7114946e 100644 --- a/frontend/src/components/signup/EnterEmailStep.tsx +++ b/frontend/src/components/signup/EnterEmailStep.tsx @@ -1,6 +1,7 @@ import React, { useState } from 'react'; import Link from 'next/link'; import { useTranslation } from 'next-i18next'; + import sendVerificationEmail from '@app/pages/api/auth/SendVerificationEmail'; import Button from '../basic/buttons/Button'; diff --git a/frontend/src/components/signup/TeamInviteStep.tsx b/frontend/src/components/signup/TeamInviteStep.tsx index 879925e2a..29cb95076 100644 --- a/frontend/src/components/signup/TeamInviteStep.tsx +++ b/frontend/src/components/signup/TeamInviteStep.tsx @@ -1,6 +1,7 @@ import React, { useState } from 'react'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; + import addUserToOrg from '@app/pages/api/organization/addUserToOrg'; import getWorkspaces from '@app/pages/api/workspace/getWorkspaces'; diff --git a/frontend/src/components/signup/UserInfoStep.tsx b/frontend/src/components/signup/UserInfoStep.tsx index abb7a4162..bf9fa1edb 100644 --- a/frontend/src/components/signup/UserInfoStep.tsx +++ b/frontend/src/components/signup/UserInfoStep.tsx @@ -1,13 +1,14 @@ import React, { useState } from 'react'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; -import completeAccountInformationSignup from '@app/pages/api/auth/CompleteAccountInformationSignup'; import { faCheck, faX } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import jsrp from 'jsrp'; import nacl from 'tweetnacl'; import { encodeBase64 } from 'tweetnacl-util'; +import completeAccountInformationSignup from '@app/pages/api/auth/CompleteAccountInformationSignup'; + import Button from '../basic/buttons/Button'; import InputField from '../basic/InputField'; import attemptLogin from '../utilities/attemptLogin'; diff --git a/frontend/src/components/utilities/attemptLogin.ts b/frontend/src/components/utilities/attemptLogin.ts index e167a8e1b..05c3fbb90 100644 --- a/frontend/src/components/utilities/attemptLogin.ts +++ b/frontend/src/components/utilities/attemptLogin.ts @@ -1,6 +1,9 @@ /* eslint-disable prefer-destructuring */ import crypto from 'crypto'; +import jsrp from 'jsrp'; +import { SecretDataProps } from 'public/data/frequentInterfaces'; + import Aes256Gcm from '@app/components/utilities/cryptography/aes-256-gcm'; import login1 from '@app/pages/api/auth/Login1'; import login2 from '@app/pages/api/auth/Login2'; @@ -9,8 +12,6 @@ import getOrganizations from '@app/pages/api/organization/getOrgs'; import getOrganizationUserProjects from '@app/pages/api/organization/GetOrgUserProjects'; import getUser from '@app/pages/api/user/getUser'; import uploadKeys from '@app/pages/api/workspace/uploadKeys'; -import jsrp from 'jsrp'; -import { SecretDataProps } from 'public/data/frequentInterfaces'; import { encryptAssymmetric } from './cryptography/crypto'; import encryptSecrets from './secrets/encryptSecrets'; diff --git a/frontend/src/components/utilities/cryptography/changePassword.ts b/frontend/src/components/utilities/cryptography/changePassword.ts index 744f45969..db72856ed 100644 --- a/frontend/src/components/utilities/cryptography/changePassword.ts +++ b/frontend/src/components/utilities/cryptography/changePassword.ts @@ -1,7 +1,8 @@ /* eslint-disable new-cap */ +import jsrp from 'jsrp'; + import changePassword2 from '@app/pages/api/auth/ChangePassword2'; import SRP1 from '@app/pages/api/auth/SRP1'; -import jsrp from 'jsrp'; import Aes256Gcm from './aes-256-gcm'; diff --git a/frontend/src/components/utilities/cryptography/issueBackupKey.ts b/frontend/src/components/utilities/cryptography/issueBackupKey.ts index 5f048d97a..49ea5400c 100644 --- a/frontend/src/components/utilities/cryptography/issueBackupKey.ts +++ b/frontend/src/components/utilities/cryptography/issueBackupKey.ts @@ -1,9 +1,10 @@ /* eslint-disable new-cap */ import crypto from 'crypto'; +import jsrp from 'jsrp'; + import issueBackupPrivateKey from '@app/pages/api/auth/IssueBackupPrivateKey'; import SRP1 from '@app/pages/api/auth/SRP1'; -import jsrp from 'jsrp'; import generateBackupPDF from '../generateBackupPDF'; import Aes256Gcm from './aes-256-gcm'; diff --git a/frontend/src/components/utilities/secrets/encryptSecrets.ts b/frontend/src/components/utilities/secrets/encryptSecrets.ts index 0b60d555e..53ce0066d 100644 --- a/frontend/src/components/utilities/secrets/encryptSecrets.ts +++ b/frontend/src/components/utilities/secrets/encryptSecrets.ts @@ -1,8 +1,9 @@ import crypto from 'crypto'; -import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; import { SecretDataProps } from 'public/data/frequentInterfaces'; +import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; + import { decryptAssymmetric, encryptSymmetric } from '../cryptography/crypto'; interface EncryptedSecretProps { diff --git a/frontend/src/ee/components/ActivitySideBar.tsx b/frontend/src/ee/components/ActivitySideBar.tsx index c45c8beca..69a6701af 100644 --- a/frontend/src/ee/components/ActivitySideBar.tsx +++ b/frontend/src/ee/components/ActivitySideBar.tsx @@ -2,11 +2,12 @@ import { useEffect, useState } from 'react'; import Image from 'next/image'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faX } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import getActionData from '@app/ee/api/secrets/GetActionData'; import patienceDiff from '@app/ee/utilities/findTextDifferences'; import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; -import { faX } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import DashboardInputField from '../../components/dashboard/DashboardInputField'; import { diff --git a/frontend/src/ee/components/ActivityTable.tsx b/frontend/src/ee/components/ActivityTable.tsx index 28977f473..1867128d4 100644 --- a/frontend/src/ee/components/ActivityTable.tsx +++ b/frontend/src/ee/components/ActivityTable.tsx @@ -2,10 +2,11 @@ import React, { useState } from 'react'; import Image from 'next/image'; import { useTranslation } from 'next-i18next'; -import timeSince from '@app/ee/utilities/timeSince'; import { faAngleDown, faAngleRight, faUpRightFromSquare } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import timeSince from '@app/ee/utilities/timeSince'; + import guidGenerator from '../../components/utilities/randomId'; interface PayloadProps { diff --git a/frontend/src/ee/components/PITRecoverySidebar.tsx b/frontend/src/ee/components/PITRecoverySidebar.tsx index 334444fb9..d9cc47a7e 100644 --- a/frontend/src/ee/components/PITRecoverySidebar.tsx +++ b/frontend/src/ee/components/PITRecoverySidebar.tsx @@ -3,6 +3,9 @@ import { useEffect, useState } from 'react'; import Image from 'next/image'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faX } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import Button from '@app/components/basic/buttons/Button'; import { decryptAssymmetric, @@ -12,8 +15,6 @@ import getProjectSecretShanpshots from '@app/ee/api/secrets/GetProjectSercetShan import getSecretSnapshotData from '@app/ee/api/secrets/GetSecretSnapshotData'; import timeSince from '@app/ee/utilities/timeSince'; import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; -import { faX } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; export interface SecretDataProps { pos: number; diff --git a/frontend/src/ee/components/SecretVersionList.tsx b/frontend/src/ee/components/SecretVersionList.tsx index b7fbdaa79..4df9c38a7 100644 --- a/frontend/src/ee/components/SecretVersionList.tsx +++ b/frontend/src/ee/components/SecretVersionList.tsx @@ -2,14 +2,15 @@ import { useEffect, useState } from 'react'; import Image from 'next/image'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faCircle, faDotCircle } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import { decryptAssymmetric, decryptSymmetric } from '@app/components/utilities/cryptography/crypto'; import getSecretVersions from '@app/ee/api/secrets/GetSecretVersions'; import getLatestFileKey from '@app/pages/api/workspace/getLatestFileKey'; -import { faCircle, faDotCircle } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; interface DecryptedSecretVersionListProps { createdAt: string; diff --git a/frontend/src/pages/_app.tsx b/frontend/src/pages/_app.tsx index 73766169d..4e22c943f 100644 --- a/frontend/src/pages/_app.tsx +++ b/frontend/src/pages/_app.tsx @@ -3,12 +3,13 @@ import { useEffect } from 'react'; import { AppProps } from 'next/app'; import { useRouter } from 'next/router'; import { appWithTranslation } from 'next-i18next'; +import { config } from '@fortawesome/fontawesome-svg-core'; + import Layout from '@app/components/basic/Layout'; import NotificationProvider from '@app/components/context/Notifications/NotificationProvider'; import RouteGuard from '@app/components/RouteGuard'; import Telemetry from '@app/components/utilities/telemetry/Telemetry'; import { publicPaths } from '@app/const'; -import { config } from '@fortawesome/fontawesome-svg-core'; import '@fortawesome/fontawesome-svg-core/styles.css'; import '../styles/globals.css'; diff --git a/frontend/src/pages/activity/[id].tsx b/frontend/src/pages/activity/[id].tsx index 981ebc4bb..55e5b1924 100644 --- a/frontend/src/pages/activity/[id].tsx +++ b/frontend/src/pages/activity/[id].tsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; + import Button from '@app/components/basic/buttons/Button'; import EventFilter from '@app/components/basic/EventFilter'; import NavHeader from '@app/components/navigation/NavHeader'; diff --git a/frontend/src/pages/dashboard/[id].tsx b/frontend/src/pages/dashboard/[id].tsx index 8499faf9c..1052a14f5 100644 --- a/frontend/src/pages/dashboard/[id].tsx +++ b/frontend/src/pages/dashboard/[id].tsx @@ -4,6 +4,20 @@ import Head from 'next/head'; import Image from 'next/image'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { + faArrowDownAZ, + faArrowDownZA, + faArrowLeft, + faCheck, + faClockRotateLeft, + faEye, + faEyeSlash, + faFolderOpen, + faMagnifyingGlass, + faPlus +} from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import Button from '@app/components/basic/buttons/Button'; import ListBox from '@app/components/basic/Listbox'; import BottonRightPopup from '@app/components/basic/popups/BottomRightPopup'; @@ -20,19 +34,6 @@ import { getTranslatedServerSideProps } from '@app/components/utilities/withTran import getProjectSercetSnapshotsCount from '@app/ee/api/secrets/GetProjectSercetSnapshotsCount'; import performSecretRollback from '@app/ee/api/secrets/PerformSecretRollback'; import PITRecoverySidebar from '@app/ee/components/PITRecoverySidebar'; -import { - faArrowDownAZ, - faArrowDownZA, - faArrowLeft, - faCheck, - faClockRotateLeft, - faEye, - faEyeSlash, - faFolderOpen, - faMagnifyingGlass, - faPlus -} from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import addSecrets from '../api/files/AddSecrets'; import deleteSecrets from '../api/files/DeleteSecrets'; diff --git a/frontend/src/pages/home/[id].tsx b/frontend/src/pages/home/[id].tsx index 0fe52c7ff..72ed8bb4d 100644 --- a/frontend/src/pages/home/[id].tsx +++ b/frontend/src/pages/home/[id].tsx @@ -1,8 +1,6 @@ import { useEffect, useState } from 'react'; import Link from 'next/link'; import { useRouter } from 'next/router'; -import onboardingCheck from '@app/components/utilities/checks/OnboardingCheck'; -import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; import { IconProp } from '@fortawesome/fontawesome-svg-core'; import { faSlack } from '@fortawesome/free-brands-svg-icons'; import { @@ -16,6 +14,9 @@ import { } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import onboardingCheck from '@app/components/utilities/checks/OnboardingCheck'; +import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; + import registerUserAction from '../api/userActions/registerUserAction'; type ItemProps = { diff --git a/frontend/src/pages/integrations/[id].tsx b/frontend/src/pages/integrations/[id].tsx index c9ede39e3..ff90e43df 100644 --- a/frontend/src/pages/integrations/[id].tsx +++ b/frontend/src/pages/integrations/[id].tsx @@ -4,13 +4,14 @@ import { useEffect, useState } from 'react'; import Head from 'next/head'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import frameworkIntegrationOptions from 'public/json/frameworkIntegrations.json'; + import ActivateBotDialog from '@app/components/basic/dialog/ActivateBotDialog'; import CloudIntegrationSection from '@app/components/integrations/CloudIntegrationSection'; import FrameworkIntegrationSection from '@app/components/integrations/FrameworkIntegrationSection'; import IntegrationSection from '@app/components/integrations/IntegrationSection'; import NavHeader from '@app/components/navigation/NavHeader'; import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; -import frameworkIntegrationOptions from 'public/json/frameworkIntegrations.json'; import { decryptAssymmetric, diff --git a/frontend/src/pages/login.tsx b/frontend/src/pages/login.tsx index 114d379e8..058987039 100644 --- a/frontend/src/pages/login.tsx +++ b/frontend/src/pages/login.tsx @@ -4,14 +4,15 @@ import Image from 'next/image'; import Link from 'next/link'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faWarning } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import Button from '@app/components/basic/buttons/Button'; import Error from '@app/components/basic/Error'; import InputField from '@app/components/basic/InputField'; import ListBox from '@app/components/basic/Listbox'; import attemptLogin from '@app/components/utilities/attemptLogin'; import { getTranslatedStaticProps } from '@app/components/utilities/withTranslateProps'; -import { faWarning } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import getWorkspaces from './api/workspace/getWorkspaces'; diff --git a/frontend/src/pages/noprojects.tsx b/frontend/src/pages/noprojects.tsx index 1e2f1737e..06ed600bb 100644 --- a/frontend/src/pages/noprojects.tsx +++ b/frontend/src/pages/noprojects.tsx @@ -1,6 +1,7 @@ import { useEffect } from 'react'; import Image from 'next/image'; import { useRouter } from 'next/router'; + import Button from '@app/components/basic/buttons/Button'; import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; diff --git a/frontend/src/pages/password-reset.tsx b/frontend/src/pages/password-reset.tsx index beb2b7816..7da1778ea 100644 --- a/frontend/src/pages/password-reset.tsx +++ b/frontend/src/pages/password-reset.tsx @@ -1,15 +1,16 @@ import { useState } from 'react'; import Image from 'next/image'; import { useRouter } from 'next/router'; +import { faCheck, faX } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import jsrp from 'jsrp'; +import queryString from 'query-string'; + import Button from '@app/components/basic/buttons/Button'; import InputField from '@app/components/basic/InputField'; import passwordCheck from '@app/components/utilities/checks/PasswordCheck'; import Aes256Gcm from '@app/components/utilities/cryptography/aes-256-gcm'; import { getTranslatedStaticProps } from '@app/components/utilities/withTranslateProps'; -import { faCheck, faX } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import jsrp from 'jsrp'; -import queryString from 'query-string'; import EmailVerifyOnPasswordReset from './api/auth/EmailVerifyOnPasswordReset'; import getBackupEncryptedPrivateKey from './api/auth/getBackupEncryptedPrivateKey'; diff --git a/frontend/src/pages/settings/billing/[id].tsx b/frontend/src/pages/settings/billing/[id].tsx index 3ee52db47..e3cd22191 100644 --- a/frontend/src/pages/settings/billing/[id].tsx +++ b/frontend/src/pages/settings/billing/[id].tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from 'react'; import Head from 'next/head'; import { useTranslation } from 'next-i18next'; + import Plan from '@app/components/billing/Plan'; import NavHeader from '@app/components/navigation/NavHeader'; import { STRIPE_PRODUCT_PRO, STRIPE_PRODUCT_STARTER } from '@app/components/utilities/config'; diff --git a/frontend/src/pages/settings/org/[id].tsx b/frontend/src/pages/settings/org/[id].tsx index d82613a2d..ff2657e6d 100644 --- a/frontend/src/pages/settings/org/[id].tsx +++ b/frontend/src/pages/settings/org/[id].tsx @@ -3,6 +3,9 @@ import { useEffect, useState } from 'react'; import Head from 'next/head'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faCheck, faMagnifyingGlass, faPlus, faX } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import Button from '@app/components/basic/buttons/Button'; import AddIncidentContactDialog from '@app/components/basic/dialog/AddIncidentContactDialog'; import AddUserDialog from '@app/components/basic/dialog/AddUserDialog'; @@ -11,8 +14,6 @@ import UserTable from '@app/components/basic/table/UserTable'; import NavHeader from '@app/components/navigation/NavHeader'; import guidGenerator from '@app/components/utilities/randomId'; import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; -import { faCheck, faMagnifyingGlass, faPlus, faX } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import addUserToOrg from '../../api/organization/addUserToOrg'; import deleteIncidentContact from '../../api/organization/deleteIncidentContact'; diff --git a/frontend/src/pages/settings/personal/[id].tsx b/frontend/src/pages/settings/personal/[id].tsx index 11fab7996..72f57f155 100644 --- a/frontend/src/pages/settings/personal/[id].tsx +++ b/frontend/src/pages/settings/personal/[id].tsx @@ -2,6 +2,9 @@ import { useEffect, useState } from 'react'; import Head from 'next/head'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faCheck, faPlus, faX } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import Button from '@app/components/basic/buttons/Button'; import InputField from '@app/components/basic/InputField'; import ListBox from '@app/components/basic/Listbox'; @@ -11,8 +14,6 @@ import passwordCheck from '@app/components/utilities/checks/PasswordCheck'; import changePassword from '@app/components/utilities/cryptography/changePassword'; import issueBackupKey from '@app/components/utilities/cryptography/issueBackupKey'; import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; -import { faCheck, faPlus, faX } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import AddApiKeyDialog from '../../../components/basic/dialog/AddApiKeyDialog'; import getAPIKeys from '../../api/apiKey/getAPIKeys'; diff --git a/frontend/src/pages/settings/project/[id].tsx b/frontend/src/pages/settings/project/[id].tsx index 737b6ac2a..14b2a3785 100644 --- a/frontend/src/pages/settings/project/[id].tsx +++ b/frontend/src/pages/settings/project/[id].tsx @@ -2,6 +2,9 @@ import { useEffect, useState } from 'react'; import Head from 'next/head'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faCheck, faCopy, faPlus } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import Button from '@app/components/basic/buttons/Button'; import AddServiceTokenDialog from '@app/components/basic/dialog/AddServiceTokenDialog'; import InputField from '@app/components/basic/InputField'; @@ -11,8 +14,6 @@ import NavHeader from '@app/components/navigation/NavHeader'; import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; import deleteEnvironment from '@app/pages/api/environments/deleteEnvironment'; import updateEnvironment from '@app/pages/api/environments/updateEnvironment'; -import { faCheck, faCopy, faPlus } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import createEnvironment from '../../api/environments/createEnvironment'; import getServiceTokens from '../../api/serviceToken/getServiceTokens'; diff --git a/frontend/src/pages/signup.tsx b/frontend/src/pages/signup.tsx index 71feec8c2..ae93d97d0 100644 --- a/frontend/src/pages/signup.tsx +++ b/frontend/src/pages/signup.tsx @@ -5,6 +5,7 @@ import Image from 'next/image'; import Link from 'next/link'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; + import CodeInputStep from '@app/components/signup/CodeInputStep'; import DownloadBackupPDF from '@app/components/signup/DonwloadBackupPDFStep'; import EnterEmailStep from '@app/components/signup/EnterEmailStep'; diff --git a/frontend/src/pages/signupinvite.tsx b/frontend/src/pages/signupinvite.tsx index 4c1c60733..ce8db9afe 100644 --- a/frontend/src/pages/signupinvite.tsx +++ b/frontend/src/pages/signupinvite.tsx @@ -5,12 +5,6 @@ import Head from 'next/head'; import Image from 'next/image'; import Link from 'next/link'; import { useRouter } from 'next/router'; -import Button from '@app/components/basic/buttons/Button'; -import InputField from '@app/components/basic/InputField'; -import attemptLogin from '@app/components/utilities/attemptLogin'; -import passwordCheck from '@app/components/utilities/checks/PasswordCheck'; -import Aes256Gcm from '@app/components/utilities/cryptography/aes-256-gcm'; -import issueBackupKey from '@app/components/utilities/cryptography/issueBackupKey'; import { faCheck, faWarning, faX } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import jsrp from 'jsrp'; @@ -18,6 +12,13 @@ import queryString from 'query-string'; import nacl from 'tweetnacl'; import { encodeBase64 } from 'tweetnacl-util'; +import Button from '@app/components/basic/buttons/Button'; +import InputField from '@app/components/basic/InputField'; +import attemptLogin from '@app/components/utilities/attemptLogin'; +import passwordCheck from '@app/components/utilities/checks/PasswordCheck'; +import Aes256Gcm from '@app/components/utilities/cryptography/aes-256-gcm'; +import issueBackupKey from '@app/components/utilities/cryptography/issueBackupKey'; + import completeAccountInformationSignupInvite from './api/auth/CompleteAccountInformationSignupInvite'; import verifySignupInvite from './api/auth/VerifySignupInvite'; diff --git a/frontend/src/pages/users/[id].tsx b/frontend/src/pages/users/[id].tsx index 22dafaa2c..db71e34fc 100644 --- a/frontend/src/pages/users/[id].tsx +++ b/frontend/src/pages/users/[id].tsx @@ -3,14 +3,15 @@ import Head from 'next/head'; import Image from 'next/image'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; +import { faMagnifyingGlass, faPlus } from '@fortawesome/free-solid-svg-icons'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; + import Button from '@app/components/basic/buttons/Button'; import AddProjectMemberDialog from '@app/components/basic/dialog/AddProjectMemberDialog'; import UserTable from '@app/components/basic/table/UserTable'; import NavHeader from '@app/components/navigation/NavHeader'; import guidGenerator from '@app/components/utilities/randomId'; import { getTranslatedServerSideProps } from '@app/components/utilities/withTranslateProps'; -import { faMagnifyingGlass, faPlus } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { decryptAssymmetric, diff --git a/frontend/src/pages/verify-email.tsx b/frontend/src/pages/verify-email.tsx index 626357280..d134a07af 100644 --- a/frontend/src/pages/verify-email.tsx +++ b/frontend/src/pages/verify-email.tsx @@ -2,6 +2,7 @@ import { useState } from 'react'; import Head from 'next/head'; import Image from 'next/image'; import Link from 'next/link'; + import Button from '@app/components/basic/buttons/Button'; import InputField from '@app/components/basic/InputField'; import { getTranslatedStaticProps } from '@app/components/utilities/withTranslateProps';