Skip to content

frontend1 -> frontend2 #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilotpal-n7 merged 1 commit into from
Sep 23, 2025
Merged

frontend1 -> frontend2 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frontend1
# frontend2

A new Flutter project.

Expand Down
4 changes: 2 additions & 2 deletions frontend2/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {


android {
namespace = "com.example.frontend1"
namespace = "com.example.frontend2"
compileSdk = flutter.compileSdkVersion
ndkVersion = "25.1.8937393"

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions frontend2/android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

android {
namespace = "com.example.frontend1"
namespace = "com.example.frontend2"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion frontend2/android/app/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
2 changes: 1 addition & 1 deletion frontend2/android/app/src/main/kotlin/com/example/frontend1/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.frontend1
package com.example.frontend2

import io.flutter.embedding.android.FlutterActivity

Expand Down
6 changes: 3 additions & 3 deletions frontend2/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions frontend2/ios/Runner/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Frontend1</string>
<string>frontend2</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>frontend1</string>
<string>frontend2</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
10 changes: 5 additions & 5 deletions frontend2/lib/apis/authentication/login.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<void> authenticate() async {
Expand Down
2 changes: 1 addition & 1 deletion frontend2/lib/apis/hostel/hostels.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<void> fetchAllHostels() async {
try {
Expand Down
2 changes: 1 addition & 1 deletion frontend2/lib/apis/mess/mess_menu.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';


Expand Down
4 changes: 2 additions & 2 deletions frontend2/lib/apis/mess/user_mess_info.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
6 changes: 3 additions & 3 deletions frontend2/lib/apis/scan/qrscan_gala.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();

Expand Down
6 changes: 3 additions & 3 deletions frontend2/lib/apis/scan/qrscan_mess.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
16 changes: 8 additions & 8 deletions frontend2/lib/apis/scan/qrscan_old.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -143,14 +143,14 @@ class _QrScanOldState extends State<QrScanOld> {
}

// 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();
//
Expand Down
4 changes: 2 additions & 2 deletions frontend2/lib/apis/users/user.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
18 changes: 9 additions & 9 deletions frontend2/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> main() async {
Expand Down
2 changes: 1 addition & 1 deletion frontend2/lib/screen1/QrDetail.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';


Expand Down
4 changes: 2 additions & 2 deletions frontend2/lib/screen1/home_screen1.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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});
Expand Down
4 changes: 2 additions & 2 deletions frontend2/lib/screen1/qr_scanner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';


Expand Down
2 changes: 1 addition & 1 deletion frontend2/lib/screens/MainNavigationScreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions frontend2/lib/screens/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
8 changes: 4 additions & 4 deletions frontend2/lib/screens/login_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
14 changes: 7 additions & 7 deletions frontend2/lib/screens/mess_change_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion frontend2/lib/screens/mess_feedback/comment_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion frontend2/lib/screens/mess_feedback/mess_feedback_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
6 changes: 3 additions & 3 deletions frontend2/lib/screens/mess_preference.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion frontend2/lib/screens/mess_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions frontend2/lib/screens/notification.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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});
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions frontend2/lib/screens/profile_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions frontend2/lib/screens/qr_scanner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();

Expand Down
Loading
Loading