Merge branch 'TMSS-285' into TMSS-243

# Conflicts: # SAS/TMSS/frontend/tmss_webapp/src/routes/index.js # SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js Resolved Conflicts

Merge branch 'TMSS-285' into TMSS-243
40116dd4 · Ramesh Kumar · b848c524 · 1c558ba9 · 40116dd4 · 40116dd4
Commit 40116dd4 authored 4 years ago by Ramesh Kumar
--- a/SAS/TriggerEmailService/CMakeLists.txt
+++ b/SAS/TriggerEmailService/CMakeLists.txt
--- a/SAS/TriggerEmailService/Common/CMakeLists.txt
+++ b/SAS/TriggerEmailService/Common/CMakeLists.txt
--- a/SAS/TriggerEmailService/Common/__init__.py
+++ b/SAS/TriggerEmailService/Common/__init__.py
--- a/SAS/TriggerEmailService/Common/config.py
+++ b/SAS/TriggerEmailService/Common/config.py
--- a/SAS/TriggerEmailService/Server/CMakeLists.txt
+++ b/SAS/TriggerEmailService/Server/CMakeLists.txt
--- a/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
+++ b/SAS/TriggerEmailService/Server/bin/CMakeLists.txt
--- a/SAS/TriggerEmailService/Server/bin/TriggerEmailService
+++ b/SAS/TriggerEmailService/Server/bin/TriggerEmailService
--- a/SAS/TriggerEmailService/Server/bin/TriggerEmailService.ini
+++ b/SAS/TriggerEmailService/Server/bin/TriggerEmailService.ini
--- a/SAS/TriggerEmailService/Server/lib/CMakeLists.txt
+++ b/SAS/TriggerEmailService/Server/lib/CMakeLists.txt
--- a/SAS/TriggerEmailService/Server/lib/Templates.py
+++ b/SAS/TriggerEmailService/Server/lib/Templates.py
--- a/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py
+++ b/SAS/TriggerEmailService/Server/lib/TriggerEmailService.py
--- a/SAS/TriggerEmailService/Server/lib/__init__.py
+++ b/SAS/TriggerEmailService/Server/lib/__init__.py
--- a/SAS/TriggerEmailService/Server/test/CMakeLists.txt
+++ b/SAS/TriggerEmailService/Server/test/CMakeLists.txt
--- a/SAS/TriggerEmailService/Server/test/t_TriggerEmailService.py
+++ b/SAS/TriggerEmailService/Server/test/t_TriggerEmailService.py
--- a/SAS/TriggerEmailService/Server/test/t_TriggerEmailService.run
+++ b/SAS/TriggerEmailService/Server/test/t_TriggerEmailService.run
--- a/SAS/TriggerEmailService/Server/test/t_TriggerEmailService.sh
+++ b/SAS/TriggerEmailService/Server/test/t_TriggerEmailService.sh
--- a/SAS/TriggerEmailService/__init__.py
+++ b/SAS/TriggerEmailService/__init__.py
--- a/SAS/TriggerEmailService/doc/package.dox
+++ b/SAS/TriggerEmailService/doc/package.dox
--- a/SAS/TriggerEmailService/doc/trigger_email_service.md
+++ b/SAS/TriggerEmailService/doc/trigger_email_service.md
--- a/SAS/TMSS/frontend/tmss_webapp/package.json
+++ b/SAS/TMSS/frontend/tmss_webapp/package.json
@@ -29,6 +29,7 @@
    "react-dom": "^16.13.1",
    "react-frame-component": "^4.1.2",
    "react-json-view": "^1.19.1",
+    "react-loader-spinner": "^3.1.14",
    "react-router-dom": "^5.2.0",
    "react-scripts": "3.4.1",
    "react-table": "^7.2.1",
@@ -44,7 +45,7 @@
    "test": "react-scripts test",
    "eject": "react-scripts eject"
  },
-  "proxy": "http://192.168.99.100:8008",
+  "proxy": "http://192.168.99.100:8008/",
  "eslintConfig": {
    "extends": "react-app"
  },