final edit

mnb27 · May 3, 2021 · febb680 · febb680
1 parent 3d60360
commit febb680
Show file tree

Hide file tree

Showing 58 changed files with 1,699 additions and 373 deletions.
diff --git a/admin_cs305/public/img/folders.svg b/admin_cs305/public/img/folders.svg
diff --git a/admin_cs305/views/additem.ejs b/admin_cs305/views/additem.ejs
@@ -37,7 +37,7 @@
 </script>
 
 <body>
-    <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+    <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
         <div class="container-fluid" style="width:60%">
             <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/allitems.ejs b/admin_cs305/views/allitems.ejs
@@ -38,7 +38,7 @@
 </script>
 
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style="width:60%">
       <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/bookinghistory.ejs b/admin_cs305/views/bookinghistory.ejs
@@ -30,7 +30,7 @@
 </style>
 
 <body onload = "readhistory()">
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style = "width:60%"> 
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/bookings.ejs b/admin_cs305/views/bookings.ejs
@@ -30,7 +30,7 @@
 </style>
 
 <body onload = "readhistory()">
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style = "width:60%"> 
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/classrooms.ejs b/admin_cs305/views/classrooms.ejs
@@ -27,7 +27,7 @@
 
 </style>
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/edit.ejs b/admin_cs305/views/edit.ejs
@@ -28,7 +28,7 @@
 </style>
 
 <body onload="readTask()">
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style="width:60%">
       <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/editlabs.ejs b/admin_cs305/views/editlabs.ejs
@@ -30,7 +30,7 @@
 </style>
 
 <body  onload = "readTask()">
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid"  style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/editsports.ejs b/admin_cs305/views/editsports.ejs
@@ -30,7 +30,7 @@
 </style>
 
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid"  style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/home.ejs b/admin_cs305/views/home.ejs
@@ -184,18 +184,18 @@
   &nbsp; &nbsp; &nbsp;
 
     <div class="card" style="width: 15rem; display: inline-block">
-
+      <img class="card-img-top" src="../img/folders.svg" width="15rem" height="130px" alt="Card image cap">
       <div class="card-body">
         <h5 class="card-title">View Bookings For a Particular Date</h5>
-        <p class="card-text"></p>
-
-      </div>
+        <p class="card-text">
       <form action="/bookings" method="POST">
         <div class="mb-3">
         <label for="exampleInputDate1" class="form-label">Enter Date: &nbsp; </label>
         <input type="date" name = "date" id="date"> </div>
         <button type="submit" class="btn btn-outline-primary">SHOW</button>
       </form>
+      </p>
+    </div>
     </div>
 
 

diff --git a/admin_cs305/views/labs.ejs b/admin_cs305/views/labs.ejs
@@ -27,7 +27,7 @@
 
 </style>
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid"  style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/selectdate.ejs b/admin_cs305/views/selectdate.ejs
@@ -28,7 +28,7 @@
 
 </style>
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/sports.ejs b/admin_cs305/views/sports.ejs
@@ -27,7 +27,7 @@
 
 </style>
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/update.ejs b/admin_cs305/views/update.ejs
@@ -32,7 +32,7 @@
 </style>
 
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style="width:60%">
       <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/updatelabs.ejs b/admin_cs305/views/updatelabs.ejs
@@ -30,7 +30,7 @@ body{
 }
 </style>
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/updatesports.ejs b/admin_cs305/views/updatesports.ejs
@@ -30,7 +30,7 @@ body{
 }
 </style>
 <body>
-  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+  <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
     <div class="container-fluid" style = "width:60%">
         <a class="navbar-brand" href="/">

diff --git a/admin_cs305/views/users.ejs b/admin_cs305/views/users.ejs
@@ -32,7 +32,7 @@
 
 <body  onload = "readUsers()">
     <!-- nav bar started -->
-    <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info">
+    <nav class="navbar py-0 navbar-expand-lg navbar-dark bg-info sticky-top">
 
       <div class="container-fluid" style = "width:60%">
           <a class="navbar-brand" href="/">

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.example.cfb",
+  "variantName": "processReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,17 +2,22 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.cfb">
 
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/appicon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/appicon"
         android:supportsRtl="true"
         android:theme="@style/Theme.CampusFacilityBooking">
-        <activity android:name=".ClassroomBooking.SearchClassRoomBookingActivity"></activity>
-        <activity android:name=".UserAttendanceActivity" />
-        <activity android:name=".ViewAllAttendanceActivity" />
-        <activity android:name=".MarkAttendanceActivity" />
+        <activity android:name=".SportBooking.SearchSportsBookingActivity"></activity>
+        <activity android:name=".LabBooking.SearchLabBookingActivity" />
+        <activity android:name=".ClassroomBooking.SearchClassRoomBookingActivity" />
+        <activity android:name=".AttendanceModule.UserAttendanceActivity" />
+        <activity android:name=".AttendanceModule.ViewAllAttendanceActivity" />
+        <activity android:name=".AttendanceModule.MarkAttendanceActivity" />
         <activity android:name=".ProfileActivity" />
         <activity android:name=".LabBooking.LabSlotActivity" />
         <activity android:name=".LabBooking.SearchByLabNameActivity" />
@@ -40,8 +45,5 @@
         <activity android:name=".SportBooking.SportsBookingActivity" />
         <activity android:name=".LabBooking.ConfirmLabBookingActivity" />
     </application>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>