Skip to content

Fixed ProgressBar #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NiallJoeMaher merged 6 commits into from
Oct 19, 2023
Merged

Fixed ProgressBar #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1696fc7
Added 'gradient' CSS for 'NextTopLoader'
seog-jun Oct 18, 2023
de7dcc1
Installed 'nextjs-toploader'
seog-jun Oct 18, 2023
1b6366c
Added 'NextTopLoader' instead of 'ProgressBar'
seog-jun Oct 18, 2023
ec21e24
Added 'linear' to keep the same speed
seog-jun Oct 19, 2023
c866d96
Reference is added to 'next-env.d.ts'
seog-jun Oct 19, 2023
5f52164
Removed 'ProgressBar' component and unused package
seog-jun Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import "../styles/globals.css";
import { headers } from "next/headers";
import Fathom from "@/components/Fathom/Fathom";
// import ProgressBar from "@/components/ProgressBar/ProgressBar";
import ThemeProvider from "@/components/Theme/ThemeProvider";
import { TRPCReactProvider } from "@/server/trpc/react";
import Footer from "@/components/Footer/Footer";
import Nav from "@/components/Nav/Nav";
import { getServerAuthSession } from "@/server/auth";
import AuthProvider from "@/context/AuthProvider";
import NextTopLoader from "nextjs-toploader";
// @TODO layout app in way that doesn't need to use client session check

export const metadata = {
title: "Codú - The Web Developer Community",
description:
Expand All @@ -31,9 +30,13 @@ export default async function RootLayout({
const session = await getServerAuthSession();
return (
<html lang="en" className="h-full">
{/* <ProgressBar /> Needs to be fixed */}
<Fathom />
<body className="h-full" suppressHydrationWarning={true}>
<NextTopLoader
easing="linear"
showSpinner={false}
template='<div class="bar" role="bar"><div class="gradient"></div></div>'
/>
<AuthProvider>
<ThemeProvider>
<TRPCReactProvider headers={headers()}>
Expand Down
56 changes: 0 additions & 56 deletions components/ProgressBar/ProgressBar.tsx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion next-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
/// <reference types="next/navigation-types/compat/navigation" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
44 changes: 27 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"@sentry/nextjs": "^7.73.0",
"@styled-icons/material": "^10.47.0",
"@tailwindcss/forms": "^0.5.6",
"@tanem/react-nprogress": "^5.0.49",
"@tanstack/react-query": "^4.35.0",
"@tiptap/extension-color": "^2.1.6",
"@tiptap/extension-highlight": "^2.1.6",
Expand Down Expand Up @@ -77,6 +76,7 @@
"next-auth": "^4.23.1",
"next-superjson-plugin": "^0.5.9",
"next-themes": "^0.2.1",
"nextjs-toploader": "^1.5.3",
"nodemailer": "^6.9.4",
"prismjs": "^1.29.0",
"react": "^18.2.0",
Expand Down
16 changes: 16 additions & 0 deletions styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,3 +350,19 @@ table div {
transform: translate(24px, 0);
}
}

@layer {
.gradient {
background-image: linear-gradient(
to right,
rgb(251, 146, 60),
rgb(219, 39, 119)
);
height: 0.25rem;
width: 100%;
left: 0px;
top: 0px;
position: fixed;
z-index: 50;
}
}