From ce9786ab05fb8dc830388e98ddbbc0d76089dcdc Mon Sep 17 00:00:00 2001 From: Benjamin Ramhorst Date: Tue, 1 Mar 2022 11:07:52 +0000 Subject: [PATCH] Minor fixes --- lib/service/auth_service.dart | 4 ++-- lib/view/home.dart | 6 +++--- lib/view/metrics/metrics_page.dart | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/service/auth_service.dart b/lib/service/auth_service.dart index 713e4e6..deed8d3 100644 --- a/lib/service/auth_service.dart +++ b/lib/service/auth_service.dart @@ -3,12 +3,12 @@ import 'package:http/http.dart' as http; import 'package:leg_barkr_app/utils/endpoints.dart' as Endpoints; class AuthService{ - Future> getUserDevices(String sessionToken) async { + Future> getUserDevices(String uid) async { final response = await http.get( Uri.parse(Endpoints.getUserDevices), headers: { 'Content-Type': 'application/json; charset=UTF-8', - 'Authorization': sessionToken, + 'UID': uid, }, ); if (response.statusCode == 200){ diff --git a/lib/view/home.dart b/lib/view/home.dart index 3950402..cf7d157 100644 --- a/lib/view/home.dart +++ b/lib/view/home.dart @@ -26,8 +26,8 @@ class _HomeScreenState extends State { Navigator.pushNamed(context, "/login"); } else { final prefs = await SharedPreferences.getInstance(); - final String token = await user.getIdToken(); - final List userDevices = await AuthService().getUserDevices(token); + //final String token = await user.getIdToken(); + final List userDevices = await AuthService().getUserDevices(user.uid); prefs.setStringList("devices", userDevices); prefs.setString("current_device", userDevices[0]); } @@ -51,7 +51,7 @@ class _HomeScreenState extends State { MetricsPage(), StepsPage(), MapPage(), - SettingsPage() + //SettingsPage() ], onPageChanged: (page) { setState(() { diff --git a/lib/view/metrics/metrics_page.dart b/lib/view/metrics/metrics_page.dart index 94e1caa..335d200 100644 --- a/lib/view/metrics/metrics_page.dart +++ b/lib/view/metrics/metrics_page.dart @@ -60,10 +60,12 @@ class _MetricsPageState extends State { MetricsRow(new MetricsData(metricsResponse.lastHumidity, metricsResponse.minHumidity, metricsResponse.maxHumidity, Constants.MIN_HUMIDITY, Constants.MAX_HUMIDITY, Constants.LOW_HUMIDITY_DOG, Constants.HIGH_HUMIDITY_DOG, "Humidity", "%"), Colors.green, Colors.black, false), MetricsRow(new MetricsData(metricsResponse.lastAirTemp, metricsResponse.minAirTemp, metricsResponse.maxAirTemp, Constants.MIN_AIR_TEMP, Constants.MAX_AIR_TEMP, Constants.LOW_AIR_TEMP_DOG, Constants.HIGH_AIR_TEMP_DOG, "Air temperature", "°C"), Colors.white, Colors.green, true), + /* Padding( padding: EdgeInsets.fromLTRB(0.0, 20.0, 0.0, 0.0), child: Text("Today's temperature", textAlign: TextAlign.center, style: TextStyle(color: Colors.black, fontSize: 36, fontWeight: FontWeight.bold)), ), + */ //TempChart(data)