diff --git a/frontend2/README.md b/frontend2/README.md index fe13608a..e15de8b3 100644 --- a/frontend2/README.md +++ b/frontend2/README.md @@ -1,4 +1,4 @@ -# frontend1 +# frontend2 A new Flutter project. diff --git a/frontend2/android/app/build.gradle b/frontend2/android/app/build.gradle index d0c557b4..eb5c50c2 100644 --- a/frontend2/android/app/build.gradle +++ b/frontend2/android/app/build.gradle @@ -8,7 +8,7 @@ plugins { android { - namespace = "com.example.frontend1" + namespace = "com.example.frontend2" compileSdk = flutter.compileSdkVersion ndkVersion = "25.1.8937393" @@ -23,7 +23,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.example.frontend1" + applicationId = "com.example.frontend2" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = 23 diff --git a/frontend2/android/app/build.gradle.kts b/frontend2/android/app/build.gradle.kts index bdf07498..40fc24d1 100644 --- a/frontend2/android/app/build.gradle.kts +++ b/frontend2/android/app/build.gradle.kts @@ -6,7 +6,7 @@ plugins { } android { - namespace = "com.example.frontend1" + namespace = "com.example.frontend2" compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion @@ -21,7 +21,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId = "com.example.frontend1" + applicationId = "com.example.frontend2" // You can update the following values to match your application needs. // For more information, see: https://flutter.dev/to/review-gradle-config. minSdk = flutter.minSdkVersion diff --git a/frontend2/android/app/google-services.json b/frontend2/android/app/google-services.json index 30a47857..40a9fb90 100644 --- a/frontend2/android/app/google-services.json +++ b/frontend2/android/app/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:291063708231:android:e350e5c95c103ba1644f62", "android_client_info": { - "package_name": "com.example.frontend1" + "package_name": "com.example.frontend2" } }, "oauth_client": [], diff --git a/frontend2/android/app/src/main/kotlin/com/example/frontend1/MainActivity.kt b/frontend2/android/app/src/main/kotlin/com/example/frontend1/MainActivity.kt index 27cd2f10..62eae89d 100644 --- a/frontend2/android/app/src/main/kotlin/com/example/frontend1/MainActivity.kt +++ b/frontend2/android/app/src/main/kotlin/com/example/frontend1/MainActivity.kt @@ -1,4 +1,4 @@ -package com.example.frontend1 +package com.example.frontend2 import io.flutter.embedding.android.FlutterActivity diff --git a/frontend2/ios/Runner.xcodeproj/project.pbxproj b/frontend2/ios/Runner.xcodeproj/project.pbxproj index 1cfbe573..3bb9d445 100644 --- a/frontend2/ios/Runner.xcodeproj/project.pbxproj +++ b/frontend2/ios/Runner.xcodeproj/project.pbxproj @@ -521,7 +521,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend1.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend2.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -540,7 +540,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend1.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend2.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; @@ -557,7 +557,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.5; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend1.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend2.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; diff --git a/frontend2/ios/Runner/Info.plist b/frontend2/ios/Runner/Info.plist index e5297c8d..fc3f748d 100644 --- a/frontend2/ios/Runner/Info.plist +++ b/frontend2/ios/Runner/Info.plist @@ -7,7 +7,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Frontend1 + frontend2 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -15,7 +15,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - frontend1 + frontend2 CFBundlePackageType APPL CFBundleShortVersionString diff --git a/frontend2/lib/apis/authentication/login.dart b/frontend2/lib/apis/authentication/login.dart index bd85c897..64cfa4d8 100644 --- a/frontend2/lib/apis/authentication/login.dart +++ b/frontend2/lib/apis/authentication/login.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_web_auth_2/flutter_web_auth_2.dart'; -import 'package:frontend1/apis/mess/user_mess_info.dart'; -import 'package:frontend1/apis/protected.dart'; -import 'package:frontend1/apis/users/user.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/apis/mess/user_mess_info.dart'; +import 'package:frontend2/apis/protected.dart'; +import 'package:frontend2/apis/users/user.dart'; +import 'package:frontend2/constants/endpoint.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:sign_in_with_apple/sign_in_with_apple.dart'; -import 'package:frontend1/utilities/notifications.dart'; +import 'package:frontend2/utilities/notifications.dart'; import '../../screens/login_screen.dart'; Future authenticate() async { diff --git a/frontend2/lib/apis/hostel/hostels.dart b/frontend2/lib/apis/hostel/hostels.dart index 08d46806..da486d73 100644 --- a/frontend2/lib/apis/hostel/hostels.dart +++ b/frontend2/lib/apis/hostel/hostels.dart @@ -1,6 +1,6 @@ import 'package:dio/dio.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/constants/endpoint.dart'; Future fetchAllHostels() async { try { diff --git a/frontend2/lib/apis/mess/mess_menu.dart b/frontend2/lib/apis/mess/mess_menu.dart index 0ebea780..7a54e99b 100644 --- a/frontend2/lib/apis/mess/mess_menu.dart +++ b/frontend2/lib/apis/mess/mess_menu.dart @@ -1,6 +1,6 @@ import 'package:shared_preferences/shared_preferences.dart'; import 'package:dio/dio.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/constants/endpoint.dart'; import '../../models/mess_menu_model.dart'; diff --git a/frontend2/lib/apis/mess/user_mess_info.dart b/frontend2/lib/apis/mess/user_mess_info.dart index 9023639a..70099a50 100644 --- a/frontend2/lib/apis/mess/user_mess_info.dart +++ b/frontend2/lib/apis/mess/user_mess_info.dart @@ -1,5 +1,5 @@ -import 'package:frontend1/apis/protected.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/apis/protected.dart'; +import 'package:frontend2/constants/endpoint.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:dio/dio.dart'; diff --git a/frontend2/lib/apis/scan/qrscan_gala.dart b/frontend2/lib/apis/scan/qrscan_gala.dart index b9b6a54d..ae671971 100644 --- a/frontend2/lib/apis/scan/qrscan_gala.dart +++ b/frontend2/lib/apis/scan/qrscan_gala.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/widgets/common/snack_bar.dart'; +import 'package:frontend2/widgets/common/snack_bar.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; -import 'package:frontend1/utilities/permission_handler/permission_handler.dart'; +import 'package:frontend2/utilities/permission_handler/permission_handler.dart'; import 'package:dio/dio.dart'; import 'package:vibration/vibration.dart'; -import 'package:frontend1/widgets/common/cornerQR.dart'; +import 'package:frontend2/widgets/common/cornerQR.dart'; final dio = Dio(); diff --git a/frontend2/lib/apis/scan/qrscan_mess.dart b/frontend2/lib/apis/scan/qrscan_mess.dart index 83b80922..00b9b2cb 100644 --- a/frontend2/lib/apis/scan/qrscan_mess.dart +++ b/frontend2/lib/apis/scan/qrscan_mess.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; -import 'package:frontend1/utilities/permission_handler/permission_handler.dart'; -import 'package:frontend1/apis/protected.dart'; +import 'package:frontend2/utilities/permission_handler/permission_handler.dart'; +import 'package:frontend2/apis/protected.dart'; import 'package:vibration/vibration.dart'; -import 'package:frontend1/widgets/common/cornerQR.dart'; +import 'package:frontend2/widgets/common/cornerQR.dart'; import 'package:dio/dio.dart'; import '../../screen1/QrDetail.dart'; diff --git a/frontend2/lib/apis/scan/qrscan_old.dart b/frontend2/lib/apis/scan/qrscan_old.dart index 26ed321b..6e701dcf 100644 --- a/frontend2/lib/apis/scan/qrscan_old.dart +++ b/frontend2/lib/apis/scan/qrscan_old.dart @@ -1,8 +1,8 @@ import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:frontend1/utilities/permission_handler/permission_handler.dart'; -import 'package:frontend1/widgets/common/cornerQR.dart'; -import 'package:frontend1/widgets/common/snack_bar.dart'; +import 'package:frontend2/utilities/permission_handler/permission_handler.dart'; +import 'package:frontend2/widgets/common/cornerQR.dart'; +import 'package:frontend2/widgets/common/snack_bar.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:vibration/vibration.dart'; @@ -143,14 +143,14 @@ class _QrScanOldState extends State { } // import 'package:flutter/material.dart'; -// import 'package:frontend1/constants/themes.dart'; -// import 'package:frontend1/screen1/qrdetails_gala.dart'; -// import 'package:frontend1/widgets/common/snack_bar.dart'; +// import 'package:frontend2/constants/themes.dart'; +// import 'package:frontend2/screen1/qrdetails_gala.dart'; +// import 'package:frontend2/widgets/common/snack_bar.dart'; // import 'package:mobile_scanner/mobile_scanner.dart'; -// import 'package:frontend1/utilities/permission_handler/permission_handler.dart'; +// import 'package:frontend2/utilities/permission_handler/permission_handler.dart'; // import 'package:dio/dio.dart'; // import 'package:flutter_vibrate/flutter_vibrate.dart'; -// import 'package:frontend1/widgets/common/cornerQR.dart'; +// import 'package:frontend2/widgets/common/cornerQR.dart'; // // final dio = Dio(); // diff --git a/frontend2/lib/apis/users/user.dart b/frontend2/lib/apis/users/user.dart index c92f591f..28bca3fe 100644 --- a/frontend2/lib/apis/users/user.dart +++ b/frontend2/lib/apis/users/user.dart @@ -1,7 +1,7 @@ import 'dart:convert'; -import 'package:frontend1/apis/protected.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/apis/protected.dart'; +import 'package:frontend2/constants/endpoint.dart'; import 'package:http/http.dart' as http; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/frontend2/lib/main.dart b/frontend2/lib/main.dart index 389f3ec2..98455f8f 100644 --- a/frontend2/lib/main.dart +++ b/frontend2/lib/main.dart @@ -2,16 +2,16 @@ import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; -import 'package:frontend1/apis/authentication/login.dart'; -import 'package:frontend1/apis/mess/user_mess_info.dart'; -import 'package:frontend1/providers/feedback_provider.dart'; -import 'package:frontend1/screens/Home_screen.dart'; -import 'package:frontend1/screens/MainNavigationScreen.dart'; -import 'package:frontend1/screens/login_screen.dart'; -import 'package:frontend1/screens/mess_screen.dart'; -import 'package:frontend1/utilities/startupitem.dart'; +import 'package:frontend2/apis/authentication/login.dart'; +import 'package:frontend2/apis/mess/user_mess_info.dart'; +import 'package:frontend2/providers/feedback_provider.dart'; +import 'package:frontend2/screens/Home_screen.dart'; +import 'package:frontend2/screens/MainNavigationScreen.dart'; +import 'package:frontend2/screens/login_screen.dart'; +import 'package:frontend2/screens/mess_screen.dart'; +import 'package:frontend2/utilities/startupitem.dart'; import 'package:provider/provider.dart'; -import 'package:frontend1/utilities/notifications.dart'; +import 'package:frontend2/utilities/notifications.dart'; import 'package:firebase_core/firebase_core.dart'; Future main() async { diff --git a/frontend2/lib/screen1/QrDetail.dart b/frontend2/lib/screen1/QrDetail.dart index fe862803..d9dc7b90 100644 --- a/frontend2/lib/screen1/QrDetail.dart +++ b/frontend2/lib/screen1/QrDetail.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/widgets/common/hostel_name.dart'; +import 'package:frontend2/widgets/common/hostel_name.dart'; import 'dart:convert'; diff --git a/frontend2/lib/screen1/home_screen1.dart b/frontend2/lib/screen1/home_screen1.dart index b63f453e..47809ffc 100644 --- a/frontend2/lib/screen1/home_screen1.dart +++ b/frontend2/lib/screen1/home_screen1.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/apis/scan/qrscan_mess.dart'; -import 'package:frontend1/screen1/qr_scanner.dart'; +import 'package:frontend2/apis/scan/qrscan_mess.dart'; +import 'package:frontend2/screen1/qr_scanner.dart'; class homescreen1 extends StatelessWidget { const homescreen1({super.key}); diff --git a/frontend2/lib/screen1/qr_scanner.dart b/frontend2/lib/screen1/qr_scanner.dart index 580a833f..fe7620b3 100644 --- a/frontend2/lib/screen1/qr_scanner.dart +++ b/frontend2/lib/screen1/qr_scanner.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/widgets/login screen/googlesignin.dart'; -import 'package:frontend1/apis/scan/qrscan_gala.dart'; +import 'package:frontend2/widgets/login screen/googlesignin.dart'; +import 'package:frontend2/apis/scan/qrscan_gala.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/frontend2/lib/screens/MainNavigationScreen.dart b/frontend2/lib/screens/MainNavigationScreen.dart index d085626c..f5556abc 100644 --- a/frontend2/lib/screens/MainNavigationScreen.dart +++ b/frontend2/lib/screens/MainNavigationScreen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/screens/mess_feedback/mess_feedback_page.dart'; +import 'package:frontend2/screens/mess_feedback/mess_feedback_page.dart'; import 'home_screen.dart'; import 'mess_screen.dart'; //import 'complaints_screen.dart'; //for future diff --git a/frontend2/lib/screens/home_screen.dart b/frontend2/lib/screens/home_screen.dart index ca4a63d4..f75b621e 100644 --- a/frontend2/lib/screens/home_screen.dart +++ b/frontend2/lib/screens/home_screen.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:frontend1/screens/mess_feedback/mess_feedback_page.dart'; -import 'package:frontend1/screens/profile_screen.dart'; -import 'package:frontend1/screens/qr_scanner.dart'; -import 'package:frontend1/widgets/common/name_trimmer.dart'; -import 'package:frontend1/widgets/mess_widgets/MessMenuBuilder.dart'; +import 'package:frontend2/screens/mess_feedback/mess_feedback_page.dart'; +import 'package:frontend2/screens/profile_screen.dart'; +import 'package:frontend2/screens/qr_scanner.dart'; +import 'package:frontend2/widgets/common/name_trimmer.dart'; +import 'package:frontend2/widgets/mess_widgets/MessMenuBuilder.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../utilities/startupitem.dart'; diff --git a/frontend2/lib/screens/login_screen.dart b/frontend2/lib/screens/login_screen.dart index 9df6cb17..5496639b 100644 --- a/frontend2/lib/screens/login_screen.dart +++ b/frontend2/lib/screens/login_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/apis/authentication/login.dart'; -import 'package:frontend1/screens/MainNavigationScreen.dart'; -import 'package:frontend1/widgets/common/snack_bar.dart'; -import 'package:frontend1/widgets/login screen/login_button.dart'; +import 'package:frontend2/apis/authentication/login.dart'; +import 'package:frontend2/screens/MainNavigationScreen.dart'; +import 'package:frontend2/widgets/common/snack_bar.dart'; +import 'package:frontend2/widgets/login screen/login_button.dart'; class LoginScreen extends StatelessWidget { const LoginScreen({Key? key}) : super(key: key); diff --git a/frontend2/lib/screens/mess_change_screen.dart b/frontend2/lib/screens/mess_change_screen.dart index a72880ba..dbe5e6eb 100644 --- a/frontend2/lib/screens/mess_change_screen.dart +++ b/frontend2/lib/screens/mess_change_screen.dart @@ -1,12 +1,12 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/apis/users/user.dart'; -import 'package:frontend1/widgets/common/hostel_details.dart'; -import 'package:frontend1/widgets/common/hostel_name.dart'; -import 'package:frontend1/widgets/confirmation_dialog.dart'; +import 'package:frontend2/apis/users/user.dart'; +import 'package:frontend2/widgets/common/hostel_details.dart'; +import 'package:frontend2/widgets/common/hostel_name.dart'; +import 'package:frontend2/widgets/confirmation_dialog.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:frontend1/widgets/common/name_trimmer.dart'; -import 'package:frontend1/widgets/common/snack_bar.dart'; -import 'package:frontend1/widgets/common/custom_linear_progress.dart'; +import 'package:frontend2/widgets/common/name_trimmer.dart'; +import 'package:frontend2/widgets/common/snack_bar.dart'; +import 'package:frontend2/widgets/common/custom_linear_progress.dart'; import 'package:animated_custom_dropdown/custom_dropdown.dart'; class MessChangeScreen extends StatefulWidget { diff --git a/frontend2/lib/screens/mess_feedback/comment_page.dart b/frontend2/lib/screens/mess_feedback/comment_page.dart index bf92d40c..c488b10b 100644 --- a/frontend2/lib/screens/mess_feedback/comment_page.dart +++ b/frontend2/lib/screens/mess_feedback/comment_page.dart @@ -1,6 +1,6 @@ import 'dart:convert'; import 'package:flutter/material.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/constants/endpoint.dart'; import 'package:http/http.dart' as http; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/frontend2/lib/screens/mess_feedback/mess_feedback_page.dart b/frontend2/lib/screens/mess_feedback/mess_feedback_page.dart index 6a4488ba..616c62f6 100644 --- a/frontend2/lib/screens/mess_feedback/mess_feedback_page.dart +++ b/frontend2/lib/screens/mess_feedback/mess_feedback_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/constants/themes.dart'; +import 'package:frontend2/constants/themes.dart'; import 'package:provider/provider.dart'; import '../../providers/feedback_provider.dart'; import '../../widgets/feedback/custom_option.dart'; diff --git a/frontend2/lib/screens/mess_preference.dart b/frontend2/lib/screens/mess_preference.dart index 1f088158..01149a56 100644 --- a/frontend2/lib/screens/mess_preference.dart +++ b/frontend2/lib/screens/mess_preference.dart @@ -1,8 +1,8 @@ import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; -import 'package:frontend1/apis/protected.dart'; -import 'package:frontend1/widgets/common/mess_pref_dropdowns.dart'; -import 'package:frontend1/constants/themes.dart'; +import 'package:frontend2/apis/protected.dart'; +import 'package:frontend2/widgets/common/mess_pref_dropdowns.dart'; +import 'package:frontend2/constants/themes.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../constants/endpoint.dart'; diff --git a/frontend2/lib/screens/mess_screen.dart b/frontend2/lib/screens/mess_screen.dart index cda8f74f..20469163 100644 --- a/frontend2/lib/screens/mess_screen.dart +++ b/frontend2/lib/screens/mess_screen.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/widgets/common/popmenubutton.dart'; +import 'package:frontend2/widgets/common/popmenubutton.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../utilities/startupitem.dart'; diff --git a/frontend2/lib/screens/notification.dart b/frontend2/lib/screens/notification.dart index a9dc53e4..a598df1f 100644 --- a/frontend2/lib/screens/notification.dart +++ b/frontend2/lib/screens/notification.dart @@ -1,5 +1,5 @@ // import 'package:flutter/material.dart'; -// import 'package:frontend1/utilities/notification_card.dart'; +// import 'package:frontend2/utilities/notification_card.dart'; // class NotificationScreen extends StatefulWidget { // const NotificationScreen({super.key}); @@ -61,7 +61,7 @@ // } import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:frontend1/utilities/notification_card.dart'; +import 'package:frontend2/utilities/notification_card.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; class NotificationScreen extends StatefulWidget { diff --git a/frontend2/lib/screens/profile_screen.dart b/frontend2/lib/screens/profile_screen.dart index 148cdabf..1fc48d00 100644 --- a/frontend2/lib/screens/profile_screen.dart +++ b/frontend2/lib/screens/profile_screen.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/apis/authentication/login.dart'; -import 'package:frontend1/widgets/common/custom_linear_progress.dart'; -import 'package:frontend1/widgets/common/hostel_name.dart'; +import 'package:frontend2/apis/authentication/login.dart'; +import 'package:frontend2/widgets/common/custom_linear_progress.dart'; +import 'package:frontend2/widgets/common/hostel_name.dart'; import 'package:shared_preferences/shared_preferences.dart'; class ProfileScreen extends StatefulWidget { diff --git a/frontend2/lib/screens/qr_scanner.dart b/frontend2/lib/screens/qr_scanner.dart index b502eb2b..eb6a1ba9 100644 --- a/frontend2/lib/screens/qr_scanner.dart +++ b/frontend2/lib/screens/qr_scanner.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/screens/scan_status.dart'; -import 'package:frontend1/widgets/common/snack_bar.dart'; +import 'package:frontend2/screens/scan_status.dart'; +import 'package:frontend2/widgets/common/snack_bar.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:dio/dio.dart'; import 'package:vibration/vibration.dart'; -import 'package:frontend1/widgets/common/cornerQR.dart'; +import 'package:frontend2/widgets/common/cornerQR.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/constants/endpoint.dart'; final dio = Dio(); diff --git a/frontend2/lib/screens/scan_status.dart b/frontend2/lib/screens/scan_status.dart index 5a766dac..9d90442e 100644 --- a/frontend2/lib/screens/scan_status.dart +++ b/frontend2/lib/screens/scan_status.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:dio/dio.dart'; -import 'package:frontend1/screens/MainNavigationScreen.dart'; +import 'package:frontend2/screens/MainNavigationScreen.dart'; class ScanStatusPage extends StatelessWidget { final Response response; diff --git a/frontend2/lib/utilities/ComingSoon.dart b/frontend2/lib/utilities/ComingSoon.dart index d81a4e6d..c1e83479 100644 --- a/frontend2/lib/utilities/ComingSoon.dart +++ b/frontend2/lib/utilities/ComingSoon.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/screens/MainNavigationScreen.dart'; +import 'package:frontend2/screens/MainNavigationScreen.dart'; class ComingSoonScreen extends StatelessWidget { const ComingSoonScreen({super.key}); diff --git a/frontend2/lib/utilities/notifications.dart b/frontend2/lib/utilities/notifications.dart index 32f18b80..c51ef8a4 100644 --- a/frontend2/lib/utilities/notifications.dart +++ b/frontend2/lib/utilities/notifications.dart @@ -1,6 +1,6 @@ import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:frontend1/constants/endpoint.dart'; -import 'package:frontend1/apis/protected.dart'; +import 'package:frontend2/constants/endpoint.dart'; +import 'package:frontend2/apis/protected.dart'; import 'dart:convert'; import 'package:dio/dio.dart'; diff --git a/frontend2/lib/widgets/common/AutoHeightPageView.dart b/frontend2/lib/widgets/common/AutoHeightPageView.dart index 75db4bed..fcac2164 100644 --- a/frontend2/lib/widgets/common/AutoHeightPageView.dart +++ b/frontend2/lib/widgets/common/AutoHeightPageView.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/models/mess_menu_model.dart'; -import 'package:frontend1/widgets/mess_widgets/menusizeMeasure.dart'; +import 'package:frontend2/models/mess_menu_model.dart'; +import 'package:frontend2/widgets/mess_widgets/menusizeMeasure.dart'; import '../mess_widgets/horizontal_menu_builder.dart'; // import the file you just created diff --git a/frontend2/lib/widgets/common/hostel_details.dart b/frontend2/lib/widgets/common/hostel_details.dart index 8ae94956..724a34ff 100644 --- a/frontend2/lib/widgets/common/hostel_details.dart +++ b/frontend2/lib/widgets/common/hostel_details.dart @@ -1,6 +1,6 @@ import 'package:http/http.dart' as http; -import 'package:frontend1/apis/protected.dart'; -import 'package:frontend1/constants/endpoint.dart'; +import 'package:frontend2/apis/protected.dart'; +import 'package:frontend2/constants/endpoint.dart'; import 'dart:convert'; // Function to fetch hostel data diff --git a/frontend2/lib/widgets/complaint_dropdown.dart b/frontend2/lib/widgets/complaint_dropdown.dart index 91cb4662..daa9390e 100644 --- a/frontend2/lib/widgets/complaint_dropdown.dart +++ b/frontend2/lib/widgets/complaint_dropdown.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/screens/notification.dart'; +import 'package:frontend2/screens/notification.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../screens/mess_feedback/mess_feedback_page.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; diff --git a/frontend2/lib/widgets/login screen/googlesignin.dart b/frontend2/lib/widgets/login screen/googlesignin.dart index a68875f0..ce3bbee5 100644 --- a/frontend2/lib/widgets/login screen/googlesignin.dart +++ b/frontend2/lib/widgets/login screen/googlesignin.dart @@ -2,8 +2,8 @@ import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:frontend1/utilities/ComingSoon.dart'; -import 'package:frontend1/screens/login_screen.dart'; +import 'package:frontend2/utilities/ComingSoon.dart'; +import 'package:frontend2/screens/login_screen.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/frontend2/lib/widgets/mess_widgets/MessFeedbackform.dart b/frontend2/lib/widgets/mess_widgets/MessFeedbackform.dart index c078e231..4936755f 100644 --- a/frontend2/lib/widgets/mess_widgets/MessFeedbackform.dart +++ b/frontend2/lib/widgets/mess_widgets/MessFeedbackform.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/screens/mess_feedback/mess_feedback_page.dart'; +import 'package:frontend2/screens/mess_feedback/mess_feedback_page.dart'; class FeedbackCard extends StatefulWidget { diff --git a/frontend2/lib/widgets/mess_widgets/MessMenuBuilder.dart b/frontend2/lib/widgets/mess_widgets/MessMenuBuilder.dart index 4d2b3cfa..4a929503 100644 --- a/frontend2/lib/widgets/mess_widgets/MessMenuBuilder.dart +++ b/frontend2/lib/widgets/mess_widgets/MessMenuBuilder.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/widgets/mess_widgets/interactive_mess_menu.dart'; +import 'package:frontend2/widgets/mess_widgets/interactive_mess_menu.dart'; import '../../apis/mess/mess_menu.dart'; import '../../models/mess_menu_model.dart'; diff --git a/frontend2/lib/widgets/mess_widgets/messmenu.dart b/frontend2/lib/widgets/mess_widgets/messmenu.dart index c864225d..18aced04 100644 --- a/frontend2/lib/widgets/mess_widgets/messmenu.dart +++ b/frontend2/lib/widgets/mess_widgets/messmenu.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:frontend1/models/mess_menu_model.dart'; +import 'package:frontend2/models/mess_menu_model.dart'; class MessMenuCard extends StatelessWidget { final List menus; diff --git a/frontend2/linux/CMakeLists.txt b/frontend2/linux/CMakeLists.txt index 29855f4b..85edd3d8 100644 --- a/frontend2/linux/CMakeLists.txt +++ b/frontend2/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "frontend1") +set(BINARY_NAME "frontend2") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.frontend1") +set(APPLICATION_ID "com.example.frontend2") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/frontend2/linux/my_application.cc b/frontend2/linux/my_application.cc index fd2776ed..2bb5bf3f 100644 --- a/frontend2/linux/my_application.cc +++ b/frontend2/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "frontend1"); + gtk_header_bar_set_title(header_bar, "frontend2"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "frontend1"); + gtk_window_set_title(window, "frontend2"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/frontend2/macos/Runner.xcodeproj/project.pbxproj b/frontend2/macos/Runner.xcodeproj/project.pbxproj index e963d1a4..533109d0 100644 --- a/frontend2/macos/Runner.xcodeproj/project.pbxproj +++ b/frontend2/macos/Runner.xcodeproj/project.pbxproj @@ -64,7 +64,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* frontend1.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "frontend1.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* frontend2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "frontend2.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -131,7 +131,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* frontend1.app */, + 33CC10ED2044A3C60003C045 /* frontend2.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -217,7 +217,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* frontend1.app */; + productReference = 33CC10ED2044A3C60003C045 /* frontend2.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -385,10 +385,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend1.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend2.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/frontend1.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/frontend1"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/frontend2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/frontend2"; }; name = Debug; }; @@ -399,10 +399,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend1.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend2.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/frontend1.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/frontend1"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/frontend2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/frontend2"; }; name = Release; }; @@ -413,10 +413,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend1.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend2.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/frontend1.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/frontend1"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/frontend2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/frontend2"; }; name = Profile; }; diff --git a/frontend2/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/frontend2/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 69004ff4..17966ab4 100644 --- a/frontend2/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/frontend2/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -65,7 +65,7 @@ @@ -82,7 +82,7 @@ diff --git a/frontend2/macos/Runner/Configs/AppInfo.xcconfig b/frontend2/macos/Runner/Configs/AppInfo.xcconfig index 3df9a429..2121da1b 100644 --- a/frontend2/macos/Runner/Configs/AppInfo.xcconfig +++ b/frontend2/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = frontend1 +PRODUCT_NAME = frontend2 // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend1 +PRODUCT_BUNDLE_IDENTIFIER = com.example.frontend2 // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2025 com.example. All rights reserved. diff --git a/frontend2/pubspec.yaml b/frontend2/pubspec.yaml index 7d4af82c..04c1bdf3 100644 --- a/frontend2/pubspec.yaml +++ b/frontend2/pubspec.yaml @@ -1,4 +1,4 @@ -name: frontend1 +name: frontend2 description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. diff --git a/frontend2/test/widget_test.dart b/frontend2/test/widget_test.dart index 9bf5e22d..81c30cfe 100644 --- a/frontend2/test/widget_test.dart +++ b/frontend2/test/widget_test.dart @@ -7,7 +7,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:frontend1/main.dart'; +import 'package:frontend2/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { diff --git a/frontend2/web/index.html b/frontend2/web/index.html index 995e3500..fc50057e 100644 --- a/frontend2/web/index.html +++ b/frontend2/web/index.html @@ -23,13 +23,13 @@ - + - frontend1 + frontend2 diff --git a/frontend2/web/manifest.json b/frontend2/web/manifest.json index 818bae0e..8f7675ff 100644 --- a/frontend2/web/manifest.json +++ b/frontend2/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "frontend1", - "short_name": "frontend1", + "name": "frontend2", + "short_name": "frontend2", "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/frontend2/windows/CMakeLists.txt b/frontend2/windows/CMakeLists.txt index c8f0dfc9..b223f7e7 100644 --- a/frontend2/windows/CMakeLists.txt +++ b/frontend2/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(frontend1 LANGUAGES CXX) +project(frontend2 LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "frontend1") +set(BINARY_NAME "frontend2") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/frontend2/windows/runner/Runner.rc b/frontend2/windows/runner/Runner.rc index 26491e2c..30a276e4 100644 --- a/frontend2/windows/runner/Runner.rc +++ b/frontend2/windows/runner/Runner.rc @@ -90,12 +90,12 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "frontend1" "\0" + VALUE "FileDescription", "frontend2" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "frontend1" "\0" + VALUE "InternalName", "frontend2" "\0" VALUE "LegalCopyright", "Copyright (C) 2025 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "frontend1.exe" "\0" - VALUE "ProductName", "frontend1" "\0" + VALUE "OriginalFilename", "frontend2.exe" "\0" + VALUE "ProductName", "frontend2" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/frontend2/windows/runner/main.cpp b/frontend2/windows/runner/main.cpp index 755fff70..42164b2e 100644 --- a/frontend2/windows/runner/main.cpp +++ b/frontend2/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"frontend1", origin, size)) { + if (!window.Create(L"frontend2", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true);