bump next, fix background color flash

3 years ago · 68570b3bb7
parent 8b0b172f7d
commit 68570b3bb7
7 changed files with 10 additions and 12 deletions
--- a/client/app/(auth)/signup/page.tsx
+++ b/client/app/(auth)/signup/page.tsx
@ -1,5 +1,4 @@
 import Auth from "@components/auth"
-import config from "@lib/config"
 import { getRequiresPasscode } from "pages/api/auth/requires-passcode"

 const getPasscode = async () => {
--- a/client/app/(profiles)/mine/page.tsx
+++ b/client/app/(profiles)/mine/page.tsx
@ -3,12 +3,10 @@ import { notFound, useRouter } from "next/navigation"
 import { cookies } from "next/headers"
 import { getPostsByUser } from "app/prisma"
 import PostList from "@components/post-list"
+
 export default async function Mine() {
-	// TODO: fix router usage
-	// const router = useRouter()
 	const userId = cookies().get(USER_COOKIE_NAME)?.value
 	if (!userId) {
-		// return router.push("/signin")
 		return notFound()
 	}

--- a/client/app/layout.tsx
+++ b/client/app/layout.tsx
@ -9,9 +9,10 @@ interface RootLayoutProps {
 export default function RootLayout({ children }: RootLayoutProps) {
 	return (
 		<ServerThemeProvider
-			disableTransitionOnChange
 			cookieName="drift-theme"
+			// disableTransitionOnChange
 			attribute="data-theme"
+			enableColorScheme
 		>
 			<html lang="en">
 				<head>
--- a/client/app/root-layout-wrapper.tsx
+++ b/client/app/root-layout-wrapper.tsx
@ -27,10 +27,10 @@ export function LayoutWrapper({ children }: { children: React.ReactNode }) {
 			warning: "var(--warning)"
 		},
 		expressiveness: {
-			dropdownBoxShadow: "0 0 0 1px var(--light-gray)",
-			shadowSmall: "0 0 0 1px var(--light-gray)",
-			shadowLarge: "0 0 0 1px var(--light-gray)",
-			shadowMedium: "0 0 0 1px var(--light-gray)"
+			dropdownBoxShadow: "0 0 0 1px var(--lighter-gray)",
+			shadowSmall: "0 0 0 1px var(--lighter-gray)",
+			shadowLarge: "0 0 0 1px var(--lighter-gray)",
+			shadowMedium: "0 0 0 1px var(--lighter-gray)",
 		},
 		layout: {
 			gap: "var(--gap)",
--- a/client/lib/render-markdown.tsx
+++ b/client/lib/render-markdown.tsx
@ -68,7 +68,7 @@ renderer.listitem = (text, task, checked) => {
 		)
 	}

-	return `<li>${text}</li>`
+	return <li>{text}</li>
 }

 //@ts-ignore
--- a/client/pages/api/welcome.ts
+++ b/client/pages/api/welcome.ts
@ -8,8 +8,6 @@ export const getWelcomeContent = async () => {
 	const introContent = config.welcome_content
 	const introTitle = config.welcome_title
 	
-
-	console.log(renderMarkdown(introContent))
 	return {
 		title: introTitle,
 		content: introContent,
--- a/client/styles/globals.css
+++ b/client/styles/globals.css
@ -99,6 +99,8 @@ body {
 	font-family: var(--font-sans);
 	display: flex;
 	flex-direction: column;
+	/* TODO: this should be unnecessary. Overides the browser background for color-scheme while geist-ui catches up  */
+	background: var(--bg);
 }

 p {