Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev v2 #294

Open
wants to merge 931 commits into
base: master_old
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
931 commits
Select commit Hold shift + click to select a range
1cc7e70
Integrated userroles with UI
Aug 12, 2022
b4a1304
Integrated user roles with UI
Aug 12, 2022
06af17f
Merge pull request #209 from wcmc-its/dev_v2_mrj4001
judygab Aug 24, 2022
7aa3201
Integrated user roles with UI
Aug 26, 2022
1a1263a
Add Edit User functionality implementation
Aug 26, 2022
0dac2b0
Add Edit User functionality Implemention
Aug 26, 2022
9aa38ea
Merge pull request #210 from wcmc-its/dev_v2_mrj4001
mrj4001 Aug 26, 2022
3c0ba51
Fixed build issue
Aug 26, 2022
77db33f
Merge pull request #212 from wcmc-its/dev_v2_mrj4001
mrj4001 Aug 26, 2022
97156ae
Fixed Issues reported
Aug 30, 2022
a6559db
Fixed issue 5 under search pubMed
Sep 1, 2022
b0938aa
Fixed review comments in Add User
Sep 2, 2022
9a59400
Merge pull request #213 from wcmc-its/dev_v2_mrj4001
mrj4001 Sep 8, 2022
fa3e862
Fixed email,PMID Link,and institutions
Sep 12, 2022
8fcc0c4
Merge pull request #211 from wcmc-its/manage-users-mrj4001
judygab Sep 12, 2022
1a1c031
Merge pull request #214 from wcmc-its/dev_v2_mrj4001
paulalbert1 Sep 15, 2022
16beff7
Merge branch 'dev_v2' into feature/manage-users
mrj4001 Sep 19, 2022
b6f952b
Merge pull request #215 from wcmc-its/feature/manage-users
judygab Sep 19, 2022
2ca8abb
Fixed build issue
Sep 19, 2022
fafac99
Fixed build issue
Sep 19, 2022
51095f1
Merge pull request #216 from wcmc-its/dev_v2_mrj4001
mrj4001 Sep 19, 2022
460ae68
Fixed broken link for List users
Sep 19, 2022
59bdde2
Merge pull request #217 from wcmc-its/dev_v2_mrj4001
mrj4001 Sep 19, 2022
90541df
Fixed Update searching behavior and Search doesnt return records appa…
Sep 19, 2022
1af6c0c
Merge pull request #218 from wcmc-its/dev_v2_mrj4001
mrj4001 Sep 19, 2022
677cdbe
Fixed issues reported on wiki
Sep 22, 2022
251439c
Merge pull request #219 from wcmc-its/dev_v2_mrj4001
mrj4001 Sep 22, 2022
0f8745d
Fixed issue reported on the wiki by paul
Oct 4, 2022
5b0c9a1
Merge pull request #220 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 4, 2022
98ae4ce
Fixed issues reported on wiki
Oct 10, 2022
5380224
Merge pull request #221 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 10, 2022
44bdf5c
saml authentication
Oct 11, 2022
0291a64
Merge pull request #222 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 11, 2022
d7d3384
saml testing
Oct 11, 2022
c4d712e
Merge pull request #223 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 11, 2022
e073f81
SAML redirection
Oct 11, 2022
0cdc586
Merge pull request #224 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 11, 2022
de60a34
SAML redirection
Oct 11, 2022
985d791
Merge pull request #225 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 11, 2022
651b001
SAML redirection testing
Oct 11, 2022
09e6e24
Merge pull request #226 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 11, 2022
385888c
Added logs to SAML Redirection
Oct 13, 2022
5bf4170
Merge pull request #227 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 13, 2022
e97d05f
SAML redirection
Oct 17, 2022
8c34525
Merge pull request #228 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 17, 2022
a4e702d
Redirection for SAML
Oct 17, 2022
58e08f1
Merge pull request #229 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 17, 2022
67cc2f0
SAML Redirection
Oct 17, 2022
e23e375
Merge pull request #230 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 17, 2022
9e7f1d4
SAML Redirection changes
Oct 17, 2022
f09f6d5
SAML redirection
Oct 17, 2022
af2313f
removed unnecessary code
Oct 17, 2022
6591336
Merge pull request #231 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 17, 2022
57f1564
SAML Redirection
Oct 17, 2022
3b005a3
Merge pull request #232 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 17, 2022
786c972
SAML redirection
Oct 17, 2022
2f35096
Merge pull request #233 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 17, 2022
61fd205
SAML Redirection
Oct 18, 2022
dc90396
Merge pull request #234 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 18, 2022
1e4151f
SAML Redirection
Oct 18, 2022
4812220
Merge pull request #235 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 18, 2022
0f2d9db
Fixed SAML redirection issue
Oct 18, 2022
fa8bead
Merge pull request #236 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 18, 2022
dc4f6ff
Issues resolved with roles
Oct 18, 2022
ee50d69
Merge pull request #237 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 18, 2022
b1646df
build error fix
Oct 18, 2022
37faa9f
Merge pull request #238 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 18, 2022
3ddd443
Fixed build issue
Oct 18, 2022
5928df8
Merge pull request #239 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 18, 2022
8237d1a
Fixed role issue
Oct 18, 2022
2fa8756
Merge pull request #240 from wcmc-its/dev_v2_mrj4001
mrj4001 Oct 18, 2022
944cae2
Fixed issues reported on Wiki
Nov 2, 2022
7b4e1fc
Merge pull request #241 from wcmc-its/dev_v2_mrj4001
mrj4001 Nov 2, 2022
48f9391
Fixed issues reported on Wiki
Nov 2, 2022
72f2b45
Merge pull request #242 from wcmc-its/dev_v2_mrj4001
mrj4001 Nov 2, 2022
bba9338
Fixed issues reported on the wiki
Nov 14, 2022
874727f
Merge pull request #243 from wcmc-its/dev_v2_mrj4001
mrj4001 Nov 14, 2022
3070ce7
Fixed issues reported on Wiki
Dec 1, 2022
5c50303
Merge pull request #244 from wcmc-its/dev_v2_mrj4001
mrj4001 Dec 1, 2022
5b58451
Fixed issues reported on Wiki
Dec 1, 2022
2dcb833
Merge pull request #245 from wcmc-its/dev_v2_mrj4001
mrj4001 Dec 1, 2022
70b1600
Fixed issues reported on wiki
Dec 5, 2022
029d5ac
Merge pull request #246 from wcmc-its/dev_v2_mrj4001
mrj4001 Dec 5, 2022
f2a065d
Fixed few incomplete issues from wiki
Dec 12, 2022
1312c9a
Merge pull request #247 from wcmc-its/dev_v2_mrj4001
mrj4001 Dec 12, 2022
bbe1016
Fixed issues reported on wiki
Dec 20, 2022
482a4a4
Merge pull request #248 from wcmc-its/dev_v2_mrj4001
mrj4001 Dec 20, 2022
da8f91a
Changes made to improve reports performance
Jan 13, 2023
8ec0e42
Merge pull request #249 from wcmc-its/dev_v2_mrj4001
mrj4001 Jan 13, 2023
749998a
Changes made to improve reports performance
Jan 13, 2023
a3ec8a7
Merge pull request #250 from wcmc-its/dev_v2_mrj4001
mrj4001 Jan 13, 2023
ed2dd67
included only required columns..
mrj4001 Jan 13, 2023
9ac339a
Included only required attributes.
mrj4001 Jan 13, 2023
b3c6561
Fix to prevent unknown column in SQL
Jan 17, 2023
7267f4b
Merge pull request #251 from wcmc-its/dev_v2_mrj4001
mrj4001 Jan 17, 2023
79c651b
Fix to prevent unknown column in SQL
Jan 17, 2023
bb74a90
Merge pull request #252 from wcmc-its/dev_v2_mrj4001
mrj4001 Jan 17, 2023
999862e
Fixed issues reported on wiki
Jan 23, 2023
357972e
Fixed reported issue on wiki
Jan 23, 2023
97b08e7
Merge pull request #253 from wcmc-its/dev_v2_mrj4001
mrj4001 Jan 23, 2023
be4e00e
Fixed reported issue on wiki
Feb 2, 2023
7ffcba5
Fixed issues reported on wiki
Feb 3, 2023
bb70e12
Fixed issue on wiki
Feb 3, 2023
94c9a1f
Fixed issues reported on wiki
Feb 6, 2023
fd9274f
Fixed issues reported on wiki
Feb 6, 2023
aa1041a
Merge pull request #254 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 6, 2023
46e0d2a
Fixed issues reported on wiki
Feb 8, 2023
4829389
Merge pull request #255 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 8, 2023
181e947
Fixed issues reported on wiki
Feb 8, 2023
814f49d
Merge pull request #256 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 8, 2023
ca3719f
Fixed issues reported on wiki
Feb 8, 2023
f78902f
Merge pull request #257 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 8, 2023
344361f
Fixed issues reported on wiki
Feb 8, 2023
cd450d3
Merge pull request #258 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 8, 2023
ef87716
Fixed authorization issue
Feb 13, 2023
5e55c89
Merge pull request #259 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 13, 2023
6f4198a
Fixed authorization issue
Feb 14, 2023
95133e0
Merge pull request #260 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 14, 2023
12874d3
Fixed Report sorting issue
Feb 15, 2023
67fee2e
Merge pull request #261 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 15, 2023
ea379ea
Added db search functionality in Manage users and Fixed authors selec…
Feb 16, 2023
c734d8e
Merge pull request #262 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 16, 2023
6b6a3cc
debugging email authentication and authorization
Feb 16, 2023
8960e5d
Merge pull request #263 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 16, 2023
e87bd76
debugging email authentication and authorization
Feb 17, 2023
f678e30
Merge pull request #264 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
5290bca
debugging email authentication and authorization
Feb 17, 2023
ea2bed4
Merge pull request #265 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
7a2da43
debugging email authentication and authorization
Feb 17, 2023
6938280
Merge pull request #266 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
daca946
debugging email authentication and authorization
Feb 17, 2023
8514278
Merge pull request #267 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
964c2bc
debugging email authentication and authorization
Feb 17, 2023
f1cfd39
debugging email authentication and authorization
Feb 17, 2023
478873d
Merge pull request #268 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
069b5e0
debugging email authentication and authorization
Feb 17, 2023
51de8af
Merge pull request #270 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
4a32536
debugging email authentication and authorization
Feb 17, 2023
fd97c77
Merge pull request #271 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
910e248
debugging email authentication and authorization
Feb 17, 2023
12d73ec
Merge pull request #272 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 17, 2023
1640853
debugging email authentication and authorization
Feb 18, 2023
9e4ac60
Merge pull request #273 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
2d96269
debugging email authentication and authorization
Feb 18, 2023
1179e8e
Merge pull request #274 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
cccac73
debugging email authentication and authorization
Feb 18, 2023
6ecdb87
Merge pull request #275 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
34cfd0b
debugging email authentication and authorization
Feb 18, 2023
ce9c699
debugging email authentication and authorization
Feb 18, 2023
fcf4468
debugging email authentication and authorization
Feb 18, 2023
a49a885
Merge pull request #276 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
252882d
debugging email authentication and authorization
Feb 18, 2023
adc4158
Merge pull request #277 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
d45b8d2
debugging email authentication and authorization
Feb 18, 2023
b5cb54b
Merge pull request #278 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
c818c5c
debugging email authentication and authorization
Feb 18, 2023
0b2d86f
Merge pull request #279 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
020a9fd
debugging email authentication and authorization
Feb 18, 2023
01aedf5
Merge pull request #280 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
a8ce127
debugging email authentication and authorization
Feb 18, 2023
972b7b5
Merge pull request #281 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
92cf404
debugging email authentication and authorization
Feb 18, 2023
edaeabc
Merge pull request #282 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
b0ca5cd
debugging email authentication and authorization
Feb 18, 2023
70edab4
Merge pull request #283 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
292fcc7
debugging email authentication and authorization
Feb 18, 2023
bc5a1e2
Merge pull request #284 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
1a1796d
debugging email authentication and authorization
Feb 18, 2023
5a97bc7
Merge pull request #285 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
e10fd10
debugging email authentication and authorization
Feb 18, 2023
5e93fde
Merge pull request #286 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
764313a
debugging email authentication and authorization
Feb 18, 2023
4f5f11e
Merge pull request #287 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
d4b491b
debugging email authentication and authorization
Feb 18, 2023
311bfda
Merge pull request #288 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
96f2b0b
debugging email authentication and authorization
Feb 18, 2023
8b0ab2a
Merge pull request #289 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 18, 2023
52ab96e
Fixed date filter rendering issue and authors dropdown and h-index
Feb 21, 2023
ed583de
Merge pull request #290 from wcmc-its/dev_v2_mrj4001
mrj4001 Feb 21, 2023
bb4f9f6
Added images, updated README
paulalbert1 Mar 14, 2023
b738505
Update README.md
paulalbert1 Mar 14, 2023
415d052
Update README.md
paulalbert1 Mar 15, 2023
f8ac9cc
Update README.md
paulalbert1 Mar 15, 2023
7251ae2
Update README.md
paulalbert1 Mar 15, 2023
eff294f
Update README.md
paulalbert1 Mar 15, 2023
418083c
Update README.md
paulalbert1 Mar 15, 2023
f5e21cd
Update README.md
paulalbert1 Mar 16, 2023
a94866d
Added configuration changes and few other issues in report
Mar 16, 2023
3e58fa6
Added configuration changes and few other issues in report
Mar 16, 2023
6a00a4b
Added configuration changes and few other issues in report
Mar 16, 2023
def1447
Merge pull request #291 from wcmc-its/dev_v2_mrj4001
mrj4001 Mar 16, 2023
aef17f2
Updated package json
mrj4001 Mar 16, 2023
181c933
Update README.md
paulalbert1 Mar 16, 2023
4234156
Added configuration changes and few other issues in report
Mar 17, 2023
a8f3c27
Merge pull request #292 from wcmc-its/dev_v2_mrj4001
mrj4001 Mar 17, 2023
278b277
More changes to Admin configurations
Mar 17, 2023
9c60a76
Fixed ViewProfile issue
Mar 17, 2023
08f4fcc
Merge pull request #293 from wcmc-its/dev_v2_mrj4001
mrj4001 Mar 17, 2023
0c57ec0
Update README.md
paulalbert1 Mar 20, 2023
8b8360d
Fixed issues reported on wiki and code review comments as well
Mar 29, 2023
3981625
Merge pull request #295 from wcmc-its/dev_v2_mrj4001
mrj4001 Mar 29, 2023
4b20b9f
reverted redirection code curateself as it needs to fixed for other r…
Mar 29, 2023
261436c
Merge pull request #296 from wcmc-its/dev_v2_mrj4001
mrj4001 Mar 29, 2023
b835c90
removed commented code
Mar 29, 2023
b360352
Fixed issue for reprots
Mar 29, 2023
f583688
Merge pull request #297 from wcmc-its/dev_v2_mrj4001
mrj4001 Mar 29, 2023
cdd6dce
Removed all console statements
Mar 31, 2023
11edd94
Removed all console statements
Mar 31, 2023
7841716
Merge pull request #298 from wcmc-its/dev_v2_mrj4001
mrj4001 Mar 31, 2023
dd0e787
Fixed code review comments
Apr 3, 2023
1eaf49e
Merge pull request #300 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 3, 2023
7eb57f6
Fixed code review comments
Apr 4, 2023
31a25da
Merge pull request #304 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 4, 2023
1463e8e
Fixed issues reported in wiki
Apr 7, 2023
6d7f702
Merge pull request #305 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 7, 2023
6381312
Corrected condition in adminSettings
Apr 7, 2023
1b883f1
Fixed query issue for organization filter and hiding unneccessary sec…
Apr 10, 2023
537193d
Merge pull request #306 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 10, 2023
21e970f
Fixed issues reported on wiki
Apr 11, 2023
b552bae
Merge pull request #307 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 11, 2023
924d600
Fixed issues for RTF export and display Rank for the export article a…
Apr 17, 2023
097be62
Fixed issues for RTF export and display Rank for the export article a…
Apr 17, 2023
94b3700
Fixed issues reported on wiki
Apr 17, 2023
16f0af5
Merge pull request #315 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 17, 2023
143b846
Fixed issue reported on wiki
Apr 28, 2023
b0197a1
Fixed issue reported on wiki
Apr 28, 2023
16ea547
Fixed issues reported on wiki
Apr 28, 2023
abc3bb3
Fixed issues reported on wiki
Apr 28, 2023
2406f33
Fixed issues reported on wiki
Apr 28, 2023
bf5e006
Merge pull request #322 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 28, 2023
7eaa188
Corrected small code fix
Apr 28, 2023
fa94f53
Merge pull request #324 from wcmc-its/dev_v2_mrj4001
mrj4001 Apr 28, 2023
04d72c0
Fixed issues reported on wiki and integrated middleware for the redir…
May 4, 2023
20a1370
Merge pull request #326 from wcmc-its/dev_v2_mrj4001
mrj4001 May 4, 2023
bec8418
Fixed Node.js library issue with Edge
May 4, 2023
d3f9bfb
Merge pull request #328 from wcmc-its/dev_v2_mrj4001
mrj4001 May 4, 2023
47c757c
Fixed Node.js library issue with Edge
May 5, 2023
af25b1f
Merge pull request #330 from wcmc-its/dev_v2_mrj4001
mrj4001 May 5, 2023
5ae42b3
Fixed Node.js library issue with Edge
May 5, 2023
83aae66
Merge pull request #332 from wcmc-its/dev_v2_mrj4001
mrj4001 May 5, 2023
0e66fd0
Fixed issue reported in teams chat
May 5, 2023
b420675
Merge pull request #334 from wcmc-its/dev_v2_mrj4001
mrj4001 May 5, 2023
f687716
Fixed Node.js library issue with Edge
May 5, 2023
b3c74d4
Merge pull request #336 from wcmc-its/dev_v2_mrj4001
mrj4001 May 5, 2023
52b36ae
Trying from different folders
May 5, 2023
053a6fc
Merge pull request #338 from wcmc-its/dev_v2_mrj4001
mrj4001 May 5, 2023
3488224
Trying from different folders
May 5, 2023
603b61c
Merge pull request #340 from wcmc-its/dev_v2_mrj4001
mrj4001 May 5, 2023
e7138ec
Trying from different folders
May 5, 2023
cef8f72
Merge pull request #342 from wcmc-its/dev_v2_mrj4001
mrj4001 May 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 3 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
node_modules/*
client/node_modules/*
package-lock.json
client/package-lock.json
node_modules
.next
.vscode
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "next/core-web-vitals"
}
86 changes: 29 additions & 57 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,67 +1,39 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release
# dependencies
/node_modules
/.pnp
.pnp.js

# Dependency directories
node_modules/
jspm_packages/
# testing
/coverage

# Typescript v1 declaration files
typings/
# next.js
/.next/
/out/

# Optional npm cache directory
.npm
# production
/build

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz
# misc
.DS_Store
*.pem

# Yarn Integrity file
.yarn-integrity
# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# dotenv environment variables file
# local env files
.env
.env.local
.env.development.local
.env.test.local
.env.production.local

# next.js build output
.next

reciter-pub-manager.code-workspace

.DS_Store
# vercel
.vercel
node_modules

package-lock.json
/config/local.js
/config/certs
22 changes: 22 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch via NPM",
"request": "launch",
"runtimeArgs": [
"run",
"dev"
],
"runtimeExecutable": "npm",
"skipFiles": [
"<node_internals>/**"
],
"type": "pwa-node",
"console": "integratedTerminal",
}
]
}
69 changes: 54 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,59 @@
FROM node:12-slim
# Install dependencies only when needed
FROM node:14.16.0-alpine AS deps
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be worth it to upgrade this node version while you can

# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
RUN apk add --no-cache libc6-compat
WORKDIR /app
RUN env
ARG RECITER_DB_HOST
ARG RECITER_DB_NAME
ARG RECITER_DB_USERNAME
ARG RECITER_DB_PASSWORD
ARG NEXT_PUBLIC_RECITER_API_KEY
ARG NEXT_PUBLIC_RECITER_TOKEN_SECRET
ARG NEXT_PUBLIC_RECITER_BACKEND_API_KEY=test
COPY package.json package-lock.json ./
RUN npm install --frozen-lockfile

RUN apt-get -y update && apt-get -y upgrade
RUN apt-get install -y ca-certificates wget

# Install server dependencies
WORKDIR /usr/src/app
# Rebuild the source code only when needed
FROM node:14.16.0-alpine AS builder
WORKDIR /app
COPY . .
RUN npm install --only=production
COPY --from=deps /app/node_modules ./node_modules
ARG RECITER_DB_HOST
ARG RECITER_DB_NAME
ARG RECITER_DB_USERNAME
ARG RECITER_DB_PASSWORD
ARG NEXT_PUBLIC_RECITER_API_KEY
ARG NEXT_PUBLIC_RECITER_TOKEN_SECRET
ARG NEXT_PUBLIC_RECITER_BACKEND_API_KEY=test
RUN env
RUN npm run build && npm install --production --ignore-scripts --prefer-offline

# Production image, copy all the files and run next
FROM node:14.16.0-alpine AS runner
WORKDIR /app

ENV NODE_ENV production

RUN addgroup -g 1001 -S nodejs
RUN adduser -S nextjs -u 1001

# You only need to copy next.config.js if you are NOT using the default configuration
COPY --from=builder /app/next.config.js ./
COPY --from=builder /app/public ./public
COPY --from=builder /app/config /app/config/
COPY --from=builder --chown=nextjs:nodejs /app/.next ./.next
COPY --from=builder /app/node_modules ./node_modules
COPY --from=builder /app/package.json ./package.json
RUN ls -lrt

USER nextjs

# Install client dependencies
WORKDIR /usr/src/app/client
RUN npm install --only=production
RUN npm run build
RUN mv build/index.html build/app.html
EXPOSE 3000

WORKDIR /usr/src/app
# Next.js collects completely anonymous telemetry data about general usage.
# Learn more here: https://nextjs.org/telemetry
# Uncomment the following line in case you want to disable telemetry.
ENV NEXT_TELEMETRY_DISABLED 1

EXPOSE 8081
CMD [ "npm", "start" ]
CMD ["npm", "run", "start"]
Loading