Skip to content

Commit

Permalink
feat: move variables to the backendD
Browse files Browse the repository at this point in the history
  • Loading branch information
nevo-david committed Sep 17, 2024
1 parent 1036313 commit 6de19e4
Show file tree
Hide file tree
Showing 42 changed files with 260 additions and 165 deletions.
7 changes: 1 addition & 6 deletions apps/frontend/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ const nextConfig = {
hostname: '**',
},
],
},
env: {
isBillingEnabled: String(!!process.env.STRIPE_PUBLISHABLE_KEY),
isGeneral: String(!!process.env.IS_GENERAL),
frontendUrl: String(process.env.FRONTEND_URL),
},
}
};

const plugins = [
Expand Down
7 changes: 3 additions & 4 deletions apps/frontend/src/app/(site)/analytics/page.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import { AnalyticsComponent } from '@gitroom/frontend/components/analytics/analytics.component';
import { Metadata } from 'next';
import { PlatformAnalytics } from '@gitroom/frontend/components/platform-analytics/platform.analytics';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Analytics`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Analytics`,
description: '',
};

export default async function Index() {
return (
<>
{isGeneral() ? <PlatformAnalytics /> : <AnalyticsComponent />}
{isGeneralServerSide() ? <PlatformAnalytics /> : <AnalyticsComponent />}
</>
);
}
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/billing/lifetime/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { LifetimeDeal } from '@gitroom/frontend/components/billing/lifetime.deal
export const dynamic = 'force-dynamic';

import { Metadata } from 'next';
import { isGeneral } from '@gitroom/react/helpers/is.general';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Lifetime deal`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Lifetime deal`,
description: '',
};

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/billing/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import { BillingComponent } from '@gitroom/frontend/components/billing/billing.component';
import { Metadata } from 'next';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Billing`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Billing`,
description: '',
};

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/launches/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import {LaunchesComponent} from "@gitroom/frontend/components/launches/launches.component";
import {Metadata} from "next";
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz Calendar' : 'Gitroom Launches'}`,
title: `${isGeneralServerSide() ? 'Postiz Calendar' : 'Gitroom Launches'}`,
description: '',
}

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/marketplace/buyer/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { Buyer } from '@gitroom/frontend/components/marketplace/buyer';

export const dynamic = 'force-dynamic';
import { Metadata } from 'next';
import { isGeneral } from '@gitroom/react/helpers/is.general';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Marketplace`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Marketplace`,
description: '',
};
export default async function Index({
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/marketplace/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';
import { Metadata } from 'next';
import { cookies } from 'next/headers';
import { redirect } from 'next/navigation';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Marketplace`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Marketplace`,
description: '',
};
export default async function Index({
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/marketplace/seller/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { Seller } from '@gitroom/frontend/components/marketplace/seller';

export const dynamic = 'force-dynamic';
import { Metadata } from 'next';
import { isGeneral } from '@gitroom/react/helpers/is.general';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Marketplace`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Marketplace`,
description: '',
};
export default async function Index({
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/messages/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { Messages } from '@gitroom/frontend/components/messages/messages';
export const dynamic = 'force-dynamic';

import { Metadata } from 'next';
import { isGeneral } from '@gitroom/react/helpers/is.general';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Messages`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Messages`,
description: '',
};

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/(site)/messages/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import {Metadata} from "next";
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Messages`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Messages`,
description: '',
}

Expand Down
5 changes: 2 additions & 3 deletions apps/frontend/src/app/(site)/settings/page.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import { SettingsComponent } from '@gitroom/frontend/components/settings/settings.component';
import { internalFetch } from '@gitroom/helpers/utils/internal.fetch';
import { redirect } from 'next/navigation';
import { RedirectType } from 'next/dist/client/components/redirect';
import { Metadata } from 'next';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Settings`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Settings`,
description: '',
};
export default async function Index({
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/auth/activate/[code]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import { Metadata } from 'next';
import { AfterActivate } from '@gitroom/frontend/components/auth/after.activate';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} - Activate your account`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} - Activate your account`,
description: '',
};

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/auth/activate/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import {Metadata} from "next";
import { Activate } from '@gitroom/frontend/components/auth/activate';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} - Activate your account`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} - Activate your account`,
description: '',
};

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/auth/forgot/[token]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import { ForgotReturn } from '@gitroom/frontend/components/auth/forgot-return';
import { Metadata } from 'next';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Forgot Password`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Forgot Password`,
description: '',
};
export default async function Auth(params: { params: { token: string } }) {
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/auth/forgot/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import {Forgot} from "@gitroom/frontend/components/auth/forgot";
import {Metadata} from "next";
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Forgot Password`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Forgot Password`,
description: '',
};

Expand Down
9 changes: 4 additions & 5 deletions apps/frontend/src/app/auth/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import { ReactNode } from 'react';
import Image from 'next/image';
import clsx from 'clsx';
import loadDynamic from 'next/dynamic';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';
const ReturnUrlComponent = loadDynamic(() => import('./return.url.component'));

export default async function AuthLayout({
Expand All @@ -22,15 +21,15 @@ export default async function AuthLayout({
<div className="w-full relative">
<div className="custom:fixed custom:text-left custom:left-[20px] custom:justify-start custom:top-[20px] absolute -top-[100px] text-textColor justify-center items-center w-full flex gap-[10px]">
<Image
src={isGeneral() ? '/postiz.svg' : '/logo.svg'}
src={isGeneralServerSide() ? '/postiz.svg' : '/logo.svg'}
width={55}
height={53}
alt="Logo"
/>
<div
className={clsx(!isGeneral() ? 'mt-[12px]' : 'min-w-[80px]')}
className={clsx(!isGeneralServerSide() ? 'mt-[12px]' : 'min-w-[80px]')}
>
{isGeneral() ? (
{isGeneralServerSide() ? (
<svg
width="80"
height="36.5"
Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/auth/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import {Login} from "@gitroom/frontend/components/auth/login";
import {Metadata} from "next";
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Login`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Login`,
description: '',
};

Expand Down
4 changes: 2 additions & 2 deletions apps/frontend/src/app/auth/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { isGeneral } from '@gitroom/react/helpers/is.general';

export const dynamic = 'force-dynamic';

import { Register } from '@gitroom/frontend/components/auth/register';
import { Metadata } from 'next';
import { isGeneralServerSide } from '@gitroom/helpers/utils/is.general.server.side';

export const metadata: Metadata = {
title: `${isGeneral() ? 'Postiz' : 'Gitroom'} Register`,
title: `${isGeneralServerSide() ? 'Postiz' : 'Gitroom'} Register`,
description: '',
};

Expand Down
22 changes: 17 additions & 5 deletions apps/frontend/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import '@copilotkit/react-ui/styles.css';
import LayoutContext from '@gitroom/frontend/components/layout/layout.context';
import { ReactNode } from 'react';
import { Chakra_Petch } from 'next/font/google';
import { isGeneral } from '@gitroom/react/helpers/is.general';
import PlausibleProvider from 'next-plausible';
import clsx from 'clsx';
import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';

const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'] });

Expand All @@ -19,14 +19,26 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
<head>
<link
rel="icon"
href={!isGeneral() ? '/favicon.png' : '/postiz-fav.png'}
href={!!process.env.IS_GENERAL ? '/favicon.png' : '/postiz-fav.png'}
sizes="any"
/>
</head>
<body className={clsx(chakra.className, 'text-primary dark')}>
<PlausibleProvider domain={isGeneral() ? "postiz.com" : "gitroom.com"}>
<LayoutContext>{children}</LayoutContext>
</PlausibleProvider>
<VariableContextComponent
backendUrl={process.env.NEXT_PUBLIC_BACKEND_URL!}
plontoKey={process.env.NEXT_PUBLIC_POLOTNO!}
billingEnabled={!!process.env.STRIPE_PUBLISHABLE_KEY}
discordUrl={process.env.NEXT_PUBLIC_DISCORD_SUPPORT!}
frontEndUrl={process.env.FRONTEND_URL!}
isGeneral={!!process.env.IS_GENERAL}
uploadDirectory={process.env.NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY!}
>
<PlausibleProvider
domain={!!process.env.IS_GENERAL ? 'postiz.com' : 'gitroom.com'}
>
<LayoutContext>{children}</LayoutContext>
</PlausibleProvider>
</VariableContextComponent>
</body>
</html>
);
Expand Down
5 changes: 3 additions & 2 deletions apps/frontend/src/components/auth/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { classValidatorResolver } from '@hookform/resolvers/class-validator';
import { LoginUserDto } from '@gitroom/nestjs-libraries/dtos/auth/login.user.dto';
import { GithubProvider } from '@gitroom/frontend/components/auth/providers/github.provider';
import interClass from '@gitroom/react/helpers/inter.font';
import { isGeneral } from '@gitroom/react/helpers/is.general';
import { GoogleProvider } from '@gitroom/frontend/components/auth/providers/google.provider';
import { useVariables } from '@gitroom/react/helpers/variable.context';

type Inputs = {
email: string;
Expand All @@ -22,6 +22,7 @@ type Inputs = {

export function Login() {
const [loading, setLoading] = useState(false);
const {isGeneral} = useVariables();
const resolver = useMemo(() => {
return classValidatorResolver(LoginUserDto);
}, []);
Expand Down Expand Up @@ -61,7 +62,7 @@ export function Login() {
</h1>
</div>

{!isGeneral() ? <GithubProvider /> : <GoogleProvider />}
{!isGeneral ? <GithubProvider /> : <GoogleProvider />}
<div className="h-[20px] mb-[24px] mt-[24px] relative">
<div className="absolute w-full h-[1px] bg-fifth top-[50%] -translate-y-[50%]" />
<div
Expand Down
Loading

0 comments on commit 6de19e4

Please sign in to comment.