Skip to content

Commit e2aa260

Browse files
authored
Merge pull request #672 from UTDNebula/develop
Sync with develop
2 parents 170595f + 1e70e9b commit e2aa260

File tree

117 files changed

+6021
-7223
lines changed

Some content is hidden

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

117 files changed

+6021
-7223
lines changed

.env.example

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,74 @@
1-
# Prisma
2-
# In production, DATABASE_URL uses a connection pooler, so we need to separately set DIRECT_DATABASE_URL because Prisma Migrate requires a direct connection to the database.
3-
# DIRECT_DATABASE_URL does not need to be set locally if you are not running database migrations.
4-
# See https://www.prisma.io/docs/guides/performance-and-optimization/connection-management/configure-pg-bouncer#prisma-migrate-and-pgbouncer-workaround for more details
1+
########## Prisma ##########
2+
## Required in all environments.
3+
##
4+
## In production, DATABASE_URL uses a connection pooler, so we need to separately set DIRECT_DATABASE_URL
5+
## because Prisma Migrate requires a direct connection to the database.
6+
## See https://www.prisma.io/docs/guides/performance-and-optimization/connection-management/configure-pg-bouncer#prisma-migrate-and-pgbouncer-workaround for more details
7+
##
8+
## For development, set DIRECT_DATABASE_URL to the same value as DATABASE_URL.
59
DATABASE_URL=
610
DIRECT_DATABASE_URL=
711
PLATFORM_DATABASE_URL=
812

9-
# Next Auth
13+
14+
########## NextAuth ##########
15+
## Required in all environments.
16+
##
17+
## NEXTAUTH_URL is the base URL of the website
18+
## (e.g. if running locally on port 3000, NEXTAUTH_URL=http://localhost:3000).
1019
NEXTAUTH_URL=
1120
NEXTAUTH_SECRET=
21+
22+
23+
########## Provider's ##########
24+
## Only one provider required for development.
25+
## All providers required in produciton.
26+
1227
# Google Provider
1328
GOOGLE_CLIENT_ID=
1429
GOOGLE_CLIENT_SECRET=
30+
1531
# Next Auth Discord Provider
1632
DISCORD_CLIENT_ID=
17-
DISCORD_CLIENT_SECRET=-
18-
#Facebook provider
33+
DISCORD_CLIENT_SECRET=
34+
35+
# Facebook provider
1936
FACEBOOK_CLIENT_ID=
2037
FACEBOOK_CLIENT_SECRET=
2138

39+
40+
########## Nodemailer ##########
41+
## Only required in production.
42+
2243
# Email Server
2344
EMAIL_SERVER_HOST=
2445
EMAIL_SERVER_PORT=
2546
EMAIL_SERVER_USER=
2647
EMAIL_SERVER_PASSWORD=
2748
EMAIL_FROM=
2849

29-
# DEGREE VALIDATOR
30-
VALIDATOR=
3150

51+
########## Degree validator ##########
52+
## Required in all environments.
53+
NEXT_PUBLIC_VALIDATOR=
54+
55+
56+
########## Node ##########
57+
## Should be set to "development" in development and "production" in production.
3258
NODE_ENV=
3359

34-
# Umami: self-hosted analytics service
60+
61+
########## Umami ##########
62+
## Umami: self-hosted analytics service
63+
## Required only in production.
3564
NEXT_PUBLIC_UMAMI_URL=
3665
NEXT_PUBLIC_UMAMI_WEBSITE_ID=
3766

67+
68+
########## Sentry ##########
69+
## Sentry: error tracking service
70+
## Not required in any environments.
71+
## If not set, defaults to "https://edb9e327f9024e7599eae859bad9be47@o4504918397353984.ingest.sentry.io/4504924302409728"
72+
## at runtime.
3873
NEXT_PUBLIC_SENTRY_DSN=
3974
SENTRY_DSN=

.github/discord-join-banner.svg

Lines changed: 46 additions & 0 deletions
Loading

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
EMAIL_FROM: noreply@example.com
7777

7878
# DEGREE VALIDATOR
79-
VALIDATOR: http://localhost:5000
79+
NEXT_PUBLIC_VALIDATOR: http://localhost:5000
8080

8181
NODE_ENV: production
8282
VERCEL_ENV: preview

.github/workflows/delete-neon-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
types:
1010
- closed
1111
paths-ignore:
12-
- 'validator/**'
12+
- '*.md'
1313
workflow_dispatch:
1414

1515
jobs:

.github/workflows/deploy-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- 'develop'
77
paths-ignore:
8-
- 'validator/**'
8+
- '*.md'
99
workflow_dispatch:
1010

1111
env:

.github/workflows/tests.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- 'develop'
88
- 'main'
99
paths-ignore:
10-
- 'validator/**'
10+
- '*.md'
1111

1212
jobs:
1313
integration-tests:
@@ -60,7 +60,7 @@ jobs:
6060
EMAIL_FROM: noreply@example.com
6161

6262
# DEGREE VALIDATOR
63-
VALIDATOR: ${{ secrets.VALIDATOR }}
63+
NEXT_PUBLIC_VALIDATOR: http://127.0.0.1:5000
6464

6565
NODE_ENV: test
6666

@@ -72,6 +72,17 @@ jobs:
7272
- name: Checkout
7373
uses: actions/checkout@v3
7474

75+
- name: Setup Python3.11
76+
uses: actions/setup-python@v4
77+
with:
78+
python-version: '3.11'
79+
80+
- name: Start validator server
81+
working-directory: validator
82+
run: |
83+
pip install -r requirements.txt
84+
flask --app api run &
85+
7586
- name: Start MongoDB
7687
uses: supercharge/mongodb-github-action@1.8.0
7788
with:

.github/workflows/validator_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- uses: actions/setup-python@v4
2121
with:
22-
python-version: '3.10'
22+
python-version: '3.11'
2323

2424
- name: Install dependencies
2525
run: |

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ yarn-error.log*
3838
# Vercel
3939
.vercel
4040

41+
# virtual environments
42+
.venv/
43+
4144
.eslintcache
4245
.firebaserc
4346
*.cache

CODEOWNERS

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
# Request project lead by default
2-
* @akevinge
1+
# Request lead for file changes in root and workflows.
2+
/* @akevinge
3+
/.github/**/* @akevinge
4+
5+
# Request Planner PR Reviewers team for changes in to the following root directories.
6+
/.vscode/ @UTDNebula/pr-reviewers
7+
/cypress/ @UTDNebula/pr-reviewers
8+
/docs/ @UTDNebula/pr-reviewers
9+
/prisma/ @UTDNebula/pr-reviewers
10+
/public/ @UTDNebula/pr-reviewers
11+
/src/ @UTDNebula/pr-reviewers
12+
/tests/ @UTDNebula/pr-reviewers
13+
/validator/ @UTDNebula/pr-reviewers
314

4-
# Request all Project Nebula Maintainers to review other pull requests
5-
src/**/* @UTDNebula/Planner-Maintainers

0 commit comments

Comments
 (0)