Skip to content

Commit 030f2cc

Browse files
committed
Merge branch 'main' into cubap/issue167
2 parents 545e454 + 6e257e9 commit 030f2cc

9 files changed

Lines changed: 1005 additions & 896 deletions

File tree

.github/workflows/cd_dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node.js
2626
uses: actions/setup-node@master
2727
with:
28-
node-version: "20"
28+
node-version: "22"
2929
- name: Cache node modules
3030
uses: actions/cache@master
3131
env:
@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
matrix:
5252
node-version:
53-
- 20
53+
- 22
5454
machines:
5555
- vlcdhp02
5656
runs-on: ${{ matrix.machines }}

.github/workflows/cd_prod.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup Node.js
1313
uses: actions/setup-node@master
1414
with:
15-
node-version: "20"
15+
node-version: "22"
1616

1717
# Speed up subsequent runs with caching
1818
- name: Cache node modules
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
matrix:
3838
node-version:
39-
- 20
39+
- 22
4040
machines:
4141
- vlcdhprdp02
4242
runs-on: ${{ matrix.machines }}

app.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import cors from 'cors'
1111
import indexRouter from './routes/index.js'
1212
import apiRouter from './routes/api-routes.js'
1313
import clientRouter from './routes/client.js'
14+
import _gog_fragmentsRouter from './routes/_gog_fragments_from_manuscript.js';
15+
import _gog_glossesRouter from './routes/_gog_glosses_from_manuscript.js';
1416
import rest from './rest.js'
1517
import { fileURLToPath } from 'url'
1618
const __filename = fileURLToPath(import.meta.url)
@@ -49,7 +51,10 @@ app.use(
4951
'Cache-Control',
5052
'Last-Modified',
5153
'Link',
52-
'X-HTTP-Method-Override'
54+
'X-HTTP-Method-Override',
55+
'Origin',
56+
'Referrer',
57+
'User-Agent'
5358
],
5459
"exposedHeaders" : "*",
5560
"origin" : "*",
@@ -64,7 +69,6 @@ app.use(cookieParser())
6469
//Publicly available scripts, CSS, and HTML pages.
6570
app.use(express.static(path.join(__dirname, 'public')))
6671

67-
6872
/**
6973
* For any request that comes through to the app, check whether or not we are in maintenance mode.
7074
* If we are, then show the sad puppy. Otherwise, continue on.
@@ -85,6 +89,9 @@ app.use('/v1', apiRouter)
8589

8690
app.use('/client', clientRouter)
8791

92+
app.use('/gog/fragmentsInManuscript', _gog_fragmentsRouter)
93+
app.use('/gog/glossesInManuscript', _gog_glossesRouter)
94+
8895
/**
8996
* Handle API errors and warnings RESTfully. All routes that don't end in res.send() will end up here.
9097
* Important to note that res.json() will fail to here

bin/stopApp.js

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

0 commit comments

Comments
 (0)