@igea/oac_frontend 1.0.4 → 1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@igea/oac_frontend",
3
- "version": "1.0.4",
3
+ "version": "1.0.6",
4
4
  "description": "Frontend service for the OAC project",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/index.js CHANGED
@@ -6,34 +6,47 @@ const path = require("path");
6
6
  const serviceName = "frontend"
7
7
 
8
8
  const app = express();
9
+ let newPort = null
10
+
11
+ app.use(`/${serviceName}`, express.static(path.join(__dirname, 'public')));
9
12
  app.use(express.json());
13
+
10
14
  app.set('view engine', 'twig');
11
15
  app.set('views', path.join(__dirname, 'views'));
12
16
 
17
+ const register = async function(){
18
+ try {
19
+ console.log(`Registering ${serviceName}...`);
20
+ await axios.post(config.url_register, {
21
+ name: serviceName,
22
+ host: "localhost",
23
+ port: newPort
24
+ });
25
+ console.log(`Registered ${serviceName}`);
26
+ } catch (err) {
27
+ console.error(`Failed to register ${serviceName}: ${err.message}`);
28
+ setTimeout(register, 10*1000)
29
+ }
30
+ }
31
+
13
32
  getPort.default({
14
33
  port: getPort.portNumbers(config.port_range.min, config.port_range.max) }
15
- ).then((newPort)=>{
16
-
34
+ ).then((port)=>{
35
+ newPort = port
36
+
37
+ // Defining routers
17
38
  const healthRouter = require('./controllers/health.js');
18
- app.use('/health', healthRouter);
39
+ app.use(`/${serviceName}/health`, healthRouter);
19
40
 
20
41
 
21
- app.get('/', (req, res) => {
22
- res.render('base', { title: 'Home Page', message: 'Hello from Twig!' });
42
+ app.get(`/${serviceName}`, (req, res) => {
43
+ res.render('base', { root: serviceName, title: 'Home Page', message: 'Hello from Twig!' });
23
44
  });
24
45
 
25
- app.listen(newPort, async () => {
26
- console.log(`${serviceName} listening on port ${newPort}`);
27
- try {
28
- await axios.post(config.url_register, {
29
- name: serviceName,
30
- host: "localhost",
31
- port: newPort
32
- });
33
- console.log(`Registered ${serviceName}`);
34
- } catch (err) {
35
- console.error(`Failed to register ${serviceName}: ${err.message}`);
36
- }
46
+ // Start listing on the specified port
47
+ app.listen(port, async () => {
48
+ console.log(`${serviceName} listening on port ${port}`);
49
+ await register()
37
50
  });
38
51
 
39
52
  })
@@ -1,6 +1,7 @@
1
1
  body {
2
2
  font-family: "Helvetica Neue", Arial, sans-serif;
3
3
  font-size: 1rem;
4
+ color: red;
4
5
  }
5
6
 
6
7
  /*# sourceMappingURL=style.css.map */
@@ -1 +1 @@
1
- {"version":3,"sourceRoot":"","sources":["../../scss/_typography.scss","../../scss/_variables.scss"],"names":[],"mappings":"AAGA;EACI,aCFS;EDGT","file":"style.css"}
1
+ {"version":3,"sourceRoot":"","sources":["../../scss/_typography.scss","../../scss/_variables.scss"],"names":[],"mappings":"AAGA;EACI,aCFS;EDGT;EACA,OCNY","file":"style.css"}
@@ -4,4 +4,5 @@
4
4
  body {
5
5
  font-family: $font-stack;
6
6
  font-size: rem(16);
7
+ color: $primary-color;
7
8
  }
@@ -2,6 +2,7 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>{{ title }}</title>
5
+ <link rel="stylesheet" type="text/css" href="/{{ root }}/css/style.css">
5
6
  </head>
6
7
  <body>
7
8
  <h1>{{ message }}</h1>