Merge branch 'master' of https://github.com/SmartColumbusOS/discovery_ui

config/config.js

@@ -1,4 +1,5 @@
 window.API_HOST = 'http://localhost:4000'
+window.CONTRIBUTE_HOST = 'http://localhost:4001'
 window.GTM_ID = ''
 window.BASE_URL = 'example.com'
 window.STREETS_TILE_LAYER_URL = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'

package.json

@@ -21,7 +21,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.22",
     "@fortawesome/free-brands-svg-icons": "^5.10.2",
     "@fortawesome/react-fontawesome": "^0.1.4",
-    "@smartcitiesdata/react-discovery-ui": "^1.4.0",
+    "@smartcitiesdata/react-discovery-ui": "^1.5.0",
     "react": "~16.8.6",
     "react-dom": "~16.8.6",
     "react-hamburger-button": "0.0.1",

run.sh

@@ -2,6 +2,7 @@
 
 cat > /usr/share/nginx/html/config.js <<EOL
 window.API_HOST = '${API_HOST}'
+window.CONTRIBUTE_HOST = '${CONTRIBUTE_HOST}'
 window.GTM_ID = '${GTM_ID}'
 window.BASE_URL = '${BASE_URL}'
 window.STREETS_TILE_LAYER_URL = '${STREETS_TILE_LAYER_URL}'

src/components/footer/footer.js

@@ -11,14 +11,16 @@ const Footer = props => {
             <ul>
             <li><a href={`https://${window.BASE_URL}/about/about-smart-columbus`}>About Us</a> </li> 
             <li><a href={`https://${window.BASE_URL}/data`}> Explore Data</a > </li> 
-            <li><a href={`https://d2rfd3nxvhnf29.cloudfront.net/2019-09/SCC-D-Data%20Privacy%20Plan-FINAL-20190906%5B1%5D_0.pdf`}> Data Privacy Plan</a > </li>
+            <li><a href={`https://www.smartcolumbusos.com/images/2020/PDF/Data-Privacy-Plan.pdf`} target="_blank"> Data Privacy Plan</a > </li>
             <li><a href={`https://${window.BASE_URL}/about/the-power-of-data`}>The Power of Data</a> </li>
             <li><a href={`https://data.smartcolumbusos.com/api/v1/data_json`}>Data Inventory</a> </li>
-            <li><a href={`https://d2rfd3nxvhnf29.cloudfront.net/2019-08/Smart%20Columbus%20Data%20Management%20Plan-%2020190822_0.pdf`}> Data Management Plan</a > </li>
+            <li><a href={`https://www.smartcolumbusos.com/images/2020/PDF/SCC-E-DataManagementPlan-Update-v1.pdf`} target="_blank"> Data Management Plan</a > </li>
             <li><a href={`https://${window.BASE_URL}/data-stories`}>Impact Stories</a> </li> 
             <li><a href={`https://data.smartcolumbusos.com/tableau/connector.html`}>Tableau Web Connector</a> </li>
-            <li><a href={`https://${window.BASE_URL}/images/Assets/SCC_De-Identification_Policy_20190917_update.pdf`}> De-Identification Policy</a > </li>
+            <li><a href={`https://www.smartcolumbusos.com/images/Assets/SCC_De-Identification_Policy_20190917_update.pdf`} target="_blank"> De-Identification Policy</a > </li>
             <li><a href={`https://${window.BASE_URL}/contact-us`}>Contact Us</a> </li>
+            <li><a href={`https://${window.BASE_URL}/about/terms-of-use`}>Terms of Use</a> </li>
+            <li><a href={`https://${window.BASE_URL}/about/privacy-policy`}>Privacy Policy</a> </li>
             </ul>
           </div>
           <div className="footerRight">< img src={smartStart} /></div>

src/components/header/header.js

@@ -89,8 +89,7 @@ export default class Header extends Component {
       items: [
         { link: `https://www.${window.BASE_URL}/about/about-smart-columbus`, text: "About Smart Columbus" },
         { link: `https://www.${window.BASE_URL}/about/smart-city-projects`, text: "Smart City Projects" },
-        { link: `https://www.${window.BASE_URL}/tools/how-to-use-this-site`, text: "How to Use The SCOS" },
-        { link: `https://www.${window.BASE_URL}/about/privacy-policy`, text: "Privacy Policy" }
+        { link: `https://www.${window.BASE_URL}/tools/how-to-use-this-site`, text: "How to Use The SCOS" }
       ]
     }
 

webpack.config.js

@@ -74,7 +74,7 @@ module.exports = (env, argv) => {
           use: [{ loader: 'svg-inline-loader' }]
         },
         {
-          test: /\.(css|scss)$/,
+          test: /\.css$/,
           use: [
             'style-loader',
             {
@@ -90,6 +90,10 @@ module.exports = (env, argv) => {
             },
             'sass-loader'
           ]
+        },
+        {
+          test: /\.scss$/,
+          use: ["style-loader", "css-loader", "sass-loader"]
         }
       ]
     },