diff --git a/.eslintrc.js b/.eslintrc.js
index 0290d4b8..642ed9cf 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,9 +2,14 @@ var tsConfigs = ['./tsconfig.json'];
 var tsConfigEmail = ['./tsconfig-emails.json'];
 
 var srcRuleOverrides = {
-  'prettier/prettier': 1,
-  '@typescript-eslint/no-unused-vars': 1,
-  '@typescript-eslint/no-non-null-assertion': 'error',
+  'prettier/prettier': 0,
+  '@typescript-eslint/no-unused-vars': 0,
+  '@typescript-eslint/no-unused-expressions': 0,
+  '@typescript-eslint/no-non-null-assertion': 0,
+  '@next/next/no-img-element': 0,
+  '@typescript-eslint/no-empty-object-type': 0,
+  '@typescript-eslint/no-explicit-any': 0,
+  '@typescript-eslint/ban-ts-comment': 0,
 };
 
 module.exports = {
diff --git a/next-env.d.ts b/next-env.d.ts
index 725dd6f2..fd36f949 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/src/app/(external-pages)/blog/(list)/page.tsx b/src/app/(external-pages)/blog/(list)/page.tsx
deleted file mode 100644
index c7de6294..00000000
--- a/src/app/(external-pages)/blog/(list)/page.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { T } from '@/components/ui/Typography';
-import {
-  anonGetAllBlogTags,
-  anonGetPublishedBlogPosts,
-} from '@/data/anon/internalBlog';
-import { Suspense } from 'react';
-import { PublicBlogList } from '../PublicBlogList';
-import { TagsNav } from '../TagsNav';
-
-export const metadata = {
-  title: 'Blog List | Nextbase',
-  description: 'Collection of the latest blog posts from the team at Nextbase',
-};
-
-async function Tags() {
-  const tags = await anonGetAllBlogTags();
-  return <TagsNav tags={tags} />;
-}
-
-async function BlogList() {
-  const blogPosts = await anonGetPublishedBlogPosts();
-  return <PublicBlogList blogPosts={blogPosts} />;
-}
-
-export default async function BlogListPage() {
-  return (
-    <div className="space-y-8 w-full">
-      <div className="flex items-center flex-col space-y-4">
-        <div className="space-y-3 mb-6 text-center">
-          <T.Subtle>Blog</T.Subtle>
-          <T.H1>All blog posts</T.H1>
-          <T.P className="text-xl leading-[30px] text-muted-foreground">
-            Here is a collection of the latest blog posts from the team at
-            Nextbase.
-          </T.P>
-        </div>
-        <Suspense fallback={<T.Subtle>Loading tags...</T.Subtle>}>
-          <Tags />
-        </Suspense>
-      </div>
-      <Suspense fallback={<T.Subtle>Loading posts...</T.Subtle>}>
-        <BlogList />
-      </Suspense>
-    </div>
-  );
-}
diff --git a/src/app/(external-pages)/blog/AuthorCard.tsx b/src/app/(external-pages)/blog/AuthorCard.tsx
deleted file mode 100644
index 7faea06d..00000000
--- a/src/app/(external-pages)/blog/AuthorCard.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
-import {
-  Card,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-import Link from 'next/link';
-
-type Props = {
-  author: {
-    avatar_url: string;
-    bio: string;
-    created_at: string;
-    display_name: string;
-    facebook_handle: string | null;
-    instagram_handle: string | null;
-    linkedin_handle: string | null;
-    twitter_handle: string | null;
-    updated_at: string;
-    user_id: string;
-    website_url: string | null;
-  };
-};
-
-const AuthorCard = ({ author }: Props) => {
-  return (
-    <Link href={`/blog/authors/${author.user_id}`} key={author.user_id}>
-      <Card>
-        <CardHeader>
-          <div className="flex">
-            <Avatar>
-              <AvatarImage src={author.avatar_url} />
-              <AvatarFallback>
-                {generateInitials(author.display_name)}
-              </AvatarFallback>
-            </Avatar>
-            <div className="ml-4">
-              <CardTitle>{author.display_name}</CardTitle>
-              <CardDescription className="mt-2">
-                {author.bio.length > 120
-                  ? author.bio.slice(0, 120) + '...'
-                  : author.bio.length}
-              </CardDescription>
-            </div>
-          </div>
-        </CardHeader>
-      </Card>
-    </Link>
-  );
-};
-
-export default AuthorCard;
-
-function generateInitials(name: string) {
-  // Split the name into individual words
-  const words = name.split(' ');
-
-  // Initialize an empty string to store initials
-  let initials = '';
-
-  // Iterate through each word
-  for (let i = 0; i < words.length; i++) {
-    // Get the first character of each word and convert it to uppercase
-    initials += words[i][0].toUpperCase();
-  }
-
-  // Return the generated initials
-  return initials;
-}
diff --git a/src/app/(external-pages)/blog/MobileNavigation.tsx b/src/app/(external-pages)/blog/MobileNavigation.tsx
deleted file mode 100644
index f1c79d8f..00000000
--- a/src/app/(external-pages)/blog/MobileNavigation.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-'use client';
-import { Dialog } from '@headlessui/react';
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
-import { ComponentProps, useState } from 'react';
-
-function MenuIcon(props: ComponentProps<'svg'>) {
-  return (
-    <svg
-      aria-hidden="true"
-      viewBox="0 0 24 24"
-      fill="none"
-      strokeWidth="2"
-      strokeLinecap="round"
-      {...props}
-    >
-      <path d="M4 7h16M4 12h16M4 17h16" />
-    </svg>
-  );
-}
-
-function CloseIcon(props: ComponentProps<'svg'>) {
-  return (
-    <svg
-      aria-hidden="true"
-      viewBox="0 0 24 24"
-      fill="none"
-      strokeWidth="2"
-      strokeLinecap="round"
-      {...props}
-    >
-      <path d="M5 5l14 14M19 5l-14 14" />
-    </svg>
-  );
-}
-
-export function MobileNavigation() {
-  const router = useRouter();
-  const [isOpen, setIsOpen] = useState(false);
-
-  // useEffect(() => {
-  //   if (!isOpen) return
-
-  //   function onRouteChange() {
-  //     setIsOpen(false)
-  //   }
-
-  //   router.events.on('routeChangeComplete', onRouteChange)
-  //   router.events.on('routeChangeError', onRouteChange)
-
-  //   return () => {
-  //     router.events.off('routeChangeComplete', onRouteChange)
-  //     router.events.off('routeChangeError', onRouteChange)
-  //   }
-  // }, [router, isOpen])
-
-  return (
-    <>
-      <button
-        type="button"
-        onClick={() => setIsOpen(true)}
-        className="relative"
-        aria-label="Open navigation"
-      >
-        <MenuIcon className="h-6 w-6 stroke-current" />
-      </button>
-      <Dialog
-        open={isOpen}
-        onClose={setIsOpen}
-        className="fixed inset-0 z-50 flex items-start overflow-y-auto bg-neutral-900 pr-10 backdrop-blur lg:hidden"
-        aria-label="Navigation"
-      >
-        <Dialog.Panel className="min-h-full w-full max-w-xs bg-neutral-100 px-4 pb-12 pt-5 sm:px-6">
-          <div className="flex items-center">
-            <button
-              type="button"
-              onClick={() => setIsOpen(false)}
-              aria-label="Close navigation"
-            >
-              <CloseIcon className="h-6 w-6 stroke-current" />
-            </button>
-            <Link href="/" className="block" aria-label="Home page">
-              <img
-                src="https://usenextbase.com/logos/nextbase/Logo%2006.png"
-                className="h-9 block sm:h-9"
-                alt="Nextbase Logo"
-              />
-            </Link>
-          </div>
-        </Dialog.Panel>
-      </Dialog>
-    </>
-  );
-}
diff --git a/src/app/(external-pages)/blog/Navbar.tsx b/src/app/(external-pages)/blog/Navbar.tsx
deleted file mode 100644
index 6e35efa3..00000000
--- a/src/app/(external-pages)/blog/Navbar.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-'use client';
-import { cn } from '@/utils/cn';
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
-import { ComponentPropsWithRef, useEffect, useState } from 'react';
-import { MobileNavigation } from './MobileNavigation';
-
-function NavLink({ href, ...props }: ComponentPropsWithRef<typeof Link>) {
-  const pathname = usePathname();
-  const isActive = pathname === href;
-  return (
-    <Link
-      {...props}
-      href={href}
-      className={cn(isActive ? 'font-bold text-blue-600' : 'font-medium')}
-    ></Link>
-  );
-}
-
-export function Navbar() {
-  const [isScrolled, setIsScrolled] = useState(false);
-
-  useEffect(() => {
-    function onScroll() {
-      setIsScrolled(window.scrollY > 0);
-    }
-    onScroll();
-    window.addEventListener('scroll', onScroll, { passive: true });
-    return () => {
-      window.removeEventListener('scroll', onScroll);
-    };
-  }, []);
-
-  return (
-    <header
-      className={cn(
-        'sticky top-0 z-50 flex flex-wrap items-center justify-between bg-white px-4 py-5 shadow-md transition duration-500 dark:shadow-none sm:px-6 lg:px-8',
-        isScrolled
-          ? 'dark:bg-primary-dark dark:backdrop-blur dark:[@supports(backdrop-filter:blur(0))]:bg-primary-dark/75'
-          : 'dark:bg-transparent',
-      )}
-    >
-      <div className="mr-6 flex lg:hidden space-x-2">
-        <MobileNavigation />
-        <div className={cn('block lg:hidden', 'relative ')}>
-          <Link href="/" className="block" aria-label="Home page">
-            <img
-              src="https://usenextbase.com/logos/nextbase/Logo%2006.png"
-              className="h-9 block sm:h-9"
-              alt="Nextbase Logo"
-            />
-          </Link>
-        </div>
-      </div>
-
-      <div
-        className={cn(
-          ' mx-auto w-full max-w-8xl flex justify-center sm:px-2 lg:px-8 xl:px-12',
-        )}
-      >
-        <div className={cn('hidden lg:flex items-center gap-8', 'relative ')}>
-          <Link href="/" aria-label="Home page">
-            <img
-              src="https://usenextbase.com/logos/nextbase/Logo%2006.png"
-              className="h-9 block sm:h-9"
-              alt="Nextbase Logo"
-            />
-          </Link>
-          <NavLink href="/blog" aria-label="Blog">
-            Blog
-          </NavLink>
-          <NavLink href="/docs" aria-label="Docs">
-            Docs
-          </NavLink>
-          <NavLink href="/changelog" aria-label="Changelog">
-            Changelog
-          </NavLink>
-          <NavLink href="/roadmap" aria-label="Roadmap">
-            Roadmap
-          </NavLink>
-        </div>
-        <div className="-my-5 mr-6 sm:mr-8 md:mr-0"></div>
-        <div className="relative flex basis-0 justify-end gap-6 sm:gap-8 md:flex-grow"></div>
-      </div>
-    </header>
-  );
-}
diff --git a/src/app/(external-pages)/blog/PublicBlogList.tsx b/src/app/(external-pages)/blog/PublicBlogList.tsx
deleted file mode 100644
index 036fb3d4..00000000
--- a/src/app/(external-pages)/blog/PublicBlogList.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { T } from '@/components/ui/Typography';
-import { Table } from '@/types';
-import moment from 'moment';
-
-export function PublicBlogList({
-  blogPosts,
-}: {
-  blogPosts: Array<Table<'internal_blog_posts'>>;
-}) {
-  return (
-    <>
-      {blogPosts.length ? (
-        <div className="space-y-2 mx-4 sm:mx-8 md:mx-0">
-          <div className="mx-auto mt-16 grid max-w-2xl grid-cols-1 gap-x-8 gap-y-20 lg:mx-0 lg:max-w-none lg:grid-cols-3">
-            {blogPosts.map((post) => (
-              <article
-                key={post.id}
-                className="flex max-w-xl flex-col items-start justify-start"
-              >
-                <div className="relative w-full">
-                  <img
-                    src={post.cover_image ?? '/images/nextbase-logo.png'}
-                    alt={post.title}
-                    className="aspect-[16/9] w-full rounded-2xl bg-neutral-100 object-cover sm:aspect-[2/1] lg:aspect-[3/2]"
-                  />
-                </div>
-                <div className="max-w-xl">
-                  <div className="mt-5 flex items-center gap-x-4 text-xs">
-                    <time
-                      dateTime={post.created_at}
-                      className="text-neutral-500 uppercase"
-                    >
-                      {moment(post.created_at).format('MMM D, YYYY')}
-                    </time>
-                  </div>
-                  <div className="group relative">
-                    <h3 className="mt-2 text-2xl font-semibold text-neutral-900 group-hover:text-neutral-600">
-                      <a href={`/blog/${post.slug}`}>
-                        <span className="absolute inset-0" />
-                        {post.title}
-                      </a>
-                    </h3>
-                    <p className="mt-2 line-clamp-3 text-base text-neutral-600">
-                      {post.summary}
-                    </p>
-                  </div>
-                </div>
-              </article>
-            ))}
-          </div>
-        </div>
-      ) : (
-        <T.Subtle className="text-center">No blog posts yet.</T.Subtle>
-      )}
-    </>
-  );
-}
diff --git a/src/app/(external-pages)/blog/TagsNav.tsx b/src/app/(external-pages)/blog/TagsNav.tsx
deleted file mode 100644
index 2923d494..00000000
--- a/src/app/(external-pages)/blog/TagsNav.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Button } from '@/components/ui/button';
-import { Table } from '@/types';
-import Link from 'next/link';
-
-export function TagsNav({
-  tags,
-}: {
-  tags: Table<'internal_blog_post_tags'>[];
-}) {
-  return (
-    <div className="space-x-2 flex px-4 sm:px-0 flex-wrap justify-center">
-      <Link href="/blog">
-        <Button variant="outline" className="mr-2 mb-2">
-          All
-        </Button>
-      </Link>
-
-      {tags.map((tag) => (
-        <Link href={`/blog/tag/${tag.slug}`} key={tag.id}>
-          <Button variant="outline" className="mr-2 mb-2">
-            {tag.name}
-          </Button>
-        </Link>
-      ))}
-    </div>
-  );
-}
diff --git a/src/app/(external-pages)/blog/[slug]/BlogContent.tsx b/src/app/(external-pages)/blog/[slug]/BlogContent.tsx
deleted file mode 100644
index 200e44d0..00000000
--- a/src/app/(external-pages)/blog/[slug]/BlogContent.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-'use client';
-
-import { getTipTapExtention } from '@/components/tip-tap-Editor/extensions';
-import type { Table } from '@/types';
-import { generateHTML } from '@tiptap/core';
-
-export function BlogContent({
-  jsonContent,
-}: {
-  jsonContent: Table<'internal_blog_posts'>['json_content'];
-}) {
-  const validContent =
-    typeof jsonContent === 'string'
-      ? JSON.parse(jsonContent)
-      : typeof jsonContent === 'object' && jsonContent !== null
-        ? jsonContent
-        : {};
-  return (
-    <div
-      dangerouslySetInnerHTML={{
-        __html: generateHTML(
-          validContent,
-          getTipTapExtention({ placeholder: 'Write your blog post...' }),
-        ),
-      }}
-    />
-  );
-}
diff --git a/src/app/(external-pages)/blog/[slug]/BlogContentWrapper.tsx b/src/app/(external-pages)/blog/[slug]/BlogContentWrapper.tsx
deleted file mode 100644
index e183c041..00000000
--- a/src/app/(external-pages)/blog/[slug]/BlogContentWrapper.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-'use client';
-
-import { Skeleton } from '@/components/ui/skeleton';
-import { Table } from '@/types';
-import dynamic from 'next/dynamic';
-import { Suspense } from 'react';
-
-const BlogContent = dynamic(
-  () => import('./BlogContent').then((m) => m.BlogContent),
-  { ssr: false },
-);
-
-export function BlogContentWrapper({
-  jsonContent,
-}: {
-  jsonContent: Table<'internal_blog_posts'>['json_content'];
-}) {
-  return (
-    <Suspense fallback={<Skeleton className="w-full h-6" />}>
-      <BlogContent jsonContent={jsonContent} />
-    </Suspense>
-  );
-}
diff --git a/src/app/(external-pages)/blog/[slug]/page.tsx b/src/app/(external-pages)/blog/[slug]/page.tsx
deleted file mode 100644
index c22cfb7f..00000000
--- a/src/app/(external-pages)/blog/[slug]/page.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import {
-  anonGetPublishedBlogPostBySlug,
-  anonGetPublishedBlogPosts,
-} from "@/data/anon/internalBlog";
-
-import { T } from "@/components/ui/Typography";
-import type { Metadata } from "next";
-import { notFound } from "next/navigation";
-import { z } from "zod";
-import AuthorCard from "../AuthorCard";
-import { BlogContentWrapper } from "./BlogContentWrapper";
-
-const paramsSchema = z.object({
-  slug: z.string(),
-});
-
-// Return a list of `params` to populate the [slug] dynamic segment
-export async function generateStaticParams() {
-  const posts = await anonGetPublishedBlogPosts();
-
-  return posts.map((post) => ({
-    slug: post.slug,
-  }));
-}
-
-export async function generateMetadata({
-  params,
-}: {
-  params: unknown;
-}): Promise<Metadata> {
-  // read route params
-  const { slug } = paramsSchema.parse(params);
-  const post = await anonGetPublishedBlogPostBySlug(slug);
-
-  console.log(post)
-
-  return {
-    title: `${post.title} | Blog | Nextbase Boilerplate`,
-    description: post.summary,
-    openGraph: {
-      title: `${post.title} | Blog | Nextbase Boilerplate`,
-      description: post.summary,
-      type: "website",
-      images: post.cover_image ? [post.cover_image] : undefined,
-    },
-    twitter: {
-      images: post.cover_image ? [post.cover_image] : undefined,
-      title: `${post.title} | Blog | Nextbase Boilerplate`,
-      card: "summary_large_image",
-      site: "@usenextbase",
-      description: post.summary,
-    },
-  };
-}
-export default async function BlogPostPage({ params }: { params: unknown }) {
-  try {
-    const { slug } = paramsSchema.parse(params);
-    const post = await anonGetPublishedBlogPostBySlug(slug);
-
-    return (
-      <div className="relative w-full space-y-8 px-4 md:px-0 max-w-4xl mx-auto">
-        {post.cover_image ? (
-          <img
-            src={post.cover_image}
-            alt={post.title}
-            className="aspect-[16/9] w-full rounded-2xl bg-gray-100 object-cover sm:aspect-[2/1] lg:aspect-[3/2]"
-          />
-        ) : null}
-        <div className="prose prose-lg dark:prose-invert prose-headings:font-display font-default focus:outline-none max-w-full">
-          <h1>{post.title}</h1>
-          <BlogContentWrapper jsonContent={post.json_content} />
-        </div>
-        {post?.internal_blog_author_posts[0]?.internal_blog_author_profiles ? (
-          <>
-            <T.H1 className="pb-4">Author</T.H1>
-            <AuthorCard
-              author={
-                post.internal_blog_author_posts[0].internal_blog_author_profiles
-              }
-            />
-          </>
-        ) : null}
-      </div>
-    );
-  } catch (error) {
-    return notFound();
-  }
-}
diff --git a/src/app/(external-pages)/blog/authors/[authorId]/page.tsx b/src/app/(external-pages)/blog/authors/[authorId]/page.tsx
deleted file mode 100644
index 15ef2317..00000000
--- a/src/app/(external-pages)/blog/authors/[authorId]/page.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { T } from '@/components/ui/Typography';
-import {
-  anonGetBlogPostsByAuthorId,
-  anonGetOneAuthor,
-} from '@/data/anon/internalBlog';
-import moment from 'moment';
-import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
-import { z } from 'zod';
-
-const paramsSchema = z.object({
-  authorId: z.string(),
-});
-
-export default async function BlogPostPage({ params }: { params: unknown }) {
-  const { authorId } = paramsSchema.parse(params);
-
-  const author = await anonGetOneAuthor(authorId);
-  const blogs = await anonGetBlogPostsByAuthorId(authorId);
-  try {
-    return (
-      <div className="space-y-8 w-full">
-        <div className="flex items-center flex-col space-y-4">
-          <div className="space-y-3 mb-6 text-center">
-            <T.Subtle>Blogs</T.Subtle>
-            <T.H1>All {author[0].display_name}'s posts</T.H1>
-            <T.P className="text-xl leading-[30px] text-muted-foreground">
-              Here is a collection of the latest blog posts
-            </T.P>
-          </div>
-        </div>
-        <div className="flex gap-5 flex-col">
-          <Suspense fallback={<T.Subtle>Loading authors...</T.Subtle>}>
-            <div className="space-y-2 mx-4 sm:mx-8 md:mx-0">
-              <div className="mx-auto mt-16 grid max-w-2xl grid-cols-1 gap-x-8 gap-y-20 lg:mx-0 lg:max-w-none lg:grid-cols-3">
-                {blogs.map(({ internal_blog_posts }) => (
-                  <article
-                    key={internal_blog_posts?.id}
-                    className="flex max-w-xl flex-col items-start justify-start"
-                  >
-                    <div className="relative w-full">
-                      <img
-                        src={
-                          internal_blog_posts?.cover_image ??
-                          '/images/nextbase-logo.png'
-                        }
-                        alt={internal_blog_posts?.title}
-                        className="aspect-[16/9] w-full rounded-2xl bg-gray-100  object-cover sm:aspect-[2/1] lg:aspect-[3/2]"
-                      />
-                    </div>
-                    <div className="max-w-xl">
-                      <div className="mt-5 flex items-center gap-x-4 text-xs">
-                        <time
-                          dateTime={internal_blog_posts?.created_at}
-                          className="text-muted-foreground dark:text-secondary-foreground uppercase"
-                        >
-                          {moment(internal_blog_posts?.created_at).format(
-                            'MMM D, YYYY',
-                          )}
-                        </time>
-                      </div>
-                      <div className="group relative">
-                        <h3 className="mt-2 text-2xl font-semibold text-foreground dark:text-card-foreground group-hover:text-muted-foreground dark:group-hover:text-secondary-foreground">
-                          <a href={`/blog/${internal_blog_posts?.slug}`}>
-                            <span className="absolute inset-0" />
-                            {internal_blog_posts?.title}
-                          </a>
-                        </h3>
-                        <p className="mt-2 line-clamp-3 text-base text-muted-foreground dark:text-muted-foreground">
-                          {internal_blog_posts?.summary}
-                        </p>
-                      </div>
-                    </div>
-                  </article>
-                ))}
-              </div>
-            </div>
-          </Suspense>
-        </div>
-      </div>
-    );
-  } catch (error) {
-    return notFound();
-  }
-}
diff --git a/src/app/(external-pages)/blog/authors/page.tsx b/src/app/(external-pages)/blog/authors/page.tsx
deleted file mode 100644
index 357357e6..00000000
--- a/src/app/(external-pages)/blog/authors/page.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { T } from '@/components/ui/Typography';
-import { anonGetAllAuthors } from '@/data/anon/internalBlog';
-import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
-import AuthorCard from '../AuthorCard';
-
-export default async function BlogPostPage({ params }: { params: unknown }) {
-  const authors = await anonGetAllAuthors();
-  try {
-    return (
-      <div className="space-y-8 w-full">
-        <div className="flex items-center flex-col space-y-4">
-          <div className="space-y-3 mb-6 text-center">
-            <T.Subtle>Contributions</T.Subtle>
-            <T.H1>Authors</T.H1>
-            <T.P className="text-xl leading-[30px] text-muted-foreground">
-              Our blog is made possible because of contributions from these
-              awesome folks!
-            </T.P>
-          </div>
-        </div>
-        <div className="flex gap-5 flex-col">
-          <Suspense fallback={<T.Subtle>Loading authors...</T.Subtle>}>
-            {authors.map((author) => (
-              <AuthorCard author={author} key={author.user_id} />
-            ))}
-          </Suspense>
-        </div>
-      </div>
-    );
-  } catch (error) {
-    return notFound();
-  }
-}
diff --git a/src/app/(external-pages)/blog/layout.css b/src/app/(external-pages)/blog/layout.css
deleted file mode 100644
index cc1c72cc..00000000
--- a/src/app/(external-pages)/blog/layout.css
+++ /dev/null
@@ -1,3 +0,0 @@
-html {
-  scroll-behavior: smooth;
-}
diff --git a/src/app/(external-pages)/blog/layout.tsx b/src/app/(external-pages)/blog/layout.tsx
deleted file mode 100644
index af27dff1..00000000
--- a/src/app/(external-pages)/blog/layout.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import './layout.css';
-import { Navbar } from './Navbar';
-
-export default function Layout({ children }: { children: React.ReactNode }) {
-  return (
-    <div>
-      {/* <Navbar /> */}
-      <div className="relative mx-auto md:container sm:px-2 md:px-6 space-x-4 sm:space-x-6 lg:space-x-8 xl:space-x-12">
-        <div className="py-8 sm:py-12 lg:py-16 xl:py-20">{children}</div>
-      </div>
-    </div>
-  );
-}
diff --git a/src/app/(external-pages)/blog/tag/[tagSlug]/page.tsx b/src/app/(external-pages)/blog/tag/[tagSlug]/page.tsx
deleted file mode 100644
index c816a4be..00000000
--- a/src/app/(external-pages)/blog/tag/[tagSlug]/page.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { T } from '@/components/ui/Typography';
-import { Metadata } from 'next';
-import { z } from 'zod';
-import { PublicBlogList } from '../../PublicBlogList';
-import { TagsNav } from '../../TagsNav';
-import {
-  anonGetAllBlogTags,
-  anonGetPublishedBlogPosts,
-  anonGetPublishedBlogPostsByTagSlug,
-  anonGetTagBySlug,
-} from '@/data/anon/internalBlog';
-import { Suspense } from 'react';
-
-const BlogListByTagPageParamsSchema = z.object({
-  tagSlug: z.string(),
-});
-
-export async function generateMetadata({
-  params,
-}: {
-  params: unknown;
-}): Promise<Metadata> {
-  // read route params
-  const { tagSlug } = BlogListByTagPageParamsSchema.parse(params);
-  const tag = await anonGetTagBySlug(tagSlug);
-
-  return {
-    title: `${tag.name} | Blog | Nextbase Ultimate`,
-    description: tag.description,
-  };
-}
-
-async function Tags() {
-  const tags = await anonGetAllBlogTags();
-  return <TagsNav tags={tags} />;
-}
-
-async function BlogList({ tagSlug }: { tagSlug: string }) {
-  const blogPosts = await anonGetPublishedBlogPostsByTagSlug(tagSlug);
-  return <PublicBlogList blogPosts={blogPosts} />;
-}
-
-export default async function BlogListByTagPage({
-  params,
-}: {
-  params: unknown;
-}) {
-  const { tagSlug } = BlogListByTagPageParamsSchema.parse(params);
-
-  const tag = await anonGetTagBySlug(tagSlug);
-
-  return (
-    <div className="space-y-8 w-full">
-      <div className="flex items-center flex-col space-y-4">
-        <div className="space-y-3 text-center">
-          <T.Subtle>Blog</T.Subtle>
-          <T.H1>{tag.name}</T.H1>
-          <T.Subtle>{tag.description}</T.Subtle>
-        </div>
-        <Suspense fallback={<T.Subtle>Loading tags...</T.Subtle>}>
-          <Tags />
-        </Suspense>
-      </div>
-      <Suspense fallback={<T.Subtle>Loading posts...</T.Subtle>}>
-        <BlogList tagSlug={tagSlug} />
-      </Suspense>
-    </div>
-  );
-}
diff --git a/src/data/feedback.ts b/src/data/feedback.ts
index d2667813..213ce51a 100644
--- a/src/data/feedback.ts
+++ b/src/data/feedback.ts
@@ -8,10 +8,17 @@ import { serverGetLoggedInUser } from '@/utils/server/serverGetLoggedInUser';
 import { serverGetUserType } from '@/utils/server/serverGetUserType';
 import { userRoles } from '@/utils/userTypes';
 import { revalidatePath } from 'next/cache';
-import { createFeedbackAddedToRoadmapUpdatedNotification, createFeedbackPriorityChangedNotification, createFeedbackReceivedCommentNotification, createFeedbackStatusChangedNotification, createFeedbackTypeUpdatedNotification, createFeedbackVisibilityUpdatedNotification, createUpdateFeedbackOpenForCommentsNotification } from './user/notifications';
+import {
+  createFeedbackAddedToRoadmapUpdatedNotification,
+  createFeedbackPriorityChangedNotification,
+  createFeedbackReceivedCommentNotification,
+  createFeedbackStatusChangedNotification,
+  createFeedbackTypeUpdatedNotification,
+  createFeedbackVisibilityUpdatedNotification,
+  createUpdateFeedbackOpenForCommentsNotification,
+} from './user/notifications';
 import { getUserFullName } from './user/user';
 
-
 export async function addCommentToInternalFeedbackThread({
   feedbackId,
   content,
@@ -42,7 +49,13 @@ export async function addCommentToInternalFeedbackThread({
      * App admins can comment on all the feedbacks
      * normal user can comment on their own feedback and the one's with open for public
      */
-    if (!(feedbackThread?.open_for_public_discussion || feedbackThread?.user_id == user.id || userRoleType == userRoles.ADMIN)) {
+    if (
+      !(
+        feedbackThread?.open_for_public_discussion ||
+        feedbackThread?.user_id == user.id ||
+        userRoleType == userRoles.ADMIN
+      )
+    ) {
       return {
         status: 'error',
         message: 'This feedback thread is not open for public discussion',
@@ -61,7 +74,7 @@ export async function addCommentToInternalFeedbackThread({
       };
     }
 
-    const userFullName = await getUserFullName(user.id)
+    const userFullName = await getUserFullName(user.id);
 
     await createFeedbackReceivedCommentNotification({
       feedbackId,
@@ -69,7 +82,7 @@ export async function addCommentToInternalFeedbackThread({
       comment: content,
       commenterId: user.id,
       commenterName: userFullName ?? 'User',
-    })
+    });
 
     revalidatePath('/feedback', 'layout');
     revalidatePath(`/feedback/${feedbackId}`, 'layout');
@@ -77,7 +90,6 @@ export async function addCommentToInternalFeedbackThread({
       status: 'success',
       data,
     };
-
   } catch (error) {
     return {
       status: 'error',
@@ -166,7 +178,7 @@ export async function adminUpdateFeedbackStatus({
       .from('internal_feedback_threads')
       .select('user_id, status')
       .eq('id', feedbackId)
-      .single()
+      .single();
 
   if (feedbackThreadError) {
     return {
@@ -177,7 +189,7 @@ export async function adminUpdateFeedbackStatus({
   const { error } = await supabaseAdminClient
     .from('internal_feedback_threads')
     .update({ status })
-    .eq('id', feedbackId)
+    .eq('id', feedbackId);
 
   if (error) {
     return { status: 'error', message: error.message };
@@ -215,7 +227,7 @@ export async function adminUpdateFeedbackType({
       .from('internal_feedback_threads')
       .select('user_id, type')
       .eq('id', feedbackId)
-      .single()
+      .single();
 
   if (feedbackThreadError) {
     return {
@@ -266,7 +278,7 @@ export async function adminUpdateFeedbackPriority({
       .from('internal_feedback_threads')
       .select('user_id, priority')
       .eq('id', feedbackId)
-      .single()
+      .single();
 
   if (feedbackThreadError) {
     return {
@@ -331,8 +343,8 @@ export async function adminToggleFeedbackFromRoadmap({
   await createFeedbackAddedToRoadmapUpdatedNotification({
     feedbackId,
     isInRoadmap,
-    updaterId: user.id
-  })
+    updaterId: user.id,
+  });
 
   revalidatePath('/feedback', 'page');
   revalidatePath(`/feedback/${feedbackId}`, 'page');
@@ -373,8 +385,8 @@ export async function adminToggleFeedbackOpenForComments({
   await createUpdateFeedbackOpenForCommentsNotification({
     feedbackId,
     isOpenForComments,
-    updaterId: user.id
-  })
+    updaterId: user.id,
+  });
 
   revalidatePath('/feedback', 'page');
   revalidatePath(`/feedback/${feedbackId}`, 'page');
@@ -408,8 +420,8 @@ export async function adminToggleFeedbackVisibility({
   await createFeedbackVisibilityUpdatedNotification({
     feedbackId,
     isPubliclyVisible,
-    updaterId: user.id
-  })
+    updaterId: user.id,
+  });
 
   revalidatePath('/feedback', 'page');
   revalidatePath(`/feedback/${feedbackId}`, 'page');
@@ -417,7 +429,13 @@ export async function adminToggleFeedbackVisibility({
   return { status: 'success' };
 }
 
-export async function getFeedbackStakeholdersExceptMentionedUser({ feedbackId, excludedUserId }: { feedbackId: string, excludedUserId?: string }): Promise<string[]> {
+export async function getFeedbackStakeholdersExceptMentionedUser({
+  feedbackId,
+  excludedUserId,
+}: {
+  feedbackId: string;
+  excludedUserId?: string;
+}): Promise<string[]> {
   // return all the user ids that are concerned with the feedback conversation including owner
   // except the one mentioned, the mentioned user could be owner of the feedback thread or the commentator or logged in user
   try {
@@ -430,15 +448,15 @@ export async function getFeedbackStakeholdersExceptMentionedUser({ feedbackId, e
     const feedbackCommentatorsQuery = supabaseClient
       .from('internal_feedback_comments')
       .select('user_id')
-      .eq('thread_id', feedbackId)
+      .eq('thread_id', feedbackId);
 
-    const [feedbackOwnerResult, feedbackCommentatorsResult] = await Promise.all([
-      feedbackOwnerQuery,
-      feedbackCommentatorsQuery
-    ]);
+    const [feedbackOwnerResult, feedbackCommentatorsResult] = await Promise.all(
+      [feedbackOwnerQuery, feedbackCommentatorsQuery],
+    );
 
     if (feedbackOwnerResult.error) throw feedbackOwnerResult.error;
-    if (feedbackCommentatorsResult.error) throw feedbackCommentatorsResult.error;
+    if (feedbackCommentatorsResult.error)
+      throw feedbackCommentatorsResult.error;
 
     const stakeholders = new Set<string>();
 
@@ -446,7 +464,7 @@ export async function getFeedbackStakeholdersExceptMentionedUser({ feedbackId, e
       stakeholders.add(feedbackOwnerResult.data[0].user_id);
     }
 
-    feedbackCommentatorsResult.data.forEach(comment => {
+    feedbackCommentatorsResult.data.forEach((comment) => {
       stakeholders.add(comment.user_id);
     });
 
@@ -456,6 +474,7 @@ export async function getFeedbackStakeholdersExceptMentionedUser({ feedbackId, e
 
     return Array.from(stakeholders);
   } catch (error) {
+    console.log('error in getFeedbackStakeholdersExceptMentionedUser: ', error);
     throw error;
   }
 }