Restructured Pages

Put components inside the route directories
kmiguel10 · Oct 2, 2023 · 99a01da · 99a01da
1 parent 4addcd5
commit 99a01da
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 14 deletions.
diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import Base from "../components/layouts/base";
-import ProfileHeader from "../components/pages/header";
+import ProfileHeader from "../components/ui/header";
 import ContainerLayout from "../components/layouts/container";
 import InProgressImage from "../../public/aboutme-option10.webp";
 import Image from "next/image";
@@ -10,7 +10,7 @@ const page = () => {
     <Base>
       <ContainerLayout className="flex flex-col space-y-4">
         <h1 className="text-3xl font-semibold tracking-tight text-gray-12 md:text-4xl">
-          Blog
+          About Me
         </h1>
         <div className="text-gray-11">Work in progress.</div>
         <Image

diff --git a/app/components/pages/about-me.tsx → app/components/home/about-me.tsx b/app/components/pages/about-me.tsx → app/components/home/about-me.tsx
diff --git a/app/components/pages/code-four-arena.tsx → app/components/home/code-four-arena.tsx b/app/components/pages/code-four-arena.tsx → app/components/home/code-four-arena.tsx
diff --git a/app/components/pages/contents.tsx → app/components/home/contents.tsx b/app/components/pages/contents.tsx → app/components/home/contents.tsx
diff --git a/app/components/pages/my-socials.tsx → app/components/home/my-socials.tsx b/app/components/pages/my-socials.tsx → app/components/home/my-socials.tsx
diff --git a/app/components/pages/speedrun.tsx → app/components/home/speedrun.tsx b/app/components/pages/speedrun.tsx → app/components/home/speedrun.tsx
diff --git a/app/components/pages/header.tsx → app/components/ui/header.tsx b/app/components/pages/header.tsx → app/components/ui/header.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import ProfileAvatar from "./profile-avatar";
-import Button from "../ui/button";
+import Button from "./button";
 import { Github, Twitter, Linkedin } from "lucide-react";
 
 const ProfileHeader = () => {

diff --git a/app/components/pages/profile-avatar.tsx → app/components/ui/profile-avatar.tsx b/app/components/pages/profile-avatar.tsx → app/components/ui/profile-avatar.tsx
diff --git a/app/page.tsx b/app/page.tsx
@@ -1,8 +1,8 @@
 import Base from "./components/layouts/base";
 
-import ProfileHeader from "./components/pages/header";
+import ProfileHeader from "./components/ui/header";
 import ContainerLayout from "./components/layouts/container";
-import Contents from "./components/pages/contents";
+import Contents from "./components/home/contents";
 
 export default function Home() {
   return (

diff --git a/...omponents/pages/resume/resume-content.tsx → app/resume/components/resume-content.tsx b/...omponents/pages/resume/resume-content.tsx → app/resume/components/resume-content.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import ContentDisplay from "../../layouts/content-display";
+import ContentDisplay from "../../components/layouts/content-display";
 import { KanbanSquare } from "lucide-react";
 
 const ResumeContent = () => {
@@ -11,7 +11,7 @@ const ResumeContent = () => {
       description=""
     >
       <div className="grid grid-flow-row auto-rows-max flex-col overflow-hidden rounded-none border border-gray-6 bg-gray-2 ">
-        <div className="collapse collapse-arrow border-base-300 border border-gray-6 bg-gray-2">
+        <div className="collapse collapse-arrow">
           <input type="radio" name="my-accordion-2" checked={undefined} />
           <div className="collapse-title text-md md:rounded-2xl">
             <div className="flex w-full items-center md:flex-row md:justify-between">
@@ -44,7 +44,7 @@ const ResumeContent = () => {
             </ul>
           </div>
         </div>
-        <div className="collapse collapse-arrow border-base-300 border border-gray-6 bg-gray-2border border-gray-6 bg-gray-2">
+        <div className="collapse collapse-arrow border-t-2">
           <input type="radio" name="my-accordion-2" />
           <div className="collapse-title text-md">
             <div className="flex w-full items-center md:flex-row md:justify-between">
@@ -79,7 +79,7 @@ const ResumeContent = () => {
             </ul>
           </div>
         </div>
-        <div className="collapse collapse-arrow border-base-300 border border-gray-6 bg-gray-2">
+        <div className="collapse collapse-arrow border-t-2">
           <input type="radio" name="my-accordion-2" />
           <div className="collapse-title text-md">
             <div className="flex w-full items-center md:flex-row md:justify-between">

diff --git a/app/components/pages/resume/skills.tsx → app/resume/components/skills.tsx b/app/components/pages/resume/skills.tsx → app/resume/components/skills.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import ContentDisplay from "../../layouts/content-display";
+import ContentDisplay from "../../components/layouts/content-display";
 import { Wand2 } from "lucide-react";
 
 const Skills = () => {

diff --git a/app/resume/page.tsx b/app/resume/page.tsx
@@ -1,12 +1,12 @@
 import React from "react";
-import ProfileHeader from "../components/pages/header";
+import ProfileHeader from "../components/ui/header";
 import Base from "../components/layouts/base";
 import ContainerLayout from "../components/layouts/container";
 import Image from "next/image";
 import profile from "../../public/profile.jpeg";
-import Contents from "../components/pages/contents";
-import ResumeContent from "../components/pages/resume/resume-content";
-import Skills from "../components/pages/resume/skills";
+import Contents from "../components/home/contents";
+import ResumeContent from "./components/resume-content";
+import Skills from "./components/skills";
 
 const page = () => {
   return (