Merge pull request #76 from SAEONData/dev

Merge latest 'dev' into 'master'
SAEONData · Apr 11, 2019 · d4ef230 · d4ef230
2 parents 2025bcd + 84f6ffd
commit d4ef230
Show file tree

Hide file tree

Showing 35 changed files with 453 additions and 455 deletions.
diff --git a/NDAO_API/NDAO_API/Startup.cs b/NDAO_API/NDAO_API/Startup.cs
@@ -39,14 +39,10 @@ public void ConfigureServices(IServiceCollection services)
                 options.AddPolicy("CORSPolicy",
                       builder =>
                       {
-                          builder.WithOrigins(
-                                        "http://localhost:8085", //NCCRD LOCAL
-                                        "http://localhost:8091", //CCIS LOCAL
-                                        "http://app01.saeon.ac.za/ccis", //CCIS LIVE
-                                        "http://app01.saeon.ac.za/nccrdsite" //NCCRD LIVE
-                                    )
-                                 .AllowAnyHeader()
-                                 .AllowAnyMethod();
+                          builder
+                            .AllowAnyOrigin()
+                            .AllowAnyHeader()
+                            .AllowAnyMethod();
                       });
             });
 

diff --git a/NDAO_Client_React/.babelrc b/NDAO_Client_React/.babelrc
@@ -3,7 +3,11 @@
     [
       "@babel/preset-env",
       {
-        "modules": false
+        "modules": false,
+        "useBuiltIns": "entry",
+        "targets": {
+          "ie": "11"
+        }
       }
     ],
     "@babel/preset-react"

diff --git a/NDAO_Client_React/app/css/antd.tree-select.css b/NDAO_Client_React/app/css/antd.tree-select.css
@@ -0,0 +1,37 @@
+.ant-select-tree li .ant-select-tree-node-content-wrapper {
+  display: inline-block; 
+  width: calc(100% - 22px); /*changed: calc(100% - 24px)*/
+  margin: 0;
+  padding: 3px 5px;
+  color: rgba(0, 0, 0, 0.65);
+  text-decoration: none;
+  border-radius: 2px;
+  cursor: pointer;
+  -webkit-transition: all 0.3s;
+  transition: all 0.3s;
+}
+
+.ant-select-tree li span.ant-select-tree-switcher {
+  position: relative;
+  margin-top: -5px; /*added*/
+  margin-left: -1px; /*added*/
+  margin-right: 2px; /*added*/
+}
+
+:root .ant-select-tree li span.ant-select-tree-switcher.ant-select-tree-switcher_open .ant-select-switcher-icon {
+  font-size: 22px;  /*changed: 12px*/
+  color: white; /*added*/
+  background-color: #8EAC85; /*added*/
+  border: 1px solid dimgray; /*added*/
+  border-radius: 2px; /*added*/
+  width: 26px; /*added*/
+}
+
+:root .ant-select-tree li span.ant-select-tree-switcher.ant-select-tree-switcher_close .ant-select-switcher-icon {
+  font-size: 24px;  /*changed: 12px*/
+  color: dimgray; /*added*/
+  background-color: #8EAC85; /*added*/
+  border: 1px solid dimgray; /*added*/
+  border-radius: 2px; /*added*/
+  width: 26px; /*added*/
+}
diff --git a/NDAO_Client_React/app/data/footerConfig.js b/NDAO_Client_React/app/data/footerConfig.js
@@ -5,7 +5,7 @@ export const footerContent = {
     {
       text: "Technology",
       links: [
-        { text: "DEA NCCIS uses open source, government funded facilities provided by SAEON. The DST and NRF funds the SAEON Open Data Platform (ODP) and associated portals. Developed by SAEON on behalf of DST, DEA, DRDLR, and other stakeholders." },
+        { text: "DEA NDAO uses open source, government funded facilities provided by SAEON. The DST and NRF funds the SAEON Open Data Platform (ODP) and associated portals. Developed by SAEON on behalf of DST, DEA, DRDLR, and other stakeholders." },
       ]
     },
     {

diff --git a/NDAO_Client_React/app/index.ejs b/NDAO_Client_React/app/index.ejs
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>NCCIS - National Climate Change Information System</title>
+  <title>NDAO - National Desired Adaptation Outcomes</title>
   <link rel="icon" href="#">
 </head>
 

diff --git a/NDAO_Client_React/app/js/components/input/FileUpload.jsx b/NDAO_Client_React/app/js/components/input/FileUpload.jsx
@@ -68,7 +68,7 @@ class FileUpload extends React.Component {
 
     //Remove
     try {
-      let res = await fetch(apiBaseURL + "RemoveFile", {
+      let res = await globalFunctions.CustomFetch(apiBaseURL + "RemoveFile", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -114,7 +114,7 @@ class FileUpload extends React.Component {
 
     //Upload
     try {
-      let res = await fetch(apiBaseURL + "UploadFile", {
+      let res = await globalFunctions.CustomFetch(apiBaseURL + "UploadFile", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",

diff --git a/NDAO_Client_React/app/js/components/input/TreeSelectInput.jsx b/NDAO_Client_React/app/js/components/input/TreeSelectInput.jsx
@@ -4,6 +4,7 @@ import React from 'react'
 import { Tooltip } from 'mdbreact'
 import * as globalFunctions from '../../globalFunctions'
 import { TreeSelect } from 'antd'
+import '../../../css/antd.tree-select.css'
 
 //AntD Tree-Select
 // import TreeSelect from 'antd/lib/tree-select'

diff --git a/NDAO_Client_React/app/js/components/layout/HostedContentFrame.jsx b/NDAO_Client_React/app/js/components/layout/HostedContentFrame.jsx
@@ -2,10 +2,11 @@
 
 import React from 'react'
 import * as globalFunctions from '../../globalFunctions'
-import { Col, Row, Container, Footer as MDBFooter, Modal, ModalBody, ModalHeader, ModalFooter, MDBBtn } from 'mdbreact'
+import { Modal, ModalBody, ModalHeader, ModalFooter } from 'mdbreact'
 import loader from '../../../images/Other/loader.gif'
 import { Button } from 'antd';
-import { object } from 'prop-types';
+import { DEAGreen } from '../../config/colours';
+
 // Properties:
 //  - source : Component label
 //  - width : Width; Default - 100%
@@ -39,12 +40,12 @@ class HostedContentFrame extends React.Component {
 
     source = globalFunctions.fixEmptyValue(source, "http://www.example.com")
     width = globalFunctions.fixEmptyValue(width, "100%")
-    height = globalFunctions.fixEmptyValue(height, "550px")
+    height = globalFunctions.fixEmptyValue(height, "73vh")
     showSource = globalFunctions.fixEmptyValue(showSource, false)
 
     return (
       <div>
-        <Modal isOpen={this.state.showModal} toggle={this.toggleModal} size="fluid" style={{ width: "95%" }} >
+        <Modal isOpen={this.state.showModal} toggle={this.toggleModal} size="fluid" fullHeight position="top" style={{ width: "95%" }} >
           <ModalHeader toggle={this.toggleModal}>{title}
 
           </ModalHeader>
@@ -66,6 +67,11 @@ class HostedContentFrame extends React.Component {
               &nbsp;source: <a href={source} target="#"><u>{source}</u></a>
             </span>
           </ModalBody>
+          <ModalFooter>
+            <Button size="sm" color="" style={{ backgroundColor: DEAGreen }} onClick={this.toggleModal}>
+              Close
+            </Button>
+          </ModalFooter>
         </Modal>
       </div>
     )

diff --git a/NDAO_Client_React/app/js/components/navigation/Header.jsx b/NDAO_Client_React/app/js/components/navigation/Header.jsx
@@ -32,7 +32,7 @@ class Header extends React.Component {
           <Col md="6">
             <div>
               <h1 style={{ textAlign: "center", letterSpacing: "2px", color: "#2e7d32" }}>
-                <b>NCCIS</b>
+                <b>NDAO</b>
 
                 {/* BETA tag */}
                 <sub style={{ fontSize: "18px", backgroundColor: "#78e26c", borderRadius: "5px", padding: "2px" }}>
@@ -42,7 +42,7 @@ class Header extends React.Component {
               </h1>
               <p></p>
               <h5 style={{ textAlign: "center", letterSpacing: "2px", marginTop: "-8px", color: "grey" }}>
-                <b>National Climate Change Information System</b>
+                <b>National Desired Adaptation Outcomes</b>
               </h5>
             </div>
           </Col>

diff --git a/NDAO_Client_React/app/js/components/navigation/Navbar.jsx b/NDAO_Client_React/app/js/components/navigation/Navbar.jsx
@@ -13,8 +13,6 @@ import NWIS from '../pages/Tools/NWIS.jsx';
 import SARVA from '../pages/Tools/SARVA.jsx';
 import { data as NavData } from '../../../data/sideNavData'
 
-const _gf = require('../../globalFunctions')
-
 const mapStateToProps = (state, props) => {
   let user = state.oidc.user
   let { general: { showSideNav } } = state
@@ -143,17 +141,17 @@ class Navbar extends React.Component {
               </NavItem>
 
               {/* Tools */}
-              <NavItem>
+              {/* <NavItem>
                 <Dropdown>
                   <DropdownToggle nav caret style={{ color: "black" }}><b>Tools</b></DropdownToggle>
                   <DropdownMenu>
                     <DropdownItem onClick={() => { window.open("https://south-africa-platform.vizzuality.com/ ", "_blank") }}>
                       Biennial Update Report (BUR)
                     </DropdownItem>
-                    <DropdownItem onClick={() => { window.open("https://www.dwa.gov.za/Hydrology/Weekly/Province.aspx", "_blank") /*this.setState({ showDASL: true })*/ }}>
+                    <DropdownItem onClick={() => { window.open("https://www.dwa.gov.za/Hydrology/Weekly/Province.aspx", "_blank") }}>
                       Dam And Stream Levels
                     </DropdownItem>
-                    <DropdownItem onClick={() => { window.open("http://www.letsrespondtoolkit.org/", "_blank") /*this.setState({ showLRT: true })*/ }}>
+                    <DropdownItem onClick={() => { window.open("http://www.letsrespondtoolkit.org/", "_blank") }}>
                       Lets Respond Toolkit
                     </DropdownItem>
                     <DropdownItem onClick={() => { this.setState({ showNCCRD: true }) }}>
@@ -162,15 +160,15 @@ class Navbar extends React.Component {
                     <DropdownItem onClick={() => { this.setState({ showNDMC: true }) }}>
                       National Hazardous Events Database
                     </DropdownItem>
-                    <DropdownItem onClick={() => { window.open("http://niwis.dws.gov.za/niwis2/", "_blank") /*this.setState({ showNWIS: true })*/ }}>
+                    <DropdownItem onClick={() => { window.open("http://niwis.dws.gov.za/niwis2/", "_blank") }}>
                       National Water Information System
                     </DropdownItem>
                     <DropdownItem onClick={() => { this.setState({ showSARVA: true }) }}>
                       Risk And Vulnerability Hotspots
                     </DropdownItem>
                   </DropdownMenu>
                 </Dropdown>
-              </NavItem>
+              </NavItem> */}
 
             </NavbarNav>
 
@@ -200,9 +198,9 @@ class Navbar extends React.Component {
               }
 
               {/* Contact */}
-              <NavItem style={{ marginLeft: "15px", marginRight: "15px", borderBottom: (locationHash === "#/contact" ? "4px solid dimgrey" : "0px solid white") }}>
+              {/* <NavItem style={{ marginLeft: "15px", marginRight: "15px", borderBottom: (locationHash === "#/contact" ? "4px solid dimgrey" : "0px solid white") }}>
                 <NavLink disabled to="contact" style={{ color: "grey" }}><b>Contact</b></NavLink>
-              </NavItem>
+              </NavItem> */}
 
               {/* Login / Logout */}
               <NavItem style={{ marginRight: "15px" }}>

diff --git a/NDAO_Client_React/app/js/components/navigation/SideNav.css b/NDAO_Client_React/app/js/components/navigation/SideNav.css
@@ -0,0 +1,13 @@
+.nav-cat-head {
+  padding-top: 7px;
+  font-size: 15px;
+}
+
+.nav-close-handle {
+  color: black;
+  box-shadow: none;
+  margin-right: 2px;
+  padding: 10px 3px 10px 2px;
+  border: 1px solid black;
+  border-radius: 3px;
+}