Learn, Apply, Jan 25

app/.env.example

@@ -3,6 +3,10 @@ NEXTAUTH_SECRET=
 
 # Database (postgres)
 DATABASE_URL=
+
+# Determines whether DB operations are logged to the node backend during development/testing.
+# Possible values: 'true' or 'false'
+IS_DB_DEBUG=
 
 # Google Cloud
 GCP_PROJECT_ID=

app/package.json

@@ -49,7 +49,7 @@
     "@radix-ui/react-radio-group": "^1.1.3",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-separator": "^1.1.0",
-    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-slot": "^1.1.1",
     "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-toast": "^1.1.5",
     "@radix-ui/react-tooltip": "^1.1.2",

app/prisma/schema.prisma

@@ -221,6 +221,8 @@ model Project {
   pricingModelDetails String?
 
   openSourceObserverSlug String?
+  isSubmittedToOso Boolean @default(false)
+
   addedTeamMembers       Boolean  @default(false)
   addedFunding           Boolean  @default(false)
   hasCodeRepositories    Boolean  @default(true)

app/src/app/application/5/page.tsx

@@ -1,7 +1,10 @@
 import { auth } from "@/auth"
 import { ApplicationFlow } from "@/components/application/5"
 import { getCategories } from "@/db/category"
-import { getAdminProjects, getRoundApplications } from "@/lib/actions/projects"
+import {
+  getAdminProjects,
+  getUserApplicationsForRound,
+} from "@/lib/actions/projects"
 
 export const maxDuration = 120
 
@@ -11,7 +14,7 @@ export default async function Page() {
   const [projects, applications, categories] = session
     ? await Promise.all([
         getAdminProjects(session.user.id, "5"),
-        getRoundApplications(session.user.id, 5),
+        getUserApplicationsForRound(session.user.id, 5),
         getCategories(),
       ])
     : [[], [], []]

app/src/app/application/6/page.tsx

@@ -1,7 +1,10 @@
 import { auth } from "@/auth"
 import { ApplicationFlow } from "@/components/application/6"
 import { getCategories } from "@/db/category"
-import { getAdminProjects, getRoundApplications } from "@/lib/actions/projects"
+import {
+  getAdminProjects,
+  getUserApplicationsForRound,
+} from "@/lib/actions/projects"
 
 export const maxDuration = 120
 
@@ -11,7 +14,7 @@ export default async function Page() {
   const [projects, applications, categories] = session
     ? await Promise.all([
         getAdminProjects(session.user.id, "6"),
-        getRoundApplications(session.user.id, 6),
+        getUserApplicationsForRound(session.user.id, 6),
         getCategories(),
       ])
     : [[], [], []]

app/src/app/dashboard/page.tsx

@@ -3,6 +3,10 @@ import { redirect } from "next/navigation"
 import { auth } from "@/auth"
 import { FeedbackButton } from "@/components/common/FeedbackButton"
 import Dashboard from "@/components/dashboard"
+import {
+  GovCandidateCallout,
+  RewardsCallout,
+} from "@/components/dashboard/Callouts"
 import { getUserById } from "@/db/users"
 import { getUserOrganizations } from "@/lib/actions/organizations"
 import {

app/src/app/layout.tsx

@@ -11,6 +11,8 @@ import { InfoIconFilled } from "@/components/icons/infoIconFilled"
 import { Toaster } from "@/components/ui/sonner"
 import Providers from "@/providers/Providers"
 
+import { sharedMetadata } from "./shared-metadata"
+
 const GOOGLE_ANALYTICS_ID = process.env.GOOGLE_ANALYTICS_ID || ""
 
 const inter = Inter({
@@ -19,22 +21,15 @@ const inter = Inter({
 })
 
 export const metadata: Metadata = {
-  metadataBase: new URL("https://atlas.optimism.io"),
-  title: "Atlas",
-  description: "",
-  icons: "/favicon.ico",
+  ...sharedMetadata,
+  title: "OP Atlas",
+  description:
+    "OP Atlas is the home of Optimism Contributors. Discover Retro Funding, grants and governance opportunities on the Superchain.",
   openGraph: {
-    title: "Atlas",
-    description: "",
-    url: "https://atlas.optimism.io",
-    images: [
-      {
-        url: "/og-image.png",
-        width: 1200,
-        height: 630,
-        alt: "Atlas",
-      },
-    ],
+    ...sharedMetadata.openGraph,
+    title: "OP Atlas",
+    description:
+      "OP Atlas is the home of Optimism Contributors. Discover Retro Funding, grants and governance opportunities on the Superchain.",
   },
 }
 

app/src/app/missions/[id]/application/page.tsx

@@ -0,0 +1,20 @@
+import { notFound } from "next/navigation"
+import React from "react"
+
+import { MissionApplication } from "@/components/missions/application/MissionApplication"
+import { MISSIONS } from "@/lib/MissionsAndRoundData"
+
+export default async function MissionApplicationPage({
+  params,
+}: {
+  params: { id: string }
+}) {
+  const round = MISSIONS.find((page) => page.pageName === params.id)
+  if (round === undefined) notFound()
+
+  return (
+    <main className="flex flex-col flex-1 h-full items-center pb-12 relative">
+      <MissionApplication />
+    </main>
+  )
+}

app/src/app/missions/[id]/page.tsx

@@ -0,0 +1,41 @@
+import { Metadata } from "next"
+import { notFound } from "next/navigation"
+import React from "react"
+
+import { sharedMetadata } from "@/app/shared-metadata"
+import Mission from "@/components/missions/details/Mission"
+import { MISSIONS } from "@/lib/MissionsAndRoundData"
+
+export async function generateMetadata({
+  params,
+}: {
+  params: { id: string }
+}): Promise<Metadata> {
+  const mission = MISSIONS.find((page) => page.pageName === params.id)
+
+  return {
+    ...sharedMetadata,
+    title: `Retro Funding: ${mission?.name ?? ""} - OP Atlas`,
+    description: mission?.ogDescription,
+    openGraph: {
+      ...sharedMetadata.openGraph,
+      title: `Retro Funding: ${mission?.name ?? ""} - OP Atlas`,
+      description: mission?.ogDescription,
+    },
+  }
+}
+
+export default async function MissionPage({
+  params,
+}: {
+  params: { id: string }
+}) {
+  const round = MISSIONS.find((page) => page.pageName === params.id)
+  if (round === undefined) notFound()
+
+  return (
+    <main className="flex flex-col flex-1 h-full items-center pb-20 relative">
+      <Mission />
+    </main>
+  )
+}

app/src/app/missions/page.tsx

@@ -0,0 +1,35 @@
+import { Metadata } from "next"
+
+import { auth } from "@/auth"
+import { Rounds } from "@/components/home/Rounds"
+import { getUserById } from "@/db/users"
+import { updateInteractions } from "@/lib/actions/users"
+
+import { sharedMetadata } from "../shared-metadata"
+
+export const metadata: Metadata = {
+  ...sharedMetadata,
+  title: "Retro Funding Missions - OP Atlas",
+  description:
+    "Discover all grants for the Superchain. Sign up on OP Atlas to apply for Optimism missions, Retro Funding, and more.",
+  openGraph: {
+    ...sharedMetadata.openGraph,
+    title: "Retro Funding Missions - OP Atlas",
+    description:
+      "Discover all grants for the Superchain. Sign up on OP Atlas to apply for Optimism missions, Retro Funding, and more.",
+  },
+}
+
+export default async function Page() {
+  const session = await auth()
+
+  const userId = session?.user.id ?? ""
+
+  const [user] = await Promise.all([getUserById(userId)])
+
+  if (session?.user) {
+    updateInteractions({ userId: session.user?.id, homePageViewCount: 1 })
+  }
+
+  return <Rounds user={user} />
+}

app/src/app/page.tsx

@@ -1,15 +1,32 @@
+import { Metadata } from "next"
 import { redirect } from "next/navigation"
 
 import { auth } from "@/auth"
 import { Rounds } from "@/components/home/Rounds"
 import { getRandomProjects } from "@/db/projects"
+import { getApplications } from "@/lib/actions/projects"
+
+import { sharedMetadata } from "./shared-metadata"
+
+export const metadata: Metadata = {
+  ...sharedMetadata,
+  title: "Homepage - OP Atlas",
+  description:
+    "OP Atlas is the home of Optimism Contributors. Discover Retro Funding, grants and governance opportunities on the Superchain.",
+  openGraph: {
+    ...sharedMetadata.openGraph,
+    title: "Homepage - OP Atlas",
+    description:
+      "OP Atlas is the home of Optimism Contributors. Discover Retro Funding, grants and governance opportunities on the Superchain.",
+  },
+}
 
 export default async function Home() {
-  const [session, projects] = await Promise.all([auth(), getRandomProjects()])
+  const [session] = await Promise.all([auth()])
 
   if (session?.user) {
     redirect("/dashboard")
   }
 
-  return <Rounds projects={projects} />
+  return <Rounds />
 }

app/src/app/projects/[projectId]/details/page.tsx

@@ -26,6 +26,18 @@ export default async function Page({
     redirect("/dashboard")
   }
 
+  // const searchParams = new URLSearchParams(window.location.search)
+  // const paramValue = searchParams.get("orgId")
+
+  // console.log("start")
+  // console.log(paramValue)
+  // console.log("after")
+  // const orgId = searchParams.get("orgId") // Extract orgId from query parameters
+
+  // const selectedOrg = userOrganizations.organizations.find((org) => {
+  //   return org.organization.id === router.query["orgId"]
+  // })?.organization
+
   return (
     <ProjectDetailsForm
       project={project}

app/src/app/projects/new/page.tsx

@@ -17,6 +17,13 @@ export default async function Page() {
 
   const userOrganizations = await getAdminOrganizations(session?.user.id)
 
+  // const searchParams = new URLSearchParams(window.location.search)
+  // const paramValue = searchParams.get("orgId")
+
+  // const selectedOrg = userOrganizations.organizations.find((org) => {
+  //   return org.organization.id === router.query["orgId"]
+  // })?.organization
+
   return (
     <div className="h-full bg-secondary flex flex-1 px-6">
       <div className="fixed bottom-4 left-4">

app/src/app/round/results/page.tsx

@@ -1,5 +1,22 @@
+import { Metadata } from "next"
+
 import { Results } from "@/components/round/results"
 
+import { sharedMetadata } from "../../shared-metadata"
+
+export const metadata: Metadata = {
+  ...sharedMetadata,
+  title: "Retro Funding Recipients - OP Atlas",
+  description:
+    "Explore projects on the Superchain that have received Optimism Retro Funding. Sign in to OP Atlas to learn about grant sizes, project info, and more.",
+  openGraph: {
+    ...sharedMetadata.openGraph,
+    title: "Retro Funding Recipients - OP Atlas",
+    description:
+      "Explore projects on the Superchain that have received Optimism Retro Funding. Sign in to OP Atlas to learn about grant sizes, project info, and more.",
+  },
+}
+
 export default function Page() {
   return <Results />
 }

app/src/app/rounds/page.tsx

@@ -1,21 +1,18 @@
 import { auth } from "@/auth"
 import { Rounds } from "@/components/home/Rounds"
-import { getRandomProjects } from "@/db/projects"
 import { getUserById } from "@/db/users"
-import { getAdminProjects } from "@/lib/actions/projects"
 import { updateInteractions } from "@/lib/actions/users"
 
 export default async function Page() {
   const session = await auth()
-  const [projects, user, userProjects] = await Promise.all([
-    getRandomProjects(),
-    session?.user.id ? getUserById(session.user.id) : null,
-    session?.user.id ? getAdminProjects(session.user.id) : null,
-  ])
+
+  const userId = session?.user.id ?? ""
+
+  const [user] = await Promise.all([getUserById(userId)])
 
   if (session?.user) {
     updateInteractions({ userId: session.user?.id, homePageViewCount: 1 })
   }
 
-  return <Rounds projects={projects} user={user} userProjects={userProjects} />
+  return <Rounds user={user} />
 }