dvelo/mhsf-dev
1
0
Fork 0
mirror of https://github.com/DeveloLongScript/MHSF.git synced 2026-05-09 12:44:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: dvelo:cc4bf911cfcc74c79461073a161d3dc6e755f75b
Branches Tags
dvelo:main
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-66.4.1
dvelo:dependabot/npm_and_yarn/react-day-picker-9.8.1
dvelo:dependabot/npm_and_yarn/unplugin-tailwindcss-mangle-4.1.2
dvelo:dependabot/npm_and_yarn/tailwind-merge-3.3.1
dvelo:v2
dvelo:dev
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-65.4.0
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-0.65.3
dvelo:dependabot/npm_and_yarn/babel/parser-7.26.3
dvelo:dependabot/npm_and_yarn/typescript-5.7.2
dvelo:dependabot/npm_and_yarn/cross-spawn-7.0.6
dvelo:dependabot/npm_and_yarn/postcss-8.4.49
dvelo:1.8.0
dvelo:1.7.5
dvelo:1.7
dvelo:1.6.5
dvelo:1.6
dvelo:1.5
dvelo:1.4.5
dvelo:1.3.2
dvelo:1.3
dvelo:1.2
dvelo:1.1.0
dvelo:1.0.1
dvelo:1.0
dvelo:0.10.7
dvelo:0.10.2
dvelo:0.10
dvelo:0.9
..
compare: dvelo:c15a06567c0d43d3d20b5c90ee973c7bea8bd5c6
Branches Tags
dvelo:main
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-66.4.1
dvelo:dependabot/npm_and_yarn/react-day-picker-9.8.1
dvelo:dependabot/npm_and_yarn/unplugin-tailwindcss-mangle-4.1.2
dvelo:dependabot/npm_and_yarn/tailwind-merge-3.3.1
dvelo:v2
dvelo:dev
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-65.4.0
dvelo:dependabot/npm_and_yarn/unocss/preset-uno-0.65.3
dvelo:dependabot/npm_and_yarn/babel/parser-7.26.3
dvelo:dependabot/npm_and_yarn/typescript-5.7.2
dvelo:dependabot/npm_and_yarn/cross-spawn-7.0.6
dvelo:dependabot/npm_and_yarn/postcss-8.4.49
dvelo:1.8.0
dvelo:1.7.5
dvelo:1.7
dvelo:1.6.5
dvelo:1.6
dvelo:1.5
dvelo:1.4.5
dvelo:1.3.2
dvelo:1.3
dvelo:1.2
dvelo:1.1.0
dvelo:1.0.1
dvelo:1.0
dvelo:0.10.7
dvelo:0.10.2
dvelo:0.10
dvelo:0.9

3 Commits
cc4bf911cf ... c15a06567c

Author SHA1 Message Date
dvelo
c15a06567c fix: non-authenticated can't work 2024-12-22 15:17:25 -06:00
dvelo
ed03f8d7c5 fix: move embeds from root to embeds. 2024-12-22 15:10:52 -06:00
dvelo
fad6c6f70a fix: infinite loop redirect in embeds 2024-12-22 13:57:03 -06:00
5 changed files with 48 additions and 39 deletions
Show Stats Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -34,7 +34,7 @@ Set the following variables in the .env.local file:
# Clerk # Clerk
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY="pk_..." NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY="pk_..."
CLERK_SECRET_KEY="sk_..." CLERK_SECRET_KEY="sk_..."
IS_AUTH="true" NEXT_PUBLIC_IS_AUTH="true"
``` ```
## MongoDB ## MongoDB

1
src/app/(embeds)/layout.tsx
View File

@ -29,7 +29,6 @@
*/ */
"use client"; "use client";
import { TooltipProvider } from "@/components/ui/tooltip"; import { TooltipProvider } from "@/components/ui/tooltip";
import "../globals.css"; import "../globals.css";
import { ThemeProvider } from "@/components/ThemeProvider"; import { ThemeProvider } from "@/components/ThemeProvider";

73
src/components/clerk/ClerkThemeProvider.tsx
View File

@ -36,44 +36,53 @@ import { type ReactNode, useEffect, useState } from "react";
import { ThemeProvider } from "../ThemeProvider"; import { ThemeProvider } from "../ThemeProvider";
export function ClerkThemeProvider({ export function ClerkThemeProvider({
children, children,
className, className,
}: { }: {
children: ReactNode | ReactNode[]; children?: ReactNode | ReactNode[];
className: string | undefined; className?: string | undefined;
}) { }) {
const [theme, setTheme] = useState<string | undefined>(""); const [theme, setTheme] = useState<string | undefined>("");
return ( if (process.env.NEXT_PUBLIC_IS_AUTH !== "true")
<ClerkProvider return (
appearance={{ baseTheme: theme == "dark" ? dark : undefined }} <html lang="en" className={className}>
> <body>
<html lang="en" className={className}> Non-authenticated environments are disallowed on this origin.
<body> </body>
<ThemeProvider </html>
attribute="class" );
defaultTheme="system"
enableSystem return (
disableTransitionOnChange <ClerkProvider
> appearance={{ baseTheme: theme == "dark" ? dark : undefined }}
{children} >
{/** This *has* to be implemented in component form for the `useTheme` to load at the appropriate time. */} <html lang="en" className={className}>
<ThemeElement setTheme={setTheme} /> <body>
</ThemeProvider> <ThemeProvider
</body> attribute="class"
</html> defaultTheme="system"
</ClerkProvider> enableSystem
); disableTransitionOnChange
>
{children}
{/** This *has* to be implemented in component form for the `useTheme` to load at the appropriate time. */}
<ThemeElement setTheme={setTheme} />
</ThemeProvider>
</body>
</html>
</ClerkProvider>
);
} }
function ThemeElement({ function ThemeElement({
setTheme, setTheme,
}: { }: {
setTheme: (update: string | undefined) => void; setTheme: (update: string | undefined) => void;
}) { }) {
const theme = useTheme(); const theme = useTheme();
useEffect(() => { useEffect(() => {
setTheme(theme.resolvedTheme); setTheme(theme.resolvedTheme);
}, [theme.resolvedTheme, setTheme]); }, [theme.resolvedTheme, setTheme]);
return <></>; return <></>;
} }

8
src/components/feat/EmbedSelector.tsx
View File

@ -59,7 +59,7 @@ export default function EmbedSelector({ server }: { server: string }) {
const [selectedCodeType, setSelectedCodeType] = useState("jsx"); const [selectedCodeType, setSelectedCodeType] = useState("jsx");
const [noMinehutBranding, setNoMinehutBranding] = useState(false); const [noMinehutBranding, setNoMinehutBranding] = useState(false);
const clipboard = useClipboard(); const clipboard = useClipboard();
const [url, setURL] = useState(`https://mhsf.app/embed/${server}?`); const [url, setURL] = useState(`https://embeds.mhsf.app/embed/${server}?`);
const [jsxCode, setJsxCode] = useState(`<iframe const [jsxCode, setJsxCode] = useState(`<iframe
src="${url}" src="${url}"
width={390} width={390}
@ -155,7 +155,7 @@ export default function EmbedSelector({ server }: { server: string }) {
onCheckedChange={(c) => { onCheckedChange={(c) => {
setEmbedStatic(c == "indeterminate" ? true : c); setEmbedStatic(c == "indeterminate" ? true : c);
setURL( setURL(
`https://mhsf.app/embed/${server}?${c ? "&static=true" : ""}${ `https://embeds.mhsf.app/embed/${server}?${c ? "&static=true" : ""}${
noMinehutBranding ? "&branding=false" : "" noMinehutBranding ? "&branding=false" : ""
}&theme=${embedTheme}` }&theme=${embedTheme}`
); );
@ -182,7 +182,7 @@ export default function EmbedSelector({ server }: { server: string }) {
onCheckedChange={(c) => { onCheckedChange={(c) => {
setNoMinehutBranding(c == "indeterminate" ? true : c); setNoMinehutBranding(c == "indeterminate" ? true : c);
setURL( setURL(
`https://mhsf.app/embed/${server}?${embedStatic ? "&static=true" : ""}${ `https://embeds.mhsf.app/embed/${server}?${embedStatic ? "&static=true" : ""}${
c ? "&branding=false" : "" c ? "&branding=false" : ""
}&theme=${embedTheme}` }&theme=${embedTheme}`
); );
@ -214,7 +214,7 @@ export default function EmbedSelector({ server }: { server: string }) {
onValueChange={(c) => { onValueChange={(c) => {
setEmbedTheme(c); setEmbedTheme(c);
setURL( setURL(
`https://mhsf.app/embed/${server}?${embedStatic ? "&static=true" : ""}${ `https://embeds.mhsf.app/embed/${server}?${embedStatic ? "&static=true" : ""}${
noMinehutBranding ? "&branding=false" : "" noMinehutBranding ? "&branding=false" : ""
}&theme=${c}` }&theme=${c}`
); );

3
src/middleware.ts
View File

@ -32,8 +32,9 @@ import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
import { NextRequest } from "next/server"; import { NextRequest } from "next/server";
const isProtectedRoute = createRouteMatcher(["/account(.*)"]); const isProtectedRoute = createRouteMatcher(["/account(.*)"]);
const isEmbed = createRouteMatcher(["/emebed(.*)"]);
export default process.env.IS_AUTH == "true" export default process.env.NEXT_PUBLIC_IS_AUTH === "true"
? clerkMiddleware((auth, req) => { ? clerkMiddleware((auth, req) => {
if (isProtectedRoute(req)) auth.protect(); if (isProtectedRoute(req)) auth.protect();
}) })