Skip to content

Commit ad78590

Browse files
alexanderl19alexanderl19
authored
Merge branch 'main' into achen-237-google-calendar-permission-request
2 parents f045efc + 8eb7a69 commit ad78590

26 files changed

Lines changed: 1571 additions & 108 deletions

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md renamed to .github/pull_request_template.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
## Description
22

3+
## Recording/Screenshots
4+
5+
### Before
6+
7+
### After
8+
39
## Test Plan
410

511
<!-- What to do to make sure that the feature works? -->
612

713
## Issues
814

915
<!-- What issues are related to or will be closed by this PR? -->
16+
<!-- This section is **not** for issues you personally ran into, or any which you expect to occur -->
1017

1118
- Closes #
1219

‎.github/workflows/deploy-prod.yml‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,56 @@
33
name: Deploy to production
44

55
on:
6-
push:
7-
branches:
8-
- main
9-
workflow_dispatch:
6+
push:
7+
branches:
8+
- main
9+
workflow_dispatch:
1010

1111
permissions:
12-
id-token: write
13-
contents: read
14-
deployments: write
15-
pull-requests: write
12+
id-token: write
13+
contents: read
14+
deployments: write
15+
pull-requests: write
1616

1717
concurrency:
18-
group: ${{ github.workflow }}-${{ github.ref }}
19-
cancel-in-progress: true
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
cancel-in-progress: true
2020

2121
env:
22-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
23-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
24-
DATABASE_URL: ${{ secrets.PROD_DB_URL }}
25-
# OIDC Configuration
26-
OIDC_CLIENT_ID: ${{ secrets.OIDC_CLIENT_ID }}
27-
OIDC_ISSUER_URL: ${{ secrets.OIDC_ISSUER_URL }}
22+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
23+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
24+
DATABASE_URL: ${{ secrets.PROD_DB_URL }}
25+
# OIDC Configuration
26+
OIDC_CLIENT_ID: ${{ secrets.OIDC_CLIENT_ID }}
27+
OIDC_ISSUER_URL: ${{ secrets.OIDC_ISSUER_URL }}
2828

2929
jobs:
30-
deploy:
31-
runs-on: ubuntu-latest
30+
deploy:
31+
runs-on: ubuntu-latest
3232

33-
environment:
34-
name: production
35-
url: https://zotmeet.com
33+
environment:
34+
name: production
35+
url: https://zotmeet.com
3636

37-
steps:
38-
- name: Checkout repository
39-
uses: actions/checkout@v4
37+
steps:
38+
- name: Checkout repository
39+
uses: actions/checkout@v4
4040

41-
- name: Setup Node.js and pnpm
42-
uses: ./.github/actions/setup-node-and-pnpm
41+
- name: Setup Node.js and pnpm
42+
uses: ./.github/actions/setup-node-and-pnpm
4343

44-
- name: Install dependencies
45-
run: pnpm install --frozen-lockfile
44+
- name: Install dependencies
45+
run: pnpm install --frozen-lockfile
4646

47-
- name: Migrate database
48-
run: pnpm db:migrate
47+
- name: Migrate database
48+
run: pnpm db:migrate
4949

50-
- name: Deploy to production
51-
run: STAGE=prod pnpm sst deploy --stage production
50+
# TODO (@KevinWu098): Remove this stage once SST fixes compat with Pulumi
51+
# https://github.com/anomalyco/sst/issues/6314
52+
- name: Setup Pulumi
53+
uses: pulumi/actions@v5
54+
with:
55+
pulumi-version: 3.138.0 # Any version < 3.214.0 works
56+
57+
- name: Deploy to production
58+
run: STAGE=prod pnpm sst deploy --stage production

‎.github/workflows/deploy-staging.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ jobs:
6060
- name: Migrate database
6161
run: pnpm db:migrate
6262

63+
# TODO (@KevinWu098): Remove this stage once SST fixes compat with Pulumi
64+
# https://github.com/anomalyco/sst/issues/6314
65+
- name: Setup Pulumi
66+
uses: pulumi/actions@v5
67+
with:
68+
pulumi-version: 3.138.0 # Any version < 3.214.0 works
69+
6370
- name: Deploy to staging
6471
id: deploy
6572
run: pnpm sst deploy --stage staging-${{ github.event.pull_request.number }}

‎.github/workflows/destroy-staging.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ jobs:
4545
- name: Install dependencies
4646
run: pnpm install --frozen-lockfile
4747

48+
# TODO (@KevinWu098): Remove this stage once SST fixes compat with Pulumi
49+
# https://github.com/anomalyco/sst/issues/6314
50+
- name: Setup Pulumi
51+
uses: pulumi/actions@v5
52+
with:
53+
pulumi-version: 3.138.0 # Any version < 3.214.0 works
54+
4855
- name: Destroy ZotMeet staging build
4956
run: pnpm sst remove --stage staging-$PR_NUM
5057

‎.husky/commit-msg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pnpm dlx commitlint --edit $1
2-
pnpm dlx devmoji --edit $1
1+
pnpm exec commitlint --edit $1
2+
pnpm exec devmoji --edit $1

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@
2525
"@oslojs/crypto": "^1.0.1",
2626
"@oslojs/encoding": "^1.1.0",
2727
"@radix-ui/react-avatar": "^1.1.1",
28+
"@radix-ui/react-checkbox": "^1.3.3",
2829
"@radix-ui/react-collapsible": "^1.1.1",
2930
"@radix-ui/react-dialog": "^1.1.2",
3031
"@radix-ui/react-dropdown-menu": "^2.1.2",
31-
"@radix-ui/react-label": "^2.1.0",
32+
"@radix-ui/react-label": "^2.1.1",
3233
"@radix-ui/react-select": "^2.1.2",
3334
"@radix-ui/react-separator": "^1.1.0",
3435
"@radix-ui/react-slot": "^1.1.0",
36+
"@radix-ui/react-switch": "^1.2.6",
3537
"@radix-ui/react-tabs": "^1.1.1",
3638
"@radix-ui/react-tooltip": "^1.1.3",
3739
"arctic": "^3.6.0",

0 commit comments

Comments
 (0)