[#501] Web: Update trails URL.

Can't fix this currently because its the changes are in a incomplete PR atm, will update properly once that PR is merged.

projects/web/src/components/submitTrail.tsx

@@ -4,9 +4,11 @@ import { Link } from "react-router-dom";
 import { myGlobals } from "../globals";
 
 import { AuthState } from "../auth";
+import { Organisation } from "../business-registry";
 
 export interface QueryProps {
   authState: AuthState;
+  organisation: Organisation;
 }
 
 export function SubmitTrail(props: QueryProps) {
@@ -22,7 +24,10 @@ export function SubmitTrail(props: QueryProps) {
 
   const submitTrail = () => {
 
-    return fetch(myGlobals.trailsUrl + '/trail', {
+    // TODO: The URL here needs to be changed to props.organisation.url, but the
+    // EDAPI that this is currently building against doesn't support the trails
+    // service yet.
+    return fetch('http://localhost:8300' + '/trail', {
       method: 'POST',
       body: JSON.stringify(trailEntry),
       headers: {

projects/web/src/globals.ts

@@ -1,15 +1,11 @@
 declare const OR_SERVICE_URL: string;
 export const orUrl: string = OR_SERVICE_URL;
 
-declare const TRAILS_SERVICE_URL: string;
-export const trailsUrl: string = TRAILS_SERVICE_URL;
-
 declare const GOOGLE_MAPS_API_KEY: string;
 export const googleMapsApiKey: string = GOOGLE_MAPS_API_KEY;
 
 export const myGlobals = {
     edapiUrl: 'http://localhost:8020' as string,
     orUrl: OR_SERVICE_URL as string,
-    trailsUrl : TRAILS_SERVICE_URL as string,
     googleMapsApiKey: GOOGLE_MAPS_API_KEY as string,
 };

projects/web/src/index.tsx

@@ -48,7 +48,7 @@ authInit().then((authState) => {
             <Submit authState={appState.auth} organisation={appState.organisation} ></Submit>} />
 
           <Route path="/submitTrail" exact render={() =>
-            <SubmitTrail authState={appState.auth} ></SubmitTrail>} />
+            <SubmitTrail authState={appState.auth} organisation={appState.organisation} ></SubmitTrail>} />
 
           <Route path="/scan/:scanData*" exact render={({ match }) =>
             <Scan authState={appState.auth}

projects/web/webpack.config.js

@@ -49,9 +49,6 @@ module.exports = (env) => {
         'OR_SERVICE_URL': JSON.stringify(env.production
                                          ? 'https://registry.mirza.d61.io'
                                          : 'http://localhost:8200'),
-        'TRAILS_SERVICE_URL': JSON.stringify(env.production
-                                         ? 'https://trails.mirza.d61.io'
-                                         : 'http://localhost:8300'),
         'GOOGLE_MAPS_API_KEY': JSON.stringify(process.env.GOOGLE_MAPS_API_KEY),
       }),
     ]