From 8e0cd0e7081125bd45ef44e038d177e7376b4094 Mon Sep 17 00:00:00 2001 From: AshGw Date: Sun, 11 Feb 2024 22:21:13 +0100 Subject: [PATCH 1/6] chore: clean up routes --- src/app/(pages)/blog/[post]/page.tsx | 2 +- src/app/(pages)/blog/page.tsx | 2 +- src/app/(pages)/login/page.tsx | 2 +- src/app/api/blogs/route.ts | 3 +- .../blog/blog-posts.tsx} | 0 src/app/components/nav/nav.tsx | 147 +++++++++++++----- src/app/components/nav/new-nav.tsx | 117 -------------- .../reusables/back-up-top.tsx} | 0 src/app/layout.tsx | 3 +- src/app/page.tsx | 1 - 10 files changed, 112 insertions(+), 165 deletions(-) rename src/app/{(pages)/blog/posts.tsx => components/blog/blog-posts.tsx} (100%) delete mode 100644 src/app/components/nav/new-nav.tsx rename src/app/{(pages)/blog/[post]/back-top.tsx => components/reusables/back-up-top.tsx} (100%) diff --git a/src/app/(pages)/blog/[post]/page.tsx b/src/app/(pages)/blog/[post]/page.tsx index 2caa708a..00eb457f 100644 --- a/src/app/(pages)/blog/[post]/page.tsx +++ b/src/app/(pages)/blog/[post]/page.tsx @@ -4,7 +4,7 @@ import StyledMDX from '@/app/components/mdx/styled-mdx'; import { Heading1 as H1 } from '@/app/components/reusables/headers'; import { formatDate, isSameMonthAndYear } from '@/lib/funcs/dates'; import { MediumSection } from '@/app/components/reusables/sections'; -import BackUpTop from './back-top'; +import BackUpTop from '@/app/components/reusables/back-up-top'; import { notFound } from 'next/navigation'; import { pub } from '@/lib/env'; import { Badge } from '@/app/components/ui/badge'; diff --git a/src/app/(pages)/blog/page.tsx b/src/app/(pages)/blog/page.tsx index 2371aecf..b936b0c9 100644 --- a/src/app/(pages)/blog/page.tsx +++ b/src/app/(pages)/blog/page.tsx @@ -1,6 +1,6 @@ import { Suspense } from 'react'; import LoadingScreen from '@/app/components/reusables/loading-screen'; -import BlogPosts from './posts'; +import BlogPosts from '@/app/components/blog/blog-posts'; import { getBlogPosts } from '@/app/actions/blog'; import { notFound } from 'next/navigation'; diff --git a/src/app/(pages)/login/page.tsx b/src/app/(pages)/login/page.tsx index d550ff8a..dab7b142 100644 --- a/src/app/(pages)/login/page.tsx +++ b/src/app/(pages)/login/page.tsx @@ -4,7 +4,7 @@ import Link from 'next/link'; import Image from 'next/image'; import { Button } from '@/app/components/ui/button'; import { Separator } from '@/app/components/ui/separator'; -import NewNav from '@/app/components/nav/new-nav'; +import NewNav from '@/app/components/nav/nav'; export default function Component() { return ( diff --git a/src/app/api/blogs/route.ts b/src/app/api/blogs/route.ts index a3769864..a3355c58 100644 --- a/src/app/api/blogs/route.ts +++ b/src/app/api/blogs/route.ts @@ -1,6 +1,5 @@ -// api/me/route.ts import { z } from 'zod'; -import { NextResponse, NextRequest } from 'next/server'; +import { NextResponse } from 'next/server'; import { getBlogPosts } from '@/app/api/blogs/content'; import type { BlogData } from '@/lib/types/mdx'; import type { AsyncResponse } from '@/lib/types/global'; diff --git a/src/app/(pages)/blog/posts.tsx b/src/app/components/blog/blog-posts.tsx similarity index 100% rename from src/app/(pages)/blog/posts.tsx rename to src/app/components/blog/blog-posts.tsx diff --git a/src/app/components/nav/nav.tsx b/src/app/components/nav/nav.tsx index 94b29be2..169bf0f5 100644 --- a/src/app/components/nav/nav.tsx +++ b/src/app/components/nav/nav.tsx @@ -1,50 +1,117 @@ -import { Button } from '../ui/button'; -import SourceCodeButton from './buttons'; +'use client'; + +import React from 'react'; +import SourceCodeButton from '@/app/components/nav/buttons'; +import { Button } from '@/app/components/ui/button'; import Link from 'next/link'; -import { cn } from '@/lib/utils'; +import Image from 'next/image'; +import HamburgerButton from '@/app/components/nav/hamburger'; +import { useState } from 'react'; + +export default function NavBar() { + const [isOpened, setIsOpened] = useState(false); -const Nav = () => { + const toggleMenu = () => { + setIsOpened(!isOpened); + }; return ( -