Skip to content

Commit ea86bb2

Browse files
author
Jonathan O'Donnell
authored
Merge pull request #509 from merico-dev/fix-production-config-build
config-ui: Fix prod build and add route controls
2 parents ee6e69a + 82510ec commit ea86bb2

File tree

5 files changed

+26
-22
lines changed

5 files changed

+26
-22
lines changed

config-ui/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"axios": "^0.21.4",
1919
"dotenv": "^10.0.0",
2020
"next": "11.1.2",
21+
"next-routes": "^1.4.2",
2122
"react": "17.0.2",
2223
"react-dom": "17.0.2"
2324
},

config-ui/pages/plugins/jira/index.test.js

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

config-ui/routes.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
const routes = require('next-routes')
2+
3+
module.exports = routes()
4+
//? Name is URL route
5+
//? Page is page (file) name in /pages
6+
//? Pattern is for dynamic routes eg. '/user/:id'
7+
8+
// Main Setup
9+
.add({name: 'configuration', page: '/'})
10+
.add({name: 'triggers', page: '/triggers'})
11+
12+
// Plugins
13+
.add({name: 'jira', page: '/plugins/jira'})
14+
.add({name: 'gitlab', page: '/plugins/gitlab'})
15+
.add({name: 'jenkins', page: '/plugins/jenkins'})

config-ui/server.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
const next = require('next')
2+
const routes = require('./routes')
3+
const app = next({dev: process.env.NODE_ENV !== 'production'})
4+
const handler = routes.getRequestHandler(app)
5+
6+
const express = require('express')
7+
app.prepare().then(() => {
8+
express().use(handler).listen(4000)
9+
})

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ services:
4444
depends_on:
4545
- grafana
4646
config-ui:
47-
image: mericodev/config-ui:0.2.0
47+
image: mericodev/config-ui:0.2.1
4848
ports:
4949
- 127.0.0.1:4000:4000
5050
environment:

0 commit comments

Comments
 (0)