From 10f5e549dcaa408d36607987ba66d9d9ee86c337 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Mon, 12 Feb 2024 17:32:09 +0100
Subject: [PATCH] add: alert on failed server connection
---
app/lib/pages/consts.dart | 4 ++--
app/lib/pages/default_page.dart | 18 +++++++++++++++++-
app/lib/pages/widgets/map_widget.dart | 9 ++++-----
server/__pycache__/consts.cpython-311.pyc | Bin 595 -> 595 bytes
.../__pycache__/data_structs.cpython-311.pyc | Bin 3945 -> 3945 bytes
.../__pycache__/get_markers.cpython-311.pyc | Bin 2626 -> 2626 bytes
6 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/app/lib/pages/consts.dart b/app/lib/pages/consts.dart
index dcf0e5a4..4ff9e123 100644
--- a/app/lib/pages/consts.dart
+++ b/app/lib/pages/consts.dart
@@ -5,7 +5,7 @@ import 'package:google_fonts/google_fonts.dart';
const String port = "8443";
const String serverURI = "https://127.0.0.1:$port/";
const String mapEndpoint = "update_map";
-const int fetchInterval = 5;
+const int fetchInterval = 60; // Fetch marker data every n minutes
// Font variables
const textColor = Colors.white;
@@ -19,7 +19,7 @@ final titleStyle = GoogleFonts.dmSans(
color: textColor,
fontWeight: FontWeight.bold, // Add this line to make the text bold
);
-final textStyle = GoogleFonts.dmSans(fontSize: 20, color: textColor);
+final regTextStyle = GoogleFonts.dmSans(fontSize: 20, color: textColor);
final chartTextStyle = GoogleFonts.dmSans(fontSize: 14, color: textColor);
// Colors
diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index 51167e84..6bd8f225 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -45,7 +45,23 @@ class _DefaultPageState extends State<DefaultPage> {
print('Request failed with status: ${response.statusCode}');
}
} catch (e) {
- print('Failed to connect to the server: $e');
+ showDialog(
+ context: context,
+ builder: (BuildContext context) {
+ return AlertDialog(
+ title: Text("Error"),
+ content: Text("Failed to connect to the server. Please check your network connection"),
+ actions: [
+ TextButton(
+ onPressed: () {
+ Navigator.of(context).pop(); // Close the dialog
+ },
+ child: Text("OK"),
+ ),
+ ],
+ );
+ },
+ );
}
}
diff --git a/app/lib/pages/widgets/map_widget.dart b/app/lib/pages/widgets/map_widget.dart
index 430f4207..33e6175a 100644
--- a/app/lib/pages/widgets/map_widget.dart
+++ b/app/lib/pages/widgets/map_widget.dart
@@ -95,7 +95,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
Center(
child: Text(
'Placeholder',
- style: textStyle,
+ style: regTextStyle,
),
),
Positioned(
@@ -138,11 +138,11 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
Text(
'Latitude: ${selectedMarker?.geoData.latitude}',
- style: textStyle,
+ style: regTextStyle,
),
Text(
'Longitude: ${selectedMarker?.geoData.longitude}',
- style: textStyle,
+ style: regTextStyle,
),
const SizedBox(height: contPadding),
SizedBox(
@@ -175,7 +175,7 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
const SizedBox(height: contPadding),
SizedBox(
width: screenWidth * boxWidth - contPadding * 2,
- height: 200,
+ height: 160,
child: BarChart(
BarChartData(
alignment: BarChartAlignment.spaceAround,
@@ -249,7 +249,6 @@ class _MapContainerWidgetState extends State<MapContainerWidget> {
),
),
),
- const SizedBox(height: contPadding),
],
);
},
diff --git a/server/__pycache__/consts.cpython-311.pyc b/server/__pycache__/consts.cpython-311.pyc
index 9ff52d124944e7e6b5fd6348a75357356a3572d9..b7f2592f2239ee05fd4207b4e5c35e5e08689ba6 100644
GIT binary patch
delta 20
acmcc2a+!sDIWI340}xoUoZ86k!2|#`Rs@m&
delta 20
acmcc2a+!sDIWI340}!ZeJ+hJ8g9!jQ%LOO^
diff --git a/server/__pycache__/data_structs.cpython-311.pyc b/server/__pycache__/data_structs.cpython-311.pyc
index 234ac85964595741b6de2f77e9d025cb0ae7b722..e071b1d60a2ebf539fbf43547a01ca60a2060165 100644
GIT binary patch
delta 20
acmaDU_fn2~IWI340}xoUoZ848#}5EJdj%B$
delta 20
acmaDU_fn2~IWI340}#xRIJS{HjvoL&cm;$2
diff --git a/server/map/__pycache__/get_markers.cpython-311.pyc b/server/map/__pycache__/get_markers.cpython-311.pyc
index 59bda76604761ffdecd11385bb472c5054fdf005..c218b600d9e5fb7a7e15ffd566a376b1d63f53a9 100644
GIT binary patch
delta 20
acmX>ka!7=GIWI340}xoUoZ853&IJH8_5_Cj
delta 20
acmX>ka!7=GIWI340}!myJGPPAoC^Rs0|g)e
--
GitLab