covas_mobile/lib/classes/auth_service.dart

@@ -3,8 +3,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:http/http.dart' as http;
 import '../variable/globals.dart' as globals;
 import 'dart:io';
-import 'package:flutter/material.dart';
-import '../pages/LoginDemo.dart';
 
 class AuthService {
   // Login with username and password
@@ -88,21 +86,6 @@ class AuthService {
     }
   }
 
-  Future<void> checkTokenStatus(context) async {
-    bool loggedIn = await isLoggedIn();
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-
-    if (!loggedIn) {
-      await prefs.remove("access_token"); // Correctly remove the token
-
-      Navigator.pushAndRemoveUntil(
-        context,
-        MaterialPageRoute(builder: (_) => LoginDemo()),
-        (route) => false, // Remove all previous routes
-      );
-    }
-  }
-
   // Get stored access token
   Future<String?> getAccessToken() async {
     final prefs = await SharedPreferences.getInstance();

covas_mobile/lib/pages/AddProfile.dart

@@ -140,7 +140,6 @@ class _AddProfileState extends State<AddProfile> with ShowAlertDialog {
   @override
   void initState() {
     super.initState();
-
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;

covas_mobile/lib/pages/Camera.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:image_picker/image_picker.dart';
 import '../classes/MyDrawer.dart';
@@ -6,7 +7,6 @@ import '../classes/MyDrawer.dart';
 import 'DisplayPictureScreen.dart';
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
-import '../classes/auth_service.dart';
 
 Future<void> main() async {
   // Ensure that plugin services are initialized so that `availableCameras()`
@@ -46,14 +46,12 @@ class Camera extends StatefulWidget {
 class CameraState extends State<Camera> {
   late CameraController _controller;
   late Future<void> _initializeControllerFuture;
-  final AuthService _authService = AuthService();
 
   @override
   void initState() {
     super.initState();
     // To display the current output from the Camera,
     // create a CameraController.
-    _authService.checkTokenStatus(context);
 
     _controller = CameraController(
       // Get a specific camera from the list of available cameras.
@@ -97,6 +95,7 @@ class CameraState extends State<Camera> {
         // camera preview. Use a FutureBuilder to display a loading spinner until the
         // controller has finished initializing.
         drawer: MyDrawer(),
+
         body: FutureBuilder<void>(
           future: _initializeControllerFuture,
           builder: (context, snapshot) {

covas_mobile/lib/pages/CameraEdit.dart

@@ -7,7 +7,6 @@ import 'package:image_picker/image_picker.dart';
 import 'EditEvent.dart';
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
-import '../classes/auth_service.dart';
 
 Future<void> main() async {
   // Ensure that plugin services are initialized so that `availableCameras()`
@@ -46,13 +45,10 @@ class CameraEdit extends StatefulWidget {
 class CameraEditState extends State<CameraEdit> {
   late CameraController _controller;
   late Future<void> _initializeControllerFuture;
-  final AuthService _authService = AuthService();
 
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     // To display the current output from the Camera,
     // create a CameraController.
 
@@ -99,6 +95,7 @@ class CameraEditState extends State<CameraEdit> {
         // camera preview. Use a FutureBuilder to display a loading spinner until the
         // controller has finished initializing.
         drawer: MyDrawer(),
+
         body: FutureBuilder<void>(
           future: _initializeControllerFuture,
           builder: (context, snapshot) {

covas_mobile/lib/pages/DisplayPictureScreen.dart

@@ -16,7 +16,6 @@ import '../classes/MyDrawer.dart';
 
 import '../classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -63,14 +62,11 @@ class DisplayPictureScreen extends StatefulWidget {
 class DisplayPictureScreenState extends State<DisplayPictureScreen>
     with ShowDescImageAdd, ShowAlertDialog, TickerProviderStateMixin {
   BannerAd? _bannerAd;
-  final AuthService _authService = AuthService();
 
   late AnimationController controller;
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;

covas_mobile/lib/pages/EditEvent.dart

@@ -9,9 +9,12 @@ import 'package:textfield_tags/textfield_tags.dart';
 import 'dart:convert';
 import 'dart:io';
 
+import 'dart:typed_data';
 import '../classes/events.dart';
 import '../classes/MyDrawer.dart';
 
+import 'ItemMenu.dart';
+import 'CameraEdit.dart';
 import 'package:camera/camera.dart';
 
 import '../classes/alert.dart';
@@ -21,7 +24,6 @@ import '../variable/globals.dart' as globals;
 
 import '../classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -58,8 +60,6 @@ class EditEvent extends StatefulWidget {
 class _EditEventState extends State<EditEvent>
     with ShowAlertDialog, ShowEventDialog {
   BannerAd? _bannerAd;
-  final AuthService _authService = AuthService();
-
   TextEditingController inputName = TextEditingController();
 
   TextEditingController inputDate = TextEditingController();
@@ -315,8 +315,6 @@ class _EditEventState extends State<EditEvent>
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;

covas_mobile/lib/pages/EditProfile.dart

@@ -17,7 +17,6 @@ import '../variable/globals.dart' as globals;
 
 import '../classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -45,8 +44,6 @@ class EditProfile extends StatefulWidget {
 class _EditProfileState extends State<EditProfile>
     with ShowAlertDialog, ShowEventDialog {
   BannerAd? _bannerAd;
-  final AuthService _authService = AuthService();
-
   TextEditingController inputUserName = TextEditingController();
 
   TextEditingController inputName = TextEditingController();
@@ -201,8 +198,6 @@ class _EditProfileState extends State<EditProfile>
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;

covas_mobile/lib/pages/EditSettings.dart

@@ -12,7 +12,6 @@ import '../classes/eventAdded.dart';
 
 import '../classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -40,8 +39,6 @@ class EditSettings extends StatefulWidget {
 class _EditProfileState extends State<EditSettings>
     with ShowAlertDialog, ShowEventDialog {
   BannerAd? _bannerAd;
-  final AuthService _authService = AuthService();
-
   TextEditingController inputUserName = TextEditingController();
   int? kilometer;
 
@@ -63,8 +60,6 @@ class _EditProfileState extends State<EditSettings>
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;

covas_mobile/lib/pages/ItemMenu.dart

@@ -23,7 +23,6 @@ import 'EditEvent.dart';
 
 import '../classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -76,7 +75,6 @@ class ItemMenu extends StatefulWidget {
 
 class _ItemMenuState extends State<ItemMenu> with ShowAlertDialog {
   BannerAd? _bannerAd;
-  final AuthService _authService = AuthService();
 
   String listUser = "";
   String eventName = "";
@@ -93,8 +91,6 @@ class _ItemMenuState extends State<ItemMenu> with ShowAlertDialog {
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;

covas_mobile/lib/pages/ListItemByOrganizers.dart

@@ -11,7 +11,6 @@ import 'package:intl/date_symbol_data_local.dart';
 
 import '../variable/globals.dart' as globals;
 import '../classes/MyDrawer.dart';
-import '../classes/auth_service.dart';
 
 // app starting point
 void main() {
@@ -42,8 +41,6 @@ class ListItemOrganizers extends StatefulWidget {
 
 // homepage state
 class _MyHomePageState extends State<ListItemOrganizers> {
-  final AuthService _authService = AuthService();
-
   // variable to call and store future list of posts
 
   // function to fetch data from api and return future list of posts
@@ -63,12 +60,6 @@ class _MyHomePageState extends State<ListItemOrganizers> {
     return body;
   }
 
-  @override
-  void initState() {
-    super.initState();
-    _authService.checkTokenStatus(context);
-  }
-
   // build function
   @override
   Widget build(BuildContext context) {

covas_mobile/lib/pages/ListItemByTags.dart

@@ -12,7 +12,6 @@ import 'package:intl/date_symbol_data_local.dart';
 import '../variable/globals.dart' as globals;
 
 import '../classes/MyDrawer.dart';
-import '../classes/auth_service.dart';
 
 // app starting point
 void main() {
@@ -44,8 +43,6 @@ class ListItemTags extends StatefulWidget {
 class _MyHomePageState extends State<ListItemTags> {
   // variable to call and store future list of posts
 
-  final AuthService _authService = AuthService();
-
   // function to fetch data from api and return future list of posts
   static Future<List<Events>> getPosts(tags) async {
     SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -63,12 +60,6 @@ class _MyHomePageState extends State<ListItemTags> {
     return body;
   }
 
-  @override
-  void initState() {
-    super.initState();
-    _authService.checkTokenStatus(context);
-  }
-
   // build function
   @override
   Widget build(BuildContext context) {

covas_mobile/lib/pages/ListItemMenu.dart

@@ -18,7 +18,6 @@ import 'package:camera/camera.dart';
 
 import '../classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -47,7 +46,6 @@ class ListItemMenu extends StatefulWidget {
 
 class _MyHomePageState extends State<ListItemMenu> {
   BannerAd? _bannerAd;
-  final AuthService _authService = AuthService();
 
   Future<List<Events>> postsFuture = getPosts();
   List<Events> filteredPosts = [];
@@ -147,7 +145,6 @@ class _MyHomePageState extends State<ListItemMenu> {
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;

covas_mobile/lib/pages/MapboxPages.dart

@@ -11,7 +11,6 @@ import 'package:geolocator/geolocator.dart'; // For getting the user's location
 import '../classes/alert.dart'; // Assuming this contains your error dialog code.
 import '../variable/globals.dart' as globals;
 import '../classes/MyDrawer.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   await dotenv.load(fileName: ".env"); // Load .env file
@@ -45,8 +44,6 @@ class MapboxPages extends StatefulWidget {
 }
 
 class _MapboxPagesState extends State<MapboxPages> with ShowAlertDialog {
-  final AuthService _authService = AuthService();
-
   late MapboxMapController mapController;
   late String mapboxAccessToken;
   List<LatLng> routeCoordinates = [];
@@ -61,8 +58,6 @@ class _MapboxPagesState extends State<MapboxPages> with ShowAlertDialog {
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     _getUserLocation();
   }
 

covas_mobile/lib/pages/UpdateEventImage.dart

@@ -18,7 +18,6 @@ import '../variable/globals.dart' as globals;
 
 import '../classes/ad_helper.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
-import '../classes/auth_service.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -52,7 +51,6 @@ class UpdateeventImage extends StatefulWidget {
 class _UpdateeventImageState extends State<UpdateeventImage>
     with ShowAlertDialog, ShowEventDialog {
   BannerAd? _bannerAd;
-  final AuthService _authService = AuthService();
 
   TextEditingController inputName = TextEditingController();
 
@@ -318,8 +316,6 @@ class _UpdateeventImageState extends State<UpdateeventImage>
   @override
   void initState() {
     super.initState();
-    _authService.checkTokenStatus(context);
-
     AdHelper.createBannerAd(() => setState(() {})).then((ad) {
       setState(() {
         _bannerAd = ad;