Skip to content

Commit 5ff8514

Browse files
Palanikannan1437Palanikannan1437
committed
Merge branch 'preview' into fix/upgrade-editor
2 parents d9944f2 + 58ac1dc commit 5ff8514

File tree

477 files changed

+14918
-5362
lines changed

Some content is hidden

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

477 files changed

+14918
-5362
lines changed

‎.github/actions/build-push-ce/action.yml‎

Lines changed: 0 additions & 126 deletions
This file was deleted.

‎.github/workflows/build-branch.yml‎

Lines changed: 27 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ env:
3636
jobs:
3737
branch_build_setup:
3838
name: Build Setup
39-
runs-on: ubuntu-20.04
39+
runs-on: ubuntu-22.04
4040
outputs:
4141
gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
4242
gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
@@ -160,20 +160,17 @@ jobs:
160160
branch_build_push_admin:
161161
if: ${{ needs.branch_build_setup.outputs.build_admin == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
162162
name: Build-Push Admin Docker Image
163-
runs-on: ubuntu-20.04
163+
runs-on: ubuntu-22.04
164164
needs: [branch_build_setup]
165165
steps:
166-
- id: checkout_files
167-
name: Checkout Files
168-
uses: actions/checkout@v4
169166
- name: Admin Build and Push
170-
uses: ./.github/actions/build-push-ce
167+
uses: makeplane/actions/build-push@v1.0.0
171168
with:
172169
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
173170
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
174171
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
175-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
176-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
172+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
173+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
177174
docker-image-owner: makeplane
178175
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_admin }}
179176
build-context: .
@@ -186,20 +183,17 @@ jobs:
186183
branch_build_push_web:
187184
if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
188185
name: Build-Push Web Docker Image
189-
runs-on: ubuntu-20.04
186+
runs-on: ubuntu-22.04
190187
needs: [branch_build_setup]
191188
steps:
192-
- id: checkout_files
193-
name: Checkout Files
194-
uses: actions/checkout@v4
195189
- name: Web Build and Push
196-
uses: ./.github/actions/build-push-ce
190+
uses: makeplane/actions/build-push@v1.0.0
197191
with:
198192
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
199193
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
200194
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
201-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
202-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
195+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
196+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
203197
docker-image-owner: makeplane
204198
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_web }}
205199
build-context: .
@@ -212,20 +206,17 @@ jobs:
212206
branch_build_push_space:
213207
if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
214208
name: Build-Push Space Docker Image
215-
runs-on: ubuntu-20.04
209+
runs-on: ubuntu-22.04
216210
needs: [branch_build_setup]
217211
steps:
218-
- id: checkout_files
219-
name: Checkout Files
220-
uses: actions/checkout@v4
221212
- name: Space Build and Push
222-
uses: ./.github/actions/build-push-ce
213+
uses: makeplane/actions/build-push@v1.0.0
223214
with:
224215
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
225216
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
226217
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
227-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
228-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
218+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
219+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
229220
docker-image-owner: makeplane
230221
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_space }}
231222
build-context: .
@@ -238,20 +229,17 @@ jobs:
238229
branch_build_push_live:
239230
if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
240231
name: Build-Push Live Collaboration Docker Image
241-
runs-on: ubuntu-20.04
232+
runs-on: ubuntu-22.04
242233
needs: [branch_build_setup]
243234
steps:
244-
- id: checkout_files
245-
name: Checkout Files
246-
uses: actions/checkout@v4
247235
- name: Live Build and Push
248-
uses: ./.github/actions/build-push-ce
236+
uses: makeplane/actions/build-push@v1.0.0
249237
with:
250238
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
251239
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
252240
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
253-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
254-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
241+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
242+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
255243
docker-image-owner: makeplane
256244
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_live }}
257245
build-context: .
@@ -264,20 +252,17 @@ jobs:
264252
branch_build_push_apiserver:
265253
if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
266254
name: Build-Push API Server Docker Image
267-
runs-on: ubuntu-20.04
255+
runs-on: ubuntu-22.04
268256
needs: [branch_build_setup]
269257
steps:
270-
- id: checkout_files
271-
name: Checkout Files
272-
uses: actions/checkout@v4
273258
- name: Backend Build and Push
274-
uses: ./.github/actions/build-push-ce
259+
uses: makeplane/actions/build-push@v1.0.0
275260
with:
276261
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
277262
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
278263
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
279-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
280-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
264+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
265+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
281266
docker-image-owner: makeplane
282267
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_backend }}
283268
build-context: ./apiserver
@@ -290,20 +275,17 @@ jobs:
290275
branch_build_push_proxy:
291276
if: ${{ needs.branch_build_setup.outputs.build_proxy == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
292277
name: Build-Push Proxy Docker Image
293-
runs-on: ubuntu-20.04
278+
runs-on: ubuntu-22.04
294279
needs: [branch_build_setup]
295280
steps:
296-
- id: checkout_files
297-
name: Checkout Files
298-
uses: actions/checkout@v4
299281
- name: Proxy Build and Push
300-
uses: ./.github/actions/build-push-ce
282+
uses: makeplane/actions/build-push@v1.0.0
301283
with:
302284
build-release: ${{ needs.branch_build_setup.outputs.build_release }}
303285
build-prerelease: ${{ needs.branch_build_setup.outputs.build_prerelease }}
304286
release-version: ${{ needs.branch_build_setup.outputs.release_version }}
305-
docker-username: ${{ secrets.DOCKERHUB_USERNAME }}
306-
docker-token: ${{ secrets.DOCKERHUB_TOKEN }}
287+
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
288+
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
307289
docker-image-owner: makeplane
308290
docker-image-name: ${{ needs.branch_build_setup.outputs.dh_img_proxy }}
309291
build-context: ./nginx
@@ -316,7 +298,7 @@ jobs:
316298
attach_assets_to_build:
317299
if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
318300
name: Attach Assets to Release
319-
runs-on: ubuntu-20.04
301+
runs-on: ubuntu-22.04
320302
needs: [branch_build_setup]
321303
steps:
322304
- name: Checkout
@@ -341,7 +323,7 @@ jobs:
341323
publish_release:
342324
if: ${{ needs.branch_build_setup.outputs.build_type == 'Release' }}
343325
name: Build Release
344-
runs-on: ubuntu-20.04
326+
runs-on: ubuntu-22.04
345327
needs:
346328
[
347329
branch_build_setup,

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
</a>
77
</p>
88
<h1 align="center"><b>Plane</b></h1>
9+
<p align="center"><b>Open-source project management that unlocks customer value</b></p>
910

1011
<p align="center">
1112
<a href="https://discord.com/invite/A92xrEGCge">
@@ -57,7 +58,7 @@ Prefer full control over your data and infrastructure? Install and run Plane on
5758
| Docker | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://developers.plane.so/self-hosting/methods/docker-compose) |
5859
| Kubernetes | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://developers.plane.so/self-hosting/methods/kubernetes) |
5960

60-
`Instance admins` can manage and customize settings using [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
61+
`Instance admins` can configure instance settings with [God mode](https://developers.plane.so/self-hosting/govern/instance-admin).
6162

6263
## 🌟 Features
6364

@@ -117,9 +118,9 @@ Setting up your local environment is simple and straightforward. Follow these st
117118

118119
That’s it! You’re all set to begin coding. Remember to refresh your browser if changes don’t auto-reload. Happy contributing! 🎉
119120

120-
## Built with
121-
[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)<br/>
122-
[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)<br/>
121+
## ⚙️ Built with
122+
[![Next JS](https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white)](https://nextjs.org/)
123+
[![Django](https://img.shields.io/badge/Django-092E20?style=for-the-badge&logo=django&logoColor=green)](https://www.djangoproject.com/)
123124
[![Node JS](https://img.shields.io/badge/node.js-339933?style=for-the-badge&logo=Node.js&logoColor=white)](https://nodejs.org/en)
124125

125126
## 📸 Screenshots

‎admin/Dockerfile.admin‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
FROM node:20-alpine as base
2+
13
# *****************************************************************************
24
# STAGE 1: Build the project
35
# *****************************************************************************
4-
FROM node:18-alpine AS builder
6+
FROM base AS builder
57
RUN apk add --no-cache libc6-compat
68
WORKDIR /app
79

@@ -13,7 +15,7 @@ RUN turbo prune --scope=admin --docker
1315
# *****************************************************************************
1416
# STAGE 2: Install dependencies & build the project
1517
# *****************************************************************************
16-
FROM node:18-alpine AS installer
18+
FROM base AS installer
1719

1820
RUN apk add --no-cache libc6-compat
1921
WORKDIR /app
@@ -52,7 +54,7 @@ RUN yarn turbo run build --filter=admin
5254
# *****************************************************************************
5355
# STAGE 3: Copy the project and start it
5456
# *****************************************************************************
55-
FROM node:18-alpine AS runner
57+
FROM base AS runner
5658
WORKDIR /app
5759

5860
COPY --from=installer /app/admin/next.config.js .

‎admin/Dockerfile.dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:18-alpine
1+
FROM node:20-alpine
22
RUN apk add --no-cache libc6-compat
33
# Set working directory
44
WORKDIR /app

‎admin/app/email/test-email-modal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { FC, useEffect, useState } from "react";
22
import { Dialog, Transition } from "@headlessui/react";
3+
// plane imports
4+
import { InstanceService } from "@plane/services";
35
// ui
46
import { Button, Input } from "@plane/ui";
5-
// services
6-
import { InstanceService } from "@/services/instance.service";
77

88
type Props = {
99
isOpen: boolean;

0 commit comments

Comments
 (0)