Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
16 changes: 10 additions & 6 deletions front_end/bun.lock

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

1 change: 1 addition & 0 deletions front_end/messages/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@
"communityDescription": "Popis komunity",
"contentTranslatedHeaderText": "Některý obsah na této stránce je automaticky přeložen a může být nepřesný.",
"showOriginalContent": "Zobrazit originál",
"translated_by": "přeloženo pomocí",
"nextQuestion": "Další otázka",
"fullName": "Celé jméno",
"country": "Země pobytu",
Expand Down
1 change: 1 addition & 0 deletions front_end/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,7 @@
"unread": "unread",
"contentTranslatedHeaderText": "Some content on this page is automatically translated, and may be inaccurate.",
"showOriginalContent": "Show original",
"translated_by": "translated by",
"nextQuestion": "Next Question",
"next": "Next",
"fullName": "Full Name",
Expand Down
1 change: 1 addition & 0 deletions front_end/messages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,7 @@
"communityDescription": "Descripción de la Comunidad",
"contentTranslatedHeaderText": "Parte del contenido en esta página se traduce automáticamente y puede ser inexacto.",
"showOriginalContent": "Mostrar original",
"translated_by": "traducido por",
"nextQuestion": "Siguiente Pregunta",
"fullName": "Nombre Completo",
"country": "País de Residencia",
Expand Down
1 change: 1 addition & 0 deletions front_end/messages/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,7 @@
"unread": "não lido",
"contentTranslatedHeaderText": "Algum conteúdo nesta página foi traduzido automaticamente e pode estar incorreto.",
"showOriginalContent": "Mostrar original",
"translated_by": "traduzido por",
"discard": "Descartar",
"onboardingStep4AlmostDone": "Você está quase terminando este tutorial!",
"onboardingStep5WellDone": "Muito bem!",
Expand Down
1 change: 1 addition & 0 deletions front_end/messages/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -1064,6 +1064,7 @@
"unread": "未讀",
"contentTranslatedHeaderText": "此頁面上的部分內容是自動翻譯的,可能不準確。",
"showOriginalContent": "顯示原文",
"translated_by": "翻譯方",
"nextQuestion": "下一個問題",
"next": "下一步",
"fullName": "全名",
Expand Down
1 change: 1 addition & 0 deletions front_end/messages/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1039,6 +1039,7 @@
"communityDescription": "社区描述",
"contentTranslatedHeaderText": "此页面上的一些内容是自动翻译的,可能不准确。",
"showOriginalContent": "显示原文",
"translated_by": "翻译方",
"nextQuestion": "下一问题",
"fullName": "全名",
"country": "居住国家",
Expand Down
2 changes: 2 additions & 0 deletions front_end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
"react-merge-refs": "^2.1.1",
"react-tweet": "^3.3.0",
"remark": "^15.0.1",
"sanitize-html": "2.17.3",
"sass": "^1.99.0",
"sharp": "^0.34.5",
"storybook": "^9.1.20",
Expand All @@ -122,6 +123,7 @@
},
"devDependencies": {
"@eslint/eslintrc": "^3.3.0",
"@types/sanitize-html": "2.16.1",
"@types/jest": "^30.0.0",
"eslint": "^9.0.0",
"eslint-config-next": "^16.2.6",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Link from "next/link";

import Button from "@/components/ui/button";

import GlobalHeader from "../../../../(main)/components/headers/global_header";
import PageWrapper from "../../../../(main)/components/pagewrapper";

export const metadata = {
Expand All @@ -14,8 +13,7 @@ export const metadata = {
export default function ContestRules() {
return (
<>
<GlobalHeader />
<div className="mx-auto mt-12 flex w-full justify-center pb-0 pt-10">
<div className="mx-auto flex w-full justify-center pb-0 pt-10">
<Button
variant="secondary"
className="cursor-pointer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Image from "next/image";

import Button from "@/components/ui/button";

import GlobalHeader from "../../../../(main)/components/headers/global_header";
import PageWrapper from "../../../../(main)/components/pagewrapper";

export const metadata = {
Expand All @@ -14,8 +13,7 @@ export const metadata = {
export default function HowItWorks() {
return (
<>
<GlobalHeader />
<div className="mx-auto mt-12 flex w-full justify-center pb-0 pt-10">
<div className="mx-auto flex w-full justify-center pb-0 pt-10">
{" "}
<Button
variant="secondary"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { TopChrome } from "@/app/(main)/components/top_chrome";

import CookiesBanner from "../../../(main)/components/cookies_banner";
import Footer from "../../../(main)/components/footer";

Expand All @@ -7,7 +9,8 @@ export default async function RootLayout({
children: React.ReactNode;
}>) {
return (
<div className="h-full min-h-screen">
<div className="h-full min-h-screen pt-header">
<TopChrome />
<div className="h-full">{children}</div>
<CookiesBanner />
<Footer />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Link from "next/link";

import GlobalHeader from "@/app/(main)/components/headers/global_header";
import ServerProfileApi from "@/services/api/profile/profile.server";
import { getAllSheetsData } from "@/services/google_spreadsheets";

Expand All @@ -20,8 +19,7 @@ export default async function Page() {

return (
<>
<GlobalHeader />
<main className="mt-12 flex h-fit min-h-screen flex-col items-center justify-start p-3 sm:p-5">
<main className="flex h-fit min-h-screen flex-col items-center justify-start p-3 sm:p-5">
<h1 className="mb-1 text-2xl font-bold">
Bridgewater Forecasting Contest
</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Link from "next/link";

import Button from "@/components/ui/button";

import GlobalHeader from "../../../../(main)/components/headers/global_header";
import PageWrapper from "../../../../(main)/components/pagewrapper";

export const metadata = {
Expand All @@ -14,8 +13,7 @@ export const metadata = {
export default function NoticeAtCollection() {
return (
<>
<GlobalHeader />
<div className="mx-auto mt-12 flex w-full justify-center pb-0 pt-10">
<div className="mx-auto flex w-full justify-center pb-0 pt-10">
<Button
variant="secondary"
className="cursor-pointer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { google } from "googleapis";
import Image from "next/image";
import Link from "next/link";

import GlobalHeader from "@/app/(main)/components/headers/global_header";

import ResultsAnnouncement from "./components/results-announcement";
import ResultsDates from "./components/results-dates";
import ResultsHero from "./components/results-hero";
Expand Down Expand Up @@ -84,8 +82,7 @@ export default async function Page() {

return (
<>
<GlobalHeader />
<main className="mt-4 p-3 pt-12 sm:p-5 sm:pt-12 md:mt-5">
<main className="mt-4 p-3 sm:p-5 md:mt-5">
<div className="flex flex-col items-center gap-3">
<div className="flex w-full flex-col gap-3 md:flex-row">
<div className="flex w-full flex-col gap-3 md:w-1/2 lg:flex-row">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Hero from "./components/hero";
import OpenLeaderboard from "./components/openLeaderboard";
import Prize from "./components/prize";
import UndergradLeaderboard from "./components/undergradLeaderboard";
import GlobalHeader from "../../../../(main)/components/headers/global_header";

export const metadata = {
title: "Bridgewater | Metaculus",
Expand All @@ -21,8 +20,7 @@ export const metadata = {
export default function BridgewaterTournamentPage() {
return (
<>
<GlobalHeader />
<main className="mt-12 flex h-fit flex-col items-center justify-start p-3 sm:p-5">
<main className="flex h-fit flex-col items-center justify-start p-3 sm:p-5">
<div className="flex size-full flex-col items-center">
<div className="flex w-full flex-col gap-3 md:flex-row">
<div className="flex w-full flex-col gap-3 md:w-1/2 lg:flex-row">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { TopChrome } from "@/app/(main)/components/top_chrome";

import CookiesBanner from "../../../(main)/components/cookies_banner";
import Footer from "../../../(main)/components/footer";

Expand All @@ -7,7 +9,8 @@ export default async function RootLayout({
children: React.ReactNode;
}>) {
return (
<div className="flex min-h-screen flex-col">
<div className="flex min-h-screen flex-col pt-header">
<TopChrome />
<div className="flex-1">{children}</div>
<CookiesBanner />
<Footer />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import GlobalHeader from "@/app/(main)/components/headers/global_header";

import { Hero } from "./components/hero-section";

export const metadata = {
Expand All @@ -9,7 +7,6 @@ export const metadata = {
export default async function Page() {
return (
<div className="flex min-h-0 flex-1 flex-col">
<GlobalHeader />
<main
className="flex flex-1 flex-col items-center justify-center p-4"
style={{ minHeight: "calc(100vh - 160px)" }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Link from "next/link";

import Button from "@/components/ui/button";

import GlobalHeader from "../../../../(main)/components/headers/global_header";
import PageWrapper from "../../../../(main)/components/pagewrapper";

export const metadata = {
Expand All @@ -14,8 +13,7 @@ export const metadata = {
export default function ContestRules() {
return (
<>
<GlobalHeader />
<div className="mx-auto mt-12 flex w-full justify-center pb-0 pt-10">
<div className="mx-auto flex w-full justify-center pb-0 pt-10">
<Button
variant="secondary"
className="cursor-pointer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Image from "next/image";

import Button from "@/components/ui/button";

import GlobalHeader from "../../../../(main)/components/headers/global_header";
import PageWrapper from "../../../../(main)/components/pagewrapper";

export const metadata = {
Expand All @@ -14,8 +13,7 @@ export const metadata = {
export default function HowItWorks() {
return (
<>
<GlobalHeader />
<div className="mx-auto mt-12 flex w-full justify-center pb-0 pt-10">
<div className="mx-auto flex w-full justify-center pb-0 pt-10">
{" "}
<Button
variant="secondary"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { TopChrome } from "@/app/(main)/components/top_chrome";

import CookiesBanner from "../../../(main)/components/cookies_banner";
import Footer from "../../../(main)/components/footer";

Expand All @@ -7,7 +9,8 @@ export default async function RootLayout({
children: React.ReactNode;
}>) {
return (
<div className="h-full min-h-screen">
<div className="h-full min-h-screen pt-header">
<TopChrome />
<div className="h-full">{children}</div>
<CookiesBanner />
<Footer />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Link from "next/link";

import GlobalHeader from "@/app/(main)/components/headers/global_header";
import ServerProfileApi from "@/services/api/profile/profile.server";
import { getAllSheetsData } from "@/services/google_spreadsheets";

Expand All @@ -20,8 +19,7 @@ export default async function Page() {

return (
<>
<GlobalHeader />
<main className="mt-12 flex h-fit min-h-screen flex-col items-center justify-start p-3 sm:p-5">
<main className="flex h-fit min-h-screen flex-col items-center justify-start p-3 sm:p-5">
<h1 className="mb-1 text-2xl font-bold">
Bridgewater Forecasting Contest
</h1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Link from "next/link";

import Button from "@/components/ui/button";

import GlobalHeader from "../../../../(main)/components/headers/global_header";
import PageWrapper from "../../../../(main)/components/pagewrapper";

export const metadata = {
Expand All @@ -14,8 +13,7 @@ export const metadata = {
export default function NoticeAtCollection() {
return (
<>
<GlobalHeader />
<div className="mx-auto mt-12 flex w-full justify-center pb-0 pt-10">
<div className="mx-auto flex w-full justify-center pb-0 pt-10">
<Button
variant="secondary"
className="cursor-pointer"
Expand Down
Loading
Loading