fix(pages): remove (main) route group

codingcodax · Jul 24, 2024 · c5ed9fc · c5ed9fc
1 parent 3ca23f2
commit c5ed9fc
Show file tree

Hide file tree

Showing 47 changed files with 37 additions and 107 deletions.
diff --git a/apps/www/src/app/(main)/layout.tsx b/apps/www/src/app/(main)/layout.tsx
diff --git a/apps/www/src/app/(main)/page.tsx b/apps/www/src/app/(main)/page.tsx
diff --git a/...)/_components/CodingHours/CodingHours.tsx → ...p/_components/CodingHours/CodingHours.tsx b/...)/_components/CodingHours/CodingHours.tsx → ...p/_components/CodingHours/CodingHours.tsx
diff --git a/...p/(main)/_components/CodingHours/index.ts → .../src/app/_components/CodingHours/index.ts b/...p/(main)/_components/CodingHours/index.ts → .../src/app/_components/CodingHours/index.ts
diff --git a/...main)/_components/ContactMe/ContactMe.tsx → ...c/app/_components/ContactMe/ContactMe.tsx b/...main)/_components/ContactMe/ContactMe.tsx → ...c/app/_components/ContactMe/ContactMe.tsx
diff --git a/...app/(main)/_components/ContactMe/index.ts → ...ww/src/app/_components/ContactMe/index.ts b/...app/(main)/_components/ContactMe/index.ts → ...ww/src/app/_components/ContactMe/index.ts
diff --git a/.../app/(main)/_components/Footer/Footer.tsx → ...www/src/app/_components/Footer/Footer.tsx b/.../app/(main)/_components/Footer/Footer.tsx → ...www/src/app/_components/Footer/Footer.tsx
diff --git a/...rc/app/(main)/_components/Footer/index.ts → apps/www/src/app/_components/Footer/index.ts b/...rc/app/(main)/_components/Footer/index.ts → apps/www/src/app/_components/Footer/index.ts
diff --git a/.../app/(main)/_components/Header/Header.tsx → ...www/src/app/_components/Header/Header.tsx b/.../app/(main)/_components/Header/Header.tsx → ...www/src/app/_components/Header/Header.tsx
diff --git a/...app/(main)/_components/Header/NavItem.tsx → ...ww/src/app/_components/Header/NavItem.tsx b/...app/(main)/_components/Header/NavItem.tsx → ...ww/src/app/_components/Header/NavItem.tsx
diff --git a/.../app/(main)/_components/Header/Navbar.tsx → ...www/src/app/_components/Header/Navbar.tsx b/.../app/(main)/_components/Header/Navbar.tsx → ...www/src/app/_components/Header/Navbar.tsx
diff --git a/...rc/app/(main)/_components/Header/index.ts → apps/www/src/app/_components/Header/index.ts b/...rc/app/(main)/_components/Header/index.ts → apps/www/src/app/_components/Header/index.ts
diff --git a/.../src/app/(main)/_components/Hero/Hero.tsx → apps/www/src/app/_components/Hero/Hero.tsx b/.../src/app/(main)/_components/Hero/Hero.tsx → apps/www/src/app/_components/Hero/Hero.tsx
diff --git a/.../src/app/(main)/_components/Hero/index.ts → apps/www/src/app/_components/Hero/index.ts b/.../src/app/(main)/_components/Hero/index.ts → apps/www/src/app/_components/Hero/index.ts
diff --git a/...rc/app/(main)/_components/Intro/Intro.tsx → apps/www/src/app/_components/Intro/Intro.tsx b/...rc/app/(main)/_components/Intro/Intro.tsx → apps/www/src/app/_components/Intro/Intro.tsx
diff --git a/...p/(main)/_components/Intro/IntroImage.tsx → .../src/app/_components/Intro/IntroImage.tsx b/...p/(main)/_components/Intro/IntroImage.tsx → .../src/app/_components/Intro/IntroImage.tsx
diff --git a/...src/app/(main)/_components/Intro/index.ts → apps/www/src/app/_components/Intro/index.ts b/...src/app/(main)/_components/Intro/index.ts → apps/www/src/app/_components/Intro/index.ts
diff --git a/.../(main)/_components/Location/Location.tsx → ...src/app/_components/Location/Location.tsx b/.../(main)/_components/Location/Location.tsx → ...src/app/_components/Location/Location.tsx
diff --git a/.../app/(main)/_components/Location/index.ts → ...www/src/app/_components/Location/index.ts b/.../app/(main)/_components/Location/index.ts → ...www/src/app/_components/Location/index.ts
diff --git a/...pp/(main)/_components/Project/Project.tsx → ...w/src/app/_components/Project/Project.tsx b/...pp/(main)/_components/Project/Project.tsx → ...w/src/app/_components/Project/Project.tsx
diff --git a/...n)/_components/Project/ProjectContent.tsx → ...pp/_components/Project/ProjectContent.tsx b/...n)/_components/Project/ProjectContent.tsx → ...pp/_components/Project/ProjectContent.tsx
diff --git a/...components/Project/ProjectDescription.tsx → ...components/Project/ProjectDescription.tsx b/...components/Project/ProjectDescription.tsx → ...components/Project/ProjectDescription.tsx
diff --git a/...ain)/_components/Project/ProjectImage.tsx → .../app/_components/Project/ProjectImage.tsx b/...ain)/_components/Project/ProjectImage.tsx → .../app/_components/Project/ProjectImage.tsx
diff --git a/...ain)/_components/Project/ProjectTitle.tsx → .../app/_components/Project/ProjectTitle.tsx b/...ain)/_components/Project/ProjectTitle.tsx → .../app/_components/Project/ProjectTitle.tsx
diff --git a/...c/app/(main)/_components/Project/index.ts → .../www/src/app/_components/Project/index.ts b/...c/app/(main)/_components/Project/index.ts → .../www/src/app/_components/Project/index.ts
diff --git a/...pp/(main)/_components/Section/Section.tsx → ...w/src/app/_components/Section/Section.tsx b/...pp/(main)/_components/Section/Section.tsx → ...w/src/app/_components/Section/Section.tsx
diff --git a/...components/Section/SectionDescription.tsx → ...components/Section/SectionDescription.tsx b/...components/Section/SectionDescription.tsx → ...components/Section/SectionDescription.tsx
diff --git a/...ain)/_components/Section/SectionTitle.tsx → .../app/_components/Section/SectionTitle.tsx b/...ain)/_components/Section/SectionTitle.tsx → .../app/_components/Section/SectionTitle.tsx
diff --git a/...c/app/(main)/_components/Section/index.ts → .../www/src/app/_components/Section/index.ts b/...c/app/(main)/_components/Section/index.ts → .../www/src/app/_components/Section/index.ts
diff --git a/...main)/_components/TechStack/TechStack.tsx → ...c/app/_components/TechStack/TechStack.tsx b/...main)/_components/TechStack/TechStack.tsx → ...c/app/_components/TechStack/TechStack.tsx
diff --git a/...app/(main)/_components/TechStack/index.ts → ...ww/src/app/_components/TechStack/index.ts b/...app/(main)/_components/TechStack/index.ts → ...ww/src/app/_components/TechStack/index.ts
diff --git a/.../(main)/about/_components/Block/Block.tsx → ...src/app/about/_components/Block/Block.tsx b/.../(main)/about/_components/Block/Block.tsx → ...src/app/about/_components/Block/Block.tsx
diff --git a/.../about/_components/Block/BlockContent.tsx → .../about/_components/Block/BlockContent.tsx b/.../about/_components/Block/BlockContent.tsx → .../about/_components/Block/BlockContent.tsx
diff --git a/...n)/about/_components/Block/BlockTitle.tsx → ...pp/about/_components/Block/BlockTitle.tsx b/...n)/about/_components/Block/BlockTitle.tsx → ...pp/about/_components/Block/BlockTitle.tsx
diff --git a/...p/(main)/about/_components/Block/index.ts → .../src/app/about/_components/Block/index.ts b/...p/(main)/about/_components/Block/index.ts → .../src/app/about/_components/Block/index.ts
diff --git a/...about/_components/DateLabel/DateLabel.tsx → ...about/_components/DateLabel/DateLabel.tsx b/...about/_components/DateLabel/DateLabel.tsx → ...about/_components/DateLabel/DateLabel.tsx
diff --git a/...ain)/about/_components/DateLabel/index.ts → .../app/about/_components/DateLabel/index.ts b/...ain)/about/_components/DateLabel/index.ts → .../app/about/_components/DateLabel/index.ts
diff --git a/...t/_components/DetailBlock/DetailBlock.tsx → ...t/_components/DetailBlock/DetailBlock.tsx b/...t/_components/DetailBlock/DetailBlock.tsx → ...t/_components/DetailBlock/DetailBlock.tsx
diff --git a/...onents/DetailBlock/DetailBlockContent.tsx → ...onents/DetailBlock/DetailBlockContent.tsx b/...onents/DetailBlock/DetailBlockContent.tsx → ...onents/DetailBlock/DetailBlockContent.tsx
diff --git a/...nents/DetailBlock/DetailBlockSubtitle.tsx → ...nents/DetailBlock/DetailBlockSubtitle.tsx b/...nents/DetailBlock/DetailBlockSubtitle.tsx → ...nents/DetailBlock/DetailBlockSubtitle.tsx
diff --git a/...mponents/DetailBlock/DetailBlockTitle.tsx → ...mponents/DetailBlock/DetailBlockTitle.tsx b/...mponents/DetailBlock/DetailBlockTitle.tsx → ...mponents/DetailBlock/DetailBlockTitle.tsx
diff --git a/...n)/about/_components/DetailBlock/index.ts → ...pp/about/_components/DetailBlock/index.ts b/...n)/about/_components/DetailBlock/index.ts → ...pp/about/_components/DetailBlock/index.ts
diff --git a/apps/www/src/app/(main)/about/page.tsx → apps/www/src/app/about/page.tsx b/apps/www/src/app/(main)/about/page.tsx → apps/www/src/app/about/page.tsx
@@ -1,7 +1,7 @@
 import type { NextPage } from 'next';
 import { clsx } from 'clsx/lite';
 
-import { Hero } from '~/app/(main)/_components/Hero';
+import { Hero } from '~/app/_components/Hero';
 import { fadeUp } from '~/config/animations';
 import { ContactMe } from '../_components/ContactMe';
 import { Block, BlockContent, BlockTitle } from './_components/Block';

diff --git a/apps/www/src/app/(main)/contact/page.tsx → apps/www/src/app/contact/page.tsx b/apps/www/src/app/(main)/contact/page.tsx → apps/www/src/app/contact/page.tsx
diff --git a/apps/www/src/app/layout.tsx b/apps/www/src/app/layout.tsx
@@ -7,6 +7,8 @@ import { cn } from '@acme/ui';
 import '~/app/globals.css';
 
 import { env } from '~/env';
+import { Footer } from './_components/Footer';
+import { Header } from './_components/Header';
 import { Providers } from './providers';
 
 export const metadata: Metadata = {
@@ -49,7 +51,25 @@ export default function RootLayout(props: { children: React.ReactNode }) {
           GeistMono.variable,
         )}
       >
-        <Providers>{props.children}</Providers>
+        <Providers>
+          <div className='relative flex flex-col rounded-3xl border border-grey-line bg-grey-base'>
+            <div className='absolute left-0 top-[68px] h-px w-full bg-grey-line' />
+
+            <Header />
+
+            <div className='relative mx-auto w-full max-w-screen-lg'>
+              <div className='absolute -left-px top-0 h-full w-px bg-grey-line' />
+              <div className='absolute left-1/3 top-0 h-full w-px border border-dashed border-grey-bg-hover' />
+              <div className='absolute right-1/3 top-0 h-full w-px border border-dashed border-grey-bg-hover' />
+              <div className='absolute -right-px top-0 h-full w-px bg-grey-line' />
+
+              {props.children}
+              <Footer />
+            </div>
+
+            <div className='absolute bottom-[68px] left-0 h-px w-full bg-grey-line' />
+          </div>
+        </Providers>
       </body>
     </html>
   );

diff --git a/apps/www/src/app/page.tsx b/apps/www/src/app/page.tsx
@@ -0,0 +1,11 @@
+import type { NextPage } from 'next';
+
+const Page: NextPage = () => {
+  return (
+    <div>
+      <p>Page page</p>
+    </div>
+  );
+};
+
+export default Page;
diff --git a/apps/www/src/app/(main)/work/page.tsx → apps/www/src/app/work/page.tsx b/apps/www/src/app/(main)/work/page.tsx → apps/www/src/app/work/page.tsx
@@ -1,19 +1,19 @@
 import type { NextPage } from 'next';
 
-import { ContactMe } from '~/app/(main)/_components/ContactMe';
-import { Hero } from '~/app/(main)/_components/Hero';
+import { ContactMe } from '~/app/_components/ContactMe';
+import { Hero } from '~/app/_components/Hero';
 import {
   Project,
   ProjectContent,
   ProjectDescription,
   ProjectImage,
   ProjectTitle,
-} from '~/app/(main)/_components/Project';
+} from '~/app/_components/Project';
 import {
   Section,
   SectionDescription,
   SectionTitle,
-} from '~/app/(main)/_components/Section';
+} from '~/app/_components/Section';
 import { projects, sideProjects } from '~/config/projects';
 
 const Work: NextPage = () => {