Skip to content

Commit e69c87f

Browse files
committed
Show date when a new day starts in chat, v0.0.95
1 parent 389c3e2 commit e69c87f

File tree

29 files changed

+2959
-5030
lines changed

29 files changed

+2959
-5030
lines changed

.do/app.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ services:
3131
value: <AWS_ENDPOINT>
3232
- key: MEDIA_DOMAIN
3333
value: <MEDIA_DOMAIN>
34-
- key: SENTRY_DSN
35-
value: <SENTRY_DSN>
3634
- key: COMET_USER_PASSWORD
3735
value: <COMET_USER_PASSWORD>
3836
databases:
@@ -42,10 +40,6 @@ databases:
4240
cluster_name: comet
4341
db_name: defaultdb
4442
db_user: doadmin
45-
- name: redis
46-
engine: REDIS
47-
production: true
48-
cluster_name: comet-redis
4943
domains:
5044
- domain: api.joincomet.app
5145
type: PRIMARY

.github/workflows/build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ jobs:
6767
- run: yarn run build:web
6868
env:
6969
VITE_API_DOMAIN: ${{ secrets.API_DOMAIN }}
70-
VITE_SENTRY_DSN: ${{ secrets.WEB_SENTRY_DSN }}
7170
VITE_BTC_ADDRESS: ${{ secrets.BTC_ADDRESS }}
7271
VITE_ETH_ADDRESS: ${{ secrets.ETH_ADDRESS }}
73-
VITE_TENOR_API_KEY: ${{ secrets.TENOR_API_KEY }}
7472
- uses: actions/upload-artifact@v2
7573
with:
7674
name: dist-web
@@ -138,7 +136,6 @@ jobs:
138136
TAG=${{ steps.prep.outputs.tag }}
139137
ACCESS_TOKEN_SECRET=$(printf '%s\n' "${{ secrets.ACCESS_TOKEN_SECRET }}" | sed -e 's/[]\/$*.^[]/\\&/g');
140138
AWS_SECRET_ACCESS_KEY=$(printf '%s\n' "${{ secrets.AWS_SECRET_ACCESS_KEY }}" | sed -e 's/[]\/$*.^[]/\\&/g');
141-
SENTRY_DSN=$(printf '%s\n' "${{ secrets.SERVER_SENTRY_DSN }}" | sed -e 's/[]\/$*.^[]/\\&/g');
142139
COMET_USER_PASSWORD=$(printf '%s\n' "${{ secrets.COMET_USER_PASSWORD }}" | sed -e 's/[]\/$*.^[]/\\&/g');
143140
sed -i "s/<TAG>/$TAG/g" .do/app.yaml
144141
sed -i "s/<ACCESS_TOKEN_SECRET>/$ACCESS_TOKEN_SECRET/g" .do/app.yaml
@@ -147,7 +144,6 @@ jobs:
147144
sed -i "s/<AWS_SECRET_ACCESS_KEY>/$AWS_SECRET_ACCESS_KEY/g" .do/app.yaml
148145
sed -i "s/<AWS_ENDPOINT>/${{ secrets.AWS_ENDPOINT }}/g" .do/app.yaml
149146
sed -i "s/<MEDIA_DOMAIN>/${{ secrets.MEDIA_DOMAIN }}/g" .do/app.yaml
150-
sed -i "s/<SENTRY_DSN>/$SENTRY_DSN/g" .do/app.yaml
151147
sed -i "s/<COMET_USER_PASSWORD>/$COMET_USER_PASSWORD/g" .do/app.yaml
152148
- name: Update app spec
153149
run: doctl apps update ${{ secrets.DIGITALOCEAN_APP_ID }} --spec .do/app.yaml

.github/workflows/create.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ jobs:
2525
TAG=${{ steps.prep.outputs.tag }}
2626
ACCESS_TOKEN_SECRET=$(printf '%s\n' "${{ secrets.ACCESS_TOKEN_SECRET }}" | sed -e 's/[]\/$*.^[]/\\&/g');
2727
AWS_SECRET_ACCESS_KEY=$(printf '%s\n' "${{ secrets.AWS_SECRET_ACCESS_KEY }}" | sed -e 's/[]\/$*.^[]/\\&/g');
28-
SENTRY_DSN=$(printf '%s\n' "${{ secrets.SERVER_SENTRY_DSN }}" | sed -e 's/[]\/$*.^[]/\\&/g');
2928
sed -i "s/<TAG>/$TAG/g" .do/app.yaml
3029
sed -i "s/<ACCESS_TOKEN_SECRET>/$ACCESS_TOKEN_SECRET/g" .do/app.yaml
3130
sed -i "s/<BUCKET>/${{ secrets.BUCKET }}/g" .do/app.yaml
3231
sed -i "s/<AWS_ACCESS_KEY_ID>/${{ secrets.AWS_ACCESS_KEY_ID }}/g" .do/app.yaml
3332
sed -i "s/<AWS_SECRET_ACCESS_KEY>/$AWS_SECRET_ACCESS_KEY/g" .do/app.yaml
3433
sed -i "s/<AWS_ENDPOINT>/${{ secrets.AWS_ENDPOINT }}/g" .do/app.yaml
3534
sed -i "s/<MEDIA_DOMAIN>/${{ secrets.MEDIA_DOMAIN }}/g" .do/app.yaml
36-
sed -i "s/<SENTRY_DSN>/$SENTRY_DSN/g" .do/app.yaml
3735
- name: Create app
3836
run: doctl apps create --spec .do/app.yaml

.github/workflows/deploy.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,12 @@ jobs:
2525
TAG=${{ steps.prep.outputs.tag }}
2626
ACCESS_TOKEN_SECRET=$(printf '%s\n' "${{ secrets.ACCESS_TOKEN_SECRET }}" | sed -e 's/[]\/$*.^[]/\\&/g');
2727
AWS_SECRET_ACCESS_KEY=$(printf '%s\n' "${{ secrets.AWS_SECRET_ACCESS_KEY }}" | sed -e 's/[]\/$*.^[]/\\&/g');
28-
SENTRY_DSN=$(printf '%s\n' "${{ secrets.SERVER_SENTRY_DSN }}" | sed -e 's/[]\/$*.^[]/\\&/g');
2928
sed -i "s/<TAG>/$TAG/g" .do/app.yaml
3029
sed -i "s/<ACCESS_TOKEN_SECRET>/$ACCESS_TOKEN_SECRET/g" .do/app.yaml
3130
sed -i "s/<BUCKET>/${{ secrets.BUCKET }}/g" .do/app.yaml
3231
sed -i "s/<AWS_ACCESS_KEY_ID>/${{ secrets.AWS_ACCESS_KEY_ID }}/g" .do/app.yaml
3332
sed -i "s/<AWS_SECRET_ACCESS_KEY>/$AWS_SECRET_ACCESS_KEY/g" .do/app.yaml
3433
sed -i "s/<AWS_ENDPOINT>/${{ secrets.AWS_ENDPOINT }}/g" .do/app.yaml
3534
sed -i "s/<MEDIA_DOMAIN>/${{ secrets.MEDIA_DOMAIN }}/g" .do/app.yaml
36-
sed -i "s/<SENTRY_DSN>/$SENTRY_DSN/g" .do/app.yaml
3735
- name: Update app spec
3836
run: doctl apps update ${{ secrets.DIGITALOCEAN_APP_ID }} --spec .do/app.yaml

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 35 additions & 321 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-2.4.2.cjs

Lines changed: 55 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-3.0.0-rc.5.cjs

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

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ plugins:
44
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
55
spec: "@yarnpkg/plugin-interactive-tools"
66

7-
yarnPath: .yarn/releases/yarn-3.0.0-rc.5.cjs
7+
yarnPath: .yarn/releases/yarn-2.4.2.cjs

README.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,45 @@ All-in-one chat and forums for communities.
2626
- [Redis](https://redis.io/)
2727

2828
[Join our Discord server](https://discord.gg/NPCMGSm)
29+
30+
31+
## Development Instructions
32+
33+
### Frontend
34+
#### Development
35+
Start dev server:
36+
- `yarn run dev:web`
37+
38+
#### Production
39+
The frontend is a React app, and can be deployed in many ways. joincomet.app is using GitHub Pages in this repo, but
40+
another good option is [Cloudflare Pages](https://pages.cloudflare.com/)
41+
42+
Build frontend:
43+
- `yarn run build:web`
44+
45+
Environment variables:
46+
- `VITE_API_DOMAIN` (domain server is running on i.e. `api.joincomet.app`)
47+
48+
### Backend
49+
50+
#### Development
51+
Start dev server with below environment variables:
52+
- `yarn run dev:server`
53+
54+
Environment variables:
55+
- `DATABASE_URL` (defaults to `postgresql://postgres:password@localhost:5432` if left blank)
56+
- `ACCESS_TOKEN_SECRET` (required, secret used for encrypting passwords)
57+
- `REDIS_URL` (optional, in-memory will be used if not provided)
58+
59+
The following environment variables are related to S3 file uploads and are required for file uploads to work. Comet has
60+
only been tested with DigitalOcean Spaces, but may also work with AWS S3.
61+
- `MEDIA_DOMAIN` (domain media is hosted on i.e. `media.joincomet.app`)
62+
- `BUCKET` (name of bucket, DO Spaces requires this to be same as `MEDIA_DOMAIN` i.e. `media.joincomet.app`)
63+
- `AWS_ENDPOINT` (endpoint bucket is hosted on i.e. `nyc3.digitaloceanspaces.com`)
64+
- `AWS_ACCESS_KEY_ID` (access key ID provided by DO Spaces/AWS)
65+
- `AWS_SECRET_ACCESS_KEY` (secret access key provided by DO Spaces/AWS)
66+
67+
#### Production
68+
A Docker image is available at [Docker Hub](https://hub.docker.com/repository/docker/joincomet/server). joincomet.
69+
app uses [DigitalOcean App Platform](https://www.digitalocean.com/products/app-platform/) to deploy the Docker image.
70+
Run the Docker image with the above environment variables.

electron/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "electron",
33
"description": "All-in-one chat and forums for communities.",
4-
"version": "0.0.94",
4+
"version": "0.0.95",
55
"private": true,
66
"repository": "github:joincomet/comet",
77
"homepage": "https://joincomet.app",
@@ -20,20 +20,20 @@
2020
"pack": "electron-builder --dir"
2121
},
2222
"dependencies": {
23-
"@electron/remote": "^1.1.0",
23+
"@electron/remote": "^1.2.0",
2424
"cross-env": "^7.0.3",
25-
"discord-rpc": "^3.2.0",
25+
"discord-rpc": "^4.0.1",
2626
"electron-builder-notarize": "^1.2.0",
27-
"electron-context-menu": "^3.1.0",
27+
"electron-context-menu": "^3.1.1",
2828
"electron-is-dev": "^2.0.0",
2929
"electron-log": "^4.3.5",
3030
"electron-store": "^8.0.0",
31-
"electron-updater": "^4.3.10",
32-
"typescript": "^4.3.2"
31+
"electron-updater": "^4.4.0",
32+
"typescript": "^4.3.5"
3333
},
3434
"devDependencies": {
35-
"electron": "13.1.2",
36-
"electron-builder": "^22.11.7"
35+
"electron": "13.1.6",
36+
"electron-builder": "^22.11.8"
3737
},
3838
"build": {
3939
"productName": "Comet",

0 commit comments

Comments
 (0)