Skip to content

Full Toolkit for Next-Level Domain Analysis

Move components into app/ 🏗️

Felix Wotschofsky48adcc1bbbbb
diff --git a/components/marketing/TrustedByLogos.tsx b/app/(landing)/_components/TrustedByLogos.tsx
similarity index 100%
rename from components/marketing/TrustedByLogos.tsx
rename to app/(landing)/_components/TrustedByLogos.tsx
diff --git a/app/lookup/(landing)/opengraph-image.tsx b/app/(landing)/opengraph-image.tsx
similarity index 100%
rename from app/lookup/(landing)/opengraph-image.tsx
rename to app/(landing)/opengraph-image.tsx
diff --git a/app/lookup/(landing)/page.tsx b/app/(landing)/page.tsx
similarity index 98%
rename from app/lookup/(landing)/page.tsx
rename to app/(landing)/page.tsx
index a63cfe3..65ac1ed 100644
--- a/app/lookup/(landing)/page.tsx
+++ b/app/(landing)/page.tsx
@@ -5,10 +5,11 @@ import { Card } from '@/components/ui/card';
import LogoDark from '@/assets/logo-dark.svg';
import LogoLight from '@/assets/logo-light.svg';
-import SearchForm from '@/components/general/SearchForm';
-import TrustedByLogos from '@/components/marketing/TrustedByLogos';
import { EXAMPLE_DOMAINS } from '@/lib/data';
+import SearchForm from '../_components/SearchForm';
+import TrustedByLogos from './_components/TrustedByLogos';
+
export const metadata = {
openGraph: {
url: '/',
diff --git a/components/layout/header/BookmarkletLink.tsx b/app/_components/BookmarkletLink.tsx
similarity index 100%
rename from components/layout/header/BookmarkletLink.tsx
rename to app/_components/BookmarkletLink.tsx
diff --git a/components/layout/Footer.tsx b/app/_components/Footer.tsx
similarity index 100%
rename from components/layout/Footer.tsx
rename to app/_components/Footer.tsx
diff --git a/components/layout/Header.tsx b/app/_components/Header.tsx
similarity index 89%
rename from components/layout/Header.tsx
rename to app/_components/Header.tsx
index 9e82bb5..769e5a1 100644
--- a/components/layout/Header.tsx
+++ b/app/_components/Header.tsx
@@ -5,8 +5,9 @@ import { Button } from '@/components/ui/button';
import LogoDark from '@/assets/logo-dark.svg';
import LogoLight from '@/assets/logo-light.svg';
-import BookmarkletLink from '@/components/layout/header/BookmarkletLink';
-import ThemeMenu from '@/components/layout/header/ThemeMenu';
+
+import BookmarkletLink from './BookmarkletLink';
+import ThemeMenu from './ThemeMenu';
const Header = () => (
<header className="w-full p-4 md:px-8">
diff --git a/components/general/SearchForm.tsx b/app/_components/SearchForm.tsx
similarity index 100%
rename from components/general/SearchForm.tsx
rename to app/_components/SearchForm.tsx
diff --git a/components/layout/header/ThemeMenu.tsx b/app/_components/ThemeMenu.tsx
similarity index 100%
rename from components/layout/header/ThemeMenu.tsx
rename to app/_components/ThemeMenu.tsx
diff --git a/app/layout.tsx b/app/layout.tsx
index d2fdbcd..4ba6b54 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -3,9 +3,8 @@ import type { FC, ReactNode } from 'react';
import { Toaster } from '@/components/ui/sonner';
-import Footer from '@/components/layout/Footer';
-import Header from '@/components/layout/Header';
-
+import Footer from './_components/Footer';
+import Header from './_components/Header';
import './globals.css';
import Providers from './providers';
diff --git a/components/results/dns/DnsTable.tsx b/app/lookup/[domain]/(dns)/_components/DnsTable.tsx
similarity index 94%
rename from components/results/dns/DnsTable.tsx
rename to app/lookup/[domain]/(dns)/_components/DnsTable.tsx
index 48da587..2fee7a4 100644
--- a/components/results/dns/DnsTable.tsx
+++ b/app/lookup/[domain]/(dns)/_components/DnsTable.tsx
@@ -9,10 +9,11 @@ import {
TableRow,
} from '@/components/ui/table';
-import RecordRow from '@/components/results/dns/RecordRow';
-import StackedRecord from '@/components/results/dns/StackedRecord';
import type { ResolvedRecords } from '@/lib/resolvers/DnsResolver';
+import RecordRow from './RecordRow';
+import StackedRecord from './StackedRecord';
+
type DnsTableProps = {
records: ResolvedRecords;
ipsInfo: Record<string, string>;
diff --git a/components/results/dns/LocationSelector.tsx b/app/lookup/[domain]/(dns)/_components/LocationSelector.tsx
similarity index 100%
rename from components/results/dns/LocationSelector.tsx
rename to app/lookup/[domain]/(dns)/_components/LocationSelector.tsx
diff --git a/components/results/dns/RecordRow.tsx b/app/lookup/[domain]/(dns)/_components/RecordRow.tsx
similarity index 96%
rename from components/results/dns/RecordRow.tsx
rename to app/lookup/[domain]/(dns)/_components/RecordRow.tsx
index d1cead0..dae6adc 100644
--- a/components/results/dns/RecordRow.tsx
+++ b/app/lookup/[domain]/(dns)/_components/RecordRow.tsx
@@ -3,10 +3,11 @@ import reactStringReplace from 'react-string-replace';
import { TableCell, TableRow } from '@/components/ui/table';
-import DomainLink from '@/components/results/DomainLink';
-import IpLink from '@/components/results/IpLink';
import { cn } from '@/lib/utils';
+import DomainLink from '../../_components/DomainLink';
+import IpLink from '../../_components/IpLink';
+
const DOMAIN_REGEX = /([a-zA-Z0-9-_]+\.)+[a-z]+\.?/gi;
const IPV4_REGEX = /(\d{1,3}\.){3}\d{1,3}/g;
const IPV6_REGEX =
diff --git a/components/results/dns/ResolverSelector.tsx b/app/lookup/[domain]/(dns)/_components/ResolverSelector.tsx
similarity index 100%
rename from components/results/dns/ResolverSelector.tsx
rename to app/lookup/[domain]/(dns)/_components/ResolverSelector.tsx
diff --git a/components/results/dns/StackedRecord.tsx b/app/lookup/[domain]/(dns)/_components/StackedRecord.tsx
similarity index 96%
rename from components/results/dns/StackedRecord.tsx
rename to app/lookup/[domain]/(dns)/_components/StackedRecord.tsx
index 02e1016..c1e1a32 100644
--- a/components/results/dns/StackedRecord.tsx
+++ b/app/lookup/[domain]/(dns)/_components/StackedRecord.tsx
@@ -1,8 +1,8 @@
import type { FC, ReactNode } from 'react';
import reactStringReplace from 'react-string-replace';
-import DomainLink from '@/components/results/DomainLink';
-import IpLink from '@/components/results/IpLink';
+import DomainLink from '../../_components/DomainLink';
+import IpLink from '../../_components/IpLink';
const DOMAIN_REGEX = /([a-zA-Z0-9-_]+\.)+[a-z]+\.?/gi;
const IPV4_REGEX = /(\d{1,3}\.){3}\d{1,3}/g;
diff --git a/app/lookup/[domain]/(dns)/page.tsx b/app/lookup/[domain]/(dns)/page.tsx
index 2b577de..c9fc6b4 100644
--- a/app/lookup/[domain]/(dns)/page.tsx
+++ b/app/lookup/[domain]/(dns)/page.tsx
@@ -2,15 +2,16 @@ import type { Metadata } from 'next';
import { redirect, RedirectType } from 'next/navigation';
import type { FC } from 'react';
-import DnsTable from '@/components/results/dns/DnsTable';
-import LocationSelector from '@/components/results/dns/LocationSelector';
-import ResolverSelector from '@/components/results/dns/ResolverSelector';
import { hostLookupLoader } from '@/lib/ips';
import AuthoritativeResolver from '@/lib/resolvers/AuthoritativeResolver';
import CloudflareDoHResolver from '@/lib/resolvers/CloudflareDoHResolver';
import GoogleDoHResolver from '@/lib/resolvers/GoogleDoHResolver';
import InternalDoHResolver from '@/lib/resolvers/InternalDoHResolver';
+import DnsTable from './_components/DnsTable';
+import LocationSelector from './_components/LocationSelector';
+import ResolverSelector from './_components/ResolverSelector';
+
const getResolver = (
resolverName: string | undefined,
locationName: string | undefined
diff --git a/components/misc/CopyButton.tsx b/app/lookup/[domain]/_components/CopyButton.tsx
similarity index 100%
rename from components/misc/CopyButton.tsx
rename to app/lookup/[domain]/_components/CopyButton.tsx
diff --git a/components/results/DomainLink.tsx b/app/lookup/[domain]/_components/DomainLink.tsx
similarity index 100%
rename from components/results/DomainLink.tsx
rename to app/lookup/[domain]/_components/DomainLink.tsx
diff --git a/components/results/ip/IpDetailsModal.tsx b/app/lookup/[domain]/_components/IpDetailsModal.tsx
similarity index 94%
rename from components/results/ip/IpDetailsModal.tsx
rename to app/lookup/[domain]/_components/IpDetailsModal.tsx
index 5802f71..136339a 100644
--- a/components/results/ip/IpDetailsModal.tsx
+++ b/app/lookup/[domain]/_components/IpDetailsModal.tsx
@@ -24,15 +24,13 @@ import { Spinner } from '@/components/ui/spinner';
import { Table, TableBody, TableCell, TableRow } from '@/components/ui/table';
import type { IpLookupResponse } from '@/app/api/lookup-ip/route';
-import CopyButton from '@/components/misc/CopyButton';
-import DomainLink from '@/components/results/DomainLink';
-const LocationMap = dynamic(
- () => import('@/components/results/ip/LocationMap'),
- {
- ssr: false,
- }
-);
+import CopyButton from './CopyButton';
+import DomainLink from './DomainLink';
+
+const LocationMap = dynamic(() => import('./LocationMap'), {
+ ssr: false,
+});
enum EntryTypes {
IP,
diff --git a/components/results/IpLink.tsx b/app/lookup/[domain]/_components/IpLink.tsx
similarity index 95%
rename from components/results/IpLink.tsx
rename to app/lookup/[domain]/_components/IpLink.tsx
index e1f34aa..d57cfc6 100644
--- a/components/results/IpLink.tsx
+++ b/app/lookup/[domain]/_components/IpLink.tsx
@@ -11,7 +11,7 @@ import {
TooltipTrigger,
} from '@/components/ui/tooltip';
-import IpDetailsModal from '@/components/results/ip/IpDetailsModal';
+import IpDetailsModal from './IpDetailsModal';
type IpLinkProps = {
value: string;
diff --git a/components/results/ip/LocationMap.tsx b/app/lookup/[domain]/_components/LocationMap.tsx
similarity index 100%
rename from components/results/ip/LocationMap.tsx
rename to app/lookup/[domain]/_components/LocationMap.tsx
diff --git a/components/results/RelatedDomains.tsx b/app/lookup/[domain]/_components/RelatedDomains.tsx
similarity index 100%
rename from components/results/RelatedDomains.tsx
rename to app/lookup/[domain]/_components/RelatedDomains.tsx
diff --git a/components/results/ResultsTabs.tsx b/app/lookup/[domain]/_components/ResultsTabs.tsx
similarity index 100%
rename from components/results/ResultsTabs.tsx
rename to app/lookup/[domain]/_components/ResultsTabs.tsx
diff --git a/components/results/ShareButton.tsx b/app/lookup/[domain]/_components/ShareButton.tsx
similarity index 100%
rename from components/results/ShareButton.tsx
rename to app/lookup/[domain]/_components/ShareButton.tsx
diff --git a/components/results/StarReminder.tsx b/app/lookup/[domain]/_components/StarReminder.tsx
similarity index 100%
rename from components/results/StarReminder.tsx
rename to app/lookup/[domain]/_components/StarReminder.tsx
diff --git a/components/results/WhoisQuickInfo.tsx b/app/lookup/[domain]/_components/WhoisQuickInfo.tsx
similarity index 100%
rename from components/results/WhoisQuickInfo.tsx
rename to app/lookup/[domain]/_components/WhoisQuickInfo.tsx
diff --git a/app/lookup/[domain]/certs/page.tsx b/app/lookup/[domain]/certs/page.tsx
index d70f783..ecba7a5 100644
--- a/app/lookup/[domain]/certs/page.tsx
+++ b/app/lookup/[domain]/certs/page.tsx
@@ -10,10 +10,11 @@ import {
TableRow,
} from '@/components/ui/table';
-import DomainLink from '@/components/results/DomainLink';
import { lookupCerts } from '@/lib/certs';
import { isValidDomain } from '@/lib/utils';
+import DomainLink from '../_components/DomainLink';
+
export const runtime = 'edge';
// crt.sh located in GB, always use LHR1 for lowest latency
export const preferredRegion = 'lhr1';
diff --git a/app/lookup/[domain]/layout.tsx b/app/lookup/[domain]/layout.tsx
index b9f3275..3b6e888 100644
--- a/app/lookup/[domain]/layout.tsx
+++ b/app/lookup/[domain]/layout.tsx
@@ -6,18 +6,18 @@ import { notFound } from 'next/navigation';
import { type FC, type ReactNode } from 'react';
import { getDomain } from 'tldts';
-import SearchForm from '@/components/general/SearchForm';
-import RelatedDomains from '@/components/results/RelatedDomains';
-import ResultsTabs from '@/components/results/ResultsTabs';
-import ShareButton from '@/components/results/ShareButton';
-import WhoisQuickInfo from '@/components/results/WhoisQuickInfo';
import bigquery from '@/lib/bigquery';
import { isValidDomain } from '@/lib/utils';
-const StarReminder = dynamic(
- () => import('@/components/results/StarReminder'),
- { ssr: false }
-);
+import SearchForm from '../../_components/SearchForm';
+import RelatedDomains from './_components/RelatedDomains';
+import ResultsTabs from './_components/ResultsTabs';
+import ShareButton from './_components/ShareButton';
+import WhoisQuickInfo from './_components/WhoisQuickInfo';
+
+const StarReminder = dynamic(() => import('./_components/StarReminder'), {
+ ssr: false,
+});
type LookupLayoutProps = {
children: ReactNode;
diff --git a/components/results/map/ResultsGlobe.module.css b/app/lookup/[domain]/map/_components/ResultsGlobe.module.css
similarity index 100%
rename from components/results/map/ResultsGlobe.module.css
rename to app/lookup/[domain]/map/_components/ResultsGlobe.module.css
diff --git a/components/results/map/ResultsGlobe.tsx b/app/lookup/[domain]/map/_components/ResultsGlobe.tsx
similarity index 100%
rename from components/results/map/ResultsGlobe.tsx
rename to app/lookup/[domain]/map/_components/ResultsGlobe.tsx
diff --git a/app/lookup/[domain]/map/page.tsx b/app/lookup/[domain]/map/page.tsx
index 6dea899..520306b 100644
--- a/app/lookup/[domain]/map/page.tsx
+++ b/app/lookup/[domain]/map/page.tsx
@@ -6,10 +6,11 @@ import type { FC } from 'react';
import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
-import ResultsGlobe from '@/components/results/map/ResultsGlobe';
import { REGIONS } from '@/lib/data';
import InternalDoHResolver from '@/lib/resolvers/InternalDoHResolver';
+import ResultsGlobe from './_components/ResultsGlobe';
+
export const runtime = 'edge';
type MapResultsPageProps = {
diff --git a/app/lookup/[domain]/subdomains/page.tsx b/app/lookup/[domain]/subdomains/page.tsx
index 074270e..430bef3 100644
--- a/app/lookup/[domain]/subdomains/page.tsx
+++ b/app/lookup/[domain]/subdomains/page.tsx
@@ -11,11 +11,12 @@ import {
TableRow,
} from '@/components/ui/table';
-import DomainLink from '@/components/results/DomainLink';
import { lookupCerts } from '@/lib/certs';
import CloudflareDoHResolver from '@/lib/resolvers/CloudflareDoHResolver';
import { isValidDomain } from '@/lib/utils';
+import DomainLink from '../_components/DomainLink';
+
export const runtime = 'edge';
// crt.sh located in GB, always use LHR1 for lowest latency
export const preferredRegion = 'lhr1';