Skip to content

Commit 697165e

Browse files
1akhanBaheti1akhanBaheti
committed
Merge branch 'preview' of https://github.com/makeplane/plane into chore/event-improvements
2 parents 2f67ca7 + f77761b commit 697165e

File tree

843 files changed

+24566
-22800
lines changed

Some content is hidden

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

843 files changed

+24566
-22800
lines changed

‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
extends: ["custom"],
55
settings: {
66
next: {
7-
rootDir: ["web/", "space/"],
7+
rootDir: ["web/", "space/", "admin/"],
88
},
99
},
1010
};

‎.github/workflows/build-branch.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
2323
gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
2424
gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
25-
build_frontend: ${{ steps.changed_files.outputs.frontend_any_changed }}
25+
build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
26+
build_apiserver: ${{ steps.changed_files.outputs.apiserver_any_changed }}
2627
build_admin: ${{ steps.changed_files.outputs.admin_any_changed }}
2728
build_space: ${{ steps.changed_files.outputs.space_any_changed }}
28-
build_backend: ${{ steps.changed_files.outputs.backend_any_changed }}
29-
build_proxy: ${{ steps.changed_files.outputs.proxy_any_changed }}
29+
build_web: ${{ steps.changed_files.outputs.web_any_changed }}
3030

3131
steps:
3232
- id: set_env_variables
@@ -54,8 +54,12 @@ jobs:
5454
uses: tj-actions/changed-files@v42
5555
with:
5656
files_yaml: |
57-
frontend:
58-
- web/**
57+
apiserver:
58+
- apiserver/**
59+
proxy:
60+
- nginx/**
61+
admin:
62+
- admin/**
5963
- packages/**
6064
- 'package.json'
6165
- 'yarn.lock'
@@ -68,20 +72,16 @@ jobs:
6872
- 'yarn.lock'
6973
- 'tsconfig.json'
7074
- 'turbo.json'
71-
admin:
72-
- admin/**
75+
web:
76+
- web/**
7377
- packages/**
7478
- 'package.json'
7579
- 'yarn.lock'
7680
- 'tsconfig.json'
7781
- 'turbo.json'
78-
backend:
79-
- apiserver/**
80-
proxy:
81-
- nginx/**
8282
83-
branch_build_push_frontend:
84-
if: ${{ needs.branch_build_setup.outputs.build_frontend == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
83+
branch_build_push_web:
84+
if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
8585
runs-on: ubuntu-20.04
8686
needs: [branch_build_setup]
8787
env:
@@ -236,8 +236,8 @@ jobs:
236236
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
237237
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
238238

239-
branch_build_push_backend:
240-
if: ${{ needs.branch_build_setup.outputs.build_backend == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
239+
branch_build_push_apiserver:
240+
if: ${{ needs.branch_build_setup.outputs.build_apiserver == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
241241
runs-on: ubuntu-20.04
242242
needs: [branch_build_setup]
243243
env:

‎.github/workflows/build-test-pull-request.yml

+56-23
Original file line numberDiff line numberDiff line change
@@ -10,95 +10,128 @@ jobs:
1010
runs-on: ubuntu-latest
1111
outputs:
1212
apiserver_changed: ${{ steps.changed-files.outputs.apiserver_any_changed }}
13+
admin_changed: ${{ steps.changed-files.outputs.admin_any_changed }}
14+
space_changed: ${{ steps.changed-files.outputs.space_any_changed }}
1315
web_changed: ${{ steps.changed-files.outputs.web_any_changed }}
14-
space_changed: ${{ steps.changed-files.outputs.deploy_any_changed }}
1516
steps:
16-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1718
- name: Get changed files
1819
id: changed-files
19-
uses: tj-actions/changed-files@v41
20+
uses: tj-actions/changed-files@v44
2021
with:
2122
files_yaml: |
2223
apiserver:
2324
- apiserver/**
24-
web:
25-
- web/**
25+
admin:
26+
- admin/**
2627
- packages/**
2728
- 'package.json'
2829
- 'yarn.lock'
2930
- 'tsconfig.json'
3031
- 'turbo.json'
31-
deploy:
32+
space:
3233
- space/**
3334
- packages/**
3435
- 'package.json'
3536
- 'yarn.lock'
3637
- 'tsconfig.json'
3738
- 'turbo.json'
39+
web:
40+
- web/**
41+
- packages/**
42+
- 'package.json'
43+
- 'yarn.lock'
44+
- 'tsconfig.json'
45+
- 'turbo.json'
3846
3947
lint-apiserver:
4048
needs: get-changed-files
4149
runs-on: ubuntu-latest
4250
if: needs.get-changed-files.outputs.apiserver_changed == 'true'
4351
steps:
44-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
4553
- name: Set up Python
46-
uses: actions/setup-python@v4
54+
uses: actions/setup-python@v5
4755
with:
48-
python-version: '3.x' # Specify the Python version you need
56+
python-version: "3.x" # Specify the Python version you need
4957
- name: Install Pylint
5058
run: python -m pip install ruff
5159
- name: Install Apiserver Dependencies
5260
run: cd apiserver && pip install -r requirements.txt
5361
- name: Lint apiserver
5462
run: ruff check --fix apiserver
5563

56-
lint-web:
64+
lint-admin:
5765
needs: get-changed-files
58-
if: needs.get-changed-files.outputs.web_changed == 'true'
66+
if: needs.get-changed-files.outputs.admin_changed == 'true'
5967
runs-on: ubuntu-latest
6068
steps:
61-
- uses: actions/checkout@v3
69+
- uses: actions/checkout@v4
6270
- name: Setup Node.js
63-
uses: actions/setup-node@v2
71+
uses: actions/setup-node@v4
6472
with:
6573
node-version: 18.x
6674
- run: yarn install
67-
- run: yarn lint --filter=web
75+
- run: yarn lint --filter=admin
6876

6977
lint-space:
7078
needs: get-changed-files
7179
if: needs.get-changed-files.outputs.space_changed == 'true'
7280
runs-on: ubuntu-latest
7381
steps:
74-
- uses: actions/checkout@v3
82+
- uses: actions/checkout@v4
7583
- name: Setup Node.js
76-
uses: actions/setup-node@v2
84+
uses: actions/setup-node@v4
7785
with:
7886
node-version: 18.x
7987
- run: yarn install
8088
- run: yarn lint --filter=space
8189

82-
build-web:
83-
needs: lint-web
90+
lint-web:
91+
needs: get-changed-files
92+
if: needs.get-changed-files.outputs.web_changed == 'true'
8493
runs-on: ubuntu-latest
8594
steps:
86-
- uses: actions/checkout@v3
95+
- uses: actions/checkout@v4
8796
- name: Setup Node.js
88-
uses: actions/setup-node@v2
97+
uses: actions/setup-node@v4
8998
with:
9099
node-version: 18.x
91100
- run: yarn install
92-
- run: yarn build --filter=web
101+
- run: yarn lint --filter=web
102+
103+
build-admin:
104+
needs: lint-admin
105+
runs-on: ubuntu-latest
106+
steps:
107+
- uses: actions/checkout@v4
108+
- name: Setup Node.js
109+
uses: actions/setup-node@v4
110+
with:
111+
node-version: 18.x
112+
- run: yarn install
113+
- run: yarn build --filter=admin
93114

94115
build-space:
95116
needs: lint-space
96117
runs-on: ubuntu-latest
97118
steps:
98-
- uses: actions/checkout@v3
119+
- uses: actions/checkout@v4
99120
- name: Setup Node.js
100-
uses: actions/setup-node@v2
121+
uses: actions/setup-node@v4
101122
with:
102123
node-version: 18.x
103124
- run: yarn install
104125
- run: yarn build --filter=space
126+
127+
build-web:
128+
needs: lint-web
129+
runs-on: ubuntu-latest
130+
steps:
131+
- uses: actions/checkout@v4
132+
- name: Setup Node.js
133+
uses: actions/setup-node@v4
134+
with:
135+
node-version: 18.x
136+
- run: yarn install
137+
- run: yarn build --filter=web

‎.github/workflows/feature-deployment.yml

+21-10
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ on:
55
inputs:
66
web-build:
77
required: false
8-
description: 'Build Web'
8+
description: "Build Web"
99
type: boolean
1010
default: true
1111
space-build:
1212
required: false
13-
description: 'Build Space'
13+
description: "Build Space"
14+
type: boolean
15+
default: false
16+
admin-build:
17+
required: false
18+
description: "Build Admin"
1419
type: boolean
1520
default: false
1621
admin-build:
@@ -35,7 +40,7 @@ jobs:
3540
echo "BUILD_SPACE=$BUILD_SPACE"
3641
echo "BUILD_ADMIN=$BUILD_ADMIN"
3742
outputs:
38-
web-build: ${{ env.BUILD_WEB}}
43+
web-build: ${{ env.BUILD_WEB}}
3944
space-build: ${{env.BUILD_SPACE}}
4045
admin-build: ${{env.BUILD_ADMIN}}
4146

@@ -53,7 +58,7 @@ jobs:
5358
- name: Set up Node.js
5459
uses: actions/setup-node@v4
5560
with:
56-
node-version: '18'
61+
node-version: "18"
5762
- name: Install AWS cli
5863
run: |
5964
sudo apt-get update
@@ -79,7 +84,7 @@ jobs:
7984
8085
FILE_EXPIRY=$(date -u -d "+2 days" +"%Y-%m-%dT%H:%M:%SZ")
8186
aws s3 cp $TAR_NAME s3://${{ env.AWS_BUCKET }}/${{github.sha}}/$TAR_NAME --expires $FILE_EXPIRY
82-
87+
8388
feature-build-space:
8489
if: ${{ needs.setup-feature-build.outputs.space-build == 'true' }}
8590
needs: setup-feature-build
@@ -89,7 +94,7 @@ jobs:
8994
AWS_ACCESS_KEY_ID: ${{ vars.FEATURE_PREVIEW_AWS_ACCESS_KEY_ID }}
9095
AWS_SECRET_ACCESS_KEY: ${{ secrets.FEATURE_PREVIEW_AWS_SECRET_ACCESS_KEY }}
9196
AWS_BUCKET: ${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}
92-
NEXT_PUBLIC_DEPLOY_WITH_NGINX: 1
97+
NEXT_PUBLIC_SPACE_BASE_PATH: "/spaces"
9398
NEXT_PUBLIC_API_BASE_URL: ${{ vars.FEATURE_PREVIEW_NEXT_PUBLIC_API_BASE_URL }}
9499
outputs:
95100
do-build: ${{ needs.setup-feature-build.outputs.space-build }}
@@ -98,7 +103,7 @@ jobs:
98103
- name: Set up Node.js
99104
uses: actions/setup-node@v4
100105
with:
101-
node-version: '18'
106+
node-version: "18"
102107
- name: Install AWS cli
103108
run: |
104109
sudo apt-get update
@@ -134,7 +139,7 @@ jobs:
134139
AWS_ACCESS_KEY_ID: ${{ vars.FEATURE_PREVIEW_AWS_ACCESS_KEY_ID }}
135140
AWS_SECRET_ACCESS_KEY: ${{ secrets.FEATURE_PREVIEW_AWS_SECRET_ACCESS_KEY }}
136141
AWS_BUCKET: ${{ vars.FEATURE_PREVIEW_AWS_BUCKET }}
137-
NEXT_PUBLIC_DEPLOY_WITH_NGINX: 1
142+
NEXT_PUBLIC_ADMIN_BASE_PATH: "/god-mode"
138143
NEXT_PUBLIC_API_BASE_URL: ${{ vars.FEATURE_PREVIEW_NEXT_PUBLIC_API_BASE_URL }}
139144
outputs:
140145
do-build: ${{ needs.setup-feature-build.outputs.admin-build }}
@@ -143,7 +148,7 @@ jobs:
143148
- name: Set up Node.js
144149
uses: actions/setup-node@v4
145150
with:
146-
node-version: '18'
151+
node-version: "18"
147152
- name: Install AWS cli
148153
run: |
149154
sudo apt-get update
@@ -172,7 +177,13 @@ jobs:
172177
173178
feature-deploy:
174179
if: ${{ always() && (needs.setup-feature-build.outputs.web-build == 'true' || needs.setup-feature-build.outputs.space-build == 'true' || needs.setup-feature-build.outputs.admin-build == 'true') }}
175-
needs: [setup-feature-build, feature-build-web, feature-build-space, feature-build-admin]
180+
needs:
181+
[
182+
setup-feature-build,
183+
feature-build-web,
184+
feature-build-space,
185+
feature-build-admin,
186+
]
176187
name: Feature Deploy
177188
runs-on: ubuntu-latest
178189
env:

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,4 @@ tmp/
8181
## packages
8282
dist
8383
.temp/
84+
deploy/selfhost/plane-app/

‎README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</p>
88

99
<h3 align="center"><b>Plane</b></h3>
10-
<p align="center"><b>Open-source project management that unlocks customer value.</b></p>
10+
<p align="center"><b>Open-source project management that unlocks customer value</b></p>
1111

1212
<p align="center">
1313
<a href="https://discord.com/invite/A92xrEGCge">
@@ -40,22 +40,22 @@
4040
</a>
4141
</p>
4242

43-
Meet [Plane](https://dub.sh/plane-website-readme). An open-source software development tool to manage issues, sprints, and product roadmaps with peace of mind. 🧘‍♀️
43+
Meet [Plane](https://dub.sh/plane-website-readme), an open-source project management tool to track issues, run ~sprints~ cycles, and manage product roadmaps without the chaos of managing the tool itself. 🧘‍♀️
4444

45-
> Plane is still in its early days, not everything will be perfect yet, and hiccups may happen. Please let us know of any suggestions, ideas, or bugs that you encounter on our [Discord](https://discord.com/invite/A92xrEGCge) or GitHub issues, and we will use your feedback to improve in our upcoming releases.
45+
> Plane is evolving every day. Your suggestions, ideas, and reported bugs help us immensely. Do not hesitate to join in the conversation on [Discord](https://discord.com/invite/A92xrEGCge) or raise a GitHub issue. We read everything and respond to most.
4646
4747
## ⚡ Installation
4848

49-
The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account where we offer a hosted solution for users.
49+
The easiest way to get started with Plane is by creating a [Plane Cloud](https://app.plane.so) account.
5050

51-
If you want more control over your data, prefer to self-host Plane, please refer to our [deployment documentation](https://docs.plane.so/docker-compose).
51+
If you would like to self-host Plane, please see our [deployment guide](https://docs.plane.so/docker-compose).
5252

53-
| Installation Methods | Documentation Link |
53+
| Installation methods | Docs link |
5454
| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
5555
| Docker | [![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)](https://docs.plane.so/self-hosting/methods/docker-compose) |
5656
| Kubernetes | [![Kubernetes](https://img.shields.io/badge/kubernetes-%23326ce5.svg?style=for-the-badge&logo=kubernetes&logoColor=white)](https://docs.plane.so/kubernetes) |
5757

58-
`Instance admin` can configure instance settings using our [God-mode](https://docs.plane.so/instance-admin) feature.
58+
`Instance admins` can configure instance settings with [God-mode](https://docs.plane.so/instance-admin).
5959

6060
## 🚀 Features
6161

‎admin/.env.example

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
NEXT_PUBLIC_API_BASE_URL=""
2+
NEXT_PUBLIC_ADMIN_BASE_PATH="/god-mode"
3+
NEXT_PUBLIC_WEB_BASE_URL=""

0 commit comments

Comments
 (0)