From b9ba70cac523fbe3b20017cff344555b34f3ca37 Mon Sep 17 00:00:00 2001
From: "Begerad, Stefan" <dialog@swingbe.de>
Date: Wed, 22 Jun 2022 12:41:59 +0200
Subject: [PATCH] feat(fare-zones-table): switch from tarifmatrix to data.vbn
 API

---
 .../src/component/fare-zones-table.js         | 28 ++++++++++++----
 fare-zones-table/src/component/fare-zones.js  | 33 +++++++++----------
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/fare-zones-table/src/component/fare-zones-table.js b/fare-zones-table/src/component/fare-zones-table.js
index a1b6496..80fa155 100644
--- a/fare-zones-table/src/component/fare-zones-table.js
+++ b/fare-zones-table/src/component/fare-zones-table.js
@@ -6,13 +6,27 @@ class FareZonesTable extends Component {
         return (
             <tr>
                 <td>{this.props.obj.id}</td>
-                <td>{this.props.obj.extern}</td>
-                <td>{this.props.obj.type}</td>
-                <td>{this.props.obj.intern}</td>
-                <td>{this.props.obj.name}</td>
-                <td>{this.props.obj.shortName}</td>
-                <td>{this.props.obj.validFrom}</td>
-                <td>{this.props.obj.validUnit}</td>
+                <td>{this.props.obj.active ? 'true' : 'false'}</td>
+                <td>{this.props.obj.lon}</td>
+                <td>{this.props.obj.lat}</td>
+                <td>{this.props.obj.stop_long_name}</td>
+                <td>{this.props.obj.stop_name}</td>
+                <td>{this.props.obj.stop_name_extern}</td>
+                <td>{this.props.obj.fare_zone_1}</td>
+                <td>
+                    {this.props.obj.fare_zone_2 ? this.props.obj.fare_zone_2 : 'null'}
+                </td>
+                <td>
+                    {this.props.obj.fare_zone_3 ? this.props.obj.fare_zone_3 : 'null'}
+                </td>
+                <td>
+                    {this.props.obj.fare_zone_4 ? this.props.obj.fare_zone_4 : 'null'}
+                </td>
+                <td>{this.props.obj.valid_from}</td>
+                <td>
+                    {this.props.obj.valid_until ? this.props.obj.valid_until : 'null'}
+                </td>
+                <td>{this.props.obj.last_modified}</td>
             </tr>
         );
     }
diff --git a/fare-zones-table/src/component/fare-zones.js b/fare-zones-table/src/component/fare-zones.js
index e345b3e..97c6ac0 100644
--- a/fare-zones-table/src/component/fare-zones.js
+++ b/fare-zones-table/src/component/fare-zones.js
@@ -9,20 +9,13 @@ export default class FareZones extends Component {
     }
 
     componentDidMount () {
-        axios.defaults.baseURL = 'https://tarifmatrix.vbn.de:4445';
+        axios.defaults.baseURL = 'https://data.vbn.de';
         axios.defaults.headers.get['Content-Type'] =
       'application/json;charset=utf-8';
         axios.defaults.headers.get['Access-Control-Allow-Origin'] = '*';
 
         axios
-            .get('fares/areas/info', {
-                // Axios looks for the `auth` option, and, if it is set, formats a
-                // basic auth header for you automatically.
-                auth: {
-                    username: 'tbd',
-                    password: 'tbd'
-                }
-            })
+            .get('/data/stops')
             .then((res) => {
                 this.setState({ usersCollection: res.data });
             })
@@ -44,14 +37,20 @@ export default class FareZones extends Component {
                     <table className="table table-striped table-dark">
                         <thead className="thead-dark">
                             <tr>
-                                <td>ID</td>
-                                <td>Extern</td>
-                                <td>Type</td>
-                                <td>Intern</td>
-                                <td>Name</td>
-                                <td>Short Name</td>
-                                <td>Valid From</td>
-                                <td>Valid To</td>
+                                <td>id</td>
+                                <td>active</td>
+                                <td>lon</td>
+                                <td>lat</td>
+                                <td>stop_long_name</td>
+                                <td>stop_name</td>
+                                <td>stop_name_extern</td>
+                                <td>fare_zone_1</td>
+                                <td>fare_zone_2</td>
+                                <td>fare_zone_3</td>
+                                <td>fare_zone_4</td>
+                                <td>valid_from</td>
+                                <td>valid_until</td>
+                                <td>last_modified</td>
                             </tr>
                         </thead>
                         <tbody>{this.dataTable()}</tbody>