Skip to content
Merged

Dev #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7c12a2e
minor fix
KeeyanGhoreshi Jun 30, 2023
3276872
Merge pull request #32 from mcode/dtr-functionality
plarocque4 Jul 14, 2023
ac1cdc0
updated dependancies
zacharyrobin Jul 27, 2023
c758884
Merge branch 'dev' into dependabot
smalho01 Jul 27, 2023
35391e6
Merge pull request #38 from mcode/dependabot
smalho01 Jul 27, 2023
707058b
Update OrderCard and updateRx route to hide View ETASU button and pre…
jtquach1 Jul 27, 2023
c87c173
enable https on the backend
smalho01 Jul 28, 2023
e7e4dfa
minor updates
smalho01 Jul 28, 2023
7910c8b
mongoose updated to 6.11.4
zacharyrobin Jul 28, 2023
57e38e4
change double quotes to single
smalho01 Jul 28, 2023
36d3e97
Merge branch 'dev' into https
smalho01 Jul 28, 2023
ad298da
fixed linting
smalho01 Jul 28, 2023
1b438ee
Merge branch 'https' of https://github.com/mcode/pims into https
smalho01 Jul 28, 2023
c4f1220
prettier linting
smalho01 Jul 28, 2023
0299272
SO MUCH LINTING
smalho01 Jul 28, 2023
e7ae236
Merge pull request #41 from mcode/mongooseUpdate
smalho01 Jul 28, 2023
2eedf3c
Merge branch 'dev' into fix-picked-up-orders-view-etasu-bug
smalho01 Jul 28, 2023
4bd6ca5
minor styling
KeeyanGhoreshi Jul 28, 2023
d893d55
cert files in frontend + gitignore
smalho01 Jul 28, 2023
6bf8598
remove white spaces
smalho01 Jul 28, 2023
ede1604
Merge pull request #39 from mcode/fix-picked-up-orders-view-etasu-bug
avirgulto Jul 28, 2023
7da634a
Merge branch 'dev' into https
smalho01 Jul 28, 2023
d15f6ea
Merge pull request #40 from mcode/https
smalho01 Jul 28, 2023
8a47a4f
cleaned up backend bug
smalho01 Aug 1, 2023
6acbc71
remove whitespace
smalho01 Aug 1, 2023
43d62a8
prettier formatting
smalho01 Aug 1, 2023
478df2b
dont update status on view etasu button
smalho01 Aug 1, 2023
a4158e0
linting
smalho01 Aug 1, 2023
e50682d
Merge pull request #42 from mcode/pims-clean-up
smalho01 Aug 1, 2023
37bb99d
Merge branch 'main' into dev
smalho01 Aug 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,10 @@ dist
npm-debug.log*
yarn-debug.log*
yarn-error.log*


frontend/server.key
frontend/server.cert

backend/server.key
backend/server.cert
9 changes: 3 additions & 6 deletions backend/.eslintrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"parser": "@typescript-eslint/parser",
"extends": [
"plugin:@typescript-eslint/recommended",
"prettier"
],
"extends": ["plugin:@typescript-eslint/recommended", "prettier"],
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
Expand All @@ -14,6 +11,6 @@
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-explicit-any": "off"
}
}
}
6 changes: 3 additions & 3 deletions backend/.mocharc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"timeout" : 20000,
"timeout": 20000,
"extension": ["ts"],
"spec": "test/**/*.test.ts",
"require": "ts-node/register",
"file" : ["test/setup.ts"]
}
"file": ["test/setup.ts"]
}
2 changes: 1 addition & 1 deletion backend/.prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
"printWidth": 100,
"tabWidth": 2,
"singleQuote": true
}
}
79 changes: 51 additions & 28 deletions backend/env.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,58 @@
{
"BACKEND_PORT" : {
"type" :"number",
"default" : 5051
},
"ALLOWED_ORIGIN" : {
"type" : "object",
"default" : ["http://localhost:3000", "http://localhost:3000/", "http://localhost:3005", "http://localhost:3005/", "http://localhost:3008", "http://localhost:3008/", "http://localhost:5050", "http://localhost:5050/", "http://localhost:4040", "http://localhost:4040/"]
},
"MONGO_USERNAME": {
"type" : "string",
"default" : "rems-admin-pims-root"
},
"BACKEND_PORT": {
"type": "number",
"default": 5051
},
"ALLOWED_ORIGIN": {
"type": "object",
"default": [
"http://localhost:3000",
"http://localhost:3000/",
"http://localhost:3005",
"http://localhost:3005/",
"http://localhost:3008",
"http://localhost:3008/",
"http://localhost:5050",
"http://localhost:5050/",
"http://localhost:4040",
"http://localhost:4040/"
]
},
"MONGO_USERNAME": {
"type": "string",
"default": "rems-admin-pims-root"
},

"MONGO_PASSWORD" :{
"type" : "string",
"default" : "rems-admin-pims-password"
},
"MONGO_PASSWORD": {
"type": "string",
"default": "rems-admin-pims-password"
},

"MONGO_URL" : {
"type" : "string",
"default" : "mongodb://localhost:27017/pims"
},
"MONGO_URL": {
"type": "string",
"default": "mongodb://localhost:27017/pims"
},

"AUTH_SOURCE" :{
"type" : "string",
"default" : "admin"
},
"AUTH_SOURCE": {
"type": "string",
"default": "admin"
},

"REMS_ADMIN_BASE" : {
"type" : "string",
"default" : "http://localhost:8090"
}
"REMS_ADMIN_BASE": {
"type": "string",
"default": "http://localhost:8090"
},

"HTTPS_KEY_PATH": {
"type": "string",
"default": "server.key"
},
"HTTPS_CERT_PATH": {
"type": "string",
"default": "server.cert"
},
"USE_HTTPS": {
"type": "boolean",
"default": false
}
}
Loading