+
+
+
)
}
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 68182386..1d92bf6b 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,11 +1,15 @@
import { GetServerSideProps } from "next"
+import { DashboardIcon } from "~/components/icons/DashboardIcon"
import { MainLayout } from "~/components/main/MainLayout"
+import { UniLink } from "~/components/ui/UniLink"
import { getAuthUser } from "~/lib/auth.server"
import { FLY_REGION } from "~/lib/env.server"
+import { useStore } from "~/lib/store"
export const getServerSideProps: GetServerSideProps = async (ctx) => {
const user = await getAuthUser(ctx.req)
const isLoggedIn = !!user
+
return {
props: {
isLoggedIn,
@@ -21,5 +25,47 @@ export default function Home({
isLoggedIn: boolean
region: string | null
}) {
- return
+ const setLoginModalOpened = useStore((store) => store.setLoginModalOpened)
+
+ return (
+
+
+
+
+
+ Content Creating for
+
+ Absolutely Everyone
+
+
+ Meet Proselog, the open-source blogging and
+
+ newsletter platform for everyone. Focus on writing, not
+ distractions.
+
+
+ {isLoggedIn ? (
+
+
+ Dashboard
+
+ ) : (
+ {
+ setLoginModalOpened(true)
+ }}
+ className="bg-indigo-500 hover:bg-indigo-600 rounded-full px-4 h-8 inline-flex items-center text-sm text-white font-medium"
+ >
+ Getting Started
+
+ )}
+
+
+
+ )
}
diff --git a/src/router/auth.ts b/src/router/auth.ts
index b9658092..60724452 100644
--- a/src/router/auth.ts
+++ b/src/router/auth.ts
@@ -3,6 +3,7 @@ import { z } from "zod"
import { prismaPrimary } from "~/lib/db.server"
import { sendLoginEmail } from "~/lib/mailgun.server"
import { createRouter } from "~/lib/trpc.server"
+import { getViewer } from "~/lib/viewer"
export const authRouter = createRouter()
.query("viewer", {
@@ -17,7 +18,7 @@ export const authRouter = createRouter()
})
.nullable(),
async resolve({ ctx }) {
- return ctx.user || null
+ return getViewer(ctx.user)
},
})
.mutation("requestLoginLink", {
diff --git a/types.d.ts b/types.d.ts
index 0e667dc4..7f95d91d 100644
--- a/types.d.ts
+++ b/types.d.ts
@@ -1,24 +1,18 @@
-declare interface ServerEnv {
+declare interface CustomEnv {
// Additional environment variables
- APP_NAME: string
+ NEXT_PUBLIC_APP_NAME: string
+ NEXT_PUBLIC_R2_URL: string
+
DATABASE_URL: string
AUTH_COOKIE_NAME: string
- OUR_DOMAIN: string
+ NEXT_PUBLIC_OUR_DOMAIN: string
MAILGUN_APIKEY: string
MAILGUN_DOMAIN: string
FLY_REGION?: string
PRIMARY_REGION?: string
ENCRYPT_SECRET: string
- NEXT_PUBLIC_R2_URL: string
- R2_API_TOKEN: string
-}
-
-declare interface BrowserEnv {
- APP_NAME: string
- OUR_DOMAIN: string
- R2_URL: string
}
declare namespace NodeJS {
- interface ProcessEnv extends ServerEnv {}
+ interface ProcessEnv extends CustomEnv {}
}