Skip to content

Commit a5d83c2

Browse files
authored
Merge branch 'main' into Kai/mark-notification-read
2 parents a1c3d6f + dec5312 commit a5d83c2

130 files changed

Lines changed: 6541 additions & 5013 deletions

File tree

Some content is hidden

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

.env_template

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
ADMIN_EMAILS=
21
DB_HOST=
32
DB_NAME=
43
DB_PASSWORD=
54
DB_PORT=
65
DB_USERNAME=
7-
HOST=
8-
IMAGE_UPLOAD_URL=
96
IS_PROD=
10-
LOGGING=
11-
NODE_TLS_REJECT_UNAUTHORIZED=
12-
OAUTH_ANDROID_CLIENT=
13-
OAUTH_BACKEND_ID=
14-
OAUTH_CLIENT_SECRET=
15-
OAUTH_IOS_ID=
7+
FIREBASE_SERVICE_ACCOUNT_PATH=
168
PORT=
9+
IMAGE_UPLOAD_URL=
1710
UPLOAD_BUCKET_NAME=
1811
UPLOAD_SIZE_LIMIT=
19-
FIREBASE_SERVICE_ACCOUNT_PATH=

.envrctemplate

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

.eslintrc.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
module.exports = {
22
root: true,
3-
parser: '@typescript-eslint/parser',
3+
parser: "@typescript-eslint/parser",
44
parserOptions: {
55
tsconfigRootDir: __dirname,
6-
project: ['./tsconfig.json', '.eslintrc.js']
6+
project: ["./tsconfig.json"],
77
},
8-
plugins: [
9-
'@typescript-eslint',
8+
ignorePatterns: [
9+
".eslintrc.js",
10+
"jest.config.js",
11+
"ormconfig.ts",
12+
"swaggerDef.js",
1013
],
11-
extends: [
12-
'eslint:recommended',
13-
'plugin:@typescript-eslint/recommended'
14-
],
15-
};
14+
plugins: ["@typescript-eslint"],
15+
extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
16+
rules: {
17+
"@typescript-eslint/no-unused-vars": "off", // Disable unused variable warnings since eslint cannot recognize decoraters as being used
18+
},
19+
};

.github/pull_request_template.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,26 @@
22

33
<!-- Your title should be able to summarize what changes you've made in one sentence. For example: "Exclude staff from the check for follows". For stacked PRs, please indicate clearly in the title where in the stack you are. For example: "[Eatery Refactor][4/5] Converted all files to MVP model" -->
44

5-
65
## Overview
76

87
<!-- Summarize your changes here. -->
98

10-
11-
129
## Changes Made
1310

1411
<!-- Include details of what your changes actually are and how it is intended to work. -->
1512

16-
17-
1813
## Test Coverage
1914

2015
<!-- Describe how you tested this feature. Manual testing and/or unit testing. Please include repro steps and/or how to turn the feature on if applicable. -->
2116

22-
23-
2417
## Next Steps (delete if not applicable)
2518

2619
<!-- If this is part of a multi-PR change, please describe what changes you plan on addressing in future PRs. -->
2720

28-
29-
3021
## Related PRs or Issues (delete if not applicable)
3122

3223
<!-- List related PRs against other branches/repositories. -->
3324

34-
35-
3625
## Screenshots (delete if not applicable)
3726

3827
<!-- This could include of screenshots of the new feature / proof that the changes work. -->
@@ -41,8 +30,6 @@
4130

4231
<summary>Screen Shot Name</summary>
4332

44-
4533
<!-- Insert file link here. Newlines above and below your link are necessary for this to work. -->
46-
4734

48-
</details>
35+
</details>

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)