From b444441dac4c2bab3037a074a977b144b4067d11 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Tue, 19 Mar 2024 11:24:55 +0100
Subject: [PATCH] refactor: folders
---
app/lib/{pages => }/consts.dart | 0
app/lib/{pages/server_requests => }/data_classes.dart | 0
app/lib/pages/default_page.dart | 11 ++++++-----
.../{pages => }/server_requests/fetch_markers.dart | 4 ++--
.../{pages => }/server_requests/fetch_relation.dart | 2 +-
app/lib/{pages => }/widgets/choropleth_map.dart | 2 +-
app/lib/{pages => }/widgets/map_widget.dart | 4 ++--
app/lib/{pages => }/widgets/osm_map.dart | 4 ++--
app/lib/{pages => }/widgets/quick_view_chart.dart | 0
app/lib/{pages => }/widgets/sat_layer.dart | 2 +-
app/lib/{pages => }/widgets/stat_charts.dart | 0
11 files changed, 15 insertions(+), 14 deletions(-)
rename app/lib/{pages => }/consts.dart (100%)
rename app/lib/{pages/server_requests => }/data_classes.dart (100%)
rename app/lib/{pages => }/server_requests/fetch_markers.dart (97%)
rename app/lib/{pages => }/server_requests/fetch_relation.dart (98%)
rename app/lib/{pages => }/widgets/choropleth_map.dart (98%)
rename app/lib/{pages => }/widgets/map_widget.dart (99%)
rename app/lib/{pages => }/widgets/osm_map.dart (92%)
rename app/lib/{pages => }/widgets/quick_view_chart.dart (100%)
rename app/lib/{pages => }/widgets/sat_layer.dart (93%)
rename app/lib/{pages => }/widgets/stat_charts.dart (100%)
diff --git a/app/lib/pages/consts.dart b/app/lib/consts.dart
similarity index 100%
rename from app/lib/pages/consts.dart
rename to app/lib/consts.dart
diff --git a/app/lib/pages/server_requests/data_classes.dart b/app/lib/data_classes.dart
similarity index 100%
rename from app/lib/pages/server_requests/data_classes.dart
rename to app/lib/data_classes.dart
diff --git a/app/lib/pages/default_page.dart b/app/lib/pages/default_page.dart
index a0a5b717..6e66746c 100644
--- a/app/lib/pages/default_page.dart
+++ b/app/lib/pages/default_page.dart
@@ -1,12 +1,13 @@
import 'dart:async';
import 'package:flutter/material.dart';
-import 'widgets/map_widget.dart';
-import 'server_requests/data_classes.dart';
-import 'consts.dart';
-import 'server_requests/fetch_markers.dart';
-import 'server_requests/fetch_relation.dart';
import 'dart:typed_data';
+import '../consts.dart';
+import '../widgets/map_widget.dart';
+import '../data_classes.dart';
+import '../server_requests/fetch_markers.dart';
+import '../server_requests/fetch_relation.dart';
+
class DefaultPage extends StatefulWidget {
const DefaultPage({Key? key}) : super(key: key);
diff --git a/app/lib/pages/server_requests/fetch_markers.dart b/app/lib/server_requests/fetch_markers.dart
similarity index 97%
rename from app/lib/pages/server_requests/fetch_markers.dart
rename to app/lib/server_requests/fetch_markers.dart
index 2e0e9679..fb16d8ec 100644
--- a/app/lib/pages/server_requests/fetch_markers.dart
+++ b/app/lib/server_requests/fetch_markers.dart
@@ -1,8 +1,8 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
-import '../consts.dart';
-import 'data_classes.dart';
+import '../../consts.dart';
+import '../data_classes.dart';
import 'package:path_provider/path_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter/material.dart';
diff --git a/app/lib/pages/server_requests/fetch_relation.dart b/app/lib/server_requests/fetch_relation.dart
similarity index 98%
rename from app/lib/pages/server_requests/fetch_relation.dart
rename to app/lib/server_requests/fetch_relation.dart
index 2a4abf5d..999a0611 100644
--- a/app/lib/pages/server_requests/fetch_relation.dart
+++ b/app/lib/server_requests/fetch_relation.dart
@@ -4,7 +4,7 @@ import 'dart:io';
import 'dart:typed_data';
import 'package:path_provider/path_provider.dart';
-import '../consts.dart';
+import '../../consts.dart';
/// Fetch relation data from server
Future<Uint8List> fetchRelation() async {
diff --git a/app/lib/pages/widgets/choropleth_map.dart b/app/lib/widgets/choropleth_map.dart
similarity index 98%
rename from app/lib/pages/widgets/choropleth_map.dart
rename to app/lib/widgets/choropleth_map.dart
index c6371034..f611a1dc 100644
--- a/app/lib/pages/widgets/choropleth_map.dart
+++ b/app/lib/widgets/choropleth_map.dart
@@ -1,5 +1,5 @@
import 'dart:typed_data';
-import '../server_requests/data_classes.dart';
+import '../data_classes.dart';
import 'package:flutter/material.dart';
import 'package:syncfusion_flutter_maps/maps.dart';
import 'dart:math';
diff --git a/app/lib/pages/widgets/map_widget.dart b/app/lib/widgets/map_widget.dart
similarity index 99%
rename from app/lib/pages/widgets/map_widget.dart
rename to app/lib/widgets/map_widget.dart
index 510d1c63..c509347d 100644
--- a/app/lib/pages/widgets/map_widget.dart
+++ b/app/lib/widgets/map_widget.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
-import '../server_requests/data_classes.dart';
-import '../consts.dart';
+import '../data_classes.dart';
+import '../../consts.dart';
import 'quick_view_chart.dart';
import 'stat_charts.dart';
import 'sat_layer.dart';
diff --git a/app/lib/pages/widgets/osm_map.dart b/app/lib/widgets/osm_map.dart
similarity index 92%
rename from app/lib/pages/widgets/osm_map.dart
rename to app/lib/widgets/osm_map.dart
index 44aa3614..d78cd8cb 100644
--- a/app/lib/pages/widgets/osm_map.dart
+++ b/app/lib/widgets/osm_map.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
-import '../server_requests/data_classes.dart';
-import '../consts.dart';
+import '../data_classes.dart';
+import '../../consts.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart';
diff --git a/app/lib/pages/widgets/quick_view_chart.dart b/app/lib/widgets/quick_view_chart.dart
similarity index 100%
rename from app/lib/pages/widgets/quick_view_chart.dart
rename to app/lib/widgets/quick_view_chart.dart
diff --git a/app/lib/pages/widgets/sat_layer.dart b/app/lib/widgets/sat_layer.dart
similarity index 93%
rename from app/lib/pages/widgets/sat_layer.dart
rename to app/lib/widgets/sat_layer.dart
index c3b65faf..097440e9 100644
--- a/app/lib/pages/widgets/sat_layer.dart
+++ b/app/lib/widgets/sat_layer.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import '../server_requests/data_classes.dart';
+import '../data_classes.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:latlong2/latlong.dart';
diff --git a/app/lib/pages/widgets/stat_charts.dart b/app/lib/widgets/stat_charts.dart
similarity index 100%
rename from app/lib/pages/widgets/stat_charts.dart
rename to app/lib/widgets/stat_charts.dart
--
GitLab