Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions app/page.tsx → app/(main)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import { useRef } from "react"
import styled from "styled-components"
import { motion, useInView } from "framer-motion"
import { PotionBackground } from "./components/PotionBackground"
import { organizers } from "./info/organizers"
import { links } from "./siteConfig"
import { PotionBackground } from "../components/PotionBackground"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit "Remove layout, page, and styles for Talk and Events sections" would be removed if we only had one layout file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, I can restructure to have one layout that's more dynamic instead of using two layouts.

import { organizers } from "../info/organizers"
import { links } from "../siteConfig"

export default function Home() {
// Add refs for each animated section
Expand Down
12 changes: 5 additions & 7 deletions app/layout.tsx → app/(talk)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { ReactNode } from "react"
import type { Metadata } from "next"
import "./globals.css"
import { Header } from "./components/Header"
import { Footer } from "./components/Footer"
import { siteConfig } from "./siteConfig"
import StyledComponentsRegistry from "./StyledComponentsRegistry"
import "../globals.css"
import { Header } from "../components/Header"
import { siteConfig } from "../siteConfig"
import StyledComponentsRegistry from "../StyledComponentsRegistry"

export const metadata: Metadata = {
title: siteConfig.title,
Expand All @@ -18,7 +17,7 @@ export const metadata: Metadata = {
}
}

export default function RootLayout({
export default function TalkRootLayout({
children
}: Readonly<{
children: ReactNode
Expand All @@ -33,7 +32,6 @@ export default function RootLayout({
<StyledComponentsRegistry>
<Header />
{children}
<Footer />
</StyledComponentsRegistry>
</body>
</html>
Expand Down
File renamed without changes.
7 changes: 7 additions & 0 deletions app/(talk)/talk/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default async function Talk() {
return (
<div>
<h1>Talk</h1>
</div>
)
}
File renamed without changes.
15 changes: 0 additions & 15 deletions app/talk/page.tsx

This file was deleted.