Skip to content
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

Sync production into staging #104

Merged
merged 3 commits into from
Jan 8, 2025
Merged

Sync production into staging #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
736d198
sync(staff): prod -> main
mezotv Jan 7, 2025
4a5d8af
sync: full prod to staging sync
mezotv Jan 7, 2025
1dd490a
chore(style): format files
mezotv Jan 7, 2025
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
5 changes: 4 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
"css.customData": [
".vscode/tailwind.json"
],
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[typescriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
}
52 changes: 28 additions & 24 deletions app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { PlausibleScript } from '@/components/plausible-script'
import { CookieProvider } from '@/components/cookies'
import { IdTokenJWT } from '@/helpers/oauth/types'
import { getIdToken } from '@/helpers/oauth'
import { ThemeProvider } from 'next-themes'
import Footer from '@/components/Footer'
import Navbar from '@/components/Navbar'
import { Inter } from 'next/font/google'
import Alert from '@/components/Alert'
import Providers from './providers'
import React from 'react'
import './globals.css'

const inter = Inter({ subsets: ['latin'] })

export default function RootLayout({
Expand All @@ -16,30 +20,30 @@ export default function RootLayout({
const idToken = getIdToken()

return (
<html
lang="en"
suppressHydrationWarning
>
<html lang="en">
<body className={inter.className}>
<script
defer
data-domain="wouldyoubot.gg"
src="https://stats.wouldyoubot.gg/js/script.js"
/>
<Providers>
<Alert
href="/premium"
className="bg-brand-primary"
active
>
<b>Would You Bot</b> • Upgrade your server with Premium
</Alert>
<div className="w-full relative min-h-dvh flex flex-col">
<Navbar idToken={idToken} />
{children}
<Footer />
</div>
</Providers>
<PlausibleScript />
<ThemeProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
>
<CookieProvider>
<Alert
href="/premium"
className="bg-brand-primary text-white"
active
>
<b>Would You Bot</b> • Upgrade your server with Premium
</Alert>
<div className="w-full relative min-h-dvh flex flex-col">
<Navbar idToken={idToken as unknown as IdTokenJWT} />
{children}
<Footer />
</div>
</CookieProvider>
</ThemeProvider>
</body>
</html>
)
Expand Down
3 changes: 1 addition & 2 deletions app/page.tsx
View file
Open in desktop
mezotv marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ const Home = async () => {

const serverData = await serverResponse.json()
const servers = JSON.parse(serverData.result ?? null) ?? []
const filteredServers = servers.filter((g: any) => g.name !== 'Pornhub')

return (
<>
Expand All @@ -70,7 +69,7 @@ const Home = async () => {
initialRatherQuestion={getRandomQuestion('rather')}
initialNhieQuestion={getRandomQuestion('nhie')}
serverCount={serverCount}
servers={filteredServers}
servers={servers}
/>
</main>
<HomeSchemaMetadata />
Expand Down
Loading