Skip to content

Commit afe6333

Browse files
committed
Fix error message for login; some refactoring
1 parent a7ab280 commit afe6333

File tree

8 files changed

+270
-6
lines changed

8 files changed

+270
-6
lines changed

.env-template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ JWT_SECRET=BeSureToChangeThis
1212
SOLR_VERSION=8.2.0
1313
API_BASE_PATH=/
1414
REMOTE_BASE_HREF='/sbn-portal-site/'
15+
PM2_LABEL='SBNPortal'

_server_manager

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ fi
3131
# Test if chosen option is a number between 1 and 5
3232
if [[ ! $option =~ ^[0-9]+$ || ! $option -ge 1 || ! $option -le 5 ]]; then
3333
echo "Chosen option ("$option") was NOT a number between 1 and 4"
34+
exit 1
3435
fi
3536

3637
# Execute code based on chosen option

documentation/client.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
The client code is built in react with typescript. For component library, we're using MaterialUI. The boilerplate adapts the [responsive-drawer](https://material-ui.com/components/drawers/#responsive-drawer) layout.
44

5-
The code and assets are transpiled and bundled using webpack. The build supports css, scss and elss styles (global and css modules), though this repo mainly uses the css-in-js solution provided by MaterialUI. State management is handled with react context.
5+
The client is a fully responsive PWA.
66

7-
To get started
7+
The code and assets are transpiled and bundled using webpack. The build supports css, scss and elss styles (global and css modules), though this repo mainly uses the css-in-js solution provided by MaterialUI. State management is handled with react context.

package-lock.json

Lines changed: 260 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
"stripcomment-loader": "0.1.0",
145145
"style-loader": "^1.0.0",
146146
"supertest": "^4.0.2",
147+
"swagger-express-middleware": "^3.0.0-alpha.5",
147148
"swagger-ui": "2.2.10",
148149
"terser-webpack-plugin": "^1.3.0",
149150
"thread-loader": "2.1.2",

src/server/config/passport-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ passport.use(
3131
const users = getUsers();
3232
// Search for existing user
3333
const user = users.find(el => el.username === username);
34+
3435
if (!user) return done(undefined, false, { message: `username ${username} not found.` });
3536
//
3637
// Test submitted password

0 commit comments

Comments
 (0)