Merge branch 'main' into 5595-fix-focused-cell

oss-gg/twenty-design-challenges/2-design-new-logo-twenty.md

@@ -16,6 +16,6 @@ Your turn 👇
 
 ////////////////////////////
 
-» 02-October-2024 by [yourhandle](https://oss.gg/yourhandle) Logo Link: [logo](https://twenty.com/) tweet Link: [tweet](https://x.com)
+» 08-October-2024 by [adityadeshlahre](https://oss.gg/adityadeshlahre) Logo Link: [logo](https://drive.google.com/drive/folders/13k22xMnX2fhnWK94vas_hO1t-ImqXcHZ?usp=drive_link) » tweet Link: [tweet](https://x.com/adityadeshlahre/status/1843354963176718374)
 
 ---

oss-gg/twenty-side-quest/1-quote-tweet-20-oss-gg-launch.md

@@ -1,6 +1,6 @@
-**Side Quest**: Meme Magic - Craft a meme where a brick plays a role. Tweet it, and tag us @papermarkio to submit.
-**Points**: 150 Points
-**Proof**: Add a screenshot of meme to the PR description. Add a link to your tweet in the list below.
+**Side Quest**: Like & Re-Tweet oss.gg Launch Tweet. Quote-tweet it tagging @twentycrm to say you’ll be contributing.
+**Points**: 50 Points
+**Proof**: Add a screenshot of the retweet to the PR description. Add a link to your retweet in the list below.
 
 Please follow the following schema:
 

oss-gg/twenty-side-quest/2-tweet-about-fav-twenty-feature.md

@@ -1,6 +1,6 @@
-**Side Quest**: Meme Magic - Craft a meme where a brick plays a role. Tweet it, and tag us @papermarkio to submit.
-**Points**: 150 Points
-**Proof**: Add a screenshot of meme to the PR description. Add a link to your tweet in the list below.
+**Side Quest**: Share a tweet about your favorite feature in Twenty. Tweet about your favorite feature in Twenty and mention @twentycrm.
+**Points**: 50 Points
+**Proof**: Add a screenshot of the tweet to the PR description. Add a link to your tweet in the list below.
 
 Please follow the following schema:
 

oss-gg/twenty-side-quest/3-bug-report.md

@@ -0,0 +1,23 @@
+**Side Quest**: Create a bug report. Use the Twenty bug issue template to report a bug in detail, including steps to reproduce it.
+**Points**: 50-150 Points
+**Proof**: Add a link to your bug report in the list below.
+
+Please follow the following schema:
+
+---
+
+» 05-April-2024 by YOUR NAME
+» Link to bug report: https://github.com/twentyhq/twenty/issues/...
+
+---
+
+////////////////////////////
+
+Your turn 👇
+
+////////////////////////////
+
+» 10-October-2024 by Devansh Baghel
+» Link to bug report: https://github.com/twentyhq/twenty/issues/7560
+
+---

oss-gg/twenty-side-quest/3-meme-magic.md → oss-gg/twenty-side-quest/4-meme-magic.md

@@ -1,4 +1,4 @@
-**Side Quest**: Meme Magic - Craft a meme where a brick plays a role. Tweet it, and tag us @papermarkio to submit.
+**Side Quest**: Meme Magic: Craft a meme where the number twenty plays a role. Tweet it, and tag @twentycrm.
 **Points**: 150 Points
 **Proof**: Add a screenshot of meme to the PR description. Add a link to your tweet in the list below.
 

oss-gg/twenty-side-quest/4-gif-magic.md → oss-gg/twenty-side-quest/5-gif-magic.md

@@ -1,4 +1,4 @@
-**Side Quest**: GIF Magic - Craft a GIF where a brick plays a role. Upload it to GIPHY with tags 'open source', 'foss', 'papermarkio'.
+**Side Quest**: Gif Magic: Create a gif related to Twenty. Tweet it, and tag  @twentycrm.
 **Points**: 150 Points
 **Proof**: Add a screenshot of GIF on Giphy to the PR description. Add a link to your GIPHY in the list below.
 
@@ -7,7 +7,7 @@ Please follow the following schema:
 ---
 
 » 05-April-2024 by YOUR NAME
-» Link to Tweet: https://giphy.com/...
+» Link to gif: https://giphy.com/...
 
 ---
 
@@ -18,6 +18,6 @@ Your turn 👇
 ////////////////////////////
 
 » 01-October-2024 by YOUR NAME
-» Link to Tweet: https://x.com/...
+» Link to gif: https://giphy.com/...
 
 ---

oss-gg/twenty-side-quest/5-quest-wizard.md → oss-gg/twenty-side-quest/6-quest-wizard.md

@@ -1,4 +1,4 @@
-**Side Quest**: Complete all papermarkio side quests
+**Side Quest**: Complete all Twenty side quests
 **Points**: 300 Points
 **Proof**: Add screenshots for each side quest to the PR description. Add your name to the list below.
 

package.json

@@ -36,8 +36,6 @@
     "@nestjs/serve-static": "^4.0.1",
     "@nestjs/terminus": "^9.2.2",
     "@nestjs/typeorm": "^10.0.0",
-    "@nivo/calendar": "^0.84.0",
-    "@nivo/core": "^0.84.0",
     "@nx/eslint-plugin": "^17.2.8",
     "@octokit/graphql": "^7.0.2",
     "@ptc-org/nestjs-query-core": "^4.2.0",
@@ -340,7 +338,7 @@
   },
   "license": "AGPL-3.0",
   "name": "twenty",
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@4.4.0",
   "resolutions": {
     "graphql": "16.8.0",
     "type-fest": "4.10.1",

packages/twenty-docker/k8s/manifests/deployment-db.yaml

@@ -22,33 +22,33 @@ spec:
         app: twentycrm-db
     spec:
       volumes:
-      - name: twentycrm-db-data
-        persistentVolumeClaim:
-          claimName: twentycrm-db-pvc
+        - name: twentycrm-db-data
+          persistentVolumeClaim:
+            claimName: twentycrm-db-pvc
       containers:
-      - env:
-        - name: POSTGRES_PASSWORD
-          value: "twenty"
-        - name: BITNAMI_DEBUG
-          value: "true"
-      - image: twentycrm/twenty-postgres:latest
-        imagePullPolicy: Always
-        name: twentycrm
-        ports:
-        - containerPort: 5432
-          name: tcp
-          protocol: TCP
-        resources:
-          requests:
-            memory: "256Mi"
-            cpu: "250m"
-          limits:
-            memory: "1024Mi"
-            cpu: "1000m"
-        stdin: true
-        tty: true
-        volumeMounts:
-        - mountPath: /bitnami/postgresql
-          name: twentycrm-db-data
+        - name: twentycrm
+          image: twentycrm/twenty-postgres:latest
+          imagePullPolicy: Always
+          env:
+            - name: POSTGRES_PASSWORD
+              value: "twenty"
+            - name: BITNAMI_DEBUG
+              value: "true"
+          ports:
+            - containerPort: 5432
+              name: tcp
+              protocol: TCP
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "250m"
+            limits:
+              memory: "1024Mi"
+              cpu: "1000m"
+          stdin: true
+          tty: true
+          volumeMounts:
+            - mountPath: /bitnami/postgresql
+              name: twentycrm-db-data
       dnsPolicy: ClusterFirst
       restartPolicy: Always

packages/twenty-docker/k8s/manifests/deployment-redis.yaml

@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: twentycrm-redis
+  name: twentycrm-redis
+  namespace: twentycrm
+spec:
+  progressDeadlineSeconds: 600
+  replicas: 1
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      app: twentycrm-redis
+  template:
+    metadata:
+      labels:
+        app: twentycrm-redis
+    spec:
+      containers:
+        - name: redis
+          image: redis/redis-stack-server:latest
+          imagePullPolicy: Always
+          env:
+            - name: PORT
+              value: 6379
+          ports:
+            - containerPort: 6379
+              name: redis
+              protocol: TCP
+          resources:
+            requests:
+              memory: "1024Mi"
+              cpu: "250m"
+            limits:
+              memory: "2048Mi"
+              cpu: "500m"
+
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always

packages/twenty-docker/k8s/manifests/deployment-server.yaml

@@ -22,67 +22,78 @@ spec:
         app: twentycrm-server
     spec:
       volumes:
-      - name: twentycrm-server-data
-        persistentVolumeClaim:
-          claimName: twentycrm-server-pvc
+        - name: twentycrm-server-data
+          persistentVolumeClaim:
+            claimName: twentycrm-server-pvc
+        - name: twentycrm-docker-data
+          persistentVolumeClaim:
+            claimName: twentycrm-docker-data-pvc
       containers:
-      - env:
-        - name: PORT
-          value: 3000
-        - name: SERVER_URL
-          value: "https://crm.example.com:443"
-        - name: FRONT_BASE_URL
-          value: "https://crm.example.com:443"
-        - name: PG_DATABASE_URL
-          value: "postgres://twenty:[email protected]/default"
-        - name: ENABLE_DB_MIGRATIONS
-          value: "true"
-        - name: SIGN_IN_PREFILLED
-          value: "true"
-        - name: STORAGE_TYPE
-          value: "local"
-        - name: "MESSAGE_QUEUE_TYPE"
-          value: "pg-boss"
-        - name: ACCESS_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: accessToken
-        - name: LOGIN_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: loginToken
-        - name: REFRESH_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: refreshToken
-        - name: FILE_TOKEN_SECRET
-          valueFrom:
-            secretKeyRef:
-              name: tokens
-              key: fileToken
-      - image: twentycrm/twenty:latest
-        imagePullPolicy: Always
-        name: twentycrm
-        ports:
-        - containerPort: 3000
-          name: http-tcp
-          protocol: TCP
-        resources:
-          requests:
-            memory: "256Mi"
-            cpu: "250m"
-          limits:
-            memory: "1024Mi"
-            cpu: "1000m"
-        stdin: true
-        tty: true
-        volumeMounts:
-        - mountPath: /app/docker-data
-          name: twentycrm-server-data
-        - mountPath: /app/.local-storage
-          name: twentycrm-server-data
+        - name: twentycrm
+          image: twentycrm/twenty:latest
+          imagePullPolicy: Always
+          env:
+            - name: PORT
+              value: 3000
+            - name: SERVER_URL
+              value: "https://crm.example.com:443"
+            - name: FRONT_BASE_URL
+              value: "https://crm.example.com:443"
+            - name: "PG_DATABASE_URL"
+              value: "postgres://twenty:[email protected]/default"
+            - name: "REDIS_HOST"
+              value: "twentycrm-redis.twentycrm.svc.cluster.local"
+            - name: "REDIS_PORT"
+              value: 6379
+            - name: ENABLE_DB_MIGRATIONS
+              value: "true"
+            - name: SIGN_IN_PREFILLED
+              value: "true"
+            - name: STORAGE_TYPE
+              value: "local"
+            - name: "MESSAGE_QUEUE_TYPE"
+              value: "bull-mq"
+            - name: "ACCESS_TOKEN_EXPIRES_IN"
+              value: "7d"
+            - name: "LOGIN_TOKEN_EXPIRES_IN"
+              value: "1h"
+            - name: ACCESS_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: accessToken
+            - name: LOGIN_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: loginToken
+            - name: REFRESH_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: refreshToken
+            - name: FILE_TOKEN_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: tokens
+                  key: fileToken
+          ports:
+            - containerPort: 3000
+              name: http-tcp
+              protocol: TCP
+          resources:
+            requests:
+              memory: "256Mi"
+              cpu: "250m"
+            limits:
+              memory: "1024Mi"
+              cpu: "1000m"
+          stdin: true
+          tty: true
+          volumeMounts:
+            - mountPath: /app/docker-data
+              name: twentycrm-docker-data
+            - mountPath: /app/packages/twenty-server/.local-storage
+              name: twentycrm-server-data
       dnsPolicy: ClusterFirst
       restartPolicy: Always