Merge pull request #3363 from ever-co/develop

Stage

.cspell.json

@@ -6,6 +6,7 @@
 	"words": [
 		" X",
 		" X ",
+		"hookform",
 		"accepte",
 		"Accordian",
 		"adipiscing",
@@ -24,6 +25,7 @@
 		"apidemodt",
 		"apidemodts",
 		"apidev",
+		"apikey",
 		"apisauce",
 		"apistage",
 		"apistagecivo",
@@ -92,6 +94,7 @@
 		"creatoe",
 		"dailyplan",
 		"Darkmode",
+		"DATACENTER",
 		"datas",
 		"dataToDisplay",
 		"daygrid",
@@ -240,6 +243,7 @@
 		"longpress",
 		"Lorem",
 		"lucide",
+		"mailchimp",
 		"mainconfig",
 		"mappagination",
 		"mathieudutour",
@@ -355,7 +359,6 @@
 		"tailess",
 		"Tailess",
 		"tailwindcss",
-		"timesheet-viewMode",
 		"tanstack",
 		"taskid",
 		"taskstatus",
@@ -367,6 +370,7 @@
 		"testid",
 		"timegrid",
 		"Timesheet",
+		"timesheet-viewMode",
 		"Timesheets",
 		"Timeslot",
 		"tinvitations",
@@ -400,6 +404,7 @@
 		"VERSONS",
 		"vertificalline",
 		"vhidden",
+		"Waitlist",
 		"WARNING️",
 		"wasabisys",
 		"webm",

Dockerfile

@@ -18,10 +18,12 @@ ARG NEXT_PUBLIC_JITSU_BROWSER_URL
 ARG NEXT_PUBLIC_JITSU_BROWSER_WRITE_KEY
 ARG NEXT_PUBLIC_GITHUB_APP_NAME=ever-github
 ARG NEXT_PUBLIC_CHATWOOT_API_KEY
+ARG NEXT_IGNORE_ESLINT_ERROR_ON_BUILD=true
 
-FROM node:${NODE_VERSION}-slim as base
+FROM node:${NODE_VERSION}-slim AS base
 
 # Output the environment variable value
+ARG NEXT_PUBLIC_GAUZY_API_SERVER_URL
 RUN echo "NEXT_PUBLIC_GAUZY_API_SERVER_URL=${NEXT_PUBLIC_GAUZY_API_SERVER_URL}"
 
 LABEL maintainer="[email protected]"
@@ -42,7 +44,7 @@ RUN mkdir /temp && cd /temp && \
 RUN npm cache clean --force
 
 # Throw-away build stage to reduce size of final image
-FROM base as build
+FROM base AS build
 
 # We make env vars passed as build argument to be available in this build stage because we prebuild the NextJs app
 ARG NEXT_PUBLIC_GAUZY_API_SERVER_URL
@@ -80,6 +82,7 @@ RUN cd apps/web && \
 COPY . .
 
 ENV NODE_ENV=production
+ENV NEXT_IGNORE_ESLINT_ERROR_ON_BUILD=true
 
 RUN echo $NEXT_PUBLIC_GAUZY_API_SERVER_URL
 
@@ -96,8 +99,6 @@ RUN yarn cache clean
 # Final stage for app image
 FROM base
 
-ENV NODE_ENV=production
-
 # Copy built application
 COPY --from=build /app/apps/web/.next/standalone ./
 COPY --from=build /app/apps/web/.next/static ./apps/web/.next/static

apps/extensions/yarn.lock

@@ -2684,9 +2684,9 @@ cosmiconfig@^7.0.1:
     yaml "^1.10.0"
 
 cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

apps/web/.env

@@ -137,3 +137,7 @@ NEXT_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
 # Warning: IF TRUE This allows production builds to successfully complete even if
 # your project has ESLint errors.
 NEXT_IGNORE_ESLINT_ERROR_ON_BUILD=true
+
+# Mailchimp
+MAILCHIMP_API_KEY=
+MAILCHIMP_LIST_ID=

apps/web/.env.sample

@@ -87,3 +87,7 @@ MEET_JWT_APP_SECRET=
 # Warning: IF TRUE This allows production builds to successfully complete even if
 # your project has ESLint errors.
 NEXT_IGNORE_ESLINT_ERROR_ON_BUILD=true
+
+# Mailchimp
+MAILCHIMP_API_KEY=
+MAILCHIMP_LIST_ID=

apps/web/app/[locale]/layout.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable no-mixed-spaces-and-tabs */
 'use client';
 import 'react-loading-skeleton/dist/skeleton.css';
-import '../../styles/globals.css';
+import '@/styles/globals.css';
 
 import clsx from 'clsx';
 import { Provider } from 'jotai';

apps/web/app/[locale]/page-component.tsx

@@ -66,9 +66,9 @@ function MainPage() {
 					showTimer={headerSize <= 11.8 && isTrackingEnabled}
 					className="h-full"
 					mainHeaderSlot={
-						<div className="sticky z-40 bg-white dark:bg-dark-high">
+						<div className="bg-white dark:bg-dark-high">
 							<div className={clsxm('bg-white dark:bg-dark-high ', !fullWidth && 'x-container')}>
-								<div className="mx-8-container mt-7 !px-0 flex flex-row items-start justify-between ">
+								<div className="mx-8-container my-3 !px-0 flex flex-row items-start justify-between ">
 									<div className="flex items-center justify-center h-10 gap-8">
 										<PeoplesIcon className="text-dark dark:text-[#6b7280] h-6 w-6" />