From c06fa079ffb77c7f39f0c4cb29cc8f253746029a Mon Sep 17 00:00:00 2001
From: Aditya Kshirsagar <aditya29@icloud.com>
Date: Wed, 13 Nov 2024 18:33:12 -0600
Subject: [PATCH 1/6] Updated user unfollow and itemshop buying endpoints

---
 app/src/main/java/org/hackillinois/android/API.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/hackillinois/android/API.kt b/app/src/main/java/org/hackillinois/android/API.kt
index 81ede45f..baae3b50 100644
--- a/app/src/main/java/org/hackillinois/android/API.kt
+++ b/app/src/main/java/org/hackillinois/android/API.kt
@@ -68,7 +68,7 @@ interface API {
     suspend fun shop(): List<ShopItem>
 
     @POST("shop/item/buy/")
-    suspend fun buyShopItem(@Body body: ItemInstance): ItemName
+    suspend fun buyShopItem(@Body body: ItemInstance): List<ShopItem>
 
     // STAFF
 
@@ -89,8 +89,8 @@ interface API {
     @PUT("user/follow/")
     fun followEvent(@Body eventId: EventId): Call<FavoritesResponse>
 
-    @PUT("user/unfollow/")
-    fun unfollowEvent(@Body eventId: EventId): Call<FavoritesResponse>
+    @DELETE("user/unfollow/{eventId}")
+    fun unfollowEvent(@Path("eventId") eventId: EventId): Call<FavoritesResponse>
 
     @GET("user/v2-qr/")
     suspend fun qrCode(): QR

From a1d8c35915f9cf8adef14490ac8180058030e41d Mon Sep 17 00:00:00 2001
From: Aditya Kshirsagar <aditya29@icloud.com>
Date: Thu, 14 Nov 2024 00:03:10 -0600
Subject: [PATCH 2/6] added logout button for staff - need to fix
 functionality/Other minor issues

---
 .../android/view/profile/ProfileFragment.kt   | 11 ++-
 .../res/layout/fragment_profile_staff.xml     | 88 +++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/fragment_profile_staff.xml

diff --git a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
index d8cd596c..b6a9c775 100644
--- a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
+++ b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
@@ -66,7 +66,7 @@ class ProfileFragment : Fragment() {
     }
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         // if not an attendee, set the layout to be the not logged in profile
-        if (!hasLoggedIn() or (hasLoggedIn() and isStaff())) {
+        if (!hasLoggedIn()) {
             val view = inflater.inflate(R.layout.fragment_profile_not_logged_in, container, false)
             val logoutButton = view.findViewById<Button>(R.id.logout_button)
             logoutButton.setOnClickListener {
@@ -75,6 +75,15 @@ class ProfileFragment : Fragment() {
             }
             return view
         }
+        if (isStaff()) {
+            val view = inflater.inflate(R.layout.fragment_profile_staff, container, false)
+            val logoutButton = view.findViewById<Button>(R.id.logout_button)
+            logoutButton.setOnClickListener {
+                val mainActivity: MainActivity = requireActivity() as MainActivity
+                mainActivity.logout()
+            }
+            return view
+        }
 
         // set up LiveData observers
         profileViewModel.currentProfileLiveData.observe(
diff --git a/app/src/main/res/layout/fragment_profile_staff.xml b/app/src/main/res/layout/fragment_profile_staff.xml
new file mode 100644
index 00000000..10ca8369
--- /dev/null
+++ b/app/src/main/res/layout/fragment_profile_staff.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/witchyPurple">
+
+    <ImageView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:adjustViewBounds="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/dark_fantasy_bg_2024"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guidelineTop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_percent="0.05" />
+
+    <TextView
+        android:id="@+id/title_textview_profile"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="35dp"
+        android:fontFamily="@font/montserrat_bold"
+        android:gravity="start"
+        android:text="@string/profile"
+        android:textColor="@color/palePeach"
+        android:textSize="24sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/guidelineTop" />
+
+    <TextView
+        android:id="@+id/logout_textview"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="30dp"
+        android:fontFamily="@font/montserrat_semi_bold"
+        android:gravity="center"
+        android:text="@string/not_logged_in_message"
+        android:textColor="@color/white"
+        android:textSize="17sp"
+        app:layout_constraintVertical_bias="0.40"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title_textview_profile" />
+
+    <ImageButton
+        android:id="@+id/logoutButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="35dp"
+        android:background="@android:color/transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/guidelineTop"
+        app:srcCompat="@drawable/ic_logout" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/logout_button"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        app:cornerRadius="24dp"
+        app:strokeWidth="2.5dp"
+        app:strokeColor="@color/white"
+        android:fontFamily="@font/montserrat_bold"
+        android:paddingHorizontal="30dp"
+        android:text="@string/profile_login"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/logout_textview"
+        tools:ignore="TouchTargetSizeCheck" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From def5bfb75d472aa4b877711993e384b0262f519b Mon Sep 17 00:00:00 2001
From: Aditya Kshirsagar <aditya29@icloud.com>
Date: Sun, 17 Nov 2024 12:33:19 -0600
Subject: [PATCH 3/6] Fixed logout button

---
 .../android/view/profile/ProfileFragment.kt       | 15 ++++++++++++---
 .../res/layout/fragment_profile_not_logged_in.xml |  2 +-
 .../main/res/layout/fragment_profile_staff.xml    |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
index b6a9c775..ebd99b59 100644
--- a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
+++ b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -68,16 +69,24 @@ class ProfileFragment : Fragment() {
         // if not an attendee, set the layout to be the not logged in profile
         if (!hasLoggedIn()) {
             val view = inflater.inflate(R.layout.fragment_profile_not_logged_in, container, false)
-            val logoutButton = view.findViewById<Button>(R.id.logout_button)
-            logoutButton.setOnClickListener {
+            val loginButton = view.findViewById<Button>(R.id.login_button)
+            loginButton.setOnClickListener {
                 val mainActivity: MainActivity = requireActivity() as MainActivity
                 mainActivity.logout()
             }
+
             return view
         }
         if (isStaff()) {
             val view = inflater.inflate(R.layout.fragment_profile_staff, container, false)
-            val logoutButton = view.findViewById<Button>(R.id.logout_button)
+            val loginButton = view.findViewById<Button>(R.id.login_button)
+            loginButton.setOnClickListener {
+//                Log.d("Staff Logout", "Attempting Logout")
+                val mainActivity: MainActivity = requireActivity() as MainActivity
+                mainActivity.logout()
+            }
+
+            val logoutButton = view.findViewById<ImageButton>(R.id.logoutButton)
             logoutButton.setOnClickListener {
                 val mainActivity: MainActivity = requireActivity() as MainActivity
                 mainActivity.logout()
diff --git a/app/src/main/res/layout/fragment_profile_not_logged_in.xml b/app/src/main/res/layout/fragment_profile_not_logged_in.xml
index eaf9cda3..b1095f30 100644
--- a/app/src/main/res/layout/fragment_profile_not_logged_in.xml
+++ b/app/src/main/res/layout/fragment_profile_not_logged_in.xml
@@ -56,7 +56,7 @@
         app:layout_constraintTop_toBottomOf="@+id/title_textview_profile" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/logout_button"
+        android:id="@+id/login_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_profile_staff.xml b/app/src/main/res/layout/fragment_profile_staff.xml
index 10ca8369..1c9ddf33 100644
--- a/app/src/main/res/layout/fragment_profile_staff.xml
+++ b/app/src/main/res/layout/fragment_profile_staff.xml
@@ -66,7 +66,7 @@
         app:srcCompat="@drawable/ic_logout" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/logout_button"
+        android:id="@+id/login_button"
         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

From c27f8288aa77ae79e5c1567b18a5bdab4c95ca8c Mon Sep 17 00:00:00 2001
From: Aditya Kshirsagar <aditya29@icloud.com>
Date: Tue, 19 Nov 2024 21:46:20 -0600
Subject: [PATCH 4/6] fixed linting

---
 app/src/main/java/org/hackillinois/android/API.kt               | 2 +-
 .../org/hackillinois/android/view/profile/ProfileFragment.kt    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/org/hackillinois/android/API.kt b/app/src/main/java/org/hackillinois/android/API.kt
index baae3b50..a0ca8a3a 100644
--- a/app/src/main/java/org/hackillinois/android/API.kt
+++ b/app/src/main/java/org/hackillinois/android/API.kt
@@ -68,7 +68,7 @@ interface API {
     suspend fun shop(): List<ShopItem>
 
     @POST("shop/item/buy/")
-    suspend fun buyShopItem(@Body body: ItemInstance): List<ShopItem>
+    suspend fun buyShopItem(@Body body: ItemInstance): ShopItem
 
     // STAFF
 
diff --git a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
index ebd99b59..8271e5c6 100644
--- a/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
+++ b/app/src/main/java/org/hackillinois/android/view/profile/ProfileFragment.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -74,7 +73,6 @@ class ProfileFragment : Fragment() {
                 val mainActivity: MainActivity = requireActivity() as MainActivity
                 mainActivity.logout()
             }
-
             return view
         }
         if (isStaff()) {

From 0d020919c03785fafaef74e6860c304638515247 Mon Sep 17 00:00:00 2001
From: Aditya Kshirsagar <aditya29@icloud.com>
Date: Tue, 19 Nov 2024 21:49:21 -0600
Subject: [PATCH 5/6] repushing for imports

---
 app/src/main/java/org/hackillinois/android/API.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/hackillinois/android/API.kt b/app/src/main/java/org/hackillinois/android/API.kt
index a0ca8a3a..afbebd7f 100644
--- a/app/src/main/java/org/hackillinois/android/API.kt
+++ b/app/src/main/java/org/hackillinois/android/API.kt
@@ -11,7 +11,6 @@ import org.hackillinois.android.model.scanner.MentorId
 import org.hackillinois.android.model.scanner.Points
 import org.hackillinois.android.model.scanner.UserEventPair
 import org.hackillinois.android.model.shop.ItemInstance
-import org.hackillinois.android.model.shop.ItemName
 import org.hackillinois.android.model.user.FavoritesResponse
 import org.hackillinois.android.model.version.Version
 import org.hackillinois.android.notifications.DeviceToken

From 9d079b04f2451ced6d9d9629892844e9a77f9027 Mon Sep 17 00:00:00 2001
From: Aditya Kshirsagar <aditya29@icloud.com>
Date: Tue, 19 Nov 2024 21:53:35 -0600
Subject: [PATCH 6/6] Added Scanner View Model to commit files

---
 .../org/hackillinois/android/viewmodel/ScannerViewModel.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/hackillinois/android/viewmodel/ScannerViewModel.kt b/app/src/main/java/org/hackillinois/android/viewmodel/ScannerViewModel.kt
index 32a9b96e..e1179ed8 100644
--- a/app/src/main/java/org/hackillinois/android/viewmodel/ScannerViewModel.kt
+++ b/app/src/main/java/org/hackillinois/android/viewmodel/ScannerViewModel.kt
@@ -122,8 +122,8 @@ class ScannerViewModel : ViewModel() {
         viewModelScope.launch {
             try {
                 Log.d("ITEMINSTANCE", body.toString())
-                val itemName = App.getAPI().buyShopItem(body)
-                val message = "You have successfully redeemed ${itemName.itemName} from the Point Shop!"
+                val item = App.getAPI().buyShopItem(body)
+                val message = "You have successfully redeemed ${item.name} from the Point Shop!"
                 val scanStatus = ScanStatus(message, true)
                 lastScanStatus.postValue(scanStatus)
             } catch (e: Exception) {