diff --git a/Dockerfile.dev b/Dockerfile.dev index 55fe8690..72bb3654 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,21 +1,21 @@ FROM node:20-alpine3.19 ARG NEXT_PUBLIC_VERSION ENV NEXT_PUBLIC_VERSION=$NEXT_PUBLIC_VERSION -RUN apk add --no-cache g++ make py3-pip supervisor bash caddy +RUN apk add --no-cache g++ make py3-pip bash nginx +RUN adduser -D -g 'www' www +RUN mkdir /www +RUN chown -R www:www /var/lib/nginx +RUN chown -R www:www /www + + RUN npm --no-update-notifier --no-fund --global install pnpm@10.6.1 pm2 WORKDIR /app COPY . /app -COPY var/docker/supervisord.conf /etc/supervisord.conf -COPY var/docker/Caddyfile /app/Caddyfile -COPY var/docker/entrypoint.sh /app/entrypoint.sh -COPY var/docker/supervisord/caddy.conf /etc/supervisor.d/caddy.conf -RUN chmod +x /app/entrypoint.sh +COPY var/docker/nginx.conf /etc/nginx/nginx.conf RUN pnpm install -RUN pnpm run build +RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm run build -EXPOSE 4200 - -CMD ["pnpm", "run", "pm2"] +CMD ["sh", "-c", "nginx && pnpm run pm2"] diff --git a/apps/backend/src/services/auth/auth.service.ts b/apps/backend/src/services/auth/auth.service.ts index 8dea316e..3b66da1e 100644 --- a/apps/backend/src/services/auth/auth.service.ts +++ b/apps/backend/src/services/auth/auth.service.ts @@ -21,7 +21,7 @@ export class AuthService { private _emailService: EmailService ) {} async canRegister(provider: string) { - if (!process.env.DISABLE_REGISTRATION || provider === Provider.GENERIC) { + if (!(process.env.DISABLE_REGISTRATION && process.env.DISABLE_REGISTRATION !== 'false') || provider === Provider.GENERIC) { return true; } diff --git a/apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx b/apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx index 226aca6f..aed33f16 100644 --- a/apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx +++ b/apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx @@ -1,5 +1,6 @@ import { ReactNode } from 'react'; import { PreviewWrapper } from '@gitroom/frontend/components/preview/preview.wrapper'; + export default async function AppLayout({ children }: { children: ReactNode }) { return (
|
diff --git a/apps/frontend/src/components/auth/login.tsx b/apps/frontend/src/components/auth/login.tsx
index 91ebfdc1..6344b918 100644
--- a/apps/frontend/src/components/auth/login.tsx
+++ b/apps/frontend/src/components/auth/login.tsx
@@ -10,7 +10,6 @@ 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 { OauthProvider } from '@gitroom/frontend/components/auth/providers/oauth.provider';
-import interClass from '@gitroom/react/helpers/inter.font';
import { GoogleProvider } from '@gitroom/frontend/components/auth/providers/google.provider';
import { useVariables } from '@gitroom/react/helpers/variable.context';
import { FarcasterProvider } from '@gitroom/frontend/components/auth/providers/farcaster.provider';
@@ -76,7 +75,7 @@ export function Login() {
{t('or', 'OR')}
|
|---|