dev: hub compose file update (#2376) (#2444) (#2445)

* docker-compose-hub modified for envs

* bug:fix recent page hiding last item on scroll #1468 (#2411)

* wip

* fixed the AMD build on ARM

---------

Co-authored-by: Manish Gupta <59428681+manishg3@users.noreply.github.com>
Co-authored-by: pablohashescobar <nikhilschacko@gmail.com>

docker-compose-hub.yml

@@ -3,22 +3,25 @@ version: "3.8"
 services:
         web:
                 container_name: web
+                platform: linux/amd64
                 image: makeplane/plane-frontend:latest
                 restart: always
                 command: /usr/local/bin/start.sh web/server.js web
-                env_file:
-                        - ./web/.env
+                environment:
+                        - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
+                        - NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL:-http://localhost/spaces}
                 depends_on:
                         - api
                         - worker
 
         space:
                 container_name: space
+                platform: linux/amd64
                 image: makeplane/plane-space:latest
                 restart: always
                 command: /usr/local/bin/start.sh space/server.js space
-                env_file:
-                        - ./space/.env
+                environment:
+                        - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0}
                 depends_on:
                         - api
                         - worker
@@ -26,22 +29,94 @@ services:
 
         api:
                 container_name: api
+                platform: linux/amd64
                 image: makeplane/plane-backend:latest
                 restart: always
                 command: ./bin/takeoff
-                env_file:
-                        - ./apiserver/.env
+                environment:
+                        - DEBUG=${DEBUG:-0}
+                        - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted}
+                        - SENTRY_DSN=${SENTRY_DSN:-""}
+                        - PGUSER=${PGUSER:-plane}
+                        - PGPASSWORD=${PGPASSWORD:-plane}
+                        - PGHOST=${PGHOST:-plane-db}
+                        - PGDATABASE=${PGDATABASE:-plane}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - REDIS_HOST=${REDIS_HOST:-plane-redis}
+                        - REDIS_PORT=${REDIS_PORT:-6379}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - EMAIL_HOST=${EMAIL_HOST:-""}
+                        - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
+                        - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
+                        - EMAIL_PORT=${EMAIL_PORT:-587}
+                        - EMAIL_FROM=${EMAIL_FROM:-Team Plane <team@mailer.plane.so>}
+                        - EMAIL_USE_TLS=${EMAIL_USE_TLS:-1}
+                        - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
+                        - AWS_REGION=${AWS_REGION:-""}
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
+                        - OPENAI_API_KEY=${OPENAI_API_KEY:-sk-}
+                        - GPT_ENGINE=${GPT_ENGINE:-gpt-3.5-turbo}
+                        - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-""}
+                        - DOCKERIZED=${DOCKERIZED:-1}
+                        - USE_MINIO=${USE_MINIO:-1}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
+                        - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
+                        - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
+                        - ENABLE_EMAIL_PASSWORD=${ENABLE_EMAIL_PASSWORD:-1}
+                        - ENABLE_MAGIC_LINK_LOGIN=${ENABLE_MAGIC_LINK_LOGIN:-0}
+                        - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
                 depends_on:
                         - plane-db
                         - plane-redis
 
         worker:
                 container_name: bgworker
+                platform: linux/amd64
                 image: makeplane/plane-backend:latest
                 restart: always
                 command: ./bin/worker
-                env_file:
-                        - ./apiserver/.env
+                environment:
+                        - DEBUG=${DEBUG:-0}
+                        - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted}
+                        - SENTRY_DSN=${SENTRY_DSN:-""}
+                        - PGUSER=${PGUSER:-plane}
+                        - PGPASSWORD=${PGPASSWORD:-plane}
+                        - PGHOST=${PGHOST:-plane-db}
+                        - PGDATABASE=${PGDATABASE:-plane}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - REDIS_HOST=${REDIS_HOST:-plane-redis}
+                        - REDIS_PORT=${REDIS_PORT:-6379}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - EMAIL_HOST=${EMAIL_HOST:-""}
+                        - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
+                        - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
+                        - EMAIL_PORT=${EMAIL_PORT:-587}
+                        - EMAIL_FROM=${EMAIL_FROM:-Team Plane <team@mailer.plane.so>}
+                        - EMAIL_USE_TLS=${EMAIL_USE_TLS:-1}
+                        - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
+                        - AWS_REGION=${AWS_REGION:-""}
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
+                        - OPENAI_API_KEY=${OPENAI_API_KEY:-sk-}
+                        - GPT_ENGINE=${GPT_ENGINE:-gpt-3.5-turbo}
+                        - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-""}
+                        - DOCKERIZED=${DOCKERIZED:-1}
+                        - USE_MINIO=${USE_MINIO:-1}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
+                        - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
+                        - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
+                        - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
                 depends_on:
                         - api
                         - plane-db
@@ -49,11 +124,46 @@ services:
 
         beat-worker:
                 container_name: beatworker
+                platform: linux/amd64
                 image: makeplane/plane-backend:latest
                 restart: always
                 command: ./bin/beat
-                env_file:
-                        - ./apiserver/.env
+                environment:
+                        - DEBUG=${DEBUG:-0}
+                        - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted}
+                        - SENTRY_DSN=${SENTRY_DSN:-""}
+                        - PGUSER=${PGUSER:-plane}
+                        - PGPASSWORD=${PGPASSWORD:-plane}
+                        - PGHOST=${PGHOST:-plane-db}
+                        - PGDATABASE=${PGDATABASE:-plane}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - REDIS_HOST=${REDIS_HOST:-plane-redis}
+                        - REDIS_PORT=${REDIS_PORT:-6379}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - EMAIL_HOST=${EMAIL_HOST:-""}
+                        - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
+                        - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
+                        - EMAIL_PORT=${EMAIL_PORT:-587}
+                        - EMAIL_FROM=${EMAIL_FROM:-Team Plane <team@mailer.plane.so>}
+                        - EMAIL_USE_TLS=${EMAIL_USE_TLS:-1}
+                        - EMAIL_USE_SSL=${EMAIL_USE_SSL:-0}
+                        - AWS_REGION=${AWS_REGION:-""}
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.openai.com/v1}
+                        - OPENAI_API_KEY=${OPENAI_API_KEY:-sk-}
+                        - GPT_ENGINE=${GPT_ENGINE:-gpt-3.5-turbo}
+                        - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET:-""}
+                        - DOCKERIZED=${DOCKERIZED:-1}
+                        - USE_MINIO=${USE_MINIO:-1}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - DEFAULT_EMAIL=${DEFAULT_EMAIL:-captain@plane.so}
+                        - DEFAULT_PASSWORD=${DEFAULT_PASSWORD:-password123}
+                        - ENABLE_SIGNUP=${ENABLE_SIGNUP:-1}
+                        - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
                 depends_on:
                         - api
                         - plane-db
@@ -67,13 +177,11 @@ services:
                 command: postgres -c 'max_connections=1000'
                 volumes:
                         - pgdata:/var/lib/postgresql/data
-                env_file:
-                        - .env
                 environment:
-                        POSTGRES_USER: ${PGUSER}
-                        POSTGRES_DB: ${PGDATABASE}
-                        POSTGRES_PASSWORD: ${PGPASSWORD}
-                        PGDATA: /var/lib/postgresql/data
+                        - POSTGRES_USER=${POSTGRES_USER:-plane}
+                        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-plane}
+                        - POSTGRES_DB=${POSTGRES_DB:-plane}
+                        - PGDATA=${PGDATA:-/var/lib/postgresql/data}
 
         plane-redis:
                 container_name: plane-redis
@@ -89,32 +197,32 @@ services:
                 command: server /export --console-address ":9090"
                 volumes:
                         - uploads:/export
-                env_file:
-                        - .env
                 environment:
-                        MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
-                        MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
+                        - MINIO_ROOT_USER=${MINIO_ROOT_USER:-access-key}
+                        - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD:-secret-key}
 
         createbuckets:
                 image: minio/mc
                 entrypoint: >
                         /bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY; /usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME; /usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME; exit 0; "
-                env_file:
-                        - .env
+                environment:
+                        - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-access-key}
+                        - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-secret-key}
+                        - AWS_S3_BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
                 depends_on:
                         - plane-minio
 
         # Comment this if you already have a reverse proxy running
         proxy:
                 container_name: proxy
+                platform: linux/amd64
                 image: makeplane/plane-proxy:latest
                 ports:
                         - ${NGINX_PORT}:80
-                env_file:
-                        - .env
                 environment:
-                        FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
-                        BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+                        - NGINX_PORT=${NGINX_PORT:-80}
+                        - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}
+                        - BUCKET_NAME=${AWS_S3_BUCKET_NAME:-uploads}
                 depends_on:
                         - web
                         - api

space/store/user.ts

@@ -27,6 +27,9 @@ class UserStore implements IUserStore {
   constructor(_rootStore: any) {
     makeObservable(this, {
       // observable
+      loader: observable.ref,
+      error: observable.ref,
+
       currentUser: observable.ref,
       // actions
       setCurrentUser: action,

web/components/icons/state/backlog.tsx

@@ -15,10 +15,28 @@ export const StateGroupBacklogIcon: React.FC<Props> = ({
     height={height}
     width={width}
     className={className}
-    viewBox="0 0 12 12"
-    fill="none"
     xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 323.15 323.03"
   >
-    <circle cx="6" cy="6" r="5.6" stroke={color} strokeWidth="0.8" strokeDasharray="4 4" />
+    <g id="Layer_2" data-name="Layer 2">
+      <g id="Layer_1-2" data-name="Layer 1">
+        <path
+          fill={color}
+          d="M163.42,322.92A172.12,172.12,0,0,1,104.8,312.7c-3.92-1.4-5.22-3.05-3.07-7.1,2.4-4.52,3-11.38,6.64-13.48s9.34,2.47,14.23,3.81c29.55,8.11,58.78,7.25,87.57-3.31,4.08-1.5,5.86-1.05,7.09,3.21a82.63,82.63,0,0,0,4.6,11c1.19,2.57,1,4.06-2,5.2a163.84,163.84,0,0,1-40.05,9.76C173.84,322.45,167.89,323.34,163.42,322.92Z"
+        />
+        <path
+          fill={color}
+          d="M.07,163a174.76,174.76,0,0,1,10.07-58c1.59-4.57,3.53-5.59,7.8-3.2a61,61,0,0,0,10.11,4.19c3.11,1.06,4.07,2.46,2.71,5.79-6.43,15.73-9.17,32.33-9.23,49.14a132.65,132.65,0,0,0,8.17,47.35c2.44,6.5,2.33,6.57-4.06,9.35-3.35,1.45-6.83,2.63-10.11,4.23-2.44,1.19-3.54.49-4.43-1.86a162.3,162.3,0,0,1-10-41C.51,173.12-.24,167.17.07,163Z"
+        />
+        <path
+          fill={color}
+          d="M323,160.16a169.68,169.68,0,0,1-10.2,58.09c-1.45,4.08-3.21,5.07-7.14,3a105.3,105.3,0,0,0-11.48-4.81c-2.23-.85-3.2-1.85-2.16-4.41a133.86,133.86,0,0,0,9.57-48.59,132,132,0,0,0-8.9-50.69c-1.67-4.24-.8-5.79,3.29-7a84,84,0,0,0,11-4.62c2.65-1.24,4.05-.82,5.16,2.12a159.68,159.68,0,0,1,9.68,39C322.56,148.71,323.52,155.17,323,160.16Z"
+        />
+        <path
+          fill={color}
+          d="M161.59,0a164.28,164.28,0,0,1,58,10.72c2.81,1,3.75,2,2.41,4.93-2,4.38-3.86,8.84-5.5,13.37-.93,2.56-2.28,2.77-4.53,1.87a137.94,137.94,0,0,0-99.35-.52c-3.43,1.32-5.3,1.35-6.45-2.69a50.33,50.33,0,0,0-4.55-11c-2.25-3.93-.36-5.11,2.9-6.29A165.32,165.32,0,0,1,161.59,0Z"
+        />
+      </g>
+    </g>
   </svg>
 );

web/components/icons/state/started.tsx

@@ -9,17 +9,38 @@ export const StateGroupStartedIcon: React.FC<Props> = ({
   width = "20",
   height = "20",
   className,
-  color = "#f59e0b",
+  color = "#f39e1f",
 }) => (
   <svg
     height={height}
     width={width}
     className={className}
     xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 12 12"
-    fill="none"
+    viewBox="0 0 152.93 152.95"
   >
-    <circle cx="6" cy="6" r="5.6" stroke={color} strokeWidth="0.8" />
-    <circle cx="6" cy="6" r="3.35" stroke={color} strokeWidth="0.8" strokeDasharray="2.4 2.4" />
+    <g id="Layer_2" data-name="Layer 2">
+      <g id="Layer_1-2" data-name="Layer 1">
+        <path
+          fill={color}
+          d="M77.74,0C35.63-.62.78,32.9,0,74.94c-.77,42.74,33,77.34,76.23,78A76.48,76.48,0,0,0,77.74,0ZM75.46,142.68a66.24,66.24,0,1,1,3-132.45c35.71,1,66.31,31.26,64.16,70.08A66.23,66.23,0,0,1,75.46,142.68Z"
+        />
+        <path
+          fill={color}
+          d="M124.29,76.58a49.52,49.52,0,0,1-3.11,16.9c-.38,1-.77,1.27-1.81.78-2.15-1-4.34-1.92-6.56-2.72-1.3-.46-1.51-1-1-2.3a36.61,36.61,0,0,0,.64-23.77c-1-3.48-1.06-3.47,2.38-4.88,1.57-.65,3.15-1.27,4.68-2,.94-.44,1.34-.22,1.69.75A49.74,49.74,0,0,1,124.29,76.58Z"
+        />
+        <path
+          fill={color}
+          d="M94.65,32.63c-.1.22-.19.42-.27.63-1,2.5-2.08,5-3.09,7.51-.28.69-.55.89-1.37.59a37.3,37.3,0,0,0-26.82,0c-.91.34-1.15.08-1.46-.7-1-2.46-2-4.92-3.06-7.34-.42-.92-.07-1.18.69-1.46a47.66,47.66,0,0,1,34.43,0C94.06,32,94.68,32,94.65,32.63Z"
+        />
+        <path
+          fill={color}
+          d="M28.72,76.67a48.27,48.27,0,0,1,3-17.13c.45-1.25.92-1.34,2-.83,2.25,1,4.56,2,6.87,2.87.86.34,1.05.67.71,1.58a36.85,36.85,0,0,0-.07,26.36c.36,1,.3,1.46-.75,1.86-2.38.9-4.72,1.88-7,2.92-1,.43-1.33.2-1.68-.76A46.76,46.76,0,0,1,28.72,76.67Z"
+        />
+        <path
+          fill={color}
+          d="M76.37,124.22a48.11,48.11,0,0,1-16.91-3.08c-1.05-.38-1.26-.8-.79-1.82,1-2.31,2-4.66,2.93-7,.34-.87.69-1.06,1.61-.72a37.06,37.06,0,0,0,26.67,0c.75-.28,1.09-.23,1.39.55,1,2.56,2,5.13,3.18,7.65.49,1.08-.3,1.13-.86,1.34A46.53,46.53,0,0,1,76.37,124.22Z"
+        />
+      </g>
+    </g>
   </svg>
 );

web/components/pages/pages-list/recent-pages-list.tsx

@@ -43,7 +43,7 @@ export const RecentPagesList: React.FC<TPagesListProps> = ({ viewType }) => {
             if (pages[key].length === 0) return null;
 
             return (
-              <div key={key} className="h-full overflow-hidden">
+              <div key={key} className="h-full overflow-hidden pb-9">
                 <h2 className="text-xl font-semibold capitalize mb-2">
                   {replaceUnderscoreIfSnakeCase(key)}
                 </h2>

web/pages/index.tsx

@@ -155,10 +155,6 @@ const HomePage: NextPage = observer(() => {
     }
   };
 
-  useEffect(() => {
-    setTheme("system");
-  }, [setTheme]);
-
   return (
     <DefaultLayout>
       {isLoading ? (