Skip to content
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

#GAD-3: all changes in gad-3 #125

Open
wants to merge 1 commit into
base: test
Choose a base branch
from
Open

#GAD-3: all changes in gad-3 #125

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
3 changes: 2 additions & 1 deletion lib/Components/side_drawer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ class _SideDrawerState extends State<SideDrawer> {
pageMover: '/library_homepage'),
ModulesPadding(line: 'Awards & Scholarship Module'),
ModulesPadding(
line: 'Complaint Module', pageMover: '/complaint'),
line: 'Complaint Module', pageMover: '/complaint',
isActive: true,),
ModulesPadding(line: 'Central Mess Module'),
ModulesPadding(line: 'Feeds Module'),
ModulesPadding(
Expand Down
20 changes: 20 additions & 0 deletions lib/Components/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import 'package:flutter/material.dart';

class Utils {
final primarycolor = Colors.purple;
final primarybackgroundcolor = Colors.white;
final lightgrey = Colors.grey;
Decoration containerBorder(Color col) {
return BoxDecoration(
borderRadius: BorderRadius.circular(10),
border: Border.all(color: primarycolor));
}

Widget leadingPopIconsButton(Color cc, BuildContext context) {
return IconButton(
onPressed: () {
Navigator.pop(context);
},
icon: Icon(Icons.arrow_back_ios));
}
}
4 changes: 2 additions & 2 deletions lib/api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//Server and local links
String klocalLink = "127.0.0.1:8000";
String kserverLink = "172.27.16.215:80";
String kserverLink = "172.27.16.214";

//Login Service
String kAuthUrl = "172.27.16.215:80";
String kAuthUrl = "172.27.16.214";
String kAuthLogin = "/api/auth/login/";

//Profile Service
Expand Down
12 changes: 8 additions & 4 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'dart:async';
import 'package:fusion/screens/Academic/Add_Drop_Courses/add_drop_courses.dart';
import 'package:fusion/screens/Complaint/ComplaintHistory/complain_history.dart';
import 'package:fusion/screens/Complaint/ComplaintHistory/get_complaint_by_id.dart';
import 'package:fusion/screens/Complaint/Feedback/feedback.dart';
import 'package:fusion/screens/Complaint/LodgeComplaint/lodge_complaint.dart';
import 'package:fusion/screens/Establishment/establishment_home_page.dart';
Expand Down Expand Up @@ -60,7 +61,7 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
MediaQueryData windowData =
MediaQueryData.fromWindow(WidgetsBinding.instance.window);
MediaQueryData.fromWindow(WidgetsBinding.instance.window);
windowData = windowData.copyWith(
textScaleFactor: 1,
);
Expand All @@ -71,10 +72,10 @@ class MyApp extends StatelessWidget {
title: 'Fusion',
debugShowCheckedModeBanner: false,
theme: ThemeData(
// primarySwatch: Colors.blueGrey,
// primarySwatch: Colors.blueGrey,
// colorSchemeSeed: Color(0xFF2085D0),
colorSchemeSeed: Color(0xFFF36C35),
fontFamily: 'Nunito',
fontFamily: 'Nunito',
useMaterial3: true,
),
initialRoute: '/landing',
Expand Down Expand Up @@ -119,10 +120,13 @@ class MyApp extends StatelessWidget {
'/complaint/lodge_complaint': (context) => LodgeComplaint(
ModalRoute.of(context)!.settings.arguments.toString()),
'/complaint/complaint_history': (context) => ComplainHistory(),
'/complaint/feedback': (context) => ComplaintFeedBack(),
// '/complaint/feedback': (context) => ComplaintFeedBack(),
'/profile': (context) => Profile(),
'/health_center': (context) => HealthCenterMod(
ModalRoute.of(context)!.settings.arguments.toString()),
'/complaint/fulldetail': (context) => GetComplaintByID(
ModalRoute.of(context)!.settings.arguments
as Map<String, dynamic>),
'/health_center/healthcenter': (context) => HealthCenter(),
'/health_center/feedback': (context) => FeedBack(),
'/health_center/viewschedule': (context) => ViewSchedule(),
Expand Down
Loading