Merge pull request #52 from hardikroongta8/main

connected accept, reject and get owned room bookings routes
swciitg · Jul 17, 2023 · 0804f41 · 0804f41
2 parents 15a2c5c + 3bd5897
commit 0804f41
Show file tree

Hide file tree

Showing 16 changed files with 679 additions and 490 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -58,14 +58,26 @@ class HomePage extends StatelessWidget {
                 // r.hardik@iitg.ac.in
                 // eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyaWQiOiI2NGE5YmY5YWFjM2VhYjAxOTdiNWI2N2UiLCJpYXQiOjE2ODg5Njg4OTQsImV4cCI6MTY4OTgzMjg5NH0.W1UyMNO1gcWKHjCb5Et3_sd6I9Hi6ObfQVYdKYFQsgM
 
-                await user.setString("userInfo", jsonEncode({
-                  "_id": "64a9bf9aac3eab0197b5b67e",
-                  "name": "Hareesh Nandigrama",
-                  "outlookEmail": "h.nandigrama@iitg.ac.in",
-                  "rollNo": "200101071",
-                  "__v": 0
+                // await user.setString("userInfo", jsonEncode({
+                //   "_id": "64a9bf9aac3eab0197b5b67e",
+                //   "name": "Hareesh Nandigrama",
+                //   "outlookEmail": "h.nandigrama@iitg.ac.in",
+                //   "rollNo": "200101071",
+                //   "__v": 0
+                // }));
+
+                await user.setString('userInfo', jsonEncode({
+                  '_id': '64a9bf9aac3eab0197b5b67e',
+                  'name': 'Hardik Roongta',
+                  'outlookEmail': 'r.hardik@iitg.ac.in',
+                  'roolNo': '210102036',
+                  '__v': 0
                 }));
-                await user.setString("accessToken", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyaWQiOiI2NDlkOTk2NzA2MmNmOTBmYzljMjMwNjAiLCJpYXQiOjE2ODg4MDQ4OTQsImV4cCI6MTY4OTY2ODg5NH0.wfrq1RDzMbDOWKQzauZpbXyxg8u687pQPK054SyQdpM");
+
+                // Hardik
+                await user.setString("accessToken", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyaWQiOiI2NGE5YmY5YWFjM2VhYjAxOTdiNWI2N2UiLCJpYXQiOjE2ODg5Njg4OTQsImV4cCI6MTY4OTgzMjg5NH0.W1UyMNO1gcWKHjCb5Et3_sd6I9Hi6ObfQVYdKYFQsgM");
+
+                //await user.setString("accessToken", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyaWQiOiI2NDlkOTk2NzA2MmNmOTBmYzljMjMwNjAiLCJpYXQiOjE2ODg4MDQ4OTQsImV4cCI6MTY4OTY2ODg5NH0.wfrq1RDzMbDOWKQzauZpbXyxg8u687pQPK054SyQdpM");
                 Navigator.of(context).push(
                     MaterialPageRoute(
                         builder: (context) => const IRBS()

diff --git a/packages/irbs/lib/src/globals/colors.dart b/packages/irbs/lib/src/globals/colors.dart
@@ -22,4 +22,5 @@ class Themes{
   static const dropDownColor = Color.fromRGBO(32, 40, 54, 1);
   static const myRoomsFormHeadingColor = Color.fromRGBO(253, 252, 255, 1);
   static const requestTile = Color.fromRGBO(35, 41, 52, 1);
+  static const disabledButtonBackground = Color.fromRGBO(62, 71, 88, 1);
 }
diff --git a/packages/irbs/lib/src/globals/endpoints.dart b/packages/irbs/lib/src/globals/endpoints.dart
@@ -3,11 +3,14 @@ class Endpoints {
   static const apiSecurityKey = '';
   static const getAllRooms = '/api/room';
   static const getRoomBookings = '/api/booking';
+  static const getOwnedRoomBookings = '/api/booking/rooms-owned';
   static const getSpecificRoom = '/api/room';
   static const getMyRooms = '/api/room/owned';
   static const deleteBooking ='/api/booking';
   static const createBooking = '/api/booking';
   static const editRoom = '/api/room';
+  static const rejectBooking = '/api/booking/reject';
+  static const acceptBooking = '/api/booking/accept';
   static getHeader() {
     return {
       'Content-Type': 'application/json',

diff --git a/packages/irbs/lib/src/main.dart b/packages/irbs/lib/src/main.dart
@@ -32,7 +32,7 @@ class _IRBSState extends State<IRBS> {
         debugShowCheckedModeBanner: false,
         initialRoute: '/irbs/home',
         routes: {
-          '/irbs/home': (context) => const Home(isAdmin: true),
+          '/irbs/home': (context) => const Home(),
           '/irbs/onboarding': (context) => const Onboarding(),
           '/irbs/roomList': (context) => const RoomList(),
           '/irbs/bookingHistory': (context) => const BookingHistory(),

diff --git a/packages/irbs/lib/src/models/owned_room_booking.dart b/packages/irbs/lib/src/models/owned_room_booking.dart
@@ -0,0 +1,37 @@
+import 'package:irbs/src/models/booking_model.dart';
+
+class OwnedRoomBooking{
+  late String roomId;
+  late String user;
+  late String status;
+  late String inTime;
+  late String outTime;
+  late String bookingPurpose;
+  late String createdAt;
+  late String id;
+  late RoomDetailsModel roomDetails;
+
+  OwnedRoomBooking({
+    required this.roomId,
+    required this.user,
+    required this.status,
+    required this.inTime,
+    required this.outTime,
+    required this.bookingPurpose,
+    required this.createdAt,
+    required this.id,
+    required this.roomDetails
+  });
+
+  OwnedRoomBooking.fromJson(Map<String, dynamic> json){
+    roomId = json['roomId'];
+    user = json['user'];
+    status = json['status'];
+    inTime = json['inTime'];
+    outTime = json['outTime'];
+    bookingPurpose = json['bookingPurpose'];
+    createdAt = json['createdAt'];
+    id = json['id'];
+    roomDetails = RoomDetailsModel.fromJson(json['roomDetails']);
+  }
+}
diff --git a/packages/irbs/lib/src/screens/all_requests.dart b/packages/irbs/lib/src/screens/all_requests.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:irbs/src/services/api.dart';
 import 'package:irbs/src/widgets/home/request.dart';
-
+import 'package:irbs/src/models/owned_room_booking.dart';
 import '../globals/colors.dart';
 import '../globals/styles.dart';
 class ViewAllRequests extends StatelessWidget {
-  const ViewAllRequests({Key? key}) : super(key: key);
+  final List<OwnedRoomBooking> requestedBookings;
+  const ViewAllRequests({required this.requestedBookings, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -28,39 +30,17 @@ class ViewAllRequests extends StatelessWidget {
 
         backgroundColor: Themes.kCommonBoxBackground,
       ),
-      body: const SafeArea(
-          child:SingleChildScrollView(
+      body: SafeArea(
+        child: SingleChildScrollView(
+          child: Center(
             child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 32,vertical: 12),
-                  child: Request(),
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 32,vertical: 12),
-                  child: Request(),
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 32,vertical: 12),
-                  child: Request(),
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 32,vertical: 12),
-                  child: Request(),
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 32,vertical: 12),
-                  child: Request(),
-                ),
-                Padding(
-                  padding: EdgeInsets.symmetric(horizontal: 32,vertical: 12),
-                  child: Request(),
-                ),
-              ],
+              children: requestedBookings.map((booking) => Padding(
+                padding: const EdgeInsets.symmetric(vertical: 12),
+                child: Request(bookingData: booking),
+              )).toList()
             ),
-          )
+          ),
+        ),
       ),
     );
   }