this should work, then we can add back
This commit is contained in:
@@ -1,12 +1,5 @@
|
|||||||
// @refresh reload
|
// @refresh reload
|
||||||
import { createHandler, StartServer } from "@solidjs/start/server";
|
import { createHandler, StartServer } from "@solidjs/start/server";
|
||||||
import { validateServerEnv } from "./env/server";
|
|
||||||
|
|
||||||
try {
|
|
||||||
validateServerEnv(process.env);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Environment validation failed:", error);
|
|
||||||
}
|
|
||||||
|
|
||||||
export default createHandler(() => (
|
export default createHandler(() => (
|
||||||
<StartServer
|
<StartServer
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { createTRPCProxyClient, httpBatchLink, loggerLink } from "@trpc/client";
|
import { createTRPCProxyClient, httpBatchLink, loggerLink } from "@trpc/client";
|
||||||
import { AppRouter } from "~/server/api/root";
|
import type { AppRouter } from "~/server/api/root";
|
||||||
|
|
||||||
const getBaseUrl = () => {
|
const getBaseUrl = () => {
|
||||||
// Browser: use relative URL
|
// Browser: use relative URL
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import XCircle from "~/components/icons/XCircle";
|
|||||||
import Dropzone from "~/components/blog/Dropzone";
|
import Dropzone from "~/components/blog/Dropzone";
|
||||||
import AddImageToS3 from "~/lib/s3upload";
|
import AddImageToS3 from "~/lib/s3upload";
|
||||||
import { validatePassword, isValidEmail } from "~/lib/validation";
|
import { validatePassword, isValidEmail } from "~/lib/validation";
|
||||||
import { checkAuthStatus } from "~/server/utils";
|
|
||||||
|
|
||||||
type UserProfile = {
|
type UserProfile = {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -21,6 +20,7 @@ type UserProfile = {
|
|||||||
|
|
||||||
const checkAuth = cache(async () => {
|
const checkAuth = cache(async () => {
|
||||||
"use server";
|
"use server";
|
||||||
|
const { checkAuthStatus } = await import("~/server/utils");
|
||||||
const event = getEvent()!;
|
const event = getEvent()!;
|
||||||
const { isAuthenticated } = await checkAuthStatus(event);
|
const { isAuthenticated } = await checkAuthStatus(event);
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,6 @@ import { Show, Suspense, For } from "solid-js";
|
|||||||
import { useParams, A, Navigate, query } from "@solidjs/router";
|
import { useParams, A, Navigate, query } from "@solidjs/router";
|
||||||
import { Title } from "@solidjs/meta";
|
import { Title } from "@solidjs/meta";
|
||||||
import { createAsync } from "@solidjs/router";
|
import { createAsync } from "@solidjs/router";
|
||||||
import {
|
|
||||||
ConnectionFactory,
|
|
||||||
getUserID,
|
|
||||||
getPrivilegeLevel
|
|
||||||
} from "~/server/utils";
|
|
||||||
import { getRequestEvent } from "solid-js/web";
|
import { getRequestEvent } from "solid-js/web";
|
||||||
import SessionDependantLike from "~/components/blog/SessionDependantLike";
|
import SessionDependantLike from "~/components/blog/SessionDependantLike";
|
||||||
import CommentIcon from "~/components/icons/CommentIcon";
|
import CommentIcon from "~/components/icons/CommentIcon";
|
||||||
@@ -19,7 +14,8 @@ import { TerminalSplash } from "~/components/TerminalSplash";
|
|||||||
// Server function to fetch post by title
|
// Server function to fetch post by title
|
||||||
const getPostByTitle = query(async (title: string) => {
|
const getPostByTitle = query(async (title: string) => {
|
||||||
"use server";
|
"use server";
|
||||||
|
const { ConnectionFactory, getUserID, getPrivilegeLevel } =
|
||||||
|
await import("~/server/utils");
|
||||||
const event = getRequestEvent()!;
|
const event = getRequestEvent()!;
|
||||||
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
||||||
const userID = await getUserID(event.nativeEvent);
|
const userID = await getUserID(event.nativeEvent);
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { useNavigate, query } from "@solidjs/router";
|
|||||||
import { Title } from "@solidjs/meta";
|
import { Title } from "@solidjs/meta";
|
||||||
import { createAsync } from "@solidjs/router";
|
import { createAsync } from "@solidjs/router";
|
||||||
import { getRequestEvent } from "solid-js/web";
|
import { getRequestEvent } from "solid-js/web";
|
||||||
import { getPrivilegeLevel, getUserID } from "~/server/utils";
|
|
||||||
import { api } from "~/lib/api";
|
import { api } from "~/lib/api";
|
||||||
import { debounce } from "~/lib/client-utils";
|
import { debounce } from "~/lib/client-utils";
|
||||||
import Dropzone from "~/components/blog/Dropzone";
|
import Dropzone from "~/components/blog/Dropzone";
|
||||||
@@ -15,7 +14,7 @@ import AddImageToS3 from "~/lib/s3upload";
|
|||||||
|
|
||||||
const getAuthState = query(async () => {
|
const getAuthState = query(async () => {
|
||||||
"use server";
|
"use server";
|
||||||
|
const { getPrivilegeLevel, getUserID } = await import("~/server/utils");
|
||||||
const event = getRequestEvent()!;
|
const event = getRequestEvent()!;
|
||||||
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
||||||
const userID = await getUserID(event.nativeEvent);
|
const userID = await getUserID(event.nativeEvent);
|
||||||
|
|||||||
@@ -3,10 +3,8 @@ import { useParams, useNavigate, query } from "@solidjs/router";
|
|||||||
import { Title } from "@solidjs/meta";
|
import { Title } from "@solidjs/meta";
|
||||||
import { createAsync } from "@solidjs/router";
|
import { createAsync } from "@solidjs/router";
|
||||||
import { getRequestEvent } from "solid-js/web";
|
import { getRequestEvent } from "solid-js/web";
|
||||||
import { getPrivilegeLevel, getUserID } from "~/server/utils";
|
|
||||||
import { api } from "~/lib/api";
|
import { api } from "~/lib/api";
|
||||||
import { debounce } from "~/lib/client-utils";
|
import { debounce } from "~/lib/client-utils";
|
||||||
import { ConnectionFactory } from "~/server/utils";
|
|
||||||
import Dropzone from "~/components/blog/Dropzone";
|
import Dropzone from "~/components/blog/Dropzone";
|
||||||
import TextEditor from "~/components/blog/TextEditor";
|
import TextEditor from "~/components/blog/TextEditor";
|
||||||
import TagMaker from "~/components/blog/TagMaker";
|
import TagMaker from "~/components/blog/TagMaker";
|
||||||
@@ -16,7 +14,8 @@ import AddImageToS3 from "~/lib/s3upload";
|
|||||||
|
|
||||||
const getPostForEdit = query(async (id: string) => {
|
const getPostForEdit = query(async (id: string) => {
|
||||||
"use server";
|
"use server";
|
||||||
|
const { getPrivilegeLevel, getUserID, ConnectionFactory } =
|
||||||
|
await import("~/server/utils");
|
||||||
const event = getRequestEvent()!;
|
const event = getRequestEvent()!;
|
||||||
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
||||||
const userID = await getUserID(event.nativeEvent);
|
const userID = await getUserID(event.nativeEvent);
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ export default function Home() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex flex-col items-end gap-4">
|
<div class="flex flex-col items-end gap-4 pr-4">
|
||||||
<Typewriter speed={50} keepAlive={false}>
|
<Typewriter speed={50} keepAlive={false}>
|
||||||
<div>
|
<div>
|
||||||
My Collection of
|
My Collection of
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ import EyeSlash from "~/components/icons/EyeSlash";
|
|||||||
import CountdownCircleTimer from "~/components/CountdownCircleTimer";
|
import CountdownCircleTimer from "~/components/CountdownCircleTimer";
|
||||||
import { isValidEmail, validatePassword } from "~/lib/validation";
|
import { isValidEmail, validatePassword } from "~/lib/validation";
|
||||||
import { getClientCookie } from "~/lib/cookies.client";
|
import { getClientCookie } from "~/lib/cookies.client";
|
||||||
import { checkAuthStatus } from "~/server/utils";
|
|
||||||
|
|
||||||
const checkAuth = cache(async () => {
|
const checkAuth = cache(async () => {
|
||||||
"use server";
|
"use server";
|
||||||
|
const { checkAuthStatus } = await import("~/server/utils");
|
||||||
const event = getEvent()!;
|
const event = getEvent()!;
|
||||||
const { isAuthenticated } = await checkAuthStatus(event);
|
const { isAuthenticated } = await checkAuthStatus(event);
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
import { createSignal, For, Show } from "solid-js";
|
import { createSignal, For, Show } from "solid-js";
|
||||||
import { query, createAsync } from "@solidjs/router";
|
import { query, createAsync } from "@solidjs/router";
|
||||||
import { getRequestEvent } from "solid-js/web";
|
import { getRequestEvent } from "solid-js/web";
|
||||||
import { getPrivilegeLevel } from "~/server/utils";
|
|
||||||
import { api } from "~/lib/api";
|
import { api } from "~/lib/api";
|
||||||
|
|
||||||
const getAuthState = query(async () => {
|
const getAuthState = query(async () => {
|
||||||
"use server";
|
"use server";
|
||||||
|
const { getPrivilegeLevel } = await import("~/server/utils");
|
||||||
const event = getRequestEvent()!;
|
const event = getRequestEvent()!;
|
||||||
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
const privilegeLevel = await getPrivilegeLevel(event.nativeEvent);
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { createClient as createAPIClient } from "@tursodatabase/api";
|
|||||||
import { v4 as uuid } from "uuid";
|
import { v4 as uuid } from "uuid";
|
||||||
import { env } from "~/env/server";
|
import { env } from "~/env/server";
|
||||||
import type { H3Event } from "vinxi/http";
|
import type { H3Event } from "vinxi/http";
|
||||||
|
import { getUserID } from "./auth";
|
||||||
|
|
||||||
let mainDBConnection: ReturnType<typeof createClient> | null = null;
|
let mainDBConnection: ReturnType<typeof createClient> | null = null;
|
||||||
let lineageDBConnection: ReturnType<typeof createClient> | null = null;
|
let lineageDBConnection: ReturnType<typeof createClient> | null = null;
|
||||||
@@ -139,7 +140,6 @@ export async function getUserBasicInfo(event: H3Event): Promise<{
|
|||||||
email: string | null;
|
email: string | null;
|
||||||
isAuthenticated: boolean;
|
isAuthenticated: boolean;
|
||||||
} | null> {
|
} | null> {
|
||||||
const { getUserID } = await import("./auth");
|
|
||||||
const userId = await getUserID(event);
|
const userId = await getUserID(event);
|
||||||
|
|
||||||
if (!userId) {
|
if (!userId) {
|
||||||
|
|||||||
Reference in New Issue
Block a user