Skip to content

Commit

Permalink
Lint + remove extra divs
Browse files Browse the repository at this point in the history
  • Loading branch information
leomet07 committed Jan 30, 2024
1 parent fc34222 commit 46a0f72
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 62 deletions.
100 changes: 48 additions & 52 deletions pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import LoadingBar from "react-top-loading-bar";
import { generateMetaTags } from "../utils/generateMetaTags";
import { useState, useEffect } from "react";
import { useRouter } from "next/router";
import { ThemeProvider } from 'next-themes'
import { ThemeProvider } from "next-themes";
import "../styles/globals.css";

function MyApp(props: AppProps) {
Expand All @@ -34,59 +34,55 @@ function MyApp(props: AppProps) {

return (
<ThemeProvider defaultTheme="light" disableTransitionOnChange>
<div>
<Head>
<link rel="icon" href="/favicon.ico" />
<link
rel="apple-touch-icon"
sizes="180x180"
href="/apple-touch-icon.png?v=1.0"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="/favicon-32x32.png?v=1.0"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/favicon-16x16.png?v=1.0"
/>
<link rel="manifest" href="/site.webmanifest?v=1.0" />
<link
rel="mask-icon"
href="/safari-pinned-tab.svg?v=1.0"
color="#5bbad5"
/>
<link rel="shortcut icon" href="/favicon.ico?v=1.0" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />

{generateMetaTags(title, description, meta_url)}
</Head>
<LoadingBar
color='#4283e4'
progress={progress}
onLoaderFinished={() => setProgress(0)}
waitingTime={500}
<Head>
<link rel="icon" href="/favicon.ico" />
<link
rel="apple-touch-icon"
sizes="180x180"
href="/apple-touch-icon.png?v=1.0"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="/favicon-32x32.png?v=1.0"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/favicon-16x16.png?v=1.0"
/>
<div>
<div id="navbar">
<Navbar />
</div>
<div id="main">
<Component {...pageProps} />
</div>
<Footer />
<Script
async
src="https://umami.stuyspec.com/script.js"
data-website-id="37284781-2b87-4063-8035-5a7f3e7ab6d3"
></Script>
</div>
<link rel="manifest" href="/site.webmanifest?v=1.0" />
<link
rel="mask-icon"
href="/safari-pinned-tab.svg?v=1.0"
color="#5bbad5"
/>
<link rel="shortcut icon" href="/favicon.ico?v=1.0" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />

{generateMetaTags(title, description, meta_url)}
</Head>
<LoadingBar
color="#4283e4"
progress={progress}
onLoaderFinished={() => setProgress(0)}
waitingTime={500}
/>
<div id="navbar">
<Navbar />
</div>
<div id="main">
<Component {...pageProps} />
</div>
<Footer />
<Script
async
src="https://umami.stuyspec.com/script.js"
data-website-id="37284781-2b87-4063-8035-5a7f3e7ab6d3"
></Script>
</ThemeProvider>
);
}
Expand Down
18 changes: 8 additions & 10 deletions pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,15 @@ async function fetch_addtional_articles(skip?: number, max?: number) {

function Home(props: Props) {
return (
<div>
<main id={styles.main}>
<MixedArticleDisplay
articles={props.articles}
display_department={true}
additional_article_function={fetch_addtional_articles}
/>
</main>
</div>
<main id={styles.main}>
<MixedArticleDisplay
articles={props.articles}
display_department={true}
additional_article_function={fetch_addtional_articles}
/>
</main>
);
};
}

export default Home;

Expand Down

0 comments on commit 46a0f72

Please sign in to comment.