fixing routes

compendium_v2/__init__.py

@@ -23,7 +23,7 @@ def create_app():
     with open(os.environ['SETTINGS_FILENAME']) as f:
         app_config = config.load(f)
 
-    app = Flask(__name__)
+    app = Flask(__name__, template_folder='static')
     CORS(app)
 
     app.secret_key = 'super secret session key'

compendium_v2/routes/default.py

@@ -14,6 +14,7 @@ import pkg_resources
 
 from flask import Blueprint, jsonify
 from compendium_v2.routes import common
+from flask import Flask, render_template
 
 routes = Blueprint("compendium-v2-default", __name__)
 API_VERSION = '0.1'
@@ -42,6 +43,11 @@ def after_request(resp):
     return common.after_request(resp)
 
 
+@routes.route("/")
+def index():
+    return render_template('index.html')
+
+
 @routes.route("/version", methods=['GET', 'POST'])
 @common.require_accepts_json
 def version():

webapp/src/About.tsx

-import React from 'react';
+import React, {ReactElement} from 'react';
 // import AnnualReport from './AnnualReport';
 // import DataAnalysis from './DataAnalysis';
 // import Navigation from './Navigation';
@@ -8,7 +8,7 @@ import React from 'react';
 
 // console.log(api_url)
 
-function About(): JSX.Element {
+function About(): ReactElement {
 
   return (
 
@@ -18,4 +18,4 @@ function About(): JSX.Element {
   );
 }
 
-export default About;
\ No newline at end of file
+export default About;

webapp/src/AnnualReport.tsx

-import React, {useState,useEffect} from 'react';
+import React, {useState, useEffect, ReactElement} from 'react';
 import {Nren, Service, ServiceMatrix} from "./Schema";
  
 
-const api_url = window.location.origin;
+// const api_url = window.location.origin;
 // const api_url = "http://[::1]:33333";
-// const api_url = "https://test-compendium01.geant.org";
+const api_url = "https://test-compendium01.geant.org";
 
-function AnnualReport(): JSX.Element {
+function AnnualReport(): ReactElement {
 
     function api<T>(url: string, options: RequestInit): Promise<T> {
         return fetch(url, options)

webapp/src/DataAnalysis.tsx

-import React from 'react';
+import React, {ReactElement} from 'react';
 
 // const api_url = window.location.origin+'/';
 
 // console.log(api_url)
 
-function DataAnalysis(): JSX.Element {
+function DataAnalysis(): ReactElement {
 
   return (
     <div>
@@ -12,4 +12,4 @@ function DataAnalysis(): JSX.Element {
     </div>
   );
 }
-export default DataAnalysis;
\ No newline at end of file
+export default DataAnalysis;

webapp/src/Navigation.tsx

-import React from 'react';
+import React, {ReactElement} from 'react';
 import {Link} from 'react-router-dom'
 
 // const api_url = window.location.origin+'/';
 
 // console.log(api_url)
 
-function Navigation(): JSX.Element {
+function Navigation(): ReactElement {
 
   const navStyle ={ 
     color: 'white'
@@ -14,15 +14,21 @@ function Navigation(): JSX.Element {
   return (
     <nav className='header-naviagtion'>
         <ul className='nav-links'>
-          <Link style={navStyle}  to="/about">
-          <li>About</li>
-          </Link>
-          <Link style={navStyle}  to="/report">
-          <li>Annual Report</li>
-          </Link>
-          <Link  style={navStyle} to="/analysis">
-          <li>Data Analysis</li>
-          </Link>
+          <li>
+            <Link  style={navStyle} to="/about">
+              About
+            </Link>
+          </li>
+          <li>
+            <Link  style={navStyle} to="/report">
+              Annual Report
+            </Link>
+          </li>
+          <li>
+            <Link  style={navStyle} to="/analysis">
+              Data Analysis
+            </Link>
+          </li>
         </ul>
     </nav>
   );