diff --git a/.ts-prune/artifacts/tsprune-false-positives.conf b/.ts-prune/artifacts/tsprune-false-positives.conf index df2132451..bc6dc4713 100644 --- a/.ts-prune/artifacts/tsprune-false-positives.conf +++ b/.ts-prune/artifacts/tsprune-false-positives.conf @@ -22,9 +22,9 @@ src/app/error.tsx:7 - default src/app/layout.tsx:4 - default src/app/not-found.tsx:1 - default src/contexts/SessionProvider.tsx:2 - default -src/app/[locale]/not-found.tsx:18 - default -src/app/[locale]/not-found.tsx:9 - generateMetadata -src/app/[locale]/layout.tsx:7 - default +src/app/[locale]/layout.tsx:13 - default +src/app/[locale]/not-found.tsx:27 - default +src/app/[locale]/not-found.tsx:12 - generateMetadata #-------------------- # **** I. 3) SHADCN @@ -287,7 +287,7 @@ src/types/adapters/PageAdapter.ts:12 - TopLevelRoot (used in module) # DO NOT DELETE THIS BEFORE A DOUBLE-CHECK! # Try to ts-prune with and without the .next folder, and see if # those false positives are always evaluated as outdated. -# ๐Ÿ“Š Entries: 43 +# ๐Ÿ“Š Entries: 41 #================================================================= #------------------------ @@ -299,47 +299,45 @@ src/app/api/auth/[...nextauth]/route.ts:8 - GET #------------------- # **** II. 2) NEXT #------------------- -src/app/[locale]/(dashboard)/dashboard/bar/page.tsx:9 - generateMetadata -src/app/[locale]/(dashboard)/dashboard/[notfound]/page.tsx:6 - default -src/app/[locale]/(dashboard)/dashboard/foo/page.tsx:16 - default -src/app/[locale]/(dashboard)/dashboard/foo/page.tsx:9 - generateMetadata -src/app/[locale]/(dashboard)/dashboard/[...notfound]/page.tsx:10 - default -src/app/[locale]/(dashboard)/dashboard/bar/page.tsx:16 - default -src/app/[locale]/(dashboard)/dashboard/page.tsx:9 - generateMetadata -src/app/[locale]/(dashboard)/dashboard/layout.tsx:17 - default -src/app/[locale]/(dashboard)/dashboard/layout.tsx:13 - generateStaticParams -src/app/[locale]/(dashboard)/layout.tsx:8 - default -src/app/[locale]/(dashboard)/dashboard/page.tsx:16 - default -src/app/[locale]/(pages)/page.tsx:26 - default -src/app/[locale]/(pages)/layout.tsx:7 - default -src/app/[locale]/lp/page.tsx:11 - generateStaticParams -src/app/[locale]/lp/sign-up/page.tsx:23 - generateStaticParams -src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/page.tsx:18 - generateMetadata -src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/page.tsx:24 - generateStaticParams -src/app/[locale]/(pages)/blog/page.tsx:9 - generateStaticParams -src/app/[locale]/(pages)/blog/[categ]/[subcateg]/page.tsx:22 - default -src/app/[locale]/(pages)/blog/[categ]/page.tsx:22 - default -src/app/[locale]/(pages)/[...path]/page.tsx:43 - default -src/app/[locale]/(pages)/blog/[categ]/[subcateg]/page.tsx:17 - generateStaticParams -src/app/[locale]/(pages)/page.tsx:22 - generateStaticParams -src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/page.tsx:29 - default -src/app/[locale]/lp/sign-up/page.tsx:27 - default -src/app/[locale]/(pages)/page.tsx:14 - generateMetadata -src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/[...notfound]/page.tsx:9 - default -src/app/[locale]/(pages)/blog/[categ]/[subcateg]/page.tsx:11 - generateMetadata -src/app/[locale]/(pages)/blog/page.tsx:13 - default -src/app/[locale]/(pages)/blog/[categ]/page.tsx:11 - generateMetadata -src/app/[locale]/lp/[lp-slug]/page.tsx:20 - generateStaticParams -src/app/[locale]/(pages)/blog/[categ]/page.tsx:17 - generateStaticParams -src/app/[locale]/lp/sign-up/page.tsx:15 - generateMetadata -src/app/[locale]/lp/page.tsx:15 - default -src/app/[locale]/(pages)/[...path]/page.tsx:31 - generateStaticParams -src/app/[locale]/lp/sign-up/layout.tsx:8 - default -src/app/[locale]/lp/[lp-slug]/page.tsx:25 - default -src/app/[locale]/lp/[lp-slug]/page.tsx:15 - generateMetadata -src/app/[locale]/(pages)/blog/[categ]/layout.tsx:8 - default -src/app/[locale]/lp/layout.tsx:7 - default -src/app/[locale]/(pages)/[...path]/page.tsx:16 - generateMetadata +src/app/[locale]/(pages)/(withfooter)/[...path]/page.tsx:12 - generateMetadata +src/app/[locale]/(pages)/(withfooter)/blog/page.tsx:13 - default +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/page.tsx:26 - generateStaticParams +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/page.tsx:19 - generateMetadata +src/app/[locale]/(pages)/(withfooter)/blog/page.tsx:9 - generateStaticParams +src/app/[locale]/(pages)/dashboard/[notfound]/page.tsx:6 - default +src/app/[locale]/(pages)/(withfooter)/[...path]/page.tsx:22 - default +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/page.tsx:33 - default +src/app/[locale]/(pages)/dashboard/[...notfound]/page.tsx:10 - default +src/app/[locale]/(pages)/(withfooter)/[...path]/page.tsx:17 - generateStaticParams +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/[...notfound]/page.tsx:10 - default +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/page.tsx:12 - generateMetadata +src/app/[locale]/lp/layout.tsx:8 - default +src/app/[locale]/lp/[lp-slug]/page.tsx:21 - generateStaticParams +src/app/[locale]/lp/sign-up/page.tsx:34 - default +src/app/[locale]/(pages)/dashboard/layout.tsx:13 - generateStaticParams +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/page.tsx:12 - generateMetadata +src/app/[locale]/(pages)/(withfooter)/layout.tsx:8 - default +src/app/[locale]/lp/sign-up/page.tsx:30 - generateStaticParams +src/app/[locale]/lp/[lp-slug]/page.tsx:26 - default +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/page.tsx:19 - generateStaticParams +src/app/[locale]/lp/sign-up/layout.tsx:9 - default +src/app/[locale]/(pages)/dashboard/foo/page.tsx:9 - generateMetadata +src/app/[locale]/(pages)/dashboard/bar/page.tsx:16 - default +src/app/[locale]/(pages)/dashboard/bar/page.tsx:9 - generateMetadata +src/app/[locale]/(pages)/dashboard/layout.tsx:17 - default +src/app/[locale]/(pages)/layout.tsx:8 - default +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/page.tsx:24 - default +src/app/[locale]/(pages)/(withfooter)/page.tsx:28 - generateStaticParams +src/app/[locale]/lp/[lp-slug]/page.tsx:16 - generateMetadata +src/app/[locale]/lp/sign-up/page.tsx:18 - generateMetadata +src/app/[locale]/(pages)/(withfooter)/page.tsx:32 - default +src/app/[locale]/(pages)/dashboard/foo/page.tsx:16 - default +src/app/[locale]/(pages)/(withfooter)/page.tsx:18 - generateMetadata +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/page.tsx:19 - generateStaticParams +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/page.tsx:24 - default +src/app/[locale]/(pages)/(withfooter)/blog/[categ]/layout.tsx:9 - default +src/app/[locale]/(pages)/dashboard/page.tsx:9 - generateMetadata +src/app/[locale]/(pages)/dashboard/page.tsx:16 - default #===================================================================== # ยง III. ๐Ÿฅš INCUBATOR diff --git a/src/app/[locale]/(dashboard)/layout.tsx b/src/app/[locale]/(dashboard)/layout.tsx deleted file mode 100644 index 4396a974a..000000000 --- a/src/app/[locale]/(dashboard)/layout.tsx +++ /dev/null @@ -1,13 +0,0 @@ -/* v8 ignore start */ -// Stryker disable all - -import type { WithChildren } from '@rtm/shared-types/Next'; - -import DashboardRootElement from '@/components/layouts/base/DashboardRootElement'; - -export default function DashboardLayout({ children }: WithChildren) { - return {children}; -} - -// Stryker restore all -/* v8 ignore stop */ diff --git a/src/app/[locale]/(pages)/[...path]/page.tsx b/src/app/[locale]/(pages)/(withfooter)/[...path]/page.tsx similarity index 100% rename from src/app/[locale]/(pages)/[...path]/page.tsx rename to src/app/[locale]/(pages)/(withfooter)/[...path]/page.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard/[...notfound]/page.tsx b/src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/[...notfound]/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard/[...notfound]/page.tsx rename to src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/[...notfound]/page.tsx diff --git a/src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/page.tsx b/src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/page.tsx similarity index 100% rename from src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/page.tsx rename to src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/[slug]/page.tsx diff --git a/src/app/[locale]/(pages)/blog/[categ]/[subcateg]/page.tsx b/src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/page.tsx similarity index 100% rename from src/app/[locale]/(pages)/blog/[categ]/[subcateg]/page.tsx rename to src/app/[locale]/(pages)/(withfooter)/blog/[categ]/[subcateg]/page.tsx diff --git a/src/app/[locale]/(pages)/blog/[categ]/layout.tsx b/src/app/[locale]/(pages)/(withfooter)/blog/[categ]/layout.tsx similarity index 100% rename from src/app/[locale]/(pages)/blog/[categ]/layout.tsx rename to src/app/[locale]/(pages)/(withfooter)/blog/[categ]/layout.tsx diff --git a/src/app/[locale]/(pages)/blog/[categ]/page.tsx b/src/app/[locale]/(pages)/(withfooter)/blog/[categ]/page.tsx similarity index 100% rename from src/app/[locale]/(pages)/blog/[categ]/page.tsx rename to src/app/[locale]/(pages)/(withfooter)/blog/[categ]/page.tsx diff --git a/src/app/[locale]/(pages)/blog/page.tsx b/src/app/[locale]/(pages)/(withfooter)/blog/page.tsx similarity index 100% rename from src/app/[locale]/(pages)/blog/page.tsx rename to src/app/[locale]/(pages)/(withfooter)/blog/page.tsx diff --git a/src/app/[locale]/(pages)/(withfooter)/layout.tsx b/src/app/[locale]/(pages)/(withfooter)/layout.tsx new file mode 100644 index 000000000..9504ab26d --- /dev/null +++ b/src/app/[locale]/(pages)/(withfooter)/layout.tsx @@ -0,0 +1,13 @@ +/* v8 ignore start */ +// Stryker disable all + +import type { WithChildren } from '@rtm/shared-types/Next'; + +import PagesWithFooterRootElement from '@/components/layouts/base/PagesWithFooterRootElement'; + +export default function PagesLayout({ children }: WithChildren) { + return {children}; +} + +// Stryker restore all +/* v8 ignore stop */ diff --git a/src/app/[locale]/(pages)/page.tsx b/src/app/[locale]/(pages)/(withfooter)/page.tsx similarity index 100% rename from src/app/[locale]/(pages)/page.tsx rename to src/app/[locale]/(pages)/(withfooter)/page.tsx diff --git a/src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/[...notfound]/page.tsx b/src/app/[locale]/(pages)/dashboard/[...notfound]/page.tsx similarity index 100% rename from src/app/[locale]/(pages)/blog/[categ]/[subcateg]/[slug]/[...notfound]/page.tsx rename to src/app/[locale]/(pages)/dashboard/[...notfound]/page.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard/[notfound]/page.tsx b/src/app/[locale]/(pages)/dashboard/[notfound]/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard/[notfound]/page.tsx rename to src/app/[locale]/(pages)/dashboard/[notfound]/page.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard/bar/page.tsx b/src/app/[locale]/(pages)/dashboard/bar/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard/bar/page.tsx rename to src/app/[locale]/(pages)/dashboard/bar/page.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard/foo/page.tsx b/src/app/[locale]/(pages)/dashboard/foo/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard/foo/page.tsx rename to src/app/[locale]/(pages)/dashboard/foo/page.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard/layout.tsx b/src/app/[locale]/(pages)/dashboard/layout.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard/layout.tsx rename to src/app/[locale]/(pages)/dashboard/layout.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard/page.tsx b/src/app/[locale]/(pages)/dashboard/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard/page.tsx rename to src/app/[locale]/(pages)/dashboard/page.tsx diff --git a/src/components/layouts/base/DocumentRoot.tsx b/src/components/layouts/base/DocumentRoot.tsx index db2bcc071..43ad45738 100644 --- a/src/components/layouts/base/DocumentRoot.tsx +++ b/src/components/layouts/base/DocumentRoot.tsx @@ -6,7 +6,6 @@ import type { FunctionComponent } from 'react'; import SitewideNavbar from '@/components/ui/navbar/SitewideNavbar'; import PROGRESSBAR_CONFIG from '@/config/progressbar'; -import Footer from '@/components/ui/Footer'; import dynamic from 'next/dynamic'; const NextTopLoader = dynamic(() => import('./NextTopLoader'), { ssr: false }); @@ -16,15 +15,13 @@ interface DocumentRootProps extends WithChildren { disableGoToTopButton?: boolean; disableTopLoader?: boolean; withNavbar?: boolean; - withFooter?: boolean; } -const DocumentRoot: FunctionComponent = ({ disableGoToTopButton, disableTopLoader, withNavbar, withFooter, children }) => ( +const DocumentRoot: FunctionComponent = ({ disableGoToTopButton, disableTopLoader, withNavbar, children }) => ( <> {!disableTopLoader && } {withNavbar && } {children} - {withFooter &&