Skip to content

Commit 995babb

Browse files
nevo-davidnevo-david
committed
feat: move to nginx, remove inter fonts
1 parent 0ff50a0 commit 995babb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+125
-187
lines changed

‎Dockerfile.dev‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
FROM node:20-alpine3.19
22
ARG NEXT_PUBLIC_VERSION
33
ENV NEXT_PUBLIC_VERSION=$NEXT_PUBLIC_VERSION
4-
RUN apk add --no-cache g++ make py3-pip supervisor bash caddy
4+
RUN apk add --no-cache g++ make py3-pip bash nginx
5+
RUN adduser -D -g 'www' www
6+
RUN mkdir /www
7+
RUN chown -R www:www /var/lib/nginx
8+
RUN chown -R www:www /www
9+
10+
511
RUN npm --no-update-notifier --no-fund --global install [email protected] pm2
612

713
WORKDIR /app
814

915
COPY . /app
10-
COPY var/docker/supervisord.conf /etc/supervisord.conf
11-
COPY var/docker/Caddyfile /app/Caddyfile
12-
COPY var/docker/entrypoint.sh /app/entrypoint.sh
13-
COPY var/docker/supervisord/caddy.conf /etc/supervisor.d/caddy.conf
14-
RUN chmod +x /app/entrypoint.sh
16+
COPY var/docker/nginx.conf /etc/nginx/nginx.conf
1517

1618
RUN pnpm install
17-
RUN pnpm run build
18-
19-
EXPOSE 4200
19+
RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm run build
2020

21-
CMD ["pnpm", "run", "pm2"]
21+
CMD ["sh", "-c", "nginx && pnpm run pm2"]

‎apps/backend/src/services/auth/auth.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class AuthService {
2121
private _emailService: EmailService
2222
) {}
2323
async canRegister(provider: string) {
24-
if (!process.env.DISABLE_REGISTRATION || provider === Provider.GENERIC) {
24+
if (!(process.env.DISABLE_REGISTRATION && process.env.DISABLE_REGISTRATION !== 'false') || provider === Provider.GENERIC) {
2525
return true;
2626
}
2727

‎apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ReactNode } from 'react';
22
import { PreviewWrapper } from '@gitroom/frontend/components/preview/preview.wrapper';
3+
34
export default async function AppLayout({ children }: { children: ReactNode }) {
45
return (
56
<div className="bg-[#000000] min-h-screen">

‎apps/frontend/src/app/(app)/auth/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const metadata: Metadata = {
1212
};
1313
export default async function Auth(params: {searchParams: {provider: string}}) {
1414
const t = await getT();
15-
if (process.env.DISABLE_REGISTRATION) {
15+
if (process.env.DISABLE_REGISTRATION && process.env.DISABLE_REGISTRATION !== 'false') {
1616
const canRegister = (
1717
await (await internalFetch('/auth/can-register')).json()
1818
).register;

‎apps/frontend/src/app/(app)/layout.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import interClass from '@gitroom/react/helpers/inter.font';
21
export const dynamic = 'force-dynamic';
32
import '../global.scss';
43
import 'react-tooltip/dist/react-tooltip.css';
54
import '@copilotkit/react-ui/styles.css';
65
import LayoutContext from '@gitroom/frontend/components/layout/layout.context';
76
import { ReactNode } from 'react';
8-
import { Chakra_Petch } from 'next/font/google';
7+
import { Plus_Jakarta_Sans } from 'next/font/google';
98
import PlausibleProvider from 'next-plausible';
109
import clsx from 'clsx';
1110
import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';
@@ -18,21 +17,23 @@ import { headers } from 'next/headers';
1817
import { headerName } from '@gitroom/react/translation/i18n.config';
1918
import { HtmlComponent } from '@gitroom/frontend/components/layout/html.component';
2019

21-
const chakra = Chakra_Petch({
22-
weight: '400',
20+
const jakartaSans = Plus_Jakarta_Sans({
21+
weight: ['600', '500'],
22+
style: ['normal', 'italic'],
2323
subsets: ['latin'],
2424
});
25+
2526
export default async function AppLayout({ children }: { children: ReactNode }) {
2627
const allHeaders = headers();
2728
const Plausible = !!process.env.STRIPE_PUBLISHABLE_KEY
2829
? PlausibleProvider
2930
: Fragment;
3031
return (
31-
<html className={interClass}>
32+
<html>
3233
<head>
3334
<link rel="icon" href="/favicon.ico" sizes="any" />
3435
</head>
35-
<body className={clsx(chakra.className, 'dark text-primary !bg-primary')}>
36+
<body className={clsx(jakartaSans.className, 'dark text-primary !bg-primary')}>
3637
<HtmlComponent />
3738
<VariableContextComponent
3839
storageProvider={

‎apps/frontend/src/app/(extension)/layout.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
import interClass from '@gitroom/react/helpers/inter.font';
21
export const dynamic = 'force-dynamic';
32
import '../global.scss';
43
import 'react-tooltip/dist/react-tooltip.css';
54
import '@copilotkit/react-ui/styles.css';
65
import LayoutContext from '@gitroom/frontend/components/layout/layout.context';
76
import { ReactNode } from 'react';
8-
import { Chakra_Petch } from 'next/font/google';
9-
import PlausibleProvider from 'next-plausible';
7+
import { Plus_Jakarta_Sans } from 'next/font/google';
108
import clsx from 'clsx';
119
import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';
12-
import { Fragment } from 'react';
1310
import UtmSaver from '@gitroom/helpers/utils/utm.saver';
14-
const chakra = Chakra_Petch({
15-
weight: '400',
11+
12+
const jakartaSans = Plus_Jakarta_Sans({
13+
weight: ['600', '500'],
14+
style: ['normal', 'italic'],
1615
subsets: ['latin'],
1716
});
17+
1818
export default async function AppLayout({ children }: { children: ReactNode }) {
1919
return (
20-
<html className={interClass}>
20+
<html>
2121
<head>
2222
<link rel="icon" href="/favicon.ico" sizes="any" />
2323
</head>
24-
<body className={clsx(chakra.className, 'dark text-primary !bg-primary')}>
24+
<body className={clsx(jakartaSans.className, 'dark text-primary !bg-primary')}>
2525
<VariableContextComponent
2626
language="en"
2727
storageProvider={

‎apps/frontend/src/components/analytics/stars.table.component.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import useSWR from 'swr';
1515
import clsx from 'clsx';
1616
import { useFetch } from '@gitroom/helpers/utils/custom.fetch';
1717
import ReactLoading from 'react-loading';
18-
import interClass from '@gitroom/react/helpers/inter.font';
1918
import { useT } from '@gitroom/react/translation/get.transation.service.client';
19+
2020
export const UpDown: FC<{
2121
name: string;
2222
param: string;
@@ -201,7 +201,7 @@ export const StarsTableComponent = () => {
201201
</div>
202202
<div className="flex-1 bg-secondary">
203203
{stars?.stars?.length ? (
204-
<table className={`table1 ${interClass}`}>
204+
<table className={`table1`}>
205205
<thead>
206206
<tr>
207207
<th>

‎apps/frontend/src/components/auth/login.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { classValidatorResolver } from '@hookform/resolvers/class-validator';
1010
import { LoginUserDto } from '@gitroom/nestjs-libraries/dtos/auth/login.user.dto';
1111
import { GithubProvider } from '@gitroom/frontend/components/auth/providers/github.provider';
1212
import { OauthProvider } from '@gitroom/frontend/components/auth/providers/oauth.provider';
13-
import interClass from '@gitroom/react/helpers/inter.font';
1413
import { GoogleProvider } from '@gitroom/frontend/components/auth/providers/google.provider';
1514
import { useVariables } from '@gitroom/react/helpers/variable.context';
1615
import { FarcasterProvider } from '@gitroom/frontend/components/auth/providers/farcaster.provider';
@@ -76,7 +75,7 @@ export function Login() {
7675
<div className="h-[20px] mb-[24px] mt-[24px] relative">
7776
<div className="absolute w-full h-[1px] bg-fifth top-[50%] -translate-y-[50%]" />
7877
<div
79-
className={`absolute z-[1] ${interClass} justify-center items-center w-full start-0 top-0 flex`}
78+
className={`absolute z-[1] justify-center items-center w-full start-0 top-0 flex`}
8079
>
8180
<div className="bg-customColor15 px-[16px]">{t('or', 'OR')}</div>
8281
</div>

‎apps/frontend/src/components/auth/login.with.oidc.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use client';
22

33
import { OauthProvider } from '@gitroom/frontend/components/auth/providers/oauth.provider';
4-
import interClass from '@gitroom/react/helpers/inter.font';
54
import { useT } from '@gitroom/react/translation/get.transation.service.client';
65
import { useVariables } from '@gitroom/react/helpers/variable.context';
76

@@ -24,7 +23,7 @@ export const LoginWithOidc = () => {
2423
<div className="h-[20px] mb-[24px] mt-[24px] relative">
2524
<div className="absolute w-full h-[1px] bg-fifth top-[50%] -translate-y-[50%]" />
2625
<div
27-
className={`absolute z-[1] ${interClass} justify-center items-center w-full start-0 top-0 flex`}
26+
className={`absolute z-[1] justify-center items-center w-full start-0 top-0 flex`}
2827
/>
2928
</div>
3029
</>

‎apps/frontend/src/components/auth/providers/farcaster.provider.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use client';
22

33
import { FC, useCallback } from 'react';
4-
import interClass from '@gitroom/react/helpers/inter.font';
54
import { useVariables } from '@gitroom/react/helpers/variable.context';
65
import { NeynarContextProvider, Theme, useNeynarContext } from '@neynar/react';
76
import { NeynarAuthButton } from '@gitroom/frontend/components/auth/nayner.auth.button';
@@ -27,7 +26,7 @@ export const ButtonCaster: FC<{
2726
>
2827
<NeynarAuthButton onLogin={login}>
2928
<div
30-
className={`cursor-pointer bg-[#855ECD] h-[44px] rounded-[4px] flex justify-center items-center text-white ${interClass} gap-[4px]`}
29+
className={`cursor-pointer bg-[#855ECD] h-[44px] rounded-[4px] flex justify-center items-center text-white gap-[4px]`}
3130
>
3231
<svg
3332
width="21px"

0 commit comments

Comments
 (0)