Update to the last version

OpenReferralUK · Mar 9, 2020 · 79cc0d6 · 79cc0d6
1 parent 7ca2412
commit 79cc0d6
Show file tree

Hide file tree

Showing 86 changed files with 7,410 additions and 5,726 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/index.html b/public/index.html
@@ -31,16 +31,29 @@
     integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+
+  <script>
+    if (!Object.entries)
+      Object.entries = function (obj) {
+        var ownProps = Object.keys(obj),
+          i = ownProps.length,
+          resArray = new Array(i); // preallocate the Array
+        while (i--)
+          resArray[i] = [ownProps[i], obj[ownProps[i]]];
+
+        return resArray;
+      };
+  </script>
+
   <title>Service Finder</title>
 </head>
 
 <body>
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
   <div id="modalDiv"></div>
-  <script src="https://code.jquery.com/jquery-3.4.1.slim.js"
-    integrity="sha256-BTlTdQO9/fascB1drekrDVkaKd9PkwBymMlHOiG+qLI=" crossorigin="anonymous">
-  </script>
+  <script src="https://code.jquery.com/jquery-3.4.1.js" integrity="sha256-WpOohJOqMqqyKL9FccASB9O0KwACQJpFTUBLTYOVvVU="
+    crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
     integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous">
   </script>

diff --git a/public/settingsConfig.json b/public/settingsConfig.json
@@ -1,5 +1,5 @@
-{
-    "config": {
-        "API_URL_BASE_DEFAULT": "https://api.porism.com/ServiceDirectoryService"
-    }
+{
+    "config": {
+        "API_URL_BASE_DEFAULT": "https://api.porism.com/ServiceDirectoryService"
+    }
 }
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,78 +1,74 @@
-import React from 'react';
-import {
-  css
-} from '@emotion/core';
-import BeatLoader from 'react-spinners/BeatLoader'
-import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
-
-//Import Components
-import Navbar from './components/sections/Navbar';
-import Body from './components/sections/Body/Body';
-import {
-  getDataFromAPI,
-  refreshData,
-} from './functions/APIFunctions';
-import initial_data from './config';
-import AboutComponent from './components/sections/About/About';
-import InfoService from './components/sections/Services/General-InfoService';
-import ServiceListComponent from './components/sections/ServiceList/ServiceListComponent';
-
-export default class App extends React.Component {
-  interval;
-  state = {
-    time: initial_data.general.dataRefreshTime,
-    isLoaded: false
-  }
-
-  override = css`
-    display: flex;
-    justify-content: center;
-    align-items:center;
-    width: 100vw;
-    margin: 50px auto;
-`;
-
-  async componentDidMount() {
-    await getDataFromAPI();
-    this.interval = setInterval(async () => {
-      await refreshData();
-    }, 1000 * ((60 * 60) * this.state.time));
-    this.setState({
-      isLoaded: true
-    })
-  }
-  componentWillUnmount() {
-    clearInterval(this.interval);
-    this.interval = null;
-  }
-
-  render() {
-    return (
-      <Router>
-        <Navbar />
-        <Switch>
-          <Route path="/" exact>
-            <div className="App" >
-              {this.state.isLoaded ?
-                <>
-                  <Body />
-                </> : <BeatLoader
-                  css={this.override}
-                  sizeUnit={"px"}
-                  size={50}
-                  color={'#C70039 '}
-                  loading={this.state.loading}
-                />
-              } </div>
-          </Route>
-          <Route path="/about" exact component={() => (<AboutComponent />)} />
-          <Route path="/service/:id" exact component={() => (<InfoService />)} />
-          <Route path="/service-list/:list" exact component={() => (<ServiceListComponent />)} />
-          <Route path="*">
-            Page not found
-          </Route>
-        </Switch>
-      </Router>
-    );
-  }
+import { css } from '@emotion/core';
+import React from 'react';
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import BeatLoader from 'react-spinners/BeatLoader';
+import AboutComponent from './components/sections/About/About';
+import Body from './components/sections/Body/Body';
+import Navbar from './components/sections/Navbar';
+import ServiceListComponent from './components/sections/ServiceList/ServiceListComponent';
+import InfoService from './components/sections/Services/General-InfoService';
+import initial_data from './config';
+import { getDataFromAPI, refreshData } from './functions/APIFunctions';
+import ResultModal from './components/shared/Elements/ResultModal/ResultModal';
+
+
+export default class App extends React.Component {
+  interval;
+  state = {
+    time: initial_data.general.dataRefreshTime,
+    isLoaded: false
+  }
+
+  override = css`
+    display: flex;
+    justify-content: center;
+    align-items:center;
+    width: 100vw;
+    margin: 50px auto;
+`;
+
+  async componentDidMount() {
+    await getDataFromAPI();
+    this.interval = setInterval(async () => {
+      await refreshData();
+    }, 1000 * ((60 * 60) * this.state.time));
+    this.setState({
+      isLoaded: true
+    })
+  }
+  componentWillUnmount() {
+    clearInterval(this.interval);
+    this.interval = null;
+  }
+
+  render() {
+    return (
+      <Router>
+        <ResultModal />
+        <Navbar />
+        <Switch>
+          <Route path="/" exact>
+            <div className="App" >
+              {this.state.isLoaded ?
+                <>
+                  <Body />
+                </> : <BeatLoader
+                  css={this.override}
+                  sizeUnit={"px"}
+                  size={50}
+                  color={'#C70039 '}
+                  loading={this.state.loading}
+                />
+              } </div>
+          </Route>
+          <Route path="/about" exact component={() => (<AboutComponent />)} />
+          <Route path="/service/:id" exact component={() => (<InfoService />)} />
+          <Route path="/service-list/:list" exact component={() => (<ServiceListComponent />)} />
+          <Route path="*">
+            Page not found
+          </Route>
+        </Switch>
+      </Router>
+    );
+  }
 }