From 5c10232d40e7727fe1aab6560a67fa1dad62356f Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 17 Nov 2023 16:24:03 +0300
Subject: [PATCH 001/246] create components for ProfileCard

---
 .../predictionpolls/ui/profile/ProfileCard.kt | 248 ++++++++++++++++++
 .../app/src/main/res/drawable/ic_add.xml      |  13 +
 .../app/src/main/res/drawable/ic_edit.xml     |  13 +
 3 files changed, 274 insertions(+)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
 create mode 100644 prediction-polls/android/app/src/main/res/drawable/ic_add.xml
 create mode 100644 prediction-polls/android/app/src/main/res/drawable/ic_edit.xml

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
new file mode 100644
index 00000000..87e3bd34
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
@@ -0,0 +1,248 @@
+package com.bounswe.predictionpolls.ui.profile
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import com.bounswe.predictionpolls.R
+import com.bounswe.predictionpolls.ui.theme.MontserratFontFamily
+import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
+
+@Composable
+fun ProfileCard(modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .clip(MaterialTheme.shapes.medium)
+            .background(MaterialTheme.colorScheme.primary)
+            .padding(16.dp)
+            .wrapContentHeight()
+            .fillMaxWidth()
+    ) {
+
+    }
+}
+
+@Composable
+private fun ProfileEditButton(onProfileEditPressed: () -> Unit, modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .clickable(onClick = onProfileEditPressed)
+            .background(MaterialTheme.colorScheme.primary)
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(16.dp)
+                .align(Alignment.Center),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_edit),
+                contentDescription = "Edit Profile",
+                tint = MaterialTheme.colorScheme.onPrimary
+            )
+            Spacer(modifier = Modifier.width(16.dp))
+            Text(
+                text = "Edit Profile",
+                color = MaterialTheme.colorScheme.onPrimary,
+                fontWeight = FontWeight.Normal,
+                fontSize = 20.sp,
+                letterSpacing = 1.5.sp
+            )
+        }
+    }
+}
+
+@Composable
+private fun CoverPhoto(imageUri: String, modifier: Modifier) {
+    AsyncImage(
+        model = imageUri,
+        contentDescription = "User Badge",
+        modifier = modifier,
+        contentScale = ContentScale.Crop,
+        alignment = Alignment.Center
+    )
+}
+
+@Composable
+private fun RequestsButton(onRequestsClicked: () -> Unit, modifier: Modifier = Modifier) {
+    Box(
+        modifier = modifier
+            .clickable(onClick = onRequestsClicked)
+            .background(MaterialTheme.colorScheme.onPrimary)
+    ) {
+        Row(
+            modifier = Modifier
+                .padding(16.dp)
+                .align(Alignment.Center),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_add),
+                contentDescription = "Requests",
+                tint = MaterialTheme.colorScheme.primary
+            )
+            Spacer(modifier = Modifier.width(16.dp))
+            Text(
+                text = "Requests",
+                color = MaterialTheme.colorScheme.primary,
+                fontWeight = FontWeight.Normal,
+                fontSize = 20.sp,
+                letterSpacing = 1.5.sp
+            )
+        }
+    }
+
+}
+
+@Composable
+fun Badges(badgeUris: List<String>, modifier: Modifier = Modifier) {
+    LazyRow(modifier = modifier) {
+        items(badgeUris) { uri ->
+            AsyncImage(
+                model = uri,
+                contentDescription = "User Badge",
+                modifier = modifier
+                    .clip(CircleShape)
+                    .padding(16.dp)
+                    .size(48.dp),
+                contentScale = ContentScale.Crop,
+                alignment = Alignment.Center
+            )
+        }
+    }
+}
+
+@Composable
+private fun ProfilePicture(imageUri: String, modifier: Modifier = Modifier) {
+    AsyncImage(
+        model = imageUri,
+        contentDescription = "User profile picture",
+        modifier = modifier
+            .clip(CircleShape)
+            .size(80.dp),
+        contentScale = ContentScale.Crop,
+        alignment = Alignment.Center
+    )
+}
+
+@Composable
+private fun UserDescription(description: String, modifier: Modifier = Modifier) {
+    Text(
+        text = description, modifier = modifier,
+        maxLines = 5,
+        overflow = TextOverflow.Ellipsis,
+        color = MaterialTheme.colorScheme.scrim,
+        fontFamily = MontserratFontFamily,
+        fontSize = 16.sp,
+        fontWeight = FontWeight.Normal
+    )
+}
+
+/**
+ * Displays the user name and user full name information.
+ */
+@Composable
+private fun UserInfoColumn(username: String, userFullName: String, modifier: Modifier = Modifier) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.SpaceBetween,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        UserInfoText(username = username)
+        UserInfoText(username = userFullName)
+    }
+}
+
+@Composable
+private fun UserInfoText(username: String, modifier: Modifier = Modifier) {
+    Text(
+        text = username,
+        maxLines = 1,
+        modifier = modifier,
+        overflow = TextOverflow.Ellipsis,
+        color = MaterialTheme.colorScheme.scrim,
+        fontFamily = MontserratFontFamily,
+        fontSize = 22.sp,
+        fontWeight = FontWeight.Bold
+    )
+}
+
+
+@Preview
+@Composable
+private fun ProfileEditButtonPreview() {
+    PredictionPollsTheme {
+        Column {
+            ProfileEditButton(
+                onProfileEditPressed = {},
+                modifier = Modifier
+                    .clip(RoundedCornerShape(12.dp))
+                    .fillMaxWidth()
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            RequestsButton(
+                onRequestsClicked = {},
+                modifier = Modifier
+                    .border(1.dp, MaterialTheme.colorScheme.primary, RoundedCornerShape(12.dp))
+                    .clip(RoundedCornerShape(12.dp))
+                    .fillMaxWidth()
+            )
+        }
+    }
+}
+
+
+@Preview
+@Composable
+private fun UsernameTextPrev() {
+    PredictionPollsTheme {
+        UserInfoColumn("can.gezer13", "Can Gezer")
+    }
+}
+
+
+@Preview
+@Composable
+private fun ProfileCardPreview() {
+    PredictionPollsTheme {
+        ProfileCard(modifier = Modifier.height(128.dp))
+    }
+
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun UserDescriptionPreview() {
+    PredictionPollsTheme {
+        UserDescription(description = "This is a long description text. Lorem ipsum dolor sit amet, consectet adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.")
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/res/drawable/ic_add.xml b/prediction-polls/android/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 00000000..8f702491
--- /dev/null
+++ b/prediction-polls/android/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:pathData="M15.625,19.792C15.625,17.49 12.827,15.625 9.375,15.625C5.923,15.625 3.125,17.49 3.125,19.792M19.792,16.667V13.542M19.792,13.542V10.417M19.792,13.542H16.667M19.792,13.542H22.917M9.375,12.5C7.074,12.5 5.208,10.634 5.208,8.333C5.208,6.032 7.074,4.167 9.375,4.167C11.676,4.167 13.542,6.032 13.542,8.333C13.542,10.634 11.676,12.5 9.375,12.5Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#2D87DA"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/prediction-polls/android/app/src/main/res/drawable/ic_edit.xml b/prediction-polls/android/app/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 00000000..32c70eb9
--- /dev/null
+++ b/prediction-polls/android/app/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="25"
+    android:viewportHeight="25">
+    <path
+        android:pathData="M4.167,20.833H20.833M4.167,20.833V16.667L12.5,8.333M4.167,20.833L8.333,20.833L16.667,12.5M12.5,8.333L15.488,5.345L15.49,5.344C15.901,4.932 16.107,4.726 16.345,4.649C16.554,4.581 16.779,4.581 16.989,4.649C17.226,4.726 17.432,4.932 17.843,5.343L19.655,7.155C20.067,7.567 20.274,7.774 20.351,8.012C20.419,8.221 20.419,8.446 20.351,8.655C20.274,8.893 20.068,9.099 19.656,9.511L19.655,9.512L16.667,12.5M12.5,8.333L16.667,12.5"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round" />
+</vector>

From 9f9b1972e2188bcf7dd6b88fd84b7ad4925932d3 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 17 Nov 2023 22:25:49 +0300
Subject: [PATCH 002/246] create profile card

---
 .../predictionpolls/ui/profile/ProfileCard.kt | 160 ++++++++++++++----
 1 file changed, 124 insertions(+), 36 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
index 87e3bd34..cbc7b797 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
@@ -8,8 +8,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -17,6 +19,7 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -25,11 +28,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
@@ -38,19 +43,109 @@ import com.bounswe.predictionpolls.ui.theme.MontserratFontFamily
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 
 @Composable
-fun ProfileCard(modifier: Modifier = Modifier) {
-    Box(
+fun ProfileCard(
+    username: String,
+    userFullName: String,
+    profilePictureUri: String,
+    userDescription: String,
+    badgeUris: List<String>,
+    onProfileEditPressed: () -> Unit,
+    onRequestsClicked: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val paddingAroundContent: Dp = 16.dp
+    Column(
         modifier = modifier
             .clip(MaterialTheme.shapes.medium)
-            .background(MaterialTheme.colorScheme.primary)
-            .padding(16.dp)
+            .background(MaterialTheme.colorScheme.primaryContainer)
             .wrapContentHeight()
             .fillMaxWidth()
     ) {
+        CoverPhoto(
+            imageUri = profilePictureUri,
+            modifier = Modifier
+                .clip(
+                    MaterialTheme.shapes.medium.copy(
+                        bottomEnd = CornerSize(0.dp),
+                        bottomStart = CornerSize(0.dp)
+                    )
+                )
+                .aspectRatio(2.5f)
+                .fillMaxWidth()
+        )
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(paddingAroundContent),
+            verticalAlignment = Alignment.Bottom,
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            val profilePictureSize: Dp = 100.dp
+            Column(
+                modifier = Modifier.offset(y = profilePictureSize / -2f - (paddingAroundContent)),
+                verticalArrangement = Arrangement.Top,
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                ProfilePicture(
+                    imageUri = profilePictureUri,
+                    modifier = Modifier.size(profilePictureSize)
+                )
+                UserInfoText(username = username)
+                UserInfoText(username = userFullName)
+            }
+            ProfileCardButtons(
+                onRequestsClicked = onRequestsClicked,
+                onProfileEditPressed = onProfileEditPressed,
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(paddingAroundContent)
+            )
+
+        }
+
+        UserDescription(
+            description = userDescription,
+            modifier = Modifier.padding(paddingAroundContent)
+        )
+
+        Badges(badgeUris = badgeUris, modifier = Modifier.padding(paddingAroundContent))
+
 
     }
 }
 
+@Composable
+private fun ProfileCardButtons(
+    onRequestsClicked: () -> Unit,
+    onProfileEditPressed: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Column(
+        verticalArrangement = Arrangement.SpaceBetween,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+    ) {
+        ProfileEditButton(
+            onProfileEditPressed = onProfileEditPressed,
+            modifier = Modifier
+                .clip(MaterialTheme.shapes.medium)
+                .fillMaxWidth()
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        RequestsButton(
+            onRequestsClicked = onRequestsClicked,
+            modifier = Modifier
+                .border(
+                    1.dp,
+                    MaterialTheme.colorScheme.primary,
+                    MaterialTheme.shapes.medium
+                )
+                .clip(MaterialTheme.shapes.medium)
+                .fillMaxWidth()
+        )
+    }
+}
+
 @Composable
 private fun ProfileEditButton(onProfileEditPressed: () -> Unit, modifier: Modifier = Modifier) {
     Box(
@@ -74,7 +169,7 @@ private fun ProfileEditButton(onProfileEditPressed: () -> Unit, modifier: Modifi
                 text = "Edit Profile",
                 color = MaterialTheme.colorScheme.onPrimary,
                 fontWeight = FontWeight.Normal,
-                fontSize = 20.sp,
+                fontSize = 12.sp,
                 letterSpacing = 1.5.sp
             )
         }
@@ -88,7 +183,8 @@ private fun CoverPhoto(imageUri: String, modifier: Modifier) {
         contentDescription = "User Badge",
         modifier = modifier,
         contentScale = ContentScale.Crop,
-        alignment = Alignment.Center
+        alignment = Alignment.Center,
+        error = painterResource(id = R.drawable.ic_warning),
     )
 }
 
@@ -115,7 +211,7 @@ private fun RequestsButton(onRequestsClicked: () -> Unit, modifier: Modifier = M
                 text = "Requests",
                 color = MaterialTheme.colorScheme.primary,
                 fontWeight = FontWeight.Normal,
-                fontSize = 20.sp,
+                fontSize = 12.sp,
                 letterSpacing = 1.5.sp
             )
         }
@@ -124,7 +220,7 @@ private fun RequestsButton(onRequestsClicked: () -> Unit, modifier: Modifier = M
 }
 
 @Composable
-fun Badges(badgeUris: List<String>, modifier: Modifier = Modifier) {
+private fun Badges(badgeUris: List<String>, modifier: Modifier = Modifier) {
     LazyRow(modifier = modifier) {
         items(badgeUris) { uri ->
             AsyncImage(
@@ -132,8 +228,8 @@ fun Badges(badgeUris: List<String>, modifier: Modifier = Modifier) {
                 contentDescription = "User Badge",
                 modifier = modifier
                     .clip(CircleShape)
-                    .padding(16.dp)
-                    .size(48.dp),
+                    .size(48.dp)
+                    .background(Color.Red),
                 contentScale = ContentScale.Crop,
                 alignment = Alignment.Center
             )
@@ -167,21 +263,6 @@ private fun UserDescription(description: String, modifier: Modifier = Modifier)
     )
 }
 
-/**
- * Displays the user name and user full name information.
- */
-@Composable
-private fun UserInfoColumn(username: String, userFullName: String, modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier,
-        verticalArrangement = Arrangement.SpaceBetween,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        UserInfoText(username = username)
-        UserInfoText(username = userFullName)
-    }
-}
-
 @Composable
 private fun UserInfoText(username: String, modifier: Modifier = Modifier) {
     Text(
@@ -212,7 +293,7 @@ private fun ProfileEditButtonPreview() {
             RequestsButton(
                 onRequestsClicked = {},
                 modifier = Modifier
-                    .border(1.dp, MaterialTheme.colorScheme.primary, RoundedCornerShape(12.dp))
+                    .border(2.dp, MaterialTheme.colorScheme.primary, RoundedCornerShape(12.dp))
                     .clip(RoundedCornerShape(12.dp))
                     .fillMaxWidth()
             )
@@ -221,20 +302,27 @@ private fun ProfileEditButtonPreview() {
 }
 
 
-@Preview
-@Composable
-private fun UsernameTextPrev() {
-    PredictionPollsTheme {
-        UserInfoColumn("can.gezer13", "Can Gezer")
-    }
-}
-
-
 @Preview
 @Composable
 private fun ProfileCardPreview() {
     PredictionPollsTheme {
-        ProfileCard(modifier = Modifier.height(128.dp))
+        ProfileCard(
+            "can.gezer13",
+            "Can Gezer",
+            "https://picsum.photos/400/400",
+            "This is a long description text. Lorem ipsum dolor sit amet, consectet adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.",
+            listOf(
+                "https://picsum.photos/400/400",
+                "https://picsum.photos/400/400",
+                "https://picsum.photos/400/400",
+                "https://picsum.photos/400/400",
+                "https://picsum.photos/400/400",
+                "https://picsum.photos/400/400", "https://picsum.photos/400/400"
+            ),
+            {},
+            {},
+            modifier = Modifier
+        )
     }
 
 }

From 1bf69ff7bd3bc74e71fb33770626303fc4f6683b Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 17 Nov 2023 22:42:18 +0300
Subject: [PATCH 003/246] create profile screen

---
 .../predictionpolls/ui/profile/ProfileCard.kt |  4 +-
 .../ui/profile/ProfileScreen.kt               | 98 +++++++++++++++++++
 2 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
index cbc7b797..9da9cc33 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
@@ -46,6 +46,7 @@ import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 fun ProfileCard(
     username: String,
     userFullName: String,
+    coverPhotoUri: String,
     profilePictureUri: String,
     userDescription: String,
     badgeUris: List<String>,
@@ -62,7 +63,7 @@ fun ProfileCard(
             .fillMaxWidth()
     ) {
         CoverPhoto(
-            imageUri = profilePictureUri,
+            imageUri = coverPhotoUri,
             modifier = Modifier
                 .clip(
                     MaterialTheme.shapes.medium.copy(
@@ -310,6 +311,7 @@ private fun ProfileCardPreview() {
             "can.gezer13",
             "Can Gezer",
             "https://picsum.photos/400/400",
+            "https://picsum.photos/400/400",
             "This is a long description text. Lorem ipsum dolor sit amet, consectet adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.",
             listOf(
                 "https://picsum.photos/400/400",
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
new file mode 100644
index 00000000..4f291f2d
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
@@ -0,0 +1,98 @@
+package com.bounswe.predictionpolls.ui.profile
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
+import com.bounswe.predictionpolls.ui.common.poll.PollComposable
+import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
+import java.util.Date
+
+/**
+ * This composable is used to display profile information and polls of a user.
+ * @param profileInformation is a function that has access to lazy list scope of the profile screen that displays profile information of a user.
+ * @param polls is a function that has access to lazy list scope of the profile screen that displays polls of a user.
+ * Since these items have access to the lazy list scope, they can be added to the lazy list.
+ */
+@Composable
+fun ProfileScreen(
+    profileInformation: @Composable () -> Unit,
+    polls: LazyListScope.() -> Unit,
+    modifier: Modifier = Modifier
+) {
+    LazyColumn(modifier = modifier.background(MaterialTheme.colorScheme.surface)) {
+
+        item {
+            profileInformation()
+        }
+
+        this@LazyColumn.polls()
+    }
+}
+
+
+@Preview
+@Composable
+private fun ProfileScreenPreview() {
+    PredictionPollsTheme {
+        ProfileScreen(
+            profileInformation = {
+                ProfileCard(
+                    username = "can.gezer13",
+                    userFullName = "Can Gezer",
+                    coverPhotoUri = "https://picsum.photos/400/400",
+                    profilePictureUri = "https://picsum.photos/id/237/200/300",
+                    userDescription = "I am a computer engineering student at Bogazici University. I am interested in machine learning and data science.",
+                    badgeUris = listOf(
+                        "https://picsum.photos/id/231/200/300",
+                        "https://picsum.photos/id/232/200/300",
+                        "https://picsum.photos/id/233/200/300"
+                    ),
+                    onProfileEditPressed = { },
+                    onRequestsClicked = { },
+                    modifier = Modifier.padding(16.dp)
+                )
+
+            },
+            polls = {
+                items(10) {
+                    PollComposable(
+                        pollCreatorProfilePictureUri = "https://picsum.photos/id/236/200/300",
+                        pollCreatorName = "Ahmet Yilmaz",
+                        tags = listOf("Lebron", "James", "NBA"),
+                        pollQuestionTitle = "Who is the best NBA player?",
+                        optionsContent = {
+                            Column {
+                                DiscreteVoteOption(
+                                    optionName = "Lebron James",
+                                    voteCount = 150,
+                                    fillPercentage = 0.75f,
+                                    isSelected = false,
+                                )
+                                DiscreteVoteOption(
+                                    optionName = "Michael Jordan",
+                                    voteCount = 50,
+                                    fillPercentage = 0.25f,
+                                    isSelected = false,
+                                )
+                            }
+
+                        },
+                        modifier = Modifier.padding(16.dp),
+                        dueDate = Date(),
+                        rejectionText = "Last 5 days",
+                        commentCount = 530
+                    )
+                }
+            }
+        )
+    }
+}
+

From 4ed297c8efc1cd3ec0a26e26801a7827c950d308 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:53:07 +0300
Subject: [PATCH 004/246] Add profile router to app

---
 prediction-polls/backend/src/app.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/app.js b/prediction-polls/backend/src/app.js
index 1e6053b2..f18f0e8d 100644
--- a/prediction-polls/backend/src/app.js
+++ b/prediction-polls/backend/src/app.js
@@ -1,6 +1,7 @@
 const express = require('express');
 const authRouter = require('./routes/AuthorizationRouter.js'); 
-const pollRouter = require('./routes/PollRouter.js'); 
+const pollRouter = require('./routes/PollRouter.js');
+const profileRouter = require('./routes/ProfileRouter.js');
 
 const cors = require("cors");
 
@@ -19,6 +20,7 @@ app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x
 
 app.use('/polls',pollRouter);
 app.use('/auth', authRouter);
+app.use('/profiles', profileRouter);
 
 const swaggerSpec = swaggerJsDoc(swaggerOptions);
 app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerSpec));

From f5034db033fb05bf2ebe4b689b09f8b21422104b Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:53:32 +0300
Subject: [PATCH 005/246] Update schema.sql

---
 prediction-polls/backend/src/schema.sql | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 2ed858e7..12d8f579 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -7,7 +7,8 @@ CREATE TABLE users (
     email VARCHAR(255) NOT NULL,
     password VARCHAR(255) NOT NULL,
     birthday DATETIME,
-    UNIQUE (username)
+    UNIQUE (username),
+    UNIQUE (email)
 );
 
 CREATE TABLE refresh_tokens (
@@ -54,4 +55,15 @@ CREATE TABLE continuous_poll_selections (
     selected_value FLOAT NOT NULL,
     FOREIGN KEY (poll_id) REFERENCES continuous_polls(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
+);
+
+CREATE TABLE profiles (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    user_id INT NOT NULL,
+    username VARCHAR(255) NOT NULL,
+    profile_picture_data MEDIUMBLOB,
+    biography VARCHAR(5000),
+    birthday DATETIME,
+    is_hidden BOOLEAN DEFAULT False,
+    FOREIGN KEY (user_id) REFERENCES users(id)
 );
\ No newline at end of file

From b98587f0dcaaddf6cbcee1c8c1ac861600b966d9 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:53:47 +0300
Subject: [PATCH 006/246] Create profile classes

---
 .../backend/src/repositories/ProfileDB.js     | 93 +++++++++++++++++++
 .../backend/src/routes/ProfileRouter.js       | 33 +++++++
 .../backend/src/services/ProfileService.js    | 20 ++++
 3 files changed, 146 insertions(+)
 create mode 100644 prediction-polls/backend/src/repositories/ProfileDB.js
 create mode 100644 prediction-polls/backend/src/routes/ProfileRouter.js
 create mode 100644 prediction-polls/backend/src/services/ProfileService.js

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
new file mode 100644
index 00000000..0bffa478
--- /dev/null
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -0,0 +1,93 @@
+const mysql = require('mysql2')
+
+require('dotenv').config();
+
+const pool = mysql.createPool({
+    host: process.env.MYSQL_HOST,
+    user: process.env.MYSQL_USER,
+    password: process.env.MYSQL_PASSWORD,
+    database: process.env.MYSQL_DATABASE
+}).promise()
+
+
+async function getProfileWithProfileId(profileId){
+    const sql = 'SELECT * FROM profiles WHERE id= ?';
+
+    try {
+        const [rows, fields] = await pool.query(sql, [profileId]);
+        return rows;
+    } catch (error) {
+        console.error('getProfileWithProfileId(): Database Error');
+        throw error;
+    }
+}
+
+async function getProfileWithUserId(userId){
+    const sql = 'SELECT * FROM profiles WHERE user_id= ?';
+
+    try {
+        const [rows, fields] = await pool.query(sql, [userId]);
+        return rows;
+    } catch (error) {
+        console.error('getProfileWithUserId(): Database Error');
+        throw error;
+    }
+}
+
+async function getProfileWithUserInfo({username,email}){
+    const userId=0;
+    if(username){
+        const sql = 'SELECT * FROM users WHERE username = ?';
+        //TODO retrieve user id using username
+        userId = 1;
+    }
+    else{
+        const sql = 'SELECT * FROM users WHERE email = ?';
+        //TODO retrieve user id using email
+        userId = 1;
+    }
+    const user = await getProfileWithUserId(userId);
+    return user;
+}
+
+async function addProfile({
+    user_id,
+    username ,
+    profile_picture,
+    biography,
+    birthday ,
+    is_hidden}){
+
+    const sql = 'INSERT INTO profiles (user_id, username, profile_picture_data, biography, birthday, is_hidden) VALUES (?, ?, ?, ?, ?, ?)';
+    values = [user_id,username,profile_picture,biography,birthday,is_hidden]
+        
+    const [resultSetHeader] = await pool.query(sql_poll, values);
+        profile_id = resultSetHeader.insertId;
+        if (!profile_id) {
+            return false;
+        }
+        return profile_id;
+}
+
+async function updateProfile({
+    user_id,
+    username ,
+    profile_picture,
+    biography,
+    birthday ,
+    is_hidden}){
+
+    if(profile_picture){
+
+    }
+    if(biography){
+
+    }
+    if(birthday){
+
+    }
+    if(is_hidden){
+        
+    }
+}
+    
\ No newline at end of file
diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
new file mode 100644
index 00000000..4fd9e80f
--- /dev/null
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -0,0 +1,33 @@
+const authenticator = require("../services/AuthorizationService.js");
+const service = require("../services/ProfileService.js");
+const express = require('express');
+const router = express.Router();
+
+/**
+ * @swagger
+ * /polls/discrete:
+ *   get:
+ *     tags:
+ *       - polls
+ *     description: Get profile using profile id
+ */
+router.get('/:profileId', service.getProfileWithProfileId);
+
+/**
+ * @swagger
+ * /polls/discrete:
+ *   get:
+ *     tags:
+ *       - polls
+ *     description: Get profile using user data
+ */
+
+router.get('/', service.getProfile);
+
+router.post('/', service.addProfile);
+
+router.patch('/', service.updateProfile);
+
+
+
+module.exports = router;
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
new file mode 100644
index 00000000..7089bedc
--- /dev/null
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -0,0 +1,20 @@
+const db = require("../repositories/PollDB.js");
+
+
+function getProfile(req,res){
+    
+}
+
+function getProfileWithProfileId(req,res){
+    
+}
+
+function addProfile(req,res){
+    
+}
+
+function updateProfile(req,res){
+    
+}
+
+module.exports = {getProfile,getProfileWithProfileId,addProfile,updateProfile}
\ No newline at end of file

From 53c71dd985649e30e516e8453d2f4f39a2d44991 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sat, 18 Nov 2023 19:30:04 +0300
Subject: [PATCH 007/246] Styling of create poll

I have changed the view of buttons and their hover apperance. Also buttons that can be selected are now reflecting the mock up. Some texts are also changed to be same with mock up.
---
 .../src/Pages/Create/Create.module.css        | 29 +++++-
 .../frontend/src/Pages/Create/index.jsx       | 94 +++++++++++--------
 2 files changed, 81 insertions(+), 42 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/Create.module.css b/prediction-polls/frontend/src/Pages/Create/Create.module.css
index 6634eefb..08524e99 100644
--- a/prediction-polls/frontend/src/Pages/Create/Create.module.css
+++ b/prediction-polls/frontend/src/Pages/Create/Create.module.css
@@ -20,17 +20,44 @@
   }
   
   .questionContainer {
+    margin-top: 64px;
     margin-bottom: 16px;
   }
   
   .pollTypeContainer {
     margin-bottom: 16px;
   }
+
+  .optButton {
+    padding-left: 25px;
+    padding-right: 25px;
+    border:none;
+    color: #fff;
+  }
+
+  .optButton:hover {
+    border: none;
+    color:#fff !important ;
+  }
   
   .submitContainer {
     position: absolute;
     bottom: 40px; 
     width: 40%;
+
+  }
+
+  .submitButton {
+    background-color: var(--secondary-500);
+    color: #fff;
+    padding-left: 25px;
+    padding-right: 25px;
+    border:none;
+  }
+
+  .submitButton:hover {
+    background-color: var(--secondary-300);
+    color:#fff !important ;
   }
 
   .multipleChoiceInputs {
@@ -39,6 +66,7 @@
   
   .choiceInput {
     margin-bottom: 8px;
+    margin-right: 4px;
   }
 
   .datePickerContainer {
@@ -70,4 +98,3 @@
     position: absolute;
     bottom: 100px;
   }
-
diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index 00eb37b6..471fdcac 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -13,7 +13,7 @@ function Create() {
   const [additionalChoices, setAdditionalChoices] = useState(['']);
   const [customizedType, setCustomizedType] = useState('text');
   const [customizedOptions, setCustomizedOptions] = useState(['']);
-  const [selectedDate, setSelectedDate] = useState(null); 
+  const [selectedDate, setSelectedDate] = useState(null);
   const [setDueDate, setSetDueDate] = useState(false);
   const [dueDatePoll, setDueDatePoll] = useState(null);
   const [numericFieldValue, setNumericFieldValue] = useState('');
@@ -76,15 +76,17 @@ function Create() {
     // Additional logic will be added
   };
 
+
+
   return (
     <div className={styles.page}>
       <Menu mode="horizontal" defaultSelectedKeys={['create']}>
         <Menu.Item key="create">Create</Menu.Item>
       </Menu>
       <div className={styles.createContainer}>
-        <h1>Create Poll</h1>
         <div className={styles.questionContainer}>
-          <label htmlFor="question">Enter the question title:</label>
+          <label htmlFor="question">Enter the question title</label>
+          <br />
           <br />
           <TextArea
             rows={1}
@@ -96,65 +98,80 @@ function Create() {
           />
         </div>
         <div className={styles.pollTypeContainer}>
-          <p>Select the type of the poll:</p>
+          <p>Choose input type</p>
           <Button
+            className={styles.optButton}
             type={pollType === 'multipleChoice' ? 'primary' : 'default'}
             onClick={() => handlePollTypeChange('multipleChoice')}
-            style={{ marginRight: '8px' }}
+            style={{ marginRight: '8px', backgroundColor: pollType === 'multipleChoice' ? 'var(--secondary-500)' : 'var(--secondary-300)' }}
           >
             Multiple Choice
           </Button>
           <Button
+            className={styles.optButton}
             type={pollType === 'customized' ? 'primary' : 'default'}
             onClick={() => handlePollTypeChange('customized')}
+            style={{ marginRight: '8px', backgroundColor: pollType === 'customized' ? 'var(--secondary-500)' : 'var(--secondary-300)' }}
           >
             Customized
           </Button>
         </div>
         {showMultipleChoiceInputs && (
-          <div className={styles.multipleChoiceInputs}>
-            {additionalChoices.map((choice, index) => (
-              <div key={index} className={styles.choiceInput}>
-                <Input
-                  placeholder={`Choice ${index + 1}`}
-                  style={{ width: '50%' }}
-                  value={choice}
-                  onChange={(e) => handleChoiceChange(index, e.target.value)}
-                />
-                <Button onClick={() => handleDeleteChoice(index)}>
-                  Delete
-                </Button>
-              </div>
-            ))}
-            <Button onClick={handleAddChoice}>Add Choice</Button>
-          </div>
+          <>
+            <div className={styles.multipleChoiceInputs}>
+              {additionalChoices.map((choice, index) => (
+                <div key={index} className={styles.choiceInput}>
+                  <Input
+                    className={styles.choiceInput}
+                    placeholder={`Choice ${index + 1}`}
+                    style={{ width: '50%'}}
+                    value={choice}
+                    onChange={(e) => handleChoiceChange(index, e.target.value)}
+                  />
+                  <Button className={styles.submitButton} onClick={() => handleDeleteChoice(index)}>
+                    Delete
+                  </Button>
+                </div>
+
+              ))}
+              <Button className={styles.submitButton} onClick={handleAddChoice}>+ Add</Button>
+            </div>
+            <div className={styles.openVisibilityContainer}>
+              <Checkbox className={styles.openVisibility} onChange={handleOpenVisibilityChange}>
+                Open Distribution Visibility
+              </Checkbox>
+            </div>
+          </>
         )}
         {pollType === 'customized' && (
           <div className={styles.customizedOptions}>
             <Button
+              className={styles.optButton}
               type={customizedType === 'date' ? 'primary' : 'default'}
               onClick={() => handleCustomizedTypeChange('date')}
-              style={{ marginRight: '8px' }}
+              style={{ marginRight: '8px', backgroundColor: customizedType === 'date' ? 'var(--secondary-500)' : 'var(--secondary-300)' }}
             >
               Date
             </Button>
             <Button
+              className={styles.optButton}
               type={customizedType === 'numeric' ? 'primary' : 'default'}
               onClick={() => handleCustomizedTypeChange('numeric')}
+              style={{ marginRight: '8px', backgroundColor: customizedType === 'numeric' ? 'var(--secondary-500)' : 'var(--secondary-300)' }}
             >
               Numeric
             </Button>
             {customizedType === 'date' && (
               <div className={styles.datePickerContainer}>
-                <DatePicker onChange={handleDateChange} />
+                <DatePicker onChange={handleDateChange}  />
               </div>
             )}
             {customizedType === 'numeric' && (
-              <div className={styles.numericInputContainer}>
+              <div className={styles.numericInputContainer} >
                 <Input
+                  style={{ width: '50%'}}
                   type="number"
                   placeholder="Enter numeric answer"
-                  style={{ width: '50%' }}
                 />
               </div>
             )}
@@ -165,23 +182,23 @@ function Create() {
           {setDueDate && (
             <>
               <div className={styles.dueDatePollInputContainer}>
-                <DatePicker onChange={handleDueDatePollChange} />
+                <DatePicker onChange={handleDueDatePollChange}  />
               </div>
               <div className={styles.dateOptionsContainer}>
                 <p>Do not accept any votes in last:</p>
                 <Input
-          type="number"
-          placeholder="Enter a number"
-          className={styles.timeInput}
-          value={numericFieldValue}
-          onChange={(e) => setNumericFieldValue(e.target.value)}
-        />
+                  type="number"
+                  placeholder="Number"
+                  className={styles.timeInput}
+                  value={numericFieldValue}
+                  onChange={(e) => setNumericFieldValue(e.target.value)}
+                />
                 <Select
+                  className= {styles.customSelect}
                   defaultValue="min"
-                  style={{ width: 80 }}
                   onChange={(value) => setSelectedTimeUnit(value)}
                 >
-                  <Option value="min">min</Option>
+                  <Option value="min">min </Option>
                   <Option value="h">h</Option>
                   <Option value="day">day</Option>
                   <Option value="mth">mth</Option>
@@ -190,15 +207,10 @@ function Create() {
             </>
           )}
         </div>
-        <div className={styles.openVisibilityContainer}>
-          <Checkbox onChange={handleOpenVisibilityChange}>Open Distribution Visibility</Checkbox>
-        </div>
         <div className={styles.submitContainer}>
           <Button
-            type="primary"
-            onClick={handleSubmit}
-            style={{ width: '40%' }}
-          >
+            className={styles.submitButton}
+            onClick={handleSubmit}>
             Create Poll
           </Button>
         </div>

From 86199dd4970261a96e028ed7bcb94d078cde2539 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 18 Nov 2023 22:15:37 +0300
Subject: [PATCH 008/246] add error codes for poll

---
 prediction-polls/backend/src/errorCodes.js    | 56 +++++++++++++++++++
 .../backend/src/services/PollService.js       | 29 +++++-----
 2 files changed, 71 insertions(+), 14 deletions(-)
 create mode 100644 prediction-polls/backend/src/errorCodes.js

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
new file mode 100644
index 00000000..4b3c4e59
--- /dev/null
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -0,0 +1,56 @@
+const errorCodes = {
+  // General errors
+  GENERIC_ERROR: {
+    code: 1000,
+    message: 'An unexpected error occurred.',
+  },
+
+  USER_NOT_FOUND: {
+    code: 2000,
+    message: 'User not found.',
+  },
+
+  INVALID_CREDENTIALS: {
+    code: 2001,
+    message: 'Invalid username or password.',
+  },
+
+  DATABASE_ERROR: {
+    code: 3000,
+    message: 'Error while accessing the database.',
+  },
+
+  NO_SUCH_POLL_ERROR: {
+    code: 3001,
+    message: 'No such poll found.'
+  },
+
+  BAD_DISCRETE_POLL_REQUEST_ERROR: {
+    code: 4000,
+    message: 'Request body for creating a discrete poll was bad.'
+  },
+  
+  BAD_CONT_POLL_REQUEST_ERROR: {
+    code: 4001,
+    message: 'Request body for creating a continuous poll was bad.'
+  },
+
+  MINMAX_BAD_CONT_POLL_REQUEST_ERROR: {
+    code: 4002,
+    message: 'Minimum value allowed was higher than maximum value allowed in the poll.'
+  },
+
+  CHOICE_DOES_NOT_EXIST_ERROR: {
+    code: 5000,
+    message: 'Choice for the poll does not exist.'
+  },
+
+  CHOICE_OUT_OF_BOUNDS_ERROR: {
+    code: 5001,
+    message: 'Choice for the poll is out of given bounds.'
+  }
+
+  // Add more error codes as needed
+};
+
+module.exports = errorCodes;
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 6bae27c8..98384c01 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -1,4 +1,5 @@
 const db = require("../repositories/PollDB.js");
+const errorCodes = require("../errorCodes.js")
 
 function getDiscretePolls(req,res){
     db.getDiscretePolls()
@@ -7,7 +8,7 @@ function getDiscretePolls(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ message: "Internal Server Error" });
+        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
     })
 }
 
@@ -17,7 +18,7 @@ function getDiscretePollWithId(req,res){
     db.getDiscretePollWithId(pollId)
     .then((rows) => {
         if (rows.length === 0) {
-            res.status(404).end("Resource Not Found");
+            res.status(404).json({ code: errorCodes.NO_SUCH_POLL_ERROR.code, message: errorCodes.NO_SUCH_POLL_ERROR.message });
         } else {
             db.getDiscretePollChoices(pollId)
             .then((choices) => {
@@ -39,13 +40,13 @@ function getDiscretePollWithId(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ message: "Internal Server Error" });
+        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
     })
 }
 
 function addDiscretePoll(req,res){
     if (!validateAddDiscretePoll(req.body)) {
-        return res.status(400).json({ error: 'Invalid request body' });
+        return res.status(400).json({ code: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.code, message: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.message });
     }
     const question = req.body.question;
     const choices = req.body.choices;
@@ -56,7 +57,7 @@ function addDiscretePoll(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).send('Internal Server Error');
+        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
     });
 }
 
@@ -86,7 +87,7 @@ function getContinuousPolls(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ message: "Internal Server Error" });
+        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
     })
 }
 
@@ -96,7 +97,7 @@ function getContinuousPollWithId(req,res){
     db.getContinuousPollWithId(pollId)
     .then((rows) => {
         if (rows.length === 0) {
-            res.status(404).end("Resource Not Found");
+            res.status(404).json({ code: errorCodes.NO_SUCH_POLL_ERROR.code, message: errorCodes.NO_SUCH_POLL_ERROR.message });
         } else {
             db.getContinuousPollVotes(pollId)
             .then((choices) => {
@@ -106,20 +107,20 @@ function getContinuousPollWithId(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ message: "Internal Server Error" });
+        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
     })
 }
 
 function addContinuousPoll(req,res){
     if (!validateAddContinuousPoll(req.body)) {
-        return res.status(400).json({ error: 'Invalid request body' });
+        return res.status(400).json({ code: errorCodes.BAD_CONT_POLL_REQUEST_ERROR.code, message: errorCodes.BAD_CONT_POLL_REQUEST_ERROR.message });
     }
     const question = req.body.question;
     const min = req.body.min;
     const max = req.body.max;
 
     if (max <= min) {
-        return res.status(400).json({ error: 'minValue higher than maxValue' });
+        return res.status(400).json({ code: errorCodes.MINMAX_BAD_CONT_POLL_REQUEST_ERROR.code, message: errorCodes.MINMAX_BAD_CONT_POLL_REQUEST_ERROR.message });
     }
 
     db.addContinuousPoll(question, min, max)
@@ -128,7 +129,7 @@ function addContinuousPoll(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).send('Internal Server Error');
+        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
     });
 }
 
@@ -154,7 +155,7 @@ function voteDiscretePoll(req,res){
     .then((choices) => {
         const choiceExists = choices.some(choice => choice.id === choiceId);
         if (!choiceExists) {
-            res.status(404).json({ error: "choice with specified id does not exist" });
+            res.status(404).json({ code: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR.code, message: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR.message });
         } else {
             db.voteDiscretePoll(pollId, userId, choiceId)
             .then(() => {
@@ -164,7 +165,7 @@ function voteDiscretePoll(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ message: "Internal Server Error" });
+        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
     })
 }
 
@@ -179,7 +180,7 @@ function voteContinuousPoll(req,res){
         const maxValue = result[0].max_value;
         const choiceValid = minValue <= choice && choice <= maxValue;
         if (!choiceValid) {
-            res.status(400).json({ error: "Choice is out of bounds" });
+            res.status(400).json({ code: errorCodes.CHOICE_OUT_OF_BOUNDS_ERROR.code, message: errorCodes.CHOICE_OUT_OF_BOUNDS_ERROR.message });
         } else {
             db.voteContinuousPoll(pollId, userId, choice)
             .then(() => {

From c035f15f43ed29b0b9a2ff9278cabaca1e6d010c Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 18 Nov 2023 22:25:19 +0300
Subject: [PATCH 009/246] add error codes for auth

---
 prediction-polls/backend/src/errorCodes.js    | 20 +++++++++++++++++++
 .../src/services/AuthorizationService.js      | 13 ++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index 4b3c4e59..d6b0aba1 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -5,6 +5,26 @@ const errorCodes = {
     message: 'An unexpected error occurred.',
   },
 
+  ACCESS_TOKEN_INVALID_ERROR: {
+    code: 1001,
+    message: 'The access token is invalid.',
+  },
+
+  REFRESH_TOKEN_INVALID_ERROR: {
+    code: 1002,
+    message: 'The refresh token is invalid.',
+  },
+
+  REFRESH_TOKEN_NEEDED_ERROR: {
+    code: 1003,
+    message: 'A refresh token is needed',
+  },
+
+  REGISTRATION_FAILED: {
+    code: 1004,
+    message: 'Registration failed'
+  },
+
   USER_NOT_FOUND: {
     code: 2000,
     message: 'User not found.',
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 8257790b..29e507a7 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -1,6 +1,7 @@
 require('dotenv').config();
 const jwt = require("jsonwebtoken");
 const db = require("../repositories/AuthorizationDB.js");
+const errorCodes = require("../errorCodes.js")
 
 const { checkCredentials, addUser } = require('./AuthenticationService.js');
 
@@ -14,16 +15,16 @@ async function signup(req, res){
   const { username, password, email, birthday } = req.body;
   const { success, error} = await addUser( username, password, email, birthday );
   
-  if(!success)  res.status(400).send('Registration failed '+ error);
+  if(!success)  res.status(400).json({ code: errorCodes.REGISTRATION_FAILED.code, message: errorCodes.REGISTRATION_FAILED.message });
   else{res.status(201).send("Registration successful")};
 
   }
 
 function createAccessTokenFromRefreshToken(req, res){
     const refreshToken = req.body.refreshToken;
-    if (refreshToken == null) return res.status(400).send('A refresh token is needed');
+    if (refreshToken == null) return res.status(400).json({ code: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.code, message: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.message });
     jwt.verify(refreshToken,process.env.REFRESH_TOKEN_SECRET, (err, user) => {
-      if (err) return res.status(401).send('The refresh token is invalid')
+      if (err) return res.status(401).json({ code: errorCodes.REFRESH_TOKEN_INVALID_ERROR.code, message: errorCodes.REFRESH_TOKEN_INVALID_ERROR.message })
       const accessToken = generateAccessToken({name : user.name, id : user.id});
       res.status(201).json({accessToken:accessToken});
     }) 
@@ -35,7 +36,7 @@ async function logIn(req,res){
     const password = req.body.password;
     let [userAuthenticated] = await checkCredentials(username,password);
     if (!userAuthenticated) {
-      res.status(401).send("Could not find a matching (username, email) - password tuple");
+      res.status(401).json({ code: errorCodes.USER_NOT_FOUND.code, message: errorCodes.USER_NOT_FOUND.message });
       return;
     }
 
@@ -52,7 +53,7 @@ async function logOut(req, res) {
     if (tokenDeleted){
       res.status(204).send("Token deleted successfully");
     } else {
-      res.status(404).send("Refresh token not found");
+      res.status(404).json({ code: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.code, message: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.message });
     }
 }
 
@@ -62,7 +63,7 @@ function authorizeAccessToken(req, res, next) {
     if (token == null) return res.sendStatus(400);
   
     jwt.verify(token, process.env.ACCESS_TOKEN_SECRET, (err, user) => {
-      if (err) return  res.status(401).send('The access token is invalid');
+      if (err) return  res.status(401).send({ code: errorCodes.ACCESS_TOKEN_INVALID_ERROR.code, message: errorCodes.ACCESS_TOKEN_INVALID_ERROR.message });
 
       req.user = user;
       next();

From 2112f3a4be29315e302e0aaf2b85e218bc7c6c71 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sun, 19 Nov 2023 16:04:26 +0300
Subject: [PATCH 010/246] API Requests

I have implemented requests for creating a new poll. There are 6 different requests based on the choices of the user. They can be changed easily if backend team requests changes.
---
 .../frontend/src/Pages/Create/index.jsx       | 206 ++++++++++++++++--
 1 file changed, 192 insertions(+), 14 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index 471fdcac..d464b453 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -3,22 +3,26 @@ import Menu from '../../Components/Menu'
 import styles from './Create.module.css'
 import { useState } from 'react';
 import { Button, Input, DatePicker, Checkbox, Select } from 'antd';
+import { useNavigate } from 'react-router-dom';
 
 const { TextArea } = Input;
 const { Option } = Select;
+
 function Create() {
   const [question, setQuestion] = useState('');
   const [pollType, setPollType] = useState('');
   const [showMultipleChoiceInputs, setShowMultipleChoiceInputs] = useState(false);
   const [additionalChoices, setAdditionalChoices] = useState(['']);
   const [customizedType, setCustomizedType] = useState('text');
-  const [customizedOptions, setCustomizedOptions] = useState(['']);
   const [selectedDate, setSelectedDate] = useState(null);
+  const [customizedNumeric, setCustomizedNumeric] = useState('');
   const [setDueDate, setSetDueDate] = useState(false);
   const [dueDatePoll, setDueDatePoll] = useState(null);
   const [numericFieldValue, setNumericFieldValue] = useState('');
   const [selectedTimeUnit, setSelectedTimeUnit] = useState('min');
   const [openVisibility, setOpenVisibility] = useState(false);
+  let urlDiscrete = "http://ec2-3-121-205-89.eu-central-1.compute.amazonaws.com:8000/"
+  const navigate = useNavigate()
 
   const handleOpenVisibilityChange = (e) => {
     setOpenVisibility(e.target.checked);
@@ -66,14 +70,187 @@ function Create() {
     setSelectedDate(date);
   };
 
-  const handleSubmit = () => {
-    console.log('Question:', question);
-    console.log('Poll Type:', pollType);
-    console.log('Additional Choices:', additionalChoices);
-    console.log('Customized Type:', customizedType);
-    console.log('Customized Options:', customizedOptions);
-    console.log('Selected Date:', selectedDate);
-    // Additional logic will be added
+  const handleSubmit = async () => {
+
+    if (pollType === 'multipleChoice' && setDueDate) {
+      const choicesData = additionalChoices.filter(choice => choice.trim() !== ''); // Remove empty choices
+      const multipleChoiceData = {
+        question: question,
+        openVisibility: openVisibility,
+        choices: choicesData,
+        setDueDate: setDueDate,
+        dueDatePoll: dueDatePoll ? dueDatePoll.format() : null, // Convert dueDatePoll to a string format if it exists
+        numericFieldValue: numericFieldValue,
+        selectedTimeUnit: selectedTimeUnit,
+      };
+
+      try {
+        const response = await fetch(urlDiscrete + "polls/discrete/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(multipleChoiceData),
+        });
+        if (!response.ok) {
+          console.error('Error:', response.statusText);
+          return;
+        }
+        const responseData = await response.json();
+        console.log('API Response:', responseData);
+        // Redirect or navigate to another page after successful API request
+        navigate('/pages/feed');
+      } catch (error) {
+        console.error('API Request Failed:', error.message);
+      }
+
+    } else if (pollType === 'multipleChoice' && !setDueDate) {
+      const choicesData = additionalChoices.filter(choice => choice.trim() !== ''); // Remove empty choices
+      const multipleChoiceData = {
+        question: question,
+        openVisibility: openVisibility,
+        choices: choicesData,
+        setDueDate: setDueDate,
+      };
+
+      try {
+        const response = await fetch(urlDiscrete + "polls/discrete/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(multipleChoiceData),
+        });
+        if (!response.ok) {
+          console.error('Error:', response.statusText);
+          return;
+        }
+        const responseData = await response.json();
+        console.log('API Response:', responseData);
+        // Redirect or navigate to another page after successful API request
+        navigate('/pages/feed');
+      } catch (error) {
+        console.error('API Request Failed:', error.message);
+      }
+
+    } else if (pollType === 'customized' && setDueDate && customizedType === 'date') {
+
+      const customizedData = {
+        question: question,
+        selectedDate: selectedDate ? selectedDate.format() : null, // Convert selectedDate to a string format if it exists
+        setDueDate: setDueDate,
+        dueDatePoll: dueDatePoll ? dueDatePoll.format() : null, // Convert dueDatePoll to a string format if it exists
+        numericFieldValue: numericFieldValue,
+        selectedTimeUnit: selectedTimeUnit,
+      };
+
+      try {
+        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(customizedData),
+        });
+        if (!response.ok) {
+          console.error('Error:', response.statusText);
+          return;
+        }
+        const responseData = await response.json();
+        console.log('API Response:', responseData);
+        // Redirect or navigate to another page after successful API request
+        navigate('/pages/feed');
+      } catch (error) {
+        console.error('API Request Failed:', error.message);
+      }
+
+    } else if (pollType === 'customized' && !setDueDate && customizedType === 'date') {
+
+      const customizedData = {
+        question: question,
+        selectedDate: selectedDate ? selectedDate.format() : null, // Convert selectedDate to a string format if it exists
+        setDueDate: setDueDate,
+      };
+
+      try {
+        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(customizedData),
+        });
+        if (!response.ok) {
+          console.error('Error:', response.statusText);
+          return;
+        }
+        const responseData = await response.json();
+        console.log('API Response:', responseData);
+        // Redirect or navigate to another page after successful API request
+        navigate('/pages/feed');
+      } catch (error) {
+        console.error('API Request Failed:', error.message);
+      }
+
+    } else if (pollType === 'customized' && setDueDate && customizedType === 'numeric') {
+
+      const customizedData = {
+        question: question,
+        customizedNumeric: customizedNumeric,
+        setDueDate: setDueDate,
+        dueDatePoll: dueDatePoll ? dueDatePoll.format() : null, // Convert dueDatePoll to a string format if it exists
+        numericFieldValue: numericFieldValue,
+        selectedTimeUnit: selectedTimeUnit,
+      };
+
+      try {
+        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(customizedData),
+        });
+        if (!response.ok) {
+          console.error('Error:', response.statusText);
+          return;
+        }
+        const responseData = await response.json();
+        console.log('API Response:', responseData);
+        // Redirect or navigate to another page after successful API request
+        navigate('/pages/feed');
+      } catch (error) {
+        console.error('API Request Failed:', error.message);
+      }
+
+    } else if (pollType === 'customized' && !setDueDate && customizedType === 'numeric') {
+
+      const customizedData = {
+        question: question,
+        customizedNumeric: customizedNumeric,
+        setDueDate: setDueDate,
+      };
+
+      try {
+        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(customizedData),
+        });
+        if (!response.ok) {
+          console.error('Error:', response.statusText);
+          return;
+        }
+        const responseData = await response.json();
+        console.log('API Response:', responseData);
+        // Redirect or navigate to another page after successful API request
+        navigate('/pages/feed');
+      } catch (error) {
+        console.error('API Request Failed:', error.message);
+      }
+    }
   };
 
 
@@ -124,7 +301,7 @@ function Create() {
                   <Input
                     className={styles.choiceInput}
                     placeholder={`Choice ${index + 1}`}
-                    style={{ width: '50%'}}
+                    style={{ width: '50%' }}
                     value={choice}
                     onChange={(e) => handleChoiceChange(index, e.target.value)}
                   />
@@ -163,15 +340,16 @@ function Create() {
             </Button>
             {customizedType === 'date' && (
               <div className={styles.datePickerContainer}>
-                <DatePicker onChange={handleDateChange}  />
+                <DatePicker onChange={handleDateChange} />
               </div>
             )}
             {customizedType === 'numeric' && (
               <div className={styles.numericInputContainer} >
                 <Input
-                  style={{ width: '50%'}}
+                  style={{ width: '50%' }}
                   type="number"
                   placeholder="Enter numeric answer"
+                  onChange={(e) => setCustomizedNumeric(e.target.value)}
                 />
               </div>
             )}
@@ -182,7 +360,7 @@ function Create() {
           {setDueDate && (
             <>
               <div className={styles.dueDatePollInputContainer}>
-                <DatePicker onChange={handleDueDatePollChange}  />
+                <DatePicker onChange={handleDueDatePollChange} />
               </div>
               <div className={styles.dateOptionsContainer}>
                 <p>Do not accept any votes in last:</p>
@@ -194,7 +372,7 @@ function Create() {
                   onChange={(e) => setNumericFieldValue(e.target.value)}
                 />
                 <Select
-                  className= {styles.customSelect}
+                  className={styles.customSelect}
                   defaultValue="min"
                   onChange={(value) => setSelectedTimeUnit(value)}
                 >

From aec7df537f700ce98740606e8415c99d9bfade7a Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sun, 19 Nov 2023 17:09:36 +0300
Subject: [PATCH 011/246] API URL Correction

I have updated URLs for API requests.
---
 .../frontend/src/Pages/Create/index.jsx            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index c58c1854..ab9c89f7 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -21,7 +21,7 @@ function Create() {
   const [numericFieldValue, setNumericFieldValue] = useState('');
   const [selectedTimeUnit, setSelectedTimeUnit] = useState('min');
   const [openVisibility, setOpenVisibility] = useState(false);
-  let urlDiscrete = "http://ec2-3-121-205-89.eu-central-1.compute.amazonaws.com:8000/"
+  const url = process.env.REACT_APP_BACKEND_LINK; 
   const navigate = useNavigate()
 
   const handleOpenVisibilityChange = (e) => {
@@ -86,7 +86,7 @@ function Create() {
       };
 
       try {
-        const response = await fetch(urlDiscrete + "polls/discrete/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL
+        const response = await fetch(url + "/polls/discrete/", { 
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
@@ -115,7 +115,7 @@ function Create() {
       };
 
       try {
-        const response = await fetch(urlDiscrete + "polls/discrete/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL
+        const response = await fetch(url + "/polls/discrete/", { 
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
@@ -146,7 +146,7 @@ function Create() {
       };
 
       try {
-        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+        const response = await fetch(url + "/polls/continuous/", { 
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
@@ -174,7 +174,7 @@ function Create() {
       };
 
       try {
-        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+        const response = await fetch(url + "/polls/continuous/", {  
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
@@ -205,7 +205,7 @@ function Create() {
       };
 
       try {
-        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+        const response = await fetch(url + "/polls/continuous/", { 
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
@@ -233,7 +233,7 @@ function Create() {
       };
 
       try {
-        const response = await fetch(urlDiscrete + "polls/continuous/", { // TODO: Replace URL_MULTIPLE_CHOICE with API URL 
+        const response = await fetch(url + "/polls/continuous/", { 
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',

From 81d22e5f6d317059656b0a217f197db071b2f9f5 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sun, 19 Nov 2023 17:42:34 +0300
Subject: [PATCH 012/246] Added access token to request

Since only users not guests are allowed to create polls, I have added access token to request headers. Also I have corrected the url for succesfull response navigation.
---
 .../frontend/src/Pages/Create/index.jsx       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index ab9c89f7..1faee6f4 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -90,6 +90,8 @@ function Create() {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
+            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`,  
+            
           },
           body: JSON.stringify(multipleChoiceData),
         });
@@ -100,7 +102,7 @@ function Create() {
         const responseData = await response.json();
         console.log('API Response:', responseData);
         // Redirect or navigate to another page after successful API request
-        navigate('/pages/feed');
+        navigate('/feed');
       } catch (error) {
         console.error('API Request Failed:', error.message);
       }
@@ -119,6 +121,7 @@ function Create() {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
+            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`,  
           },
           body: JSON.stringify(multipleChoiceData),
         });
@@ -129,7 +132,7 @@ function Create() {
         const responseData = await response.json();
         console.log('API Response:', responseData);
         // Redirect or navigate to another page after successful API request
-        navigate('/pages/feed');
+        navigate('/feed');
       } catch (error) {
         console.error('API Request Failed:', error.message);
       }
@@ -150,6 +153,7 @@ function Create() {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
+            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`,  
           },
           body: JSON.stringify(customizedData),
         });
@@ -160,7 +164,7 @@ function Create() {
         const responseData = await response.json();
         console.log('API Response:', responseData);
         // Redirect or navigate to another page after successful API request
-        navigate('/pages/feed');
+        navigate('/feed');
       } catch (error) {
         console.error('API Request Failed:', error.message);
       }
@@ -178,6 +182,7 @@ function Create() {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
+            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`,  
           },
           body: JSON.stringify(customizedData),
         });
@@ -188,7 +193,7 @@ function Create() {
         const responseData = await response.json();
         console.log('API Response:', responseData);
         // Redirect or navigate to another page after successful API request
-        navigate('/pages/feed');
+        navigate('/feed');
       } catch (error) {
         console.error('API Request Failed:', error.message);
       }
@@ -209,6 +214,7 @@ function Create() {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
+            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`,  
           },
           body: JSON.stringify(customizedData),
         });
@@ -219,7 +225,7 @@ function Create() {
         const responseData = await response.json();
         console.log('API Response:', responseData);
         // Redirect or navigate to another page after successful API request
-        navigate('/pages/feed');
+        navigate('/feed');
       } catch (error) {
         console.error('API Request Failed:', error.message);
       }
@@ -237,6 +243,7 @@ function Create() {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
+            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`,  
           },
           body: JSON.stringify(customizedData),
         });
@@ -247,7 +254,7 @@ function Create() {
         const responseData = await response.json();
         console.log('API Response:', responseData);
         // Redirect or navigate to another page after successful API request
-        navigate('/pages/feed');
+        navigate('/feed');
       } catch (error) {
         console.error('API Request Failed:', error.message);
       }

From 4f116102705fce00fd7403cfab4333de0c11759a Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sun, 19 Nov 2023 17:57:23 +0300
Subject: [PATCH 013/246] error fix

There was an error about the styling convention. I fixed it
---
 prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx b/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
index 6037b451..959998e1 100644
--- a/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
@@ -54,8 +54,8 @@ function SignIn() {
         <Form className = {{...styles.formItemLayout,labelCol: { span: 24 }, wrapperCol: { span: 24 }}}>
           <Form.Item>
             <div>
-              <Button style={formButtonStyle} onClick={handleLogin}>
-                <GoogleLogo style={googleLogoStyle} />
+              <Button className={styles.formButtonStyle} onClick={handleLogin}>
+                <GoogleLogo className={styles.googleLogoStyle} />
                 <span>Sign In with Google</span>
               </Button>
             </div>

From 6e8d0c449f03dbfd54e530661d0386d87564449f Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 19 Nov 2023 18:18:39 +0300
Subject: [PATCH 014/246] add ACCESS_TOKEN_NULL error

---
 prediction-polls/backend/src/errorCodes.js                   | 5 +++++
 .../backend/src/services/AuthorizationService.js             | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index d6b0aba1..2f8a32f1 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -25,6 +25,11 @@ const errorCodes = {
     message: 'Registration failed'
   },
 
+  ACCESS_TOKEN_NULL: {
+    code: 1005,
+    message: 'The access token is null.',
+  },
+
   USER_NOT_FOUND: {
     code: 2000,
     message: 'User not found.',
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 29e507a7..339ad45b 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -60,10 +60,10 @@ async function logOut(req, res) {
 function authorizeAccessToken(req, res, next) {
     const authHeader = req.headers["authorization"];
     const token = authHeader && authHeader.split(" ")[1];
-    if (token == null) return res.sendStatus(400);
+    if (token == null) return res.sendStatus(400).json({ code: errorCodes.ACCESS_TOKEN_NULL.code, message: errorCodes.ACCESS_TOKEN_NULL.message });
   
     jwt.verify(token, process.env.ACCESS_TOKEN_SECRET, (err, user) => {
-      if (err) return  res.status(401).send({ code: errorCodes.ACCESS_TOKEN_INVALID_ERROR.code, message: errorCodes.ACCESS_TOKEN_INVALID_ERROR.message });
+      if (err) return  res.status(401).json({ code: errorCodes.ACCESS_TOKEN_INVALID_ERROR.code, message: errorCodes.ACCESS_TOKEN_INVALID_ERROR.message });
 
       req.user = user;
       next();

From aa43633ac0130a5ce386754ab3fa13bb975bf310 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 19 Nov 2023 20:10:48 +0300
Subject: [PATCH 015/246] add error swagger

---
 prediction-polls/backend/src/errorCodes.js    |   4 +-
 .../backend/src/routes/PollRouter.js          | 120 +++++++++++++++++-
 2 files changed, 120 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index 2f8a32f1..a0789ebd 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -52,12 +52,12 @@ const errorCodes = {
 
   BAD_DISCRETE_POLL_REQUEST_ERROR: {
     code: 4000,
-    message: 'Request body for creating a discrete poll was bad.'
+    message: 'Bad request body for creating a discrete poll.'
   },
   
   BAD_CONT_POLL_REQUEST_ERROR: {
     code: 4001,
-    message: 'Request body for creating a continuous poll was bad.'
+    message: 'Bad request body for creating a continuous poll.'
   },
 
   MINMAX_BAD_CONT_POLL_REQUEST_ERROR: {
diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index c0ac7a44..b4dce8f0 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -27,6 +27,22 @@ const router = express.Router();
  *                   question:
  *                     type: string
  *                     example: "Who will become POTUS?"
+ *       500:
+ *         description: Internal Server Error
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               databaseError:
+ *                 value:
+ *                   message: Error while accessing the database.
+ *                   code: 3000
  */
 router.get('/discrete', service.getDiscretePolls);
 
@@ -122,9 +138,57 @@ router.get('/discrete/:pollId', authenticator.authorizeAccessToken, service.getD
  *       201:
  *         description: true
  *       400:
- *         description: Bad request
+ *         description: Bad Request
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               badRequest:
+ *                 value:
+ *                   message: Bad request body for creating a discrete poll.
+ *                   code: 4000
+ *               accessTokenNull:
+ *                 value:
+ *                   message: The access token is null
+ *                   code: 1005
+ *       401:
+ *         description: Unauthorized
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               accessTokenInvalid:
+ *                 value:
+ *                   message: The access token is invalid.
+ *                   code: 1001
  *       500:
  *         description: Internal Server Error
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               databaseError:
+ *                 value:
+ *                   message: Error while accessing the database.
+ *                   code: 3000
  */
 router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscretePoll);
 
@@ -244,9 +308,61 @@ router.get('/continuous/:pollId', authenticator.authorizeAccessToken, service.ge
  *       201:
  *         description: true
  *       400:
- *         description: Bad request
+ *         description: Bad Request
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               badRequest:
+ *                 value:
+ *                   message: Bad request body for creating a continuous poll.
+ *                   code: 4001
+ *               MINMAX_BAD_CONT_POLL_REQUEST_ERROR:
+ *                 value:
+ *                   message: Minimum value allowed was higher than maximum value allowed in the poll.
+ *                   code: 4002
+ *               accessTokenNull:
+ *                 value:
+ *                   message: The access token is null
+ *                   code: 1005
+ *       401:
+ *         description: Unauthorized
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               accessTokenInvalid:
+ *                 value:
+ *                   message: The access token is invalid.
+ *                   code: 1001
  *       500:
  *         description: Internal Server Error
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               databaseError:
+ *                 value:
+ *                   message: Error while accessing the database.
+ *                   code: 3000
  */
 router.post('/continuous', authenticator.authorizeAccessToken, service.addContinuousPoll);
 

From 98fb347f5f44a2147904cefde4372fe6e8b1fb56 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 19 Nov 2023 23:15:18 +0300
Subject: [PATCH 016/246] merge continuous and discrete poll gets

---
 .../backend/src/repositories/PollDB.js        |  54 +++--
 .../backend/src/routes/PollRouter.js          | 198 +++++++-----------
 .../backend/src/services/PollService.js       |  36 +++-
 3 files changed, 138 insertions(+), 150 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index a1f575b0..1632d0e4 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -10,8 +10,8 @@ const pool = mysql.createPool({
 }).promise()
 
 
-async function getDiscretePolls(){
-    const sql = 'SELECT * FROM discrete_polls';
+async function getPolls(){
+    const sql = 'SELECT * FROM polls';
 
     try {
         const [rows, fields] = await pool.query(sql);
@@ -22,14 +22,14 @@ async function getDiscretePolls(){
     }
 }
 
-async function getContinuousPolls(){
-    const sql = 'SELECT * FROM continuous_polls';
+async function getPollWithId(pollId){
+    const sql = 'SELECT * FROM polls WHERE id = ?';
 
     try {
-        const [rows, fields] = await pool.query(sql);
-        return rows
+        const [rows, fields] = await pool.query(sql, [pollId]);
+        return rows;
     } catch (error) {
-        console.error('getDiscretePolls(): Database Error');
+        console.error('getPollWithID(): Database Error');
         throw error;
     }
 }
@@ -60,38 +60,64 @@ async function getContinuousPollWithId(pollId){
 }
 
 async function addDiscretePoll(question, choices){
-    const sql_poll = 'INSERT INTO discrete_polls (question) VALUES (?)';
+    const connection = await pool.getConnection();
+
+    const sql_poll = 'INSERT INTO polls (question, poll_type) VALUES (?, ?)';
+    const sql_discrete_poll = 'INSERT INTO discrete_polls (id) VALUES (?)';
     const sql_choice = 'INSERT INTO discrete_poll_choices (choice_text, poll_id) VALUES (?, ?)';
 
     try {
-        const [resultSetHeader] = await pool.query(sql_poll, [question]);
+        await connection.beginTransaction()
+        const [resultSetHeader] = await connection.query(sql_poll, [question, 'discrete']);
         poll_id = resultSetHeader.insertId;
+
         if (!poll_id) {
+            await connection.rollback();
             return false;
         }
+
+        await connection.query(sql_discrete_poll, [poll_id]);
+
         await Promise.all(choices.map(choice => {
-            return pool.query(sql_choice, [choice, poll_id]);
+            return connection.query(sql_choice, [choice, poll_id]);
         }))
+
+        await connection.commit();
         return true;
     } catch (error) {
         console.error('addDiscretePoll(): Database Error');
+        await connection.rollback();
         throw error;
+    } finally {
+        connection.release();
     }
 }
 
 async function addContinuousPoll(question, min, max){
-    const sql_poll = 'INSERT INTO continuous_polls (question, min_value, max_value) VALUES (?, ?, ?)';
+    const connection = await pool.getConnection();
+
+    const sql_poll = 'INSERT INTO polls (question, poll_type) VALUES (?, ?)';
+    const sql_continuous_poll = 'INSERT INTO continuous_polls (id, min_value, max_value) VALUES (?, ?, ?)';
 
     try {
-        const [resultSetHeader] = await pool.query(sql_poll, [question, min, max]);
-        poll_id = resultSetHeader.insertId;
+        const [pollResultSetHeader] = await connection.query(sql_poll, [question, 'continuous']);
+        const poll_id = pollResultSetHeader.insertId;
+
         if (!poll_id) {
+            await connection.rollback();
             return false;
         }
+
+        await connection.query(sql_continuous_poll, [poll_id, min, max]);
+
+        await connection.commit();
         return true;
     } catch (error) {
         console.error('addContinuousPoll(): Database Error');
+        await connection.rollback();
         throw error;
+    } finally {
+        connection.release();
     }
 }
 
@@ -163,7 +189,7 @@ async function getContinuousPollVotes(pollId) {
 
 
 
-module.exports = {getDiscretePolls, getContinuousPolls, getDiscretePollWithId, getContinuousPollWithId, 
+module.exports = {getPolls, getPollWithId, getDiscretePollWithId, getContinuousPollWithId, 
     addDiscretePoll,addContinuousPoll, getDiscretePollChoices, getDiscreteVoteCount, voteDiscretePoll, voteContinuousPoll,
     getContinuousPollVotes}
     
\ No newline at end of file
diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index b4dce8f0..9d978c63 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -6,11 +6,11 @@ const router = express.Router();
 
 /**
  * @swagger
- * /polls/discrete:
+ * /polls:
  *   get:
  *     tags:
  *       - polls
- *     description: Get all discrete polls
+ *     description: Get all polls
  *     responses:
  *       200:
  *         description: Successful response
@@ -20,13 +20,26 @@ const router = express.Router();
  *               type: array
  *               items:
  *                 type: object
+ *                 required: ["id", "question", "poll_type"]
  *                 properties: 
  *                   id:
  *                     type: integer
- *                     example: 1
  *                   question:
  *                     type: string
- *                     example: "Who will become POTUS?"
+ *                   poll_type:
+ *                     type: string
+ *             examples:
+ *               genericExample:
+ *                 value:
+ *                   - id: 1
+ *                     question: "Who will become POTUS?"
+ *                     poll_type: "discrete"
+ *                   - id: 2
+ *                     question: "Test3?"
+ *                     poll_type: "continuous"
+ *                   - id: 3
+ *                     question: "Who will become POTUS?"
+ *                     poll_type: "discrete"
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -44,11 +57,11 @@ const router = express.Router();
  *                   message: Error while accessing the database.
  *                   code: 3000
  */
-router.get('/discrete', service.getDiscretePolls);
+router.get('/', service.getPolls);
 
 /**
  * @swagger
- * /polls/discrete/{pollId}:
+ * /polls/{pollId}:
  *   get:
  *     tags:
  *       - polls
@@ -67,53 +80,72 @@ router.get('/discrete', service.getDiscretePolls);
  *           application/json:
  *             schema:
  *               type: object
+ *               required: ["id", "question", "poll_type", "poll", "choices"]
  *               properties:
+ *                 id:
+ *                   type: integer
+ *                 question:
+ *                   type: string
+ *                 poll_type:
+ *                   type: string
  *                 poll:
  *                   type: object
  *                   properties:
  *                     id:
  *                       type: integer
- *                       example: 1
- *                     question:
- *                       type: string
- *                       example: "Who will become POTUS?"
  *                 choices:
- *                   type: array
- *                   items:
- *                     type: object
- *                     properties:
- *                       id:
- *                         type: integer
- *                         example: 1
- *                       choice_text:
- *                         type: string
- *                         example: "Trumpo"
- *                       poll_id:
+ *                   oneOf:
+ *                     - type: array
+ *                       items:
+ *                         type: object
+ *                         properties:
+ *                           id:
+ *                             type: integer
+ *                           choice_text:
+ *                             type: string
+ *                           poll_id:
+ *                             type: integer
+ *                           voter_count:
+ *                             type: integer
+ *                     - type: array
+ *                       items:
  *                         type: integer
- *                         example: 1
- *                       voter_count:
- *                         type: integer
- *                         example: 0
- *               example:
- *                 poll:
+ * 
+ *             examples:
+ *               discrete:
+ *                 value:
  *                   id: 1
  *                   question: "Who will become POTUS?"
- *                 choices:
- *                   - id: 1
- *                     choice_text: "Trumpo"
- *                     poll_id: 1
- *                     voter_count: 0
- *                   - id: 2
- *                     choice_text: "Biden"
- *                     poll_id: 1
- *                     voter_count: 1
- *
+ *                   poll_type: "discrete"
+ *                   poll:
+ *                     id: 1
+ *                   choices:
+ *                     - id: 1
+ *                       choice_text: "Trumpo"
+ *                       poll_id: 1
+ *                       voter_count: 0
+ *                     - id: 2
+ *                       choice_text: "Biden"
+ *                       poll_id: 1
+ *                       voter_count: 1
+ *               continuous:
+ *                 value:
+ *                   id: 2
+ *                   question: "Test question?"
+ *                   poll_type: "continuous"
+ *                   poll:
+ *                     id: 2
+ *                     min_value: 6
+ *                     max_value: 10
+ *                   choices:
+ *                     - 7
+ *                     - 8   
  */
-router.get('/discrete/:pollId', authenticator.authorizeAccessToken, service.getDiscretePollWithId);
+router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId);
 
 /**
  * @swagger
- * /polls/discrete/:
+ * /polls/discrete:
  *   post:
  *     tags:
  *       - polls
@@ -192,94 +224,6 @@ router.get('/discrete/:pollId', authenticator.authorizeAccessToken, service.getD
  */
 router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscretePoll);
 
-/**
- * @swagger
- * /polls/continuous:
- *   get:
- *     tags:
- *       - polls
- *     description: Get a list of continuous polls
- *     responses:
- *       200:
- *         description: Successful response
- *         content:
- *           application/json:
- *             schema:
- *               type: array
- *               items:
- *                 type: object
- *                 properties:
- *                   id:
- *                     type: integer
- *                     example: 1
- *                   question:
- *                     type: string
- *                     example: "Test3?"
- *                   min_value:
- *                     type: integer
- *                     example: 6
- *                   max_value:
- *                     type: integer
- *                     example: 10
- *       404:
- *         description: Polls not found
- *       500:
- *         description: Internal Server Error
- */
-router.get('/continuous', authenticator.authorizeAccessToken, service.getContinuousPolls);
-
-/**
- * @swagger
- * /polls/continuous/{pollId}:
- *   get:
- *     tags:
- *       - polls
- *     description: Get a specific continuous poll by ID
- *     parameters:
- *       - in: path
- *         name: pollId
- *         required: true
- *         schema:
- *           type: integer
- *         description: The ID of the continuous poll.
- *     responses:
- *       200:
- *         description: Successful response
- *         content:
- *           application/json:
- *             schema:
- *               type: object
- *               properties:
- *                 poll:
- *                   type: object
- *                   properties:
- *                     id:
- *                       type: integer
- *                       example: 1
- *                     question:
- *                       type: string
- *                       example: "Test3?"
- *                     min_value:
- *                       type: integer
- *                       example: 6
- *                     max_value:
- *                       type: integer
- *                       example: 10
- *                 choices:
- *                   type: array
- *                   items:
- *                     type: object
- *                     properties:
- *                       selected_value:
- *                         type: integer
- *                         example: 7
- *       404:
- *         description: Poll not found
- *       500:
- *         description: Internal Server Error
- */
-router.get('/continuous/:pollId', authenticator.authorizeAccessToken, service.getContinuousPollWithId);
-
 /**
  * @swagger
  * /polls/continuous:
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 98384c01..854de493 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -1,8 +1,8 @@
 const db = require("../repositories/PollDB.js");
 const errorCodes = require("../errorCodes.js")
 
-function getDiscretePolls(req,res){
-    db.getDiscretePolls()
+function getPolls(req,res){
+    db.getPolls()
     .then((rows) => {
         res.json(rows);
     })
@@ -12,7 +12,25 @@ function getDiscretePolls(req,res){
     })
 }
 
-function getDiscretePollWithId(req,res){
+function getPollWithId(req, res) {
+    const pollId = req.params.pollId;
+    db.getPollWithId(pollId)
+    .then((rows) => {
+        if (rows.length === 0) {
+            res.status(404).json({ code: errorCodes.NO_SUCH_POLL_ERROR.code, message: errorCodes.NO_SUCH_POLL_ERROR.message });
+        } else {
+            const pollType = rows[0].poll_type;
+            const responseBody = rows[0];
+            if (pollType === 'discrete') {
+                getDiscretePollWithId(req, res, responseBody);
+            } else if (pollType === 'continuous') {
+                getContinuousPollWithId(req, res, responseBody);
+            }
+        }
+    })
+}
+
+function getDiscretePollWithId(req,res, responseBody){
     const pollId = req.params.pollId;
 
     db.getDiscretePollWithId(pollId)
@@ -24,7 +42,6 @@ function getDiscretePollWithId(req,res){
             .then((choices) => {
                 
                 const choicesWithVoteCount = choices.map((choice) => {
-                    // Call your function and set the "voter_count" property based on the result
                     return db.getDiscreteVoteCount(choice.id)
                     .then((voterCount) => {
                         return { ...choice, voter_count: voterCount };
@@ -33,7 +50,8 @@ function getDiscretePollWithId(req,res){
 
                 Promise.all(choicesWithVoteCount)
                 .then((updatedChoices) => {
-                    res.json({ "poll": rows[0], "choices": updatedChoices });
+                    responseBody = { ...responseBody, "poll": rows[0], "choices": updatedChoices };
+                    res.json(responseBody);
                 })
             })
         }
@@ -91,7 +109,7 @@ function getContinuousPolls(req,res){
     })
 }
 
-function getContinuousPollWithId(req,res){
+function getContinuousPollWithId(req,res, responseBody){
     const pollId = req.params.pollId;
 
     db.getContinuousPollWithId(pollId)
@@ -101,7 +119,8 @@ function getContinuousPollWithId(req,res){
         } else {
             db.getContinuousPollVotes(pollId)
             .then((choices) => {
-                res.json({"poll": rows[0], "choices": choices})
+                responseBody = {...responseBody, "poll": rows[0], "choices": choices}
+                res.json(responseBody)
             })
         }
     })
@@ -190,5 +209,4 @@ function voteContinuousPoll(req,res){
     })
 }
 
-module.exports = {getDiscretePolls,getDiscretePollWithId,addDiscretePoll,getContinuousPolls,
-    getContinuousPollWithId,addContinuousPoll,voteDiscretePoll,voteContinuousPoll}
\ No newline at end of file
+module.exports = {getPolls, getPollWithId, addDiscretePoll, addContinuousPoll, voteDiscretePoll, voteContinuousPoll}
\ No newline at end of file

From e925287e39ec6a8f693c795d926c4640edac1c2c Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sun, 19 Nov 2023 23:19:18 +0300
Subject: [PATCH 017/246] Closed unnecessary AuthenticationService class

---
 .../src/repositories/AuthorizationDB.js       | 67 ++++++++++++++++++-
 .../src/services/AuthenticationService.js     | 56 ----------------
 2 files changed, 66 insertions(+), 57 deletions(-)
 delete mode 100644 prediction-polls/backend/src/services/AuthenticationService.js

diff --git a/prediction-polls/backend/src/repositories/AuthorizationDB.js b/prediction-polls/backend/src/repositories/AuthorizationDB.js
index febe5701..80c8bb3c 100644
--- a/prediction-polls/backend/src/repositories/AuthorizationDB.js
+++ b/prediction-polls/backend/src/repositories/AuthorizationDB.js
@@ -9,6 +9,71 @@ const pool = mysql.createPool({
     database: process.env.MYSQL_DATABASE
 }).promise()
 
+function hashPassword(password) {
+    return new Promise((resolve, reject) => {
+        bcrypt.hash(password, 10, (err, hashedPassword) => {
+            if (err) reject(err);
+            resolve(hashedPassword);
+        });
+    });
+}
+
+async function checkCredentials(username, password) {
+    try {
+        /* We want to store our passwords hashed in the db But currently 
+         * our hashing function does not return the same hashed password
+         * for the same password value. This creates an issue with verification.
+         */
+
+        // const hashedPassword = await hashPassword(password);
+
+        const sql = 'SELECT * FROM users WHERE (username = ? || email = ?) && password = ?';
+        const values = [username, username, password];
+
+        const [rows] = await pool.query(sql, values);
+        return rows;
+    } catch (error) {
+        console.error(error);
+        return false;
+    }
+}
+
+async function addUser(username, password,email,birthday){
+    try {
+        /* We want to store our passwords hashed in the db But currently 
+         * our hashing function does not return the same hashed password
+         * for the same password value. This creates an issue with verification.
+         */
+        // const hashedPassword = await hashPassword(password);
+    
+        // Store the user in the database
+        const sql = 'INSERT INTO users (username, email, password, birthday) VALUES (?, ?, ?, ?)';
+        const values = [username, email, password, birthday];
+    
+        const [result] = await pool.query(sql, values);
+        return {"success":true,"error":undefined, "userid": result.insertId} ;
+      } catch (error) {
+        return {"success":false,"error":error} ;
+      }
+  }
+
+
+async function findUserId({username,email}){
+    if(username){
+        const sql = 'SELECT id FROM users WHERE username = ?';
+    
+        const [result] = await pool.query(sql, [username]);
+        return result[0].id;
+    }
+    if(email){
+        const sql = 'SELECT id FROM users WHERE email = ?';
+    
+        const [result] = await pool.query(sql, [email]);
+        return result[0].id;
+    }
+}
+
+
 //Add the given refresh token to db
 async function addRefreshToken(token){
     const sql = 'INSERT INTO refresh_tokens (token) VALUES (?)';
@@ -43,4 +108,4 @@ async function deleteRefreshToken(token){
     return result.affectedRows > 0;
 }
 
-module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken}
\ No newline at end of file
+module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken,checkCredentials,addUser,findUserId}
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/AuthenticationService.js b/prediction-polls/backend/src/services/AuthenticationService.js
deleted file mode 100644
index b13ea017..00000000
--- a/prediction-polls/backend/src/services/AuthenticationService.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const db = require("../repositories/AuthorizationDB.js");
-
-require('dotenv').config();
-
-const bcrypt = require('bcrypt');
-
-function hashPassword(password) {
-    return new Promise((resolve, reject) => {
-        bcrypt.hash(password, 10, (err, hashedPassword) => {
-            if (err) reject(err);
-            resolve(hashedPassword);
-        });
-    });
-}
-
-async function checkCredentials(username, password) {
-    try {
-        /* We want to store our passwords hashed in the db But currently 
-         * our hashing function does not return the same hashed password
-         * for the same password value. This creates an issue with verification.
-         */
-
-        // const hashedPassword = await hashPassword(password);
-
-        const sql = 'SELECT * FROM users WHERE (username = ? || email = ?) && password = ?';
-        const values = [username, username, password];
-
-        const [rows] = await db.pool.query(sql, values);
-        return rows;
-    } catch (error) {
-        console.error(error);
-        return false;
-    }
-}
-
-async function addUser(username, password,email,birthday){
-    try {
-        /* We want to store our passwords hashed in the db But currently 
-         * our hashing function does not return the same hashed password
-         * for the same password value. This creates an issue with verification.
-         */
-        // const hashedPassword = await hashPassword(password);
-    
-        // Store the user in the database
-        const sql = 'INSERT INTO users (username, email, password, birthday) VALUES (?, ?, ?, ?)';
-        const values = [username, email, password, birthday];
-    
-        const [result] = await db.pool.query(sql, values);
-        return {"success":true,"error":undefined, "userid": result.insertId} ;
-      } catch (error) {
-        return {"success":false,"error":error} ;
-      }
-  }
-
-
-module.exports = {checkCredentials,addUser}
\ No newline at end of file

From ce0729e58ffe3288871053605043793d30d71027 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sun, 19 Nov 2023 23:20:00 +0300
Subject: [PATCH 018/246] Update ProfileRouter.js

Changed positions of two endpoints
---
 prediction-polls/backend/src/routes/ProfileRouter.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 4fd9e80f..81c51de4 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -3,15 +3,17 @@ const service = require("../services/ProfileService.js");
 const express = require('express');
 const router = express.Router();
 
+
 /**
  * @swagger
  * /polls/discrete:
  *   get:
  *     tags:
  *       - polls
- *     description: Get profile using profile id
+ *     description: Get profile using user data
  */
-router.get('/:profileId', service.getProfileWithProfileId);
+
+router.get('/', service.getProfile);
 
 /**
  * @swagger
@@ -19,10 +21,9 @@ router.get('/:profileId', service.getProfileWithProfileId);
  *   get:
  *     tags:
  *       - polls
- *     description: Get profile using user data
+ *     description: Get profile using profile id
  */
-
-router.get('/', service.getProfile);
+router.get('/:profileId', service.getProfileWithProfileId);
 
 router.post('/', service.addProfile);
 

From ac4094b92d98de25b9fc9b8820f6196f4ec1ac08 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sun, 19 Nov 2023 23:20:50 +0300
Subject: [PATCH 019/246] Updated the classes to adapt to removal of
 authentionService

---
 prediction-polls/backend/src/services/AuthGoogleService.js  | 6 +++---
 .../backend/src/services/AuthorizationService.js            | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/prediction-polls/backend/src/services/AuthGoogleService.js b/prediction-polls/backend/src/services/AuthGoogleService.js
index 81d4d094..8c9559c5 100644
--- a/prediction-polls/backend/src/services/AuthGoogleService.js
+++ b/prediction-polls/backend/src/services/AuthGoogleService.js
@@ -3,7 +3,7 @@ const axios = require("axios");
 const db = require("../repositories/AuthorizationDB.js");
 const crypto = require('crypto');
 
-const { addUser } = require('./AuthenticationService.js');
+
 const { generateAccessToken, generateRefreshToken } = require('./AuthorizationService.js');
 
 
@@ -38,7 +38,7 @@ async function googleLogInWithCode(code,res){
       }
 
       const generatedPassword = generateRandomPassword(12);
-      const { success, error, userid} = await addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
+      const { success, error, userid} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
 
       const user = {name : googleUser.given_name, id: userid};
       const accesToken = generateAccessToken(user);
@@ -61,7 +61,7 @@ async function googleLogInWithCode(code,res){
       }
 
       const generatedPassword = generateRandomPassword(12);
-      const { success, error, userid} = await addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
+      const { success, error, userid} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
 
       const user = {name : googleUser.given_name, id: userid};
       const accesToken = generateAccessToken(user);
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 8257790b..3ad5a524 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -2,8 +2,6 @@ require('dotenv').config();
 const jwt = require("jsonwebtoken");
 const db = require("../repositories/AuthorizationDB.js");
 
-const { checkCredentials, addUser } = require('./AuthenticationService.js');
-
 const bcrypt = require('bcrypt')
 
 function homePage(req, res){
@@ -12,7 +10,7 @@ function homePage(req, res){
 
 async function signup(req, res){
   const { username, password, email, birthday } = req.body;
-  const { success, error} = await addUser( username, password, email, birthday );
+  const { success, error} = await db.addUser( username, password, email, birthday );
   
   if(!success)  res.status(400).send('Registration failed '+ error);
   else{res.status(201).send("Registration successful")};
@@ -33,7 +31,7 @@ async function logIn(req,res){
     // Authorize User  
     const username = req.body.username;
     const password = req.body.password;
-    let [userAuthenticated] = await checkCredentials(username,password);
+    let [userAuthenticated] = await db.checkCredentials(username,password);
     if (!userAuthenticated) {
       res.status(401).send("Could not find a matching (username, email) - password tuple");
       return;

From 22032052f4a6f3ea23aa3d7d22a8f19a2c9e6df4 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sun, 19 Nov 2023 23:21:02 +0300
Subject: [PATCH 020/246] Update schema.sql

Small change to schema
---
 prediction-polls/backend/src/schema.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 12d8f579..c90fb893 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -59,11 +59,11 @@ CREATE TABLE continuous_poll_selections (
 
 CREATE TABLE profiles (
     id INT AUTO_INCREMENT PRIMARY KEY,
-    user_id INT NOT NULL,
+    userId INT NOT NULL,
     username VARCHAR(255) NOT NULL,
     profile_picture_data MEDIUMBLOB,
     biography VARCHAR(5000),
     birthday DATETIME,
-    is_hidden BOOLEAN DEFAULT False,
-    FOREIGN KEY (user_id) REFERENCES users(id)
+    isHidden BOOLEAN DEFAULT False,
+    FOREIGN KEY (userId) REFERENCES users(id)
 );
\ No newline at end of file

From be8edec531b608d36eff3bc63b405a1d36904af6 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sun, 19 Nov 2023 23:21:19 +0300
Subject: [PATCH 021/246] Added logic to profile classes

---
 .../backend/src/repositories/ProfileDB.js     | 109 ++++++++++++------
 .../backend/src/services/ProfileService.js    |  41 +++++--
 2 files changed, 108 insertions(+), 42 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index 0bffa478..9f3f254d 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -1,3 +1,4 @@
+const authDb = require("../repositories/AuthorizationDB.js");
 const mysql = require('mysql2')
 
 require('dotenv').config();
@@ -11,10 +12,14 @@ const pool = mysql.createPool({
 
 
 async function getProfileWithProfileId(profileId){
+    console.log("profileId")
+    console.log(profileId)
+
     const sql = 'SELECT * FROM profiles WHERE id= ?';
 
     try {
-        const [rows, fields] = await pool.query(sql, [profileId]);
+        const [rows] = await pool.query(sql, [profileId]);
+        console.log(rows)
         return rows;
     } catch (error) {
         console.error('getProfileWithProfileId(): Database Error');
@@ -27,67 +32,105 @@ async function getProfileWithUserId(userId){
 
     try {
         const [rows, fields] = await pool.query(sql, [userId]);
-        return rows;
+        return {profile:rows[0]};
     } catch (error) {
-        console.error('getProfileWithUserId(): Database Error');
-        throw error;
+        return {error:{code:1000,message:"An error occured:" + error}};
     }
 }
 
 async function getProfileWithUserInfo({username,email}){
-    const userId=0;
-    if(username){
-        const sql = 'SELECT * FROM users WHERE username = ?';
-        //TODO retrieve user id using username
-        userId = 1;
-    }
-    else{
-        const sql = 'SELECT * FROM users WHERE email = ?';
-        //TODO retrieve user id using email
-        userId = 1;
-    }
+    const userId = await authDb.findUserId({username,email});
     const user = await getProfileWithUserId(userId);
     return user;
 }
 
 async function addProfile({
-    user_id,
+    userId,
     username ,
     profile_picture,
     biography,
     birthday ,
-    is_hidden}){
+    isHidden}){
 
-    const sql = 'INSERT INTO profiles (user_id, username, profile_picture_data, biography, birthday, is_hidden) VALUES (?, ?, ?, ?, ?, ?)';
-    values = [user_id,username,profile_picture,biography,birthday,is_hidden]
-        
-    const [resultSetHeader] = await pool.query(sql_poll, values);
+    try {
+        const sql = 'INSERT INTO profiles (user_id, username, profile_picture_data, biography, birthday, is_hidden) VALUES (?, ?, ?, ?, ?, ?)';
+        values = [userId,username,profile_picture,biography,birthday,isHidden]
+            
+        const [resultSetHeader] = await pool.query(sql, values);
         profile_id = resultSetHeader.insertId;
         if (!profile_id) {
-            return false;
+            return {error:{code:1111,message:"Could not insert"}};
+        }
+        return {profile_id:profile_id};
+    }catch(error){
+        // Error management will be handled later
+        /*
+        console.log(error);
+        if(error.sqlMessage == "Error: Column 'user_id' cannot be null"){
+            return {error:{code:1111,message:"Gimme user id"}}
         }
-        return profile_id;
+        if(error.sqlMessage == "Error: Cannot add or update a child row: a foreign key constraint "+
+        "fails (`predict_app`.`profiles`, CONSTRAINT `profiles_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`))"){
+            return {error:{code:1110,message:"No user exists with the given user id"}}
+        }
+        */
+        return {error:{code:1000,message:"An error occured:" + error}};
+    }
+
 }
 
 async function updateProfile({
-    user_id,
+    userId,
     username ,
     profile_picture,
     biography,
     birthday ,
-    is_hidden}){
+    isHidden}){
 
-    if(profile_picture){
+    let user_id = userId
 
+    if(!userId){
+        user_id = await authDb.findUserId({username});
     }
-    if(biography){
+    try {
+        if(profile_picture){
+            const sql = 'UPDATE profiles SET profile_picture_data = ? WHERE user_id = ?';
+            values = [profile_picture,user_id];
 
-    }
-    if(birthday){
+            const [resultSetHeader] = await pool.query(sql, values);
+        }
+        if(biography){
+            const sql = 'UPDATE profiles SET biography = ? WHERE user_id = ?';
+            values = [biography,user_id];
 
-    }
-    if(is_hidden){
-        
-    }
+            const [resultSetHeader] = await pool.query(sql, values);
+        }
+        if(birthday){
+            const sql = 'UPDATE profiles SET birthday = ? WHERE user_id = ?';
+            values = [birthday,user_id];
+
+            const [resultSetHeader] = await pool.query(sql, values);
+        }
+        if(isHidden){
+            const sql = 'UPDATE profiles SET is_hidden = ? WHERE user_id = ?';
+            values = [isHidden,user_id];
+
+            const [resultSetHeader] = await pool.query(sql, values);
+        }
+        console.log("Im done");
+        return {status:"success"};
+    }catch(error) {
+        return {error:{code:1000,message:"An error occured:" + error}};
+    } 
 }
+
+
+async function getProfileIsHidden(profileId){
+    profile = await getProfileWithProfileId(profileId);
+    return profile.is_hidden;
+
+}
+
+
+module.exports = {getProfileWithProfileId,getProfileWithUserId,getProfileWithUserInfo,addProfile,updateProfile}
     
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 7089bedc..69d4ba67 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -1,20 +1,43 @@
-const db = require("../repositories/PollDB.js");
+const db = require("../repositories/ProfileDB.js");
 
 
-function getProfile(req,res){
-    
+async function getProfile(req,res){
+    const { userId, username, email } = req.query;
+    if(userId){
+        console.log("Found UserId");
+        const profile = await db.getProfileWithUserId(userId);
+        return res.status(200).json(profile);
+    }
+    console.log("Did not find UserId");
+    const profile = await db.getProfileWithUserInfo({username,email})
+    res.status(200).json(profile);
 }
 
-function getProfileWithProfileId(req,res){
-    
+async function getProfileWithProfileId(req,res){
+    const profileId = req.params.profileId;
+    const {profile,error} = await db.getProfileWithProfileId(profileId);
+    if(error){
+        return res.status(400).json({error:error});
+    }
+    res.status(200).json(profile);
 }
 
-function addProfile(req,res){
-    
+async function addProfile(req,res){
+    const {userId,username,email,profile_picture,biography, birthday, isHidden} = req.body;
+    const {profile_id,error} = await db.addProfile({userId,username,email,profile_picture,biography, birthday, isHidden});
+    if(error){
+        return res.status(400).json({error:error});
+    }
+    return res.status(200).json({profileId:profile_id});
 }
 
-function updateProfile(req,res){
-    
+async function updateProfile(req,res){
+    const {userId,username,profile_picture,biography, birthday, isHidden} = req.body;
+    const {status,error} = await db.updateProfile({userId,username,profile_picture,biography, birthday, isHidden});
+    if(error){
+        return res.status(400).json({error:error});
+    }
+    return res.status(200).json({status:status});
 }
 
 module.exports = {getProfile,getProfileWithProfileId,addProfile,updateProfile}
\ No newline at end of file

From 38bddd943eaf82ce98a3d1b9dd4fe8bfd4e1bda8 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 19 Nov 2023 23:30:15 +0300
Subject: [PATCH 022/246] add modified schema

---
 prediction-polls/backend/src/schema.sql | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 2ed858e7..d9555330 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -18,16 +18,29 @@ CREATE TABLE refresh_tokens (
     UNIQUE KEY token (token)
 );
 
-CREATE TABLE discrete_polls (
+CREATE TABLE polls (
     id INT AUTO_INCREMENT PRIMARY KEY,
-    question VARCHAR(255) NOT NULL
+    question VARCHAR(255) NOT NULL,
+    poll_type ENUM('discrete', 'continuous') NOT NULL
+);
+
+CREATE TABLE discrete_polls (
+    id INT PRIMARY KEY,
+    FOREIGN KEY (id) REFERENCES polls(id)
+);
+
+CREATE TABLE continuous_polls (
+    id INT PRIMARY KEY,
+    min_value FLOAT NOT NULL,
+    max_value FLOAT NOT NULL,
+    FOREIGN KEY (id) REFERENCES polls(id)
 );
 
 CREATE TABLE discrete_poll_choices (
     id INT AUTO_INCREMENT PRIMARY KEY,
     choice_text VARCHAR(255) NOT NULL,
     poll_id INT, 
-    FOREIGN KEY (poll_id) REFERENCES discrete_polls(id)
+    FOREIGN KEY (poll_id) REFERENCES polls(id)
 );
 
 CREATE TABLE discrete_polls_selections (
@@ -35,23 +48,16 @@ CREATE TABLE discrete_polls_selections (
     poll_id INT,
     choice_id INT,
     user_id INT,
-    FOREIGN KEY (poll_id) REFERENCES discrete_polls(id),
+    FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (choice_id) REFERENCES discrete_poll_choices(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
 );
 
-CREATE TABLE continuous_polls (
-    id INT PRIMARY KEY AUTO_INCREMENT,
-    question VARCHAR(255) NOT NULL,
-    min_value FLOAT NOT NULL,
-    max_value FLOAT NOT NULL
-);
-
 CREATE TABLE continuous_poll_selections (
     id INT PRIMARY KEY AUTO_INCREMENT,
     poll_id INT,
     user_id INT, 
     selected_value FLOAT NOT NULL,
-    FOREIGN KEY (poll_id) REFERENCES continuous_polls(id),
+    FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
 );
\ No newline at end of file

From 45e87726bc28232cd2fd29de04d993ad48f8d12d Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 01:30:11 +0300
Subject: [PATCH 023/246] delete unneeded function

---
 prediction-polls/backend/src/services/PollService.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 854de493..85a6e37e 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -98,17 +98,6 @@ function validateAddDiscretePoll(body) {
     return true;
 }
 
-function getContinuousPolls(req,res){
-    db.getContinuousPolls()
-    .then((rows) => {
-        res.json(rows);
-    })
-    .catch((error) => {
-        console.error(error);
-        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
-    })
-}
-
 function getContinuousPollWithId(req,res, responseBody){
     const pollId = req.params.pollId;
 

From f410743545106d3970ab235433d1aa24bf4447b5 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 10:45:43 +0300
Subject: [PATCH 024/246] add new poll properties

---
 prediction-polls/backend/src/schema.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 9f692a93..0f61d840 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -22,7 +22,12 @@ CREATE TABLE refresh_tokens (
 CREATE TABLE polls (
     id INT AUTO_INCREMENT PRIMARY KEY,
     question VARCHAR(255) NOT NULL,
-    poll_type ENUM('discrete', 'continuous') NOT NULL
+    poll_type ENUM('discrete', 'continuous') NOT NULL,
+    openVisibility BOOLEAN NOT NULL,
+    setDueDate BOOLEAN NOT NULL,
+    dueDatePoll DATE,
+    numericFieldValue INT,
+    selectedTimeUnit ENUM('min', 'h', 'day', 'mth')
 );
 
 CREATE TABLE discrete_polls (

From ba9ce8719acf778d8125cd412d69835f5335cbc8 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 10:45:58 +0300
Subject: [PATCH 025/246] Implement addDiscretePoll

---
 .../backend/src/repositories/PollDB.js           |  6 +++---
 .../backend/src/services/PollService.js          | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 1632d0e4..58ecb680 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -59,16 +59,16 @@ async function getContinuousPollWithId(pollId){
     }
 }
 
-async function addDiscretePoll(question, choices){
+async function addDiscretePoll(question, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
     const connection = await pool.getConnection();
 
-    const sql_poll = 'INSERT INTO polls (question, poll_type) VALUES (?, ?)';
+    const sql_poll = 'INSERT INTO polls (question, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?)';
     const sql_discrete_poll = 'INSERT INTO discrete_polls (id) VALUES (?)';
     const sql_choice = 'INSERT INTO discrete_poll_choices (choice_text, poll_id) VALUES (?, ?)';
 
     try {
         await connection.beginTransaction()
-        const [resultSetHeader] = await connection.query(sql_poll, [question, 'discrete']);
+        const [resultSetHeader] = await connection.query(sql_poll, [question, 'discrete', openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
         poll_id = resultSetHeader.insertId;
 
         if (!poll_id) {
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 85a6e37e..47f0884e 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -63,13 +63,25 @@ function getDiscretePollWithId(req,res, responseBody){
 }
 
 function addDiscretePoll(req,res){
+    console.log(req.body)
     if (!validateAddDiscretePoll(req.body)) {
         return res.status(400).json({ code: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.code, message: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.message });
     }
     const question = req.body.question;
     const choices = req.body.choices;
-
-    db.addDiscretePoll(question, choices)
+    const openVisibility = req.body.openVisibility;
+    const setDueDate = req.body.setDueDate;
+    const numericFieldValue = req.body.numericFieldValue;
+    const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
+    const selectedTimeUnit = req.body.selectedTimeUnit;
+
+    console.log("openVisibility: ", openVisibility);
+    console.log("setDueDate: ", setDueDate);
+    console.log("numericFieldValue: ", numericFieldValue);
+    console.log("dueDatePoll: ", dueDatePoll);
+    console.log("selectedTimeUnit: ", selectedTimeUnit);
+
+    db.addDiscretePoll(question, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
     .then((result) => {
         res.end(result.toString());
     })

From 3b6ee3daca2eeac57af7d7cf2cae531595e6d3fe Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 12:04:30 +0300
Subject: [PATCH 026/246] update swagger for post discrete

---
 .../backend/src/routes/PollRouter.js          | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 9d978c63..91385cf9 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -156,16 +156,45 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *       content:
  *         application/json:
  *           schema:
+ *             required: ["question", "choices", "openVisibility", "setDueDate"]
  *             type: object
  *             properties:
  *               question:
  *                 type: string
- *                 example: "Who will become POTUS?"
  *               choices:
  *                 type: array
  *                 items:
  *                   type: string
- *                 example: ["Trumpino", "Biden"]
+ *               openVisibility:
+ *                 type: boolean
+ *               setDueDate:
+ *                 type: boolean
+ *               dueDatePoll:
+ *                 type: string
+ *               numericFieldValue:
+ *                 type: integer
+ *               selectedTimeUnit:
+ *                 type: string
+ *           examples:
+ *             setDueDateTrue:
+ *               value:
+ *                 question: Question 4
+ *                 choices:
+ *                   - choice 1
+ *                   - choice 2
+ *                 openVisibility: true
+ *                 setDueDate: true
+ *                 dueDatePoll: 2023-11-21T11:39:00+03:00
+ *                 numericFieldValue: 2
+ *                 selectedTimeUnit: min
+ *             setDueDateFalse:
+ *               value:
+ *                 question: Question 4
+ *                 choices:
+ *                   - choice 1
+ *                   - choice 2
+ *                 openVisibility: true
+ *                 setDueDate: false
  *     responses:
  *       201:
  *         description: true

From ad0b5f22bdb4e5d989280f2bde81ada56ddf3f88 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 12:17:33 +0300
Subject: [PATCH 027/246] add validation discrete poll

---
 prediction-polls/backend/src/services/PollService.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 47f0884e..8f4eb749 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -94,7 +94,9 @@ function addDiscretePoll(req,res){
 function validateAddDiscretePoll(body) {
     if (
         typeof body !== 'object' ||
-        typeof body.question !== 'string'
+        typeof body.question !== 'string' ||
+        typeof body.openVisibility !== 'boolean' ||
+        typeof body.setDueDate !== 'boolean'
     ) {
         return false;
     }

From eaebce8414ed7777e7cf8196565963b3f53abcda Mon Sep 17 00:00:00 2001
From: kutaysaran <74209499+kutaysaran@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:02:31 +0300
Subject: [PATCH 028/246] Search bar

I have implemented search bar.
---
 .../src/Components/PollCard/index.jsx         |  2 +-
 .../Components/SearchBar/SearchBar.module.css | 12 ++++++
 .../src/Components/SearchBar/index.jsx        | 28 +++++++++++++
 .../frontend/src/Pages/Feed/index.jsx         | 39 ++++++++++++++-----
 4 files changed, 71 insertions(+), 10 deletions(-)
 create mode 100644 prediction-polls/frontend/src/Components/SearchBar/SearchBar.module.css
 create mode 100644 prediction-polls/frontend/src/Components/SearchBar/index.jsx

diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index 43e9e40a..f7421ee8 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -57,7 +57,7 @@ function PollCard({ PollData }) {
                   option={option}
                   isSelected={selectedArray[index]}
                   index={index}
-                  arrayLength={PollData["options"].length}
+                  arrayLength={PollData["options"]?.length || 0}
                   key={index}
                   selectOption={handleSelect}
                 />
diff --git a/prediction-polls/frontend/src/Components/SearchBar/SearchBar.module.css b/prediction-polls/frontend/src/Components/SearchBar/SearchBar.module.css
new file mode 100644
index 00000000..9ab21e92
--- /dev/null
+++ b/prediction-polls/frontend/src/Components/SearchBar/SearchBar.module.css
@@ -0,0 +1,12 @@
+.searchbar {
+  margin-bottom: 20px;
+  margin-top: -50px;
+  max-width: 400px;
+  padding: 10px;
+}
+
+@media (max-width: 990px) {
+  .searchbar {
+    max-width: 250px;
+  }
+}
diff --git a/prediction-polls/frontend/src/Components/SearchBar/index.jsx b/prediction-polls/frontend/src/Components/SearchBar/index.jsx
new file mode 100644
index 00000000..cb9a9626
--- /dev/null
+++ b/prediction-polls/frontend/src/Components/SearchBar/index.jsx
@@ -0,0 +1,28 @@
+import React, { useState } from 'react';
+import { Input } from 'antd';
+import { SearchOutlined } from '@ant-design/icons';
+import styles from "./SearchBar.module.css";
+
+function SearchBar({ onSearch }) {
+  const [searchText, setSearchText] = useState('');
+
+  const handleSearch = value => {
+    setSearchText(value);
+    onSearch(value);
+  };
+
+  return (
+    <div className={styles.searchbar}>
+      <Input
+        style={{ padding: '10px' }}
+        placeholder="Search with question, tag, and creator name"
+        value={searchText}
+        onChange={e => handleSearch(e.target.value)}
+        prefix={<SearchOutlined />}
+        allowClear
+      />
+    </div>
+  );
+}
+
+export default SearchBar;
diff --git a/prediction-polls/frontend/src/Pages/Feed/index.jsx b/prediction-polls/frontend/src/Pages/Feed/index.jsx
index 97144f71..046b7a54 100644
--- a/prediction-polls/frontend/src/Pages/Feed/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Feed/index.jsx
@@ -1,21 +1,42 @@
-import React from "react";
+import React, { useState } from "react";
 import Menu from "../../Components/Menu";
 import styles from "./Feed.module.css";
 import pollData from "../../MockData/PollData.json"
 import PollCard from "../../Components/PollCard";
 import PointsButton from "../../Components/PointsButton";
-import pointData from "../../MockData/PointList.json"
+import pointData from "../../MockData/PointList.json";
+import SearchBar from "../../Components/SearchBar"
 
 function Feed() {
+  const [filteredPolls, setFilteredPolls] = useState(pollData.pollList);
+
+  const handleSearch = (searchText) => {
+    if (!searchText.trim()) {
+      setFilteredPolls(pollData.pollList);
+      return;
+    }
+
+    const lowerCaseSearchText = searchText.toLowerCase();
+
+    const filtered = pollData.pollList.filter(poll => {
+      const questionMatch = poll.question.toLowerCase().includes(lowerCaseSearchText);
+      const tagsMatch = poll.tags && poll.tags.some(tag => tag.toLowerCase().includes(lowerCaseSearchText));
+      const creatorNameMatch = poll.creatorName && poll.creatorName.toLowerCase().includes(lowerCaseSearchText);
+
+      return questionMatch || tagsMatch || creatorNameMatch;
+    });
+
+    setFilteredPolls(filtered);
+  };
+
   return (
     <div className={styles.page}>
-      <Menu currentPage="Feed" />
-      <div className = {styles.pollList}>     
-      {
-        pollData.pollList.map((poll, index) => (
-          <PollCard PollData={poll} key={index}/>
-        ))
-      }</div>
+      <Menu currentPage="Feed" />   
+      <div className = {styles.pollList}>  
+       <SearchBar onSearch={handleSearch} />
+       {filteredPolls.map((poll) => (
+          <PollCard PollData={poll} key={poll.id} />
+        ))}</div>
      <div className={styles.pointsButton}>
       <PointsButton points={pointData.points}/></div> 
     </div>

From 9f6d9070eee411a4d54d9e35032280232cebdcef Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:21:25 +0300
Subject: [PATCH 029/246] Add errors to errorcodes

---
 prediction-polls/backend/src/errorCodes.js    | 26 ++++++++++++------
 .../src/repositories/AuthorizationDB.js       |  8 ++++++
 .../backend/src/services/ProfileService.js    | 27 +++++++++++++------
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index a0789ebd..84909b0d 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -15,19 +15,19 @@ const errorCodes = {
     message: 'The refresh token is invalid.',
   },
 
-  REFRESH_TOKEN_NEEDED_ERROR: {
+  ACCESS_TOKEN_NEEDED_ERROR: {
     code: 1003,
-    message: 'A refresh token is needed',
+    message: 'A access token is needed',
   },
 
-  REGISTRATION_FAILED: {
+  REFRESH_TOKEN_NEEDED_ERROR: {
     code: 1004,
-    message: 'Registration failed'
+    message: 'A refresh token is needed',
   },
 
-  ACCESS_TOKEN_NULL: {
+  REGISTRATION_FAILED: {
     code: 1005,
-    message: 'The access token is null.',
+    message: 'Registration failed'
   },
 
   USER_NOT_FOUND: {
@@ -35,9 +35,19 @@ const errorCodes = {
     message: 'User not found.',
   },
 
-  INVALID_CREDENTIALS: {
+  WRONG_PASSWORD: {
     code: 2001,
-    message: 'Invalid username or password.',
+    message: 'Given password is wrong',
+  },
+
+  USERNAME_ALREADY_EXISTS: {
+    code: 2002,
+    message: 'Given username is taken',
+  },
+
+  EMAIL_ALREADY_EXISTS: {
+    code: 2002,
+    message: 'Given email is already in use',
   },
 
   DATABASE_ERROR: {
diff --git a/prediction-polls/backend/src/repositories/AuthorizationDB.js b/prediction-polls/backend/src/repositories/AuthorizationDB.js
index 80c8bb3c..abc1d756 100644
--- a/prediction-polls/backend/src/repositories/AuthorizationDB.js
+++ b/prediction-polls/backend/src/repositories/AuthorizationDB.js
@@ -1,4 +1,5 @@
 const mysql = require('mysql2')
+const errorCodes = require("../errorCodes.js")
 
 require('dotenv').config();
 
@@ -63,14 +64,21 @@ async function findUserId({username,email}){
         const sql = 'SELECT id FROM users WHERE username = ?';
     
         const [result] = await pool.query(sql, [username]);
+        if(result.length == 0){
+            throw {error:errorCodes.GENERIC_ERROR}
+        }
         return result[0].id;
     }
     if(email){
         const sql = 'SELECT id FROM users WHERE email = ?';
     
         const [result] = await pool.query(sql, [email]);
+        if(result.length == 0){
+            throw {error:errorCodes.GENERIC_ERROR}
+        }
         return result[0].id;
     }
+    throw {error:errorCodes.GENERIC_ERROR}
 }
 
 
diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 69d4ba67..c151c7d5 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -1,16 +1,27 @@
 const db = require("../repositories/ProfileDB.js");
+const authDb = require("../repositories/AuthorizationDB.js");
 
 
 async function getProfile(req,res){
-    const { userId, username, email } = req.query;
-    if(userId){
-        console.log("Found UserId");
-        const profile = await db.getProfileWithUserId(userId);
-        return res.status(200).json(profile);
+    const {userId, username, email} = req.query;
+
+    let user_Id = userId
+    try{
+        if(!user_Id){
+            user_Id = await authDb.findUserId({username,email})
+            throw {code:1023113,message:"wdojfnwaev"}
+        }
+        if(userId){
+            console.log("Found UserId");
+            const profile = await db.getProfileWithUserId(userId);
+            return res.status(200).json(profile);
+        }
+    }catch(error){
+        return res.status(400).json({error:error});
     }
-    console.log("Did not find UserId");
-    const profile = await db.getProfileWithUserInfo({username,email})
-    res.status(200).json(profile);
+        console.log("Did not find UserId");
+        const profile = await db.getProfileWithUserInfo({username,email})
+        res.status(200).json(profile);
 }
 
 async function getProfileWithProfileId(req,res){

From e698397db9712e5beb350a2f1d3f233982def152 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:35:29 +0300
Subject: [PATCH 030/246] Sign up validation

---
 .../src/repositories/AuthorizationDB.js       | 20 +++++-
 .../src/services/AuthorizationService.js      | 70 +++++++++++++++++--
 2 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/AuthorizationDB.js b/prediction-polls/backend/src/repositories/AuthorizationDB.js
index 80c8bb3c..53551abc 100644
--- a/prediction-polls/backend/src/repositories/AuthorizationDB.js
+++ b/prediction-polls/backend/src/repositories/AuthorizationDB.js
@@ -73,6 +73,24 @@ async function findUserId({username,email}){
     }
 }
 
+async function isUsernameOrEmailInUse(username, email) {
+    try {
+        const usernameSql = 'SELECT 1 FROM users WHERE username = ?';
+        const [usernameRows] = await pool.query(usernameSql, [username]);
+
+        const emailSql = 'SELECT 1 FROM users WHERE email = ?';
+        const [emailRows] = await pool.query(emailSql, [email]);
+
+        const isUsernameInUse = usernameRows.length > 0;
+        const isEmailInUse = emailRows.length > 0;
+
+        return { usernameInUse: isUsernameInUse, emailInUse: isEmailInUse };
+    } catch (error) {
+        console.error("Database error in isUsernameOrEmailInUse:", error);
+        return { usernameInUse: false, emailInUse: false, error: 'Database error occurred' };
+    }
+}
+
 
 //Add the given refresh token to db
 async function addRefreshToken(token){
@@ -108,4 +126,4 @@ async function deleteRefreshToken(token){
     return result.affectedRows > 0;
 }
 
-module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken,checkCredentials,addUser,findUserId}
\ No newline at end of file
+module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken,isUsernameOrEmailInUse,checkCredentials,addUser,findUserId}
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 38b9576a..e0f28c16 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -9,13 +9,75 @@ function homePage(req, res){
     res.status(200).json({"username":req.user.name,"key":"very-secret"});
   }
 
-async function signup(req, res){
+async function signup(req, res) {
   const { username, password, email, birthday } = req.body;
-  const { success, error} = await db.addUser( username, password, email, birthday );
+
+  // Email validation
+  if (!isValidEmail(email)) {
+      return res.status(400).send('Invalid email format');
+  }
+
+  // Birthday validation
+  if (!isValidBirthday(birthday)) {
+      return res.status(400).send('Invalid or unreasonable birthday');
+  }
+
+  // Check if username or email is in use
+  const { usernameInUse, emailInUse, error } = await db.isUsernameOrEmailInUse(username, email);
   
-  if(!success)  res.status(400).json({ code: errorCodes.REGISTRATION_FAILED.code, message: errorCodes.REGISTRATION_FAILED.message });
-  else{res.status(201).send("Registration successful")};
+  if (error) {
+      return res.status(500).send('Internal server error');
+  }
+
+  if (usernameInUse) {
+      return res.status(400).send('Username is already in use');
+  }
+
+  if (emailInUse) {
+      return res.status(400).send('Email is already in use');
+  }
+
+  // Validate password
+  if (!isValidPassword(password)) {
+      return res.status(400).send('Password does not meet the required criteria');
+  }
+
+  // Attempt to add user
+  const { success, error: addUserError } = await db.addUser(username, password, email, birthday);
+
+  if (!success) {
+      return res.status(400).send('Registration failed: ' + addUserError);
+  } else {
+      res.status(201).send("Registration successful");
+  }
+}
+
+  
+function isValidPassword(password) {
+  const lower = /[a-z]/;
+  const upper = /[A-Z]/;
+  const number = /[0-9]/;
+  const special = /[!@#$%^&*]/;
+
+  let count = 0;
+  if (lower.test(password)) count++;
+  if (upper.test(password)) count++;
+  if (number.test(password)) count++;
+  if (special.test(password)) count++;
+
+  return password.length >= 8 && count >= 3;
+}
+
+function isValidBirthday(birthday) {
+    const date = new Date(birthday);
+    const now = new Date();
+    // Check if birthday is a valid date and if the date is in the past
+    return date instanceof Date && !isNaN(date) && date < now;
+  }
 
+function isValidEmail(email) {
+    const emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/;
+    return emailRegex.test(email);
   }
 
 function createAccessTokenFromRefreshToken(req, res){

From c6c5633799141a41d6a92cc8b91d17c8c0371fde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hebun=20=C5=9Eim=C5=9Fek?=
 <hebunsimsek@Hebuns-MacBook-Air.local>
Date: Mon, 20 Nov 2023 18:01:04 +0300
Subject: [PATCH 031/246] added email verification

---
 .../src/repositories/AuthorizationDB.js       | 29 +++++-
 .../backend/src/routes/AuthorizationRouter.js | 16 ++++
 .../src/services/AuthorizationService.js      | 91 ++++++++++++-------
 3 files changed, 102 insertions(+), 34 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/AuthorizationDB.js b/prediction-polls/backend/src/repositories/AuthorizationDB.js
index 53551abc..1c403e50 100644
--- a/prediction-polls/backend/src/repositories/AuthorizationDB.js
+++ b/prediction-polls/backend/src/repositories/AuthorizationDB.js
@@ -126,4 +126,31 @@ async function deleteRefreshToken(token){
     return result.affectedRows > 0;
 }
 
-module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken,isUsernameOrEmailInUse,checkCredentials,addUser,findUserId}
\ No newline at end of file
+async function saveEmailVerificationToken(userId, token) {
+    const sql = 'UPDATE users SET email_verification_token = ? WHERE id = ?';
+    const values = [token, userId];
+
+    return pool.query(sql, values);
+}
+
+async function verifyEmail(token) {
+    const sql = 'UPDATE users SET email_verified = TRUE WHERE email_verification_token = ?';
+    const values = [token];
+
+    return pool.query(sql, values);
+}
+const nodemailer = require('nodemailer');
+
+function createTransporter() {
+    return nodemailer.createTransport({
+        host: 'smtp.zoho.eu',
+        port: 465,
+        secure: true,
+        auth: {
+            user: 'predictionpolls@zohomail.eu',
+            pass: 'nzDnTajTmFpz' // this is not safe change to env later
+        }
+    });
+}
+
+module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken,isUsernameOrEmailInUse,checkCredentials,addUser,findUserId,saveEmailVerificationToken,verifyEmail,createTransporter}
\ No newline at end of file
diff --git a/prediction-polls/backend/src/routes/AuthorizationRouter.js b/prediction-polls/backend/src/routes/AuthorizationRouter.js
index 7bacff81..5531ae16 100644
--- a/prediction-polls/backend/src/routes/AuthorizationRouter.js
+++ b/prediction-polls/backend/src/routes/AuthorizationRouter.js
@@ -183,7 +183,23 @@ router.post("/signup", service.signup)
  *         description: Server was not able to log in user with the given data.
  */
 router.post("/google", googleService.googleLogIn)
+router.get('/verify-email', async (req, res) => {
+    const token = req.query.token;
 
+    try {
+        // Verify the token and update the user's email_verified status in the database
+        const verificationSuccessful = await verifyEmailToken(token);
+
+        if (verificationSuccessful) {
+            res.send('Email successfully verified');
+        } else {
+            res.status(400).send('Invalid or expired verification token');
+        }
+    } catch (error) {
+        console.error("Error during email verification:", error);
+        res.status(500).send('Internal server error');
+    }
+});
 
 
 module.exports = router;
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index e0f28c16..bff6d63e 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -9,47 +9,72 @@ function homePage(req, res){
     res.status(200).json({"username":req.user.name,"key":"very-secret"});
   }
 
-async function signup(req, res) {
-  const { username, password, email, birthday } = req.body;
+  async function signup(req, res) {
+    const { username, password, email, birthday } = req.body;
 
-  // Email validation
-  if (!isValidEmail(email)) {
-      return res.status(400).send('Invalid email format');
-  }
+    // Email validation
+    if (!isValidEmail(email)) {
+        return res.status(400).send('Invalid email format');
+    }
 
-  // Birthday validation
-  if (!isValidBirthday(birthday)) {
-      return res.status(400).send('Invalid or unreasonable birthday');
-  }
+    // Birthday validation
+    if (!isValidBirthday(birthday)) {
+        return res.status(400).send('Invalid or unreasonable birthday');
+    }
 
-  // Check if username or email is in use
-  const { usernameInUse, emailInUse, error } = await db.isUsernameOrEmailInUse(username, email);
-  
-  if (error) {
-      return res.status(500).send('Internal server error');
-  }
+    // Check if username or email is in use
+    const { usernameInUse, emailInUse, error } = await db.isUsernameOrEmailInUse(username, email);
+    
+    if (error) {
+        return res.status(500).send('Internal server error');
+    }
 
-  if (usernameInUse) {
-      return res.status(400).send('Username is already in use');
-  }
+    if (usernameInUse) {
+        return res.status(400).send('Username is already in use');
+    }
 
-  if (emailInUse) {
-      return res.status(400).send('Email is already in use');
-  }
+    if (emailInUse) {
+        return res.status(400).send('Email is already in use');
+    }
 
-  // Validate password
-  if (!isValidPassword(password)) {
-      return res.status(400).send('Password does not meet the required criteria');
+    // Validate password
+    if (!isValidPassword(password)) {
+        return res.status(400).send('Password does not meet the required criteria');
+    }
+    const verificationToken = generateVerificationToken();
+    await db.saveEmailVerificationToken(username, verificationToken);
+    await sendVerificationEmail(email, verificationToken);
+    // Attempt to add user
+    const { success, error: addUserError } = await db.addUser(username, password, email, birthday);
+
+    if (!success) {
+        return res.status(400).send('Registration failed: ' + addUserError);
+    } else {
+        res.status(201).send("Registration successful");
+    }
+}
+async function sendVerificationEmail(email, token) {
+  const transporter = db.createTransporter();
+  const verificationUrl = `http://ec2-3-78-169-139.eu-central-1.compute.amazonaws.com:3000/verify-email?token=${token}`;
+
+  const mailOptions = {
+      from: '"Prediction Polls" <predictionpolls@zohomail.eu>',
+      to: email,
+      subject: 'Email Verification',
+      html: `<p>Please verify your email by clicking on the link: <a href="${verificationUrl}">${verificationUrl}</a></p>`
+  };
+
+  try {
+      await transporter.sendMail(mailOptions);
+  } catch (error) {
+      console.error("Error sending email: ", error);
+      // Handle email sending error
   }
+}
+const crypto = require('crypto');
 
-  // Attempt to add user
-  const { success, error: addUserError } = await db.addUser(username, password, email, birthday);
-
-  if (!success) {
-      return res.status(400).send('Registration failed: ' + addUserError);
-  } else {
-      res.status(201).send("Registration successful");
-  }
+function generateVerificationToken() {
+    return crypto.randomBytes(20).toString('hex');
 }
 
   

From dfa179e8b64e51b4f31ff34f4a56aab5fb7cc04a Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:55:46 +0300
Subject: [PATCH 032/246] Added new errors from profile

---
 prediction-polls/backend/src/errorCodes.js | 32 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index 84909b0d..e43d8a9a 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -35,19 +35,39 @@ const errorCodes = {
     message: 'User not found.',
   },
 
-  WRONG_PASSWORD: {
+  USER_NOT_FOUND_WITH_USERID: {
     code: 2001,
-    message: 'Given password is wrong',
+    message: 'User with the given user id not found.',
   },
 
-  USERNAME_ALREADY_EXISTS: {
+  USER_NOT_FOUND_WITH_USERNAME: {
     code: 2002,
-    message: 'Given username is taken',
+    message: 'User with the given username not found.',
+  },
+
+  USER_NOT_FOUND_WITH_EMAIL: {
+    code: 2003,
+    message: 'User with the given email not found.',
+  },
+
+  USERNAME_ALREADY_EXISTS: {
+    code: 2004,
+    message: 'Username is taken',
   },
 
   EMAIL_ALREADY_EXISTS: {
-    code: 2002,
-    message: 'Given email is already in use',
+    code: 2005,
+    message: 'Email is already in use',
+  },
+
+  WRONG_PASSWORD: {
+    code: 2006,
+    message: 'Password is wrong',
+  },
+
+  PROFILE_NOT_FOUND: {
+    code: 3000,
+    message: 'Profile not found.',
   },
 
   DATABASE_ERROR: {

From 1c91dad8f4e1ef84f713a0d01cd15ad98252c8fc Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:56:07 +0300
Subject: [PATCH 033/246] Update findUser

---
 .../src/repositories/AuthorizationDB.js       | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/AuthorizationDB.js b/prediction-polls/backend/src/repositories/AuthorizationDB.js
index abc1d756..e094666d 100644
--- a/prediction-polls/backend/src/repositories/AuthorizationDB.js
+++ b/prediction-polls/backend/src/repositories/AuthorizationDB.js
@@ -59,26 +59,40 @@ async function addUser(username, password,email,birthday){
   }
 
 
-async function findUserId({username,email}){
-    if(username){
-        const sql = 'SELECT id FROM users WHERE username = ?';
-    
-        const [result] = await pool.query(sql, [username]);
-        if(result.length == 0){
-            throw {error:errorCodes.GENERIC_ERROR}
+async function findUser({userId,username,email}){
+    try{
+        if(userId){
+            const sql = 'SELECT * FROM users WHERE id = ?';
+        
+            const [result] = await pool.query(sql, [userId]);
+            if(result.length == 0){
+                throw {error:errorCodes.USER_NOT_FOUND_WITH_USERID}
+            }
+            return result[0];
         }
-        return result[0].id;
-    }
-    if(email){
-        const sql = 'SELECT id FROM users WHERE email = ?';
-    
-        const [result] = await pool.query(sql, [email]);
-        if(result.length == 0){
-            throw {error:errorCodes.GENERIC_ERROR}
+
+        if(username){
+            const sql = 'SELECT * FROM users WHERE username = ?';
+        
+            const [result] = await pool.query(sql, [username]);
+            if(result.length == 0){
+                throw {error:errorCodes.USER_NOT_FOUND_WITH_USERNAME}
+            }
+            return result[0];
+        }
+        if(email){
+            const sql = 'SELECT * FROM users WHERE email = ?';
+        
+            const [result] = await pool.query(sql, [email]);
+            if(result.length == 0){
+                throw {error:errorCodes.USER_NOT_FOUND_WITH_EMAIL}
+            }
+            return result[0];
         }
-        return result[0].id;
+        throw {error:errorCodes.USER_NOT_FOUND}
+    } catch(error){
+        return error
     }
-    throw {error:errorCodes.GENERIC_ERROR}
 }
 
 
@@ -116,4 +130,4 @@ async function deleteRefreshToken(token){
     return result.affectedRows > 0;
 }
 
-module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken,checkCredentials,addUser,findUserId}
\ No newline at end of file
+module.exports = {pool, addRefreshToken,checkRefreshToken,deleteRefreshToken,checkCredentials,addUser,findUser}
\ No newline at end of file

From 83a6bb4429c4b25bd12c3f7e2d1c2eb1d4cfda91 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:57:16 +0300
Subject: [PATCH 034/246] Added new error handling system to profile

---
 .../backend/src/repositories/ProfileDB.js     | 43 +++++++------
 .../backend/src/services/ProfileService.js    | 62 ++++++++++++-------
 2 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index 9f3f254d..2655e2ab 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -1,5 +1,6 @@
 const authDb = require("../repositories/AuthorizationDB.js");
 const mysql = require('mysql2')
+const errorCodes = require("../errorCodes.js")
 
 require('dotenv').config();
 
@@ -12,18 +13,17 @@ const pool = mysql.createPool({
 
 
 async function getProfileWithProfileId(profileId){
-    console.log("profileId")
-    console.log(profileId)
 
     const sql = 'SELECT * FROM profiles WHERE id= ?';
 
     try {
         const [rows] = await pool.query(sql, [profileId]);
-        console.log(rows)
-        return rows;
+        if(rows.length == 0){
+            throw {error:errorCodes.PROFILE_NOT_FOUND}
+        }
+        return {profile:rows[0]};
     } catch (error) {
-        console.error('getProfileWithProfileId(): Database Error');
-        throw error;
+        return error;
     }
 }
 
@@ -31,17 +31,23 @@ async function getProfileWithUserId(userId){
     const sql = 'SELECT * FROM profiles WHERE user_id= ?';
 
     try {
-        const [rows, fields] = await pool.query(sql, [userId]);
+        const [rows] = await pool.query(sql, [userId]);
+        if(rows.length == 0){
+            throw {error:errorCodes.PROFILE_NOT_FOUND}
+        }
         return {profile:rows[0]};
     } catch (error) {
-        return {error:{code:1000,message:"An error occured:" + error}};
+        return error;
     }
 }
 
 async function getProfileWithUserInfo({username,email}){
-    const userId = await authDb.findUserId({username,email});
-    const user = await getProfileWithUserId(userId);
-    return user;
+    const {userId,error} = await authDb.findUserId({username,email});
+    if(error){
+        return error;
+    }
+    const profile = await getProfileWithUserId(userId);
+    return profile;
 }
 
 async function addProfile({
@@ -81,43 +87,36 @@ async function addProfile({
 
 async function updateProfile({
     userId,
-    username ,
     profile_picture,
     biography,
     birthday ,
     isHidden}){
 
-    let user_id = userId
-
-    if(!userId){
-        user_id = await authDb.findUserId({username});
-    }
     try {
         if(profile_picture){
             const sql = 'UPDATE profiles SET profile_picture_data = ? WHERE user_id = ?';
-            values = [profile_picture,user_id];
+            values = [profile_picture,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
         if(biography){
             const sql = 'UPDATE profiles SET biography = ? WHERE user_id = ?';
-            values = [biography,user_id];
+            values = [biography,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
         if(birthday){
             const sql = 'UPDATE profiles SET birthday = ? WHERE user_id = ?';
-            values = [birthday,user_id];
+            values = [birthday,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
         if(isHidden){
             const sql = 'UPDATE profiles SET is_hidden = ? WHERE user_id = ?';
-            values = [isHidden,user_id];
+            values = [isHidden,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
-        console.log("Im done");
         return {status:"success"};
     }catch(error) {
         return {error:{code:1000,message:"An error occured:" + error}};
diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index c151c7d5..cbb3b707 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -4,51 +4,69 @@ const authDb = require("../repositories/AuthorizationDB.js");
 
 async function getProfile(req,res){
     const {userId, username, email} = req.query;
-
-    let user_Id = userId
     try{
-        if(!user_Id){
-            user_Id = await authDb.findUserId({username,email})
-            throw {code:1023113,message:"wdojfnwaev"}
+        const result = await authDb.findUser({userId,username,email})
+        if(result.error){
+            throw result.error;
         }
-        if(userId){
-            console.log("Found UserId");
-            const profile = await db.getProfileWithUserId(userId);
-            return res.status(200).json(profile);
+    
+        const {profile,error} = await db.getProfileWithUserId(result.id);
+        if(error){
+            throw error;
         }
+        return res.status(200).json(profile);
+        
     }catch(error){
         return res.status(400).json({error:error});
     }
-        console.log("Did not find UserId");
-        const profile = await db.getProfileWithUserInfo({username,email})
-        res.status(200).json(profile);
 }
 
 async function getProfileWithProfileId(req,res){
     const profileId = req.params.profileId;
-    const {profile,error} = await db.getProfileWithProfileId(profileId);
-    if(error){
+    try{
+        const {profile,error} = await db.getProfileWithProfileId(profileId);
+        if(error){
+            throw error
+        }
+        res.status(200).json(profile);
+    }catch(error){
         return res.status(400).json({error:error});
     }
-    res.status(200).json(profile);
 }
 
 async function addProfile(req,res){
     const {userId,username,email,profile_picture,biography, birthday, isHidden} = req.body;
-    const {profile_id,error} = await db.addProfile({userId,username,email,profile_picture,biography, birthday, isHidden});
-    if(error){
+    try{
+        const result = await authDb.findUser({userId,username,email})
+        if(result.error){
+            throw result.error;
+        }
+        const {profile_id,error} = await db.addProfile({userId:result.id,username:result.username,email:result.email,profile_picture,biography, birthday, isHidden});
+        if(error){
+            throw error;
+        }
+        return res.status(200).json({profileId:profile_id});
+    }catch(error){
         return res.status(400).json({error:error});
     }
-    return res.status(200).json({profileId:profile_id});
 }
 
 async function updateProfile(req,res){
-    const {userId,username,profile_picture,biography, birthday, isHidden} = req.body;
-    const {status,error} = await db.updateProfile({userId,username,profile_picture,biography, birthday, isHidden});
-    if(error){
+    const {userId,username,email,profile_picture,biography, birthday, isHidden} = req.body;
+
+    try{
+        const result = await authDb.findUser({userId,username,email})
+        if(result.error){
+            throw result.error;
+        }
+        const {status,error} = await db.updateProfile({userId:result.id,profile_picture,biography, birthday, isHidden});
+        if(error){
+            throw error;
+        }
+        return res.status(200).json({status:status});
+    }catch(error){
         return res.status(400).json({error:error});
     }
-    return res.status(200).json({status:status});
 }
 
 module.exports = {getProfile,getProfileWithProfileId,addProfile,updateProfile}
\ No newline at end of file

From 9dd1d207ec3e7e01d93c48e9dd2e7edd4aeca155 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 19:57:24 +0300
Subject: [PATCH 035/246] Update schema

---
 prediction-polls/backend/src/schema.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 9f692a93..a873d5bc 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -67,6 +67,7 @@ CREATE TABLE profiles (
     id INT AUTO_INCREMENT PRIMARY KEY,
     userId INT NOT NULL,
     username VARCHAR(255) NOT NULL,
+    email VARCHAR(255) NOT NULL,
     profile_picture_data MEDIUMBLOB,
     biography VARCHAR(5000),
     birthday DATETIME,

From ac2442631612db8d25fd242d46e5444f3bc2bd39 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 20:14:58 +0300
Subject: [PATCH 036/246] add date and numeric types of continuous polls

---
 prediction-polls/backend/src/schema.sql | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 0f61d840..09d12a7e 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -37,9 +37,8 @@ CREATE TABLE discrete_polls (
 
 CREATE TABLE continuous_polls (
     id INT PRIMARY KEY,
-    min_value FLOAT NOT NULL,
-    max_value FLOAT NOT NULL,
-    FOREIGN KEY (id) REFERENCES polls(id)
+    FOREIGN KEY (id) REFERENCES polls(id),
+    cont_poll_type ENUM('date', 'numeric') NOT NULL
 );
 
 CREATE TABLE discrete_poll_choices (

From 56697b61dab43e25026ed703736e283c19f5e0f7 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 20:15:23 +0300
Subject: [PATCH 037/246] implement insertion of continuous polls

---
 .../backend/src/repositories/PollDB.js        | 12 ++++++------
 .../backend/src/services/PollService.js       | 19 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 58ecb680..916cdb61 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -93,22 +93,22 @@ async function addDiscretePoll(question, choices, openVisibility, setDueDate, du
     }
 }
 
-async function addContinuousPoll(question, min, max){
+async function addContinuousPoll(question, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
     const connection = await pool.getConnection();
 
-    const sql_poll = 'INSERT INTO polls (question, poll_type) VALUES (?, ?)';
-    const sql_continuous_poll = 'INSERT INTO continuous_polls (id, min_value, max_value) VALUES (?, ?, ?)';
+    const sql_poll = 'INSERT INTO polls (question, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?)';
+    const sql_continuous_poll = 'INSERT INTO continuous_polls (id, cont_poll_type) VALUES (?, ?)' 
 
     try {
-        const [pollResultSetHeader] = await connection.query(sql_poll, [question, 'continuous']);
-        const poll_id = pollResultSetHeader.insertId;
+        const [resultSetHeader] = await connection.query(sql_poll, [question, 'continuous', openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
+        poll_id = resultSetHeader.insertId;
 
         if (!poll_id) {
             await connection.rollback();
             return false;
         }
 
-        await connection.query(sql_continuous_poll, [poll_id, min, max]);
+        await connection.query(sql_continuous_poll, [poll_id, cont_poll_type]);
 
         await connection.commit();
         return true;
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 8f4eb749..b938cdd3 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -137,15 +137,16 @@ function addContinuousPoll(req,res){
     if (!validateAddContinuousPoll(req.body)) {
         return res.status(400).json({ code: errorCodes.BAD_CONT_POLL_REQUEST_ERROR.code, message: errorCodes.BAD_CONT_POLL_REQUEST_ERROR.message });
     }
-    const question = req.body.question;
-    const min = req.body.min;
-    const max = req.body.max;
 
-    if (max <= min) {
-        return res.status(400).json({ code: errorCodes.MINMAX_BAD_CONT_POLL_REQUEST_ERROR.code, message: errorCodes.MINMAX_BAD_CONT_POLL_REQUEST_ERROR.message });
-    }
+    const question = req.body.question;
+    const cont_poll_type = req.body.cont_poll_type;
+    const openVisibility = req.body.openVisibility;
+    const setDueDate = req.body.setDueDate;
+    const numericFieldValue = req.body.numericFieldValue;
+    const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
+    const selectedTimeUnit = req.body.selectedTimeUnit;
 
-    db.addContinuousPoll(question, min, max)
+    db.addContinuousPoll(question, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
     .then((result) => {
         res.end(result.toString());
     })
@@ -158,9 +159,7 @@ function addContinuousPoll(req,res){
 function validateAddContinuousPoll(body) {
     if (
         typeof body !== 'object' ||
-        typeof body.question !== 'string' ||
-        typeof body.min !== 'number' ||
-        typeof body.max !== 'number'
+        typeof body.question !== 'string'
     ) {
         return false;
     }

From af3923187c69832a2923b6714918a4a52c705013 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 20:15:36 +0300
Subject: [PATCH 038/246] update /polls/continuous POST swagger

---
 .../backend/src/routes/PollRouter.js          | 49 ++++++++++++++++---
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 91385cf9..153dcd65 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -266,17 +266,54 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *       content:
  *         application/json:
  *           schema:
+ *             required: ["question", "openVisibility", "setDueDate", "cont_poll_type"]
  *             type: object
  *             properties:
  *               question:
  *                 type: string
- *                 example: "Test3?"
- *               min:
- *                 type: integer
- *                 example: 6
- *               max:
+ *               openVisibility:
+ *                 type: boolean
+ *               setDueDate:
+ *                 type: boolean
+ *               dueDatePoll:
+ *                 type: string
+ *               numericFieldValue:
  *                 type: integer
- *                 example: 10
+ *               selectedTimeUnit:
+ *                 type: string
+ *               cont_poll_type:
+ *                 type: string
+ *           examples:
+ *             setDueDateTrueNumeric:
+ *               value:
+ *                 question: Question 5
+ *                 openVisibility: true
+ *                 setDueDate: true
+ *                 dueDatePoll: 2023-11-21T11:39:00+03:00
+ *                 numericFieldValue: 2
+ *                 selectedTimeUnit: min
+ *                 cont_poll_type: numeric
+ *             setDueDateFalseNumeric:
+ *               value:
+ *                 question: Question 4
+ *                 openVisibility: true
+ *                 setDueDate: false
+ *                 cont_poll_type: numeric
+ *             setDueDateTrueDate:
+ *               value:
+ *                 question: Question 5
+ *                 openVisibility: true
+ *                 setDueDate: true
+ *                 dueDatePoll: 2023-11-21T11:39:00+03:00
+ *                 numericFieldValue: 2
+ *                 selectedTimeUnit: min
+ *                 cont_poll_type: date
+ *             setDueDateFalseDate:
+ *               value:
+ *                 question: Question 4
+ *                 openVisibility: true
+ *                 setDueDate: false
+ *                 cont_poll_type: date
  *     responses:
  *       201:
  *         description: true

From 7d8f96b33da191aeb32346149c1a7bab03335b21 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:41:20 +0300
Subject: [PATCH 039/246] Some minor fixes

---
 prediction-polls/backend/src/errorCodes.js     | 15 +++++++++++++++
 prediction-polls/backend/src/schema.sql        |  1 +
 .../backend/src/services/ProfileService.js     | 18 +++++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index e43d8a9a..cf03e7c1 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -70,6 +70,21 @@ const errorCodes = {
     message: 'Profile not found.',
   },
 
+  USER_ALREADY_HAS_PROFILE: {
+    code: 3001,
+    message: 'User already has profile',
+  },
+
+  PROFILE_COULD_NOT_BE_CREATED: {
+    code: 3002,
+    message: 'Profile could not be created.',
+  },
+
+  PROFILE_COULD_NOT_BE_UPDATED: {
+    code: 3003,
+    message: 'Profile could not be updated.',
+  },
+
   DATABASE_ERROR: {
     code: 3000,
     message: 'Error while accessing the database.',
diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index a873d5bc..2634fb82 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -72,5 +72,6 @@ CREATE TABLE profiles (
     biography VARCHAR(5000),
     birthday DATETIME,
     isHidden BOOLEAN DEFAULT False,
+    unique(userId),
     FOREIGN KEY (userId) REFERENCES users(id)
 );
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index cbb3b707..61c56d7b 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -41,11 +41,17 @@ async function addProfile(req,res){
         if(result.error){
             throw result.error;
         }
-        const {profile_id,error} = await db.addProfile({userId:result.id,username:result.username,email:result.email,profile_picture,biography, birthday, isHidden});
+        const {profileId,error} = await db.addProfile({userId:result.id,username:result.username,email:result.email,profile_picture,biography, birthday, isHidden});
         if(error){
             throw error;
         }
-        return res.status(200).json({profileId:profile_id});
+
+        const {profile,user_error} = await db.getProfileWithUserId(result.id);
+        if(user_error){
+            throw user_error;
+        }
+
+        return res.status(200).json(profile);
     }catch(error){
         return res.status(400).json({error:error});
     }
@@ -63,7 +69,13 @@ async function updateProfile(req,res){
         if(error){
             throw error;
         }
-        return res.status(200).json({status:status});
+
+        const {profile,user_error} = await db.getProfileWithUserId(result.id);
+        if(user_error){
+            throw user_error;
+        }
+
+        return res.status(200).json(profile);
     }catch(error){
         return res.status(400).json({error:error});
     }

From 06c05a83481bf475122b237c35313c45c7dbd207 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:41:40 +0300
Subject: [PATCH 040/246] Changed some errors

---
 .../backend/src/repositories/ProfileDB.js     | 63 ++++++++-----------
 1 file changed, 25 insertions(+), 38 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index 2655e2ab..2762b619 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -28,7 +28,7 @@ async function getProfileWithProfileId(profileId){
 }
 
 async function getProfileWithUserId(userId){
-    const sql = 'SELECT * FROM profiles WHERE user_id= ?';
+    const sql = 'SELECT * FROM profiles WHERE userId= ?';
 
     try {
         const [rows] = await pool.query(sql, [userId]);
@@ -41,46 +41,30 @@ async function getProfileWithUserId(userId){
     }
 }
 
-async function getProfileWithUserInfo({username,email}){
-    const {userId,error} = await authDb.findUserId({username,email});
-    if(error){
-        return error;
-    }
-    const profile = await getProfileWithUserId(userId);
-    return profile;
-}
-
 async function addProfile({
     userId,
-    username ,
+    username,
+    email,
     profile_picture,
     biography,
     birthday ,
     isHidden}){
 
     try {
-        const sql = 'INSERT INTO profiles (user_id, username, profile_picture_data, biography, birthday, is_hidden) VALUES (?, ?, ?, ?, ?, ?)';
-        values = [userId,username,profile_picture,biography,birthday,isHidden]
-            
+        const {error} = await getProfileWithUserId(userId);
+        if(error != errorCodes.PROFILE_NOT_FOUND){
+            throw {error:errorCodes.USER_ALREADY_HAS_PROFILE};
+        }
+
+        const sql = 'INSERT INTO profiles (userId, username, email, profile_picture, biography, birthday, isHidden) VALUES (?, ?, ?, ?, ?, ?, ?)';
+        values = [userId,username,email,profile_picture,biography,birthday,isHidden]   
         const [resultSetHeader] = await pool.query(sql, values);
-        profile_id = resultSetHeader.insertId;
-        if (!profile_id) {
-            return {error:{code:1111,message:"Could not insert"}};
+        if(!resultSetHeader.insertId){
+            throw {error:errorCodes.PROFILE_COULD_NOT_BE_CREATED};
         }
-        return {profile_id:profile_id};
+        return {profileId:resultSetHeader.insertId};
     }catch(error){
-        // Error management will be handled later
-        /*
-        console.log(error);
-        if(error.sqlMessage == "Error: Column 'user_id' cannot be null"){
-            return {error:{code:1111,message:"Gimme user id"}}
-        }
-        if(error.sqlMessage == "Error: Cannot add or update a child row: a foreign key constraint "+
-        "fails (`predict_app`.`profiles`, CONSTRAINT `profiles_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`))"){
-            return {error:{code:1110,message:"No user exists with the given user id"}}
-        }
-        */
-        return {error:{code:1000,message:"An error occured:" + error}};
+        return error;
     }
 
 }
@@ -93,43 +77,46 @@ async function updateProfile({
     isHidden}){
 
     try {
+        const {error} = await getProfileWithUserId(userId);
+        if(error){
+            throw {error:errorCodes.PROFILE_NOT_FOUND};
+        }
         if(profile_picture){
-            const sql = 'UPDATE profiles SET profile_picture_data = ? WHERE user_id = ?';
+            const sql = 'UPDATE profiles SET profile_picture = ? WHERE userId = ?';
             values = [profile_picture,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
         if(biography){
-            const sql = 'UPDATE profiles SET biography = ? WHERE user_id = ?';
+            const sql = 'UPDATE profiles SET biography = ? WHERE userId = ?';
             values = [biography,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
         if(birthday){
-            const sql = 'UPDATE profiles SET birthday = ? WHERE user_id = ?';
+            const sql = 'UPDATE profiles SET birthday = ? WHERE userId = ?';
             values = [birthday,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
         if(isHidden){
-            const sql = 'UPDATE profiles SET is_hidden = ? WHERE user_id = ?';
+            const sql = 'UPDATE profiles SET isHidden = ? WHERE userId = ?';
             values = [isHidden,userId];
 
             const [resultSetHeader] = await pool.query(sql, values);
         }
         return {status:"success"};
     }catch(error) {
-        return {error:{code:1000,message:"An error occured:" + error}};
+        return {error:errorCodes.PROFILE_COULD_NOT_BE_UPDATED};
     } 
 }
 
 
 async function getProfileIsHidden(profileId){
     profile = await getProfileWithProfileId(profileId);
-    return profile.is_hidden;
-
+    return profile.isHidden;
 }
 
 
-module.exports = {getProfileWithProfileId,getProfileWithUserId,getProfileWithUserInfo,addProfile,updateProfile}
+module.exports = {getProfileWithProfileId,getProfileWithUserId,addProfile,updateProfile}
     
\ No newline at end of file

From 85b14c92a9e32e3225a6275427419500f7725f10 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:41:47 +0300
Subject: [PATCH 041/246] Added swagger

---
 .../backend/src/routes/ProfileRouter.js       | 193 +++++++++++++++++-
 1 file changed, 186 insertions(+), 7 deletions(-)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 81c51de4..4665b0be 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -3,30 +3,209 @@ const service = require("../services/ProfileService.js");
 const express = require('express');
 const router = express.Router();
 
+/**
+ * @swagger
+ * components:
+ *   schemas:
+ *     Profile:
+ *       type: object
+ *       properties:
+ *         userId:
+ *           type: integer
+ *         username:
+ *           type: string
+ *         email:
+ *           type: string
+ *         profile_picture:
+ *           type: string
+ *         biography:
+ *           type: string
+ *         birthday:
+ *           type: string
+ *         isHidden:
+ *           type: integer
+ * 
+ */
+
 
 /**
  * @swagger
- * /polls/discrete:
+ * /profiles:
  *   get:
  *     tags:
- *       - polls
- *     description: Get profile using user data
+ *       - profiles
+ *     description: Get a profile using user info. user id, username or email can be used.If multiple info is provided only the most prioritized one is used 
+ *     parameters:
+ *       - in: path
+ *         name: userId
+ *         required: false
+ *         schema:
+ *           type: integer
+ *         description: The ID of the requested profile's user.
+ *       - in: path
+ *         name: username
+ *         required: false
+ *         schema:
+ *           type: string
+ *         description: The username of the requested profile's user.
+ *       - in: path
+ *         name: email
+ *         required: false
+ *         schema:
+ *           type: string
+ *         description: The email of the requested profile's user.
+ *     responses:
+ *       200:
+ *         description: Successful response
+ *         content:
+ *           application/json:
+ *             schema:
+ *               schema:
+ *               $ref: '#/components/schemas/Profile'
+ *       400:
+ *         description: Bad Request
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               userNotFoundWithUserId:
+ *                 value:
+ *                   error:
+ *                     code: 2001,
+ *                     message: User with the given user id not found
+ *               ProfileNotFound:
+ *                 value:
+ *                   error:
+ *                     code: 3000,
+ *                     message: Profile not found,
  */
-
 router.get('/', service.getProfile);
 
 /**
  * @swagger
- * /polls/discrete:
+ * /profiles/{profileId}:
  *   get:
  *     tags:
- *       - polls
- *     description: Get profile using profile id
+ *       - profiles
+ *     description: Get a profile by profile ID.
+ *     parameters:
+ *       - in: path
+ *         name: profileId
+ *         required: true
+ *         schema:
+ *           type: integer
+ *         description: The ID of the requested profile.
+ *     responses:
+ *       200:
+ *         description: Successful response
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/Profile'
+ *       400:
+ *         description: Bad Request
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               ProfileNotFound:
+ *                 value:
+ *                   error:
+ *                     code: 3000,
+ *                     message: Profile not found,
  */
 router.get('/:profileId', service.getProfileWithProfileId);
 
+/**
+ * @swagger
+ * /profiles:
+ *   post:
+ *     tags:
+ *       - profiles
+ *     description: Add a new profile. UserId, username and email only one of them have to be added. The others wont be used
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/Profile'
+ *     responses:
+ *       201:
+ *         description: Profile created successfully
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/Profile'
+ *       400:
+ *         description: Bad Request
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               ProfileNotFound:
+ *                 value:
+ *                   error:
+ *                     code: 3002,
+ *                     message: Profile could not be created.
+ */
 router.post('/', service.addProfile);
 
+/**
+ * @swagger
+ * /profiles:
+ *   patch:
+ *     tags:
+ *       - profiles
+ *     description: Update a profile. UserId, username and email only one of them have to be added. The others wont be used
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/Profile'
+ *     responses:
+ *       201:
+ *         description: Profile created successfully
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/Profile'
+ *       400:
+ *         description: Bad Request
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               ProfileNotFound:
+ *                 value:
+ *                   error:
+ *                     code: 3003,
+ *                     message: Profile could not be updated.
+ */
 router.patch('/', service.updateProfile);
 
 

From af1a6a0303c756bb1e38be2e548f480defea43fb Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 22:58:24 +0300
Subject: [PATCH 042/246] delete log statements

---
 prediction-polls/backend/src/services/PollService.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index b938cdd3..f8b70bf1 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -63,7 +63,6 @@ function getDiscretePollWithId(req,res, responseBody){
 }
 
 function addDiscretePoll(req,res){
-    console.log(req.body)
     if (!validateAddDiscretePoll(req.body)) {
         return res.status(400).json({ code: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.code, message: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.message });
     }
@@ -75,12 +74,6 @@ function addDiscretePoll(req,res){
     const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
     const selectedTimeUnit = req.body.selectedTimeUnit;
 
-    console.log("openVisibility: ", openVisibility);
-    console.log("setDueDate: ", setDueDate);
-    console.log("numericFieldValue: ", numericFieldValue);
-    console.log("dueDatePoll: ", dueDatePoll);
-    console.log("selectedTimeUnit: ", selectedTimeUnit);
-
     db.addDiscretePoll(question, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
     .then((result) => {
         res.end(result.toString());

From edc3be4e1ed8c3888b0d3fd8ea1b2bd50c515607 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:42:17 +0300
Subject: [PATCH 043/246] Small fixes

---
 .../backend/src/services/ProfileService.js       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 61c56d7b..479715f4 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -46,12 +46,12 @@ async function addProfile(req,res){
             throw error;
         }
 
-        const {profile,user_error} = await db.getProfileWithUserId(result.id);
-        if(user_error){
-            throw user_error;
+        const result_profile = await db.getProfileWithUserId(result.id);
+        if(result_profile.error){
+            throw result_profile.error;
         }
 
-        return res.status(200).json(profile);
+        return res.status(200).json(result_profile.profile);
     }catch(error){
         return res.status(400).json({error:error});
     }
@@ -70,12 +70,12 @@ async function updateProfile(req,res){
             throw error;
         }
 
-        const {profile,user_error} = await db.getProfileWithUserId(result.id);
-        if(user_error){
-            throw user_error;
+        const result_profile = await db.getProfileWithUserId(result.id);
+        if(result_profile.error){
+            throw result_profile.error;
         }
 
-        return res.status(200).json(profile);
+        return res.status(200).json(result_profile.profile);
     }catch(error){
         return res.status(400).json({error:error});
     }

From fd1b0fcc2e1f4847b066d5fd39d819f9b5dcb56f Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:42:25 +0300
Subject: [PATCH 044/246] Updated tests

---
 .../tests/AuthorizationService.test.js        |  25 ++--
 .../backend/tests/ProfileService.test.js      | 128 ++++++++++++++++++
 2 files changed, 138 insertions(+), 15 deletions(-)
 create mode 100644 prediction-polls/backend/tests/ProfileService.test.js

diff --git a/prediction-polls/backend/tests/AuthorizationService.test.js b/prediction-polls/backend/tests/AuthorizationService.test.js
index cf9aa12d..72c2eff8 100644
--- a/prediction-polls/backend/tests/AuthorizationService.test.js
+++ b/prediction-polls/backend/tests/AuthorizationService.test.js
@@ -1,6 +1,6 @@
+
 const service = require('../src/services/AuthorizationService.js');
 const db = require('../src/repositories/AuthorizationDB.js');
-const authService = require('../src/services/AuthenticationService.js');
 const jwt = require('jsonwebtoken');
 
 require('dotenv').config();
@@ -10,20 +10,14 @@ jest.mock('../src/repositories/AuthorizationDB.js', () => ({
     addRefreshToken: jest.fn(),
     checkRefreshToken: jest.fn(),
     deleteRefreshToken: jest.fn(),
+    checkCredentials: jest.fn().mockImplementation(async (username, password) => {
+      return true; // Customize this based on your test scenarios
+    }),
+    addUser: jest.fn().mockImplementation(async (username, password,email,birthday) => {
+      return {"success":true,"error":undefined};
+    })
 }));
 
-// Mock the AuthenticationService module
-jest.mock('../src/services/AuthenticationService.js', () => {
-    return {
-        checkCredentials: jest.fn().mockImplementation(async (username, password) => {
-            return true; // Customize this based on your test scenarios
-        }),
-        addUser: jest.fn().mockImplementation(async (username, password,email,birthday) => {
-            return {"success":true,"error":undefined};
-        })
-    };
-});
-
 // Mock the jwt.verify function
 jest.mock('jsonwebtoken', () => ({
     verify: jest.fn((token, secret, callback) => {
@@ -54,7 +48,7 @@ test('test if logIn returns accessToken and refreshToken', async () => {
     await service.logIn(req, res);
 
     // Assert that the correct functions were called and with the correct arguments
-    expect(authService.checkCredentials).toHaveBeenCalledWith(username, password);
+    expect(db.checkCredentials).toHaveBeenCalledWith(username, password);
     expect(db.addRefreshToken).toHaveBeenCalledWith(expect.any(String));
 
     // Assert that the response was sent with the correct data
@@ -82,7 +76,7 @@ test('test if signup returns registration successful response ', async () => {
     await service.signup(req, res);
 
     // Assert that the correct functions were called and with the correct arguments
-    expect(authService.addUser).toHaveBeenCalledWith(username, password, email, birthday);
+    expect(db.addUser).toHaveBeenCalledWith(username, password, email, birthday);
 
     // Assert that the response was sent with the correct data
     expect(res.status).toHaveBeenCalledWith(201);
@@ -231,3 +225,4 @@ test('test if authorizeAccessToken authorizes correctly', async () => {
     // Assert that next was not called
     expect(next).not.toHaveBeenCalled();
   });
+  
diff --git a/prediction-polls/backend/tests/ProfileService.test.js b/prediction-polls/backend/tests/ProfileService.test.js
new file mode 100644
index 00000000..c734e545
--- /dev/null
+++ b/prediction-polls/backend/tests/ProfileService.test.js
@@ -0,0 +1,128 @@
+const service = require('../src/services/ProfileService.js');
+const db = require('../src/repositories/ProfileDB.js');
+const authDb = require('../src/repositories/AuthorizationDB.js');
+
+// Mock the ProfileDB module
+jest.mock('../src/repositories/ProfileDB.js', () => ({
+    findUser: jest.fn(),
+    getProfileWithUserId: jest.fn(),
+    getProfileWithProfileId: jest.fn(),
+    addProfile: jest.fn(),
+    updateProfile: jest.fn(),
+}));
+
+// Mock the AuthorizationDB module
+jest.mock('../src/repositories/AuthorizationDB.js', () => ({
+    findUser: jest.fn(),
+}));
+
+test('test if getProfile returns profile data', async () => {
+    // Set up mock behavior for findUser and getProfileWithUserId
+    const userId = 2;
+    const username = 'testUsername';
+    const email = 'test@mail.com';
+    const password = "testPassword.";
+
+    const profile = { id: 2,username,email,biograhpy:"Biograhpy"};
+
+    authDb.findUser.mockResolvedValue({ id: userId, username, email, password });
+    db.getProfileWithUserId.mockResolvedValue({ profile: profile});
+
+    const req = { query: { userId, username, email } };
+    const res = {
+        status: jest.fn(() => res),
+        json: jest.fn(),
+    };
+
+    await service.getProfile(req, res);
+
+    // Assert that the correct functions were called and with the correct arguments
+    expect(authDb.findUser).toHaveBeenCalledWith({ userId, username, email });
+    expect(db.getProfileWithUserId).toHaveBeenCalledWith(userId);
+
+    // Assert that the response was sent with the correct data
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith(profile);
+});
+
+test('test if getProfileWithProfileId returns profile data', async () => {
+    // Set up mock behavior for getProfileWithProfileId
+    const profileId = 1;
+
+    const profile = { id: 2,username:"testUsername",email:"email@test.com",biograhpy:"Biograhpy"};
+
+    db.getProfileWithProfileId.mockResolvedValue({ profile: profile});
+
+    const req = { params: { profileId } };
+    const res = {
+        status: jest.fn(() => res),
+        json: jest.fn(),
+    };
+
+    await service.getProfileWithProfileId(req, res);
+
+    // Assert that the correct function was called and with the correct arguments
+    expect(db.getProfileWithProfileId).toHaveBeenCalledWith(profileId);
+
+    // Assert that the response was sent with the correct data
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith(profile);
+});
+
+test('test if addProfile returns added profile data', async () => {
+    // Set up mock behavior for findUser, addProfile, and getProfileWithUserId
+    const userId = 2;
+    const username = 'testUsername';
+    const email = 'test@mail.com';
+
+    const profile = { userId,username,email,biography:"Biography"};
+
+    authDb.findUser.mockResolvedValue({ userId, username, email });
+    db.addProfile.mockResolvedValue({ profileId: 5 });
+    db.getProfileWithUserId.mockResolvedValue({ profile: profile});
+
+    const req = { body: { userId, username, email, biography:"Biography" } };
+    const res = {
+        status: jest.fn(() => res),
+        json: jest.fn(),
+    };
+
+    await service.addProfile(req, res);
+
+    // Assert that the correct functions were called and with the correct arguments
+    expect(authDb.findUser).toHaveBeenCalledWith({ userId, username, email });
+    expect(db.addProfile).toHaveBeenCalledWith({ userId, username, email, biography:"Biography","isHidden": undefined, "profile_picture": undefined, "userId": undefined });
+    expect(db.getProfileWithUserId).toHaveBeenCalledWith(userId);
+
+    // Assert that the response was sent with the correct data
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({ userId, username, email, biography:"Biography","isHidden": undefined, "profile_picture": undefined, "userId": undefined });
+});
+
+test('test if updateProfile returns updated profile data', async () => {
+    // Set up mock behavior for findUser, updateProfile, and getProfileWithUserId
+    const userId = 'testUserId';
+    const username = 'testUsername';
+    const email = 'test@mail.com';
+
+    authDb.findUser.mockResolvedValue({ id: userId, username, email });
+    db.updateProfile.mockResolvedValue({ status: 'updated', error: undefined });
+    db.getProfileWithUserId.mockResolvedValue({ profile: { /* updated profile data */ }, user_error: undefined });
+
+    const req = { body: { userId, username, email, /* updated profile data */ } };
+    const res = {
+        status: jest.fn(() => res),
+        json: jest.fn(),
+    };
+
+    await service.updateProfile(req, res);
+
+    // Assert that the correct functions were called and with the correct arguments
+    expect(authDb.findUser).toHaveBeenCalledWith({ userId, username, email });
+    expect(db.updateProfile).toHaveBeenCalledWith({ userId, /* updated profile data */ });
+    expect(db.getProfileWithUserId).toHaveBeenCalledWith(userId);
+
+    // Assert that the response was sent with the correct data
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({ /* updated profile data */ });
+});
\ No newline at end of file

From dc780584dcaa32f6248a30db1b08365c77b358b0 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 23:50:46 +0300
Subject: [PATCH 045/246] add simple unit test for 404

---
 .../backend/tests/PollService.test.js         | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 prediction-polls/backend/tests/PollService.test.js

diff --git a/prediction-polls/backend/tests/PollService.test.js b/prediction-polls/backend/tests/PollService.test.js
new file mode 100644
index 00000000..87d15dad
--- /dev/null
+++ b/prediction-polls/backend/tests/PollService.test.js
@@ -0,0 +1,25 @@
+const { getPollWithId } = require('../src/services/PollService.js');
+const db = require('../src/repositories/PollDB.js');
+const errorCodes = require("../src/errorCodes.js")
+
+jest.mock('../src/repositories/PollDB');
+
+describe('getPollWithId', () => {
+  test('returns a 404 response for non-existing poll', async () => {
+    const req = { params: { pollId: 'nonexistentId' } };
+    const res = {
+      status: jest.fn().mockReturnThis(),
+      json: jest.fn(),
+    };
+
+    db.getPollWithId.mockResolvedValue([]);
+
+    await getPollWithId(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({
+      code: errorCodes.NO_SUCH_POLL_ERROR.code,
+      message: errorCodes.NO_SUCH_POLL_ERROR.message,
+    });
+  });
+});
\ No newline at end of file

From f881f6da571d2098862a6c521fb3342a591d10f3 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 23:59:17 +0300
Subject: [PATCH 046/246] install nodemailer

---
 prediction-polls/backend/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prediction-polls/backend/package.json b/prediction-polls/backend/package.json
index de4e65ae..0616d341 100644
--- a/prediction-polls/backend/package.json
+++ b/prediction-polls/backend/package.json
@@ -19,6 +19,7 @@
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.2",
     "mysql2": "^3.6.2",
+    "nodemailer": "^6.9.7",
     "querystring": "^0.2.1",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0"

From 77c1e825fcba9bcc597a47a5572da0e566baf58b Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Tue, 21 Nov 2023 00:18:30 +0300
Subject: [PATCH 047/246] format error responses of polls

---
 .../backend/src/services/PollService.js       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index f8b70bf1..5772abd6 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -8,7 +8,7 @@ function getPolls(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
+        res.status(500).json({error: errorCodes.DATABASE_ERROR});
     })
 }
 
@@ -17,7 +17,7 @@ function getPollWithId(req, res) {
     db.getPollWithId(pollId)
     .then((rows) => {
         if (rows.length === 0) {
-            res.status(404).json({ code: errorCodes.NO_SUCH_POLL_ERROR.code, message: errorCodes.NO_SUCH_POLL_ERROR.message });
+            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
         } else {
             const pollType = rows[0].poll_type;
             const responseBody = rows[0];
@@ -36,7 +36,7 @@ function getDiscretePollWithId(req,res, responseBody){
     db.getDiscretePollWithId(pollId)
     .then((rows) => {
         if (rows.length === 0) {
-            res.status(404).json({ code: errorCodes.NO_SUCH_POLL_ERROR.code, message: errorCodes.NO_SUCH_POLL_ERROR.message });
+            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
         } else {
             db.getDiscretePollChoices(pollId)
             .then((choices) => {
@@ -58,13 +58,13 @@ function getDiscretePollWithId(req,res, responseBody){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
+        res.status(500).json({error: errorCodes.DATABASE_ERROR});
     })
 }
 
 function addDiscretePoll(req,res){
     if (!validateAddDiscretePoll(req.body)) {
-        return res.status(400).json({ code: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.code, message: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR.message });
+        return res.status(400).json({error: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR});
     }
     const question = req.body.question;
     const choices = req.body.choices;
@@ -80,7 +80,7 @@ function addDiscretePoll(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
+        res.status(500).json({error: errorCodes.DATABASE_ERROR});
     });
 }
 
@@ -111,7 +111,7 @@ function getContinuousPollWithId(req,res, responseBody){
     db.getContinuousPollWithId(pollId)
     .then((rows) => {
         if (rows.length === 0) {
-            res.status(404).json({ code: errorCodes.NO_SUCH_POLL_ERROR.code, message: errorCodes.NO_SUCH_POLL_ERROR.message });
+            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
         } else {
             db.getContinuousPollVotes(pollId)
             .then((choices) => {
@@ -122,13 +122,13 @@ function getContinuousPollWithId(req,res, responseBody){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
+        res.status(500).json({error: errorCodes.DATABASE_ERROR});
     })
 }
 
 function addContinuousPoll(req,res){
     if (!validateAddContinuousPoll(req.body)) {
-        return res.status(400).json({ code: errorCodes.BAD_CONT_POLL_REQUEST_ERROR.code, message: errorCodes.BAD_CONT_POLL_REQUEST_ERROR.message });
+        return res.status(400).json({error: errorCodes.BAD_CONT_POLL_REQUEST_ERROR});
     }
 
     const question = req.body.question;
@@ -145,7 +145,7 @@ function addContinuousPoll(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
+        res.status(500).json({error: errorCodes.DATABASE_ERROR});
     });
 }
 
@@ -169,7 +169,7 @@ function voteDiscretePoll(req,res){
     .then((choices) => {
         const choiceExists = choices.some(choice => choice.id === choiceId);
         if (!choiceExists) {
-            res.status(404).json({ code: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR.code, message: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR.message });
+            res.status(404).json({error: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR});
         } else {
             db.voteDiscretePoll(pollId, userId, choiceId)
             .then(() => {
@@ -179,7 +179,7 @@ function voteDiscretePoll(req,res){
     })
     .catch((error) => {
         console.error(error);
-        res.status(500).json({ code: errorCodes.DATABASE_ERROR.code, message: errorCodes.DATABASE_ERROR.message});
+        res.status(500).json({error: errorCodes.DATABASE_ERROR});
     })
 }
 
@@ -194,7 +194,7 @@ function voteContinuousPoll(req,res){
         const maxValue = result[0].max_value;
         const choiceValid = minValue <= choice && choice <= maxValue;
         if (!choiceValid) {
-            res.status(400).json({ code: errorCodes.CHOICE_OUT_OF_BOUNDS_ERROR.code, message: errorCodes.CHOICE_OUT_OF_BOUNDS_ERROR.message });
+            res.status(400).json({error: errorCodes.CHOICE_OUT_OF_BOUNDS_ERROR});
         } else {
             db.voteContinuousPoll(pollId, userId, choice)
             .then(() => {

From 85e37e06c717fc5ceb694c379c7f59cd379d109c Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Tue, 21 Nov 2023 00:36:03 +0300
Subject: [PATCH 048/246] update swagger error codes

---
 .../backend/src/routes/PollRouter.js          | 160 ++++++++++++------
 1 file changed, 109 insertions(+), 51 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 153dcd65..184f2842 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -47,15 +47,19 @@ const router = express.Router();
  *             schema:
  *               type: object
  *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                    message:
+ *                      type: string
+ *                    code:
+ *                      type: integer
  *             examples:
  *               databaseError:
  *                 value:
- *                   message: Error while accessing the database.
- *                   code: 3000
+ *                   error:
+ *                     message: Error while accessing the database.
+ *                     code: 3000
  */
 router.get('/', service.getPolls);
 
@@ -140,6 +144,46 @@ router.get('/', service.getPolls);
  *                   choices:
  *                     - 7
  *                     - 8   
+ *       404:
+ *         description: Resource Not Found
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                    message:
+ *                      type: string
+ *                    code:
+ *                      type: integer
+ *             examples:
+ *               NO_SUCH_POLL_ERROR:
+ *                 value:
+ *                   error:
+ *                     message: No such poll found.
+ *                     code: 3001
+ *       500:
+ *         description: Internal Server Error
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                    message:
+ *                      type: string
+ *                    code:
+ *                      type: integer
+ *             examples:
+ *               databaseError:
+ *                 value:
+ *                   error:
+ *                     message: Error while accessing the database.
+ *                     code: 3000
  */
 router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId);
 
@@ -205,19 +249,24 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *             schema:
  *               type: object
  *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                     message:
+ *                       type: string
+ *                     code:
+ *                       type: integer
  *             examples:
  *               badRequest:
  *                 value:
- *                   message: Bad request body for creating a discrete poll.
- *                   code: 4000
- *               accessTokenNull:
+ *                   error:
+ *                     message: Bad request body for creating a discrete poll.
+ *                     code: 4000
+ *               ACCESS_TOKEN_INVALID_ERROR:
  *                 value:
- *                   message: The access token is null
- *                   code: 1005
+ *                   error:
+ *                     message: The access token is invalid.
+ *                     code: 1001
  *       401:
  *         description: Unauthorized
  *         content:
@@ -225,15 +274,19 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *             schema:
  *               type: object
  *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                     message:
+ *                       type: string
+ *                     code:
+ *                       type: integer
  *             examples:
- *               accessTokenInvalid:
+ *               ACCESS_TOKEN_INVALID_ERROR:
  *                 value:
- *                   message: The access token is invalid.
- *                   code: 1001
+ *                   error:
+ *                     message: The access token is invalid.
+ *                     code: 1001
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -241,15 +294,19 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *             schema:
  *               type: object
  *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                     message:
+ *                       type: string
+ *                     code:
+ *                       type: integer
  *             examples:
  *               databaseError:
  *                 value:
- *                   message: Error while accessing the database.
- *                   code: 3000
+ *                   error:
+ *                     message: Error while accessing the database.
+ *                     code: 3000
  */
 router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscretePoll);
 
@@ -324,23 +381,19 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *             schema:
  *               type: object
  *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                     message:
+ *                       type: string
+ *                     code:
+ *                       type: integer
  *             examples:
  *               badRequest:
  *                 value:
- *                   message: Bad request body for creating a continuous poll.
- *                   code: 4001
- *               MINMAX_BAD_CONT_POLL_REQUEST_ERROR:
- *                 value:
- *                   message: Minimum value allowed was higher than maximum value allowed in the poll.
- *                   code: 4002
- *               accessTokenNull:
- *                 value:
- *                   message: The access token is null
- *                   code: 1005
+ *                   error:
+ *                     message: Bad request body for creating a continuous poll.
+ *                     code: 4001
  *       401:
  *         description: Unauthorized
  *         content:
@@ -353,10 +406,11 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *                 code:
  *                   type: integer
  *             examples:
- *               accessTokenInvalid:
+ *               ACCESS_TOKEN_INVALID_ERROR:
  *                 value:
- *                   message: The access token is invalid.
- *                   code: 1001
+ *                   error:
+ *                     message: The access token is invalid.
+ *                     code: 1001
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -364,15 +418,19 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *             schema:
  *               type: object
  *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
+ *                 error:
+ *                   type: object
+ *                   properties:
+ *                     message:
+ *                       type: string
+ *                     code:
+ *                       type: integer
  *             examples:
  *               databaseError:
  *                 value:
- *                   message: Error while accessing the database.
- *                   code: 3000
+ *                   error:
+ *                     message: Error while accessing the database.
+ *                     code: 3000
  */
 router.post('/continuous', authenticator.authorizeAccessToken, service.addContinuousPoll);
 

From 549cb852d8ca6da6acf58b88989a7f438be2cc35 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Tue, 21 Nov 2023 14:21:45 +0300
Subject: [PATCH 049/246] fix schema

---
 prediction-polls/backend/src/schema.sql                       | 2 ++
 prediction-polls/backend/src/services/AuthorizationService.js | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 771ead9f..0a74ca1a 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -7,6 +7,8 @@ CREATE TABLE users (
     email VARCHAR(255) NOT NULL,
     password VARCHAR(255) NOT NULL,
     birthday DATETIME,
+    email_verified BOOLEAN DEFAULT FALSE,
+    email_verification_token VARCHAR(255),
     UNIQUE (username),
     UNIQUE (email)
 );
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index bff6d63e..d79211f1 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -42,7 +42,8 @@ function homePage(req, res){
         return res.status(400).send('Password does not meet the required criteria');
     }
     const verificationToken = generateVerificationToken();
-    await db.saveEmailVerificationToken(username, verificationToken);
+    userData = await db.findUser({username: username})
+    await db.saveEmailVerificationToken(userData.id, verificationToken);
     await sendVerificationEmail(email, verificationToken);
     // Attempt to add user
     const { success, error: addUserError } = await db.addUser(username, password, email, birthday);

From afa051f6ca5940b41b160fd9c714209ca6a91b9a Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Tue, 21 Nov 2023 16:18:01 +0300
Subject: [PATCH 050/246] create poll model

---
 prediction-polls/android/app/build.gradle.kts |  5 +++
 .../predictionpolls/domain/poll/Poll.kt       | 31 +++++++++++++++++++
 .../predictionpolls/domain/poll/PollOption.kt |  5 +++
 .../ui/common/poll/PollComposable.kt          | 17 +++-------
 4 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt

diff --git a/prediction-polls/android/app/build.gradle.kts b/prediction-polls/android/app/build.gradle.kts
index 9bc77094..bc5c2a99 100644
--- a/prediction-polls/android/app/build.gradle.kts
+++ b/prediction-polls/android/app/build.gradle.kts
@@ -134,4 +134,9 @@ dependencies {
 
     // Easy Google Login
     implementation("com.github.stevdza-san:OneTapCompose:1.0.9")
+
+    // Immutable Kotlin Collections
+    // Used for creating stable domain classes. Check stability meaning in terms of compose if you do not know what I mean.
+    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6")
+
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
new file mode 100644
index 00000000..5eb66c8e
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
@@ -0,0 +1,31 @@
+package com.bounswe.predictionpolls.domain.poll
+
+import kotlinx.collections.immutable.ImmutableList
+
+sealed interface Poll {
+    val creatorProfilePictureUri: String
+    val pollCreatorName: String
+    val pollQuestionTitle: String
+    val dueDate: String
+    val rejectionText: String
+    val commentCount: Int
+
+    data class ContinuousPoll(
+        override val creatorProfilePictureUri: String,
+        override val dueDate: String,
+        override val pollCreatorName: String,
+        override val pollQuestionTitle: String,
+        override val rejectionText: String,
+        override val commentCount: Int,
+        val options: ImmutableList<PollOption.ContinuousPollOption>
+    ) : Poll
+
+    data class DiscretePoll(
+        override val creatorProfilePictureUri: String,
+        override val dueDate: String,
+        override val pollCreatorName: String,
+        override val pollQuestionTitle: String,
+        override val rejectionText: String,
+        override val commentCount: Int,
+    ) : Poll
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt
new file mode 100644
index 00000000..0c0f00cd
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt
@@ -0,0 +1,5 @@
+package com.bounswe.predictionpolls.domain.poll
+
+sealed interface PollOption {
+    data class ContinuousPollOption(val id: String, val text: String, val voteCount: Int): PollOption
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
index be1fcdf7..698f551a 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
@@ -33,9 +33,6 @@ import androidx.compose.ui.unit.sp
 import com.bounswe.predictionpolls.R
 import com.bounswe.predictionpolls.ui.theme.MontserratFontFamily
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
 
 @Composable
 fun PollComposable(
@@ -44,7 +41,7 @@ fun PollComposable(
     tags: List<String>,
     pollQuestionTitle: String,
     optionsContent: @Composable () -> Unit,
-    dueDate: Date,
+    dueDate: String,
     rejectionText: String,
     commentCount: Int,
     modifier: Modifier = Modifier
@@ -141,7 +138,7 @@ private fun PollIcon(@DrawableRes id: Int, modifier: Modifier = Modifier) {
 }
 
 @Composable
-private fun DueDateComposable(dueDate: Date, modifier: Modifier = Modifier) {
+private fun DueDateComposable(dueDate: String, modifier: Modifier = Modifier) {
     Column(
         modifier = modifier.wrapContentSize(),
         horizontalAlignment = Alignment.CenterHorizontally
@@ -156,7 +153,7 @@ private fun DueDateComposable(dueDate: Date, modifier: Modifier = Modifier) {
         )
         Spacer(modifier = Modifier.height(8.dp))
         Text(
-            text = formatDate(dueDate),
+            text = dueDate,
             fontFamily = MontserratFontFamily,
             color = MaterialTheme.colorScheme.error,
             fontWeight = FontWeight.Bold,
@@ -223,7 +220,7 @@ private fun PollQuestionTitle(pollQuestionTitle: String, modifier: Modifier = Mo
 
 @Composable
 @Preview(showBackground = true, showSystemUi = true)
-fun PollComposablePreview() {
+private fun PollComposablePreview() {
     PredictionPollsTheme(dynamicColor = false) {
         PollComposable(
             "https://picsum.photos/id/237/600/800",
@@ -248,7 +245,7 @@ fun PollComposablePreview() {
                 }
 
             },
-            dueDate = Date(),
+            dueDate = "21 Nov 2023",
             rejectionText = "Last 5 Days",
             commentCount = 265,
             modifier = Modifier.padding(16.dp)
@@ -256,7 +253,3 @@ fun PollComposablePreview() {
     }
 }
 
-private fun formatDate(dueDate: Date): String {
-    val sdf = SimpleDateFormat("dd MMMM yyyy", Locale("tr", "TR"))
-    return sdf.format(dueDate)
-}
\ No newline at end of file

From c29ec3493ae0d7a06f1cfad4a2e06cd44bbb0312 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Tue, 21 Nov 2023 16:19:26 +0300
Subject: [PATCH 051/246] add immutable tag

---
 .../main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
index 5eb66c8e..5bb0eb1d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
@@ -1,7 +1,9 @@
 package com.bounswe.predictionpolls.domain.poll
 
+import androidx.compose.runtime.Immutable
 import kotlinx.collections.immutable.ImmutableList
 
+@Immutable
 sealed interface Poll {
     val creatorProfilePictureUri: String
     val pollCreatorName: String

From 3ed8977a339f58ed9b9f8a1e6e2170f7a947733f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Tue, 21 Nov 2023 16:34:16 +0300
Subject: [PATCH 052/246] implemented edit profile page

---
 prediction-polls/frontend/package-lock.json   |  16 +-
 prediction-polls/frontend/package.json        |   3 +-
 .../Pages/EditProfile/EditProfile.module.css  | 154 +++++++++++++++++-
 .../frontend/src/Pages/EditProfile/index.jsx  | 141 +++++++++++++++-
 .../src/Pages/Profile/Profile.module.css      |   6 +-
 .../frontend/src/Pages/Profile/index.jsx      |   2 +-
 .../frontend/src/Routes/Router.jsx            |   5 +-
 7 files changed, 306 insertions(+), 21 deletions(-)

diff --git a/prediction-polls/frontend/package-lock.json b/prediction-polls/frontend/package-lock.json
index a8b88ffc..c80f46f3 100644
--- a/prediction-polls/frontend/package-lock.json
+++ b/prediction-polls/frontend/package-lock.json
@@ -12,8 +12,9 @@
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
         "antd": "^5.10.0",
-        "jest-matchmedia-mock": "^1.1.0",
         "history": "^5.3.0",
+        "jest-matchmedia-mock": "^1.1.0",
+        "moment": "^2.29.4",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-router-dom": "^6.16.0",
@@ -12824,6 +12825,14 @@
         "mkdirp": "bin/cmd.js"
       }
     },
+    "node_modules/moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -28051,6 +28060,11 @@
         "minimist": "^1.2.6"
       }
     },
+    "moment": {
+      "version": "2.29.4",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
+      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
+    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
diff --git a/prediction-polls/frontend/package.json b/prediction-polls/frontend/package.json
index 932370aa..8c5a251b 100644
--- a/prediction-polls/frontend/package.json
+++ b/prediction-polls/frontend/package.json
@@ -7,8 +7,9 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "antd": "^5.10.0",
-    "jest-matchmedia-mock": "^1.1.0",
     "history": "^5.3.0",
+    "jest-matchmedia-mock": "^1.1.0",
+    "moment": "^2.29.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.16.0",
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
index a8398eb3..55badc17 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
+++ b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
@@ -1,10 +1,154 @@
-.page{
+.page {
+  display: flex;
+  background-color: var(--neutral-white);
+  width: 100%;
+  justify-content: space-between;
+}
+@media (max-width: 640px) {
+  .page {
+    flex-direction: column;
+  }
+}
+.editProfileInfo {
+  display: flex;
+  flex-direction: column;
+  padding-left: 20px;
+  width: 60%;
+  justify-content: center;
+  align-items: center;
+  margin-top: 30px;
+}
+.profileImage {
+  width: 150px;
+  height: 150px;
+  object-fit: cover;
+  border-radius: 100px;
+  justify-self: center;
+  box-shadow: 2px 4px 8px var(--neutral-shadow);
+}
+
+.formInputStyle {
+  padding: 5px 5px;
+  width: 100%;
+  background-color: var(--neutral-pollCard);
+  color: var(--neutral-black);
+}
+.formDatePickerStyle {
+  padding: 5px 5px;
+  width: 100%;
+  width: 100%;
+  background-color: var(--neutral-pollCard);
+  color: var(--neutral-black);
+}
+.formStyle {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+
+.profileImageWrapperStyle {
+display: flex;
+justify-content: center;
+}
+
+.birthdayWrapperStyle {
+display: grid;
+grid-template-columns: 1fr 1fr 1fr;
+gap:20px;
+align-items: center;
+padding-bottom: 10px;
+}
+.thumbnailImage{
+height: 240px;
+width: 100%;
+object-fit: cover;
+border-radius: 10px;
+}
+.thumbnailImageWrapper {
+    height: fit-content;
+}
+
+.pointCol {
     display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: start;
+    width: 20%;
+    padding-top: 100px;
+
+}
+
+.badgesContainer{
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.badge{
+    width: 85px;
+    height: 85px;
+    border-radius: 100%;
+    background-color: gold;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    gap:5px;
+    box-sizing: border-box;
+    overflow-wrap:anywhere;
+    padding: 4px;
+    text-align: center;
+    vertical-align: middle;
+    position: relative;
+
+}
+.badge::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 85px;
+    height: 85px;
     background-color: var(--neutral-white);
+    opacity: 0.2; 
+    border-radius: 100%; 
+    pointer-events: none; 
+}
+.badgeText{
+    font-weight: 700;
+    color: var(--neutral-black);
+    line-height: 14px;
+    font-size: 14px;
+    margin: 0px 0px;
+    z-index: 1;
+    
+}
+.badgeCheckbox{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap:10px;
+}
+.badgesText{
+    margin: 0px;
+    font-weight: 700;
+    color: var(--neutral-black);
+    font-size: 24px;
+}
+.formButtonStyle {
+    background-color: var(--primary-500);
+    color: var(--neutral-white);
+}
+.buttonContainer{
+    justify-content: center;
+    display: flex;
     width: 100%;
+    align-self:center;
+    padding-bottom: 10px;
 }
-@media (max-width: 640px) {
-    .page{
-        flex-direction: column;
-    }
+
+.formLabel{
+    color: var(--neutral-black);
 }
\ No newline at end of file
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index da18c2b0..a3efe69a 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -1,14 +1,139 @@
-import React from 'react'
-import Menu from '../../Components/Menu'
-import styles  from './EditProfile.module.css'
+import React from "react";
+import Menu from "../../Components/Menu";
+import styles from "./EditProfile.module.css";
+import { useParams } from "react-router-dom";
+import Users from "../../MockData/Users.json";
+import {
+  Button,
+  Input,
+  Form,
+  DatePicker,
+  Checkbox,
+  Typography,
+  Divider,
+} from "antd";
+import PointsButton from "../../Components/PointsButton";
+import pointData from "../../MockData/PointList.json";
+import moment from "moment";
 
 function EditProfile() {
+  const { username } = useParams();
+  const [form] = Form.useForm();
+
+
+  const userData = Users.userList.filter(
+    (user) => user.username === username
+  )[0];
+
+  const initialValues = {
+    username: userData.username,
+    fullname: userData.name,
+    about: userData.about,
+    birthday: userData.birthday ? moment(userData.birthday) : null, 
+  };
+
   return (
     <div className={styles.page}>
-    <Menu currentPage="Profile" />
-    <h1>Edit Profile Page</h1>
- </div>
-  )
+      <Menu currentPage="Profile" />
+      <div className={styles.editProfileInfo}>
+        <Form
+          labelCol={{ span: 24 }}
+          wrapperCol={{ span: 24 }}
+          form={form}
+          validateTrigger="onSubmit"
+          className={styles.formStyle}
+          initialValues={initialValues}
+        >
+          <Form.Item className={styles.profileImageWrapperStyle}>
+            <img
+              src={userData.image}
+              alt="profileImage"
+              className={styles.profileImage}
+            ></img>
+          </Form.Item>
+          <Form.Item label={<label className={styles.formLabel}>USERNAME</label> }name="username" className={styles.formItem}>
+            <Input
+              type="text"
+              className={styles.formInputStyle}
+              placeholder="username"
+            />
+          </Form.Item>
+          <Form.Item label={<label className={styles.formLabel}>FULL NAME</label>} name="fullname" className={styles.formItem}>
+            <Input
+              type="text"
+              className={styles.formInputStyle}
+              placeholder="Full Name"
+            />
+          </Form.Item>
+          <Form.Item label={<label className={styles.formLabel}>ABOUT</label>} name="about" className={styles.formItem}>
+            <Input
+              className={styles.formInputStyle}
+              type="text"
+              placeholder="about"
+            />
+          </Form.Item>
+          <Form.Item>
+            <p>COVER IMAGE</p>
+            <img
+              src={userData.thumbnailImage}
+              alt="thumbnailImage"
+              className={styles.thumbnailImage}
+            ></img>
+          </Form.Item>
+          <Form.Item label={<label className={styles.formLabel}>BIRTHDAY</label>} name="birthday" htmlFor="birthday" className={styles.formItem}>
+            <div className={styles.birthdayWrapperStyle}>
+              <DatePicker
+                id="birthday"
+                className={styles.formDatePickerStyle}
+                placeholder="01.01.2000"
+                format="YYYY-MM-DD"
+              />
+              <Checkbox>Show in profile</Checkbox>
+            </div>
+          </Form.Item>
+          <Form.Item className={styles.buttonContainer} >
+            <div className={styles.buttonWrapper}>
+              <Button
+                type="primary"
+                htmlType="submit"
+                className={styles.formButtonStyle}
+              >
+                Save Changes
+              </Button>
+            </div>
+          </Form.Item>
+        </Form>
+      </div>
+      <div className={styles.pointCol}>
+        <PointsButton points={pointData.points} />
+        <p className={styles.badgesText}>Badges</p>
+        <p>(You can choose at most 3)</p>
+        <div className={styles.badgesContainer}>
+          <div className={styles.badgeCheckbox}>
+            <Checkbox />
+            <div className={styles.badge}>
+              <p className={styles.badgeText}>1</p>
+              <p className={styles.badgeText}>Basketball</p>
+            </div>
+          </div>
+          <div className={styles.badgeCheckbox}>
+            <Checkbox />
+            <div className={styles.badge}>
+              <p className={styles.badgeText}>1</p>
+              <p className={styles.badgeText}>Politics</p>
+            </div>
+          </div>
+          <div className={styles.badgeCheckbox}>
+            <Checkbox />
+            <div className={styles.badge}>
+              <p className={styles.badgeText}>1</p>
+              <p className={styles.badgeText}>Football</p>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
 }
 
-export default EditProfile;
\ No newline at end of file
+export default EditProfile;
diff --git a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
index e195a3a8..02ab2976 100644
--- a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
+++ b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
@@ -160,9 +160,9 @@
     width: 85px;
     height: 85px;
     background-color: var(--neutral-white);
-    opacity: 0.2; /* Adjust this value for desired opacity */
-    border-radius: 100%; /* To maintain the circular shape of the badge */
-    pointer-events: none; /* So that the overlay does not interfere with interaction */
+    opacity: 0.2; 
+    border-radius: 100%; 
+    pointer-events: none; 
 }
 .badgeText{
     font-weight: 700;
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index 7f3f2192..64a7cabb 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -43,7 +43,7 @@ function Profile() {
                 </p>
               </div>
               <div className={styles.buttonContainer}>
-                <button className={styles.button} onClick={() => navigate("/editProfile")}>
+                <button className={styles.button} onClick={() => navigate(`/editProfile/${userData.username}`)}>
                   {userData.username === "can.gezer" ? <><EditIcon />
                   <p className={styles.buttonText}>Edit Profile</p></> : <p className={styles.buttonText}>Follow</p>}
                   
diff --git a/prediction-polls/frontend/src/Routes/Router.jsx b/prediction-polls/frontend/src/Routes/Router.jsx
index 2ba783af..cf012e65 100644
--- a/prediction-polls/frontend/src/Routes/Router.jsx
+++ b/prediction-polls/frontend/src/Routes/Router.jsx
@@ -34,7 +34,8 @@ function AppRouter() {
           <GoogleLogin />
         } />
         <Route path="/create" element={
-          <PrivateRoute><Create /></PrivateRoute>
+          <Create />
+          //<PrivateRoute><Create /></PrivateRoute>
         } />
         <Route path="/leaderboard" element={
           <PrivateRoute><Leaderboard /></PrivateRoute>
@@ -55,7 +56,7 @@ function AppRouter() {
           //<PrivateRoute><Vote /></PrivateRoute>
           <Vote/>
         } />
-        <Route path="/editProfile" element={
+        <Route path="/editProfile/:username" element={
           //<PrivateRoute><EditProfile/></PrivateRoute>
           <EditProfile/>
         } />

From dd28e67f6e24a3922430c6110624d89aabf1a1e0 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Tue, 21 Nov 2023 16:36:20 +0300
Subject: [PATCH 053/246] create feedrepository

---
 .../com/bounswe/predictionpolls/common/Result.kt    |  9 +++++++++
 .../predictionpolls/domain/feed/FeedRepository.kt   | 11 +++++++++++
 .../predictionpolls/domain/feed/GetFeedUseCase.kt   | 13 +++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/Result.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/Result.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/Result.kt
new file mode 100644
index 00000000..336524ea
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/Result.kt
@@ -0,0 +1,9 @@
+package com.bounswe.predictionpolls.common
+
+/**
+ * A generic class that holds a value or an exception
+ */
+sealed class Result<out R> {
+    data class Success<out T>(val data: T) : Result<T>()
+    data class Error(val exception: Exception) : Result<Nothing>()
+}
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt
new file mode 100644
index 00000000..07815a5b
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt
@@ -0,0 +1,11 @@
+package com.bounswe.predictionpolls.domain.feed
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.poll.Poll
+
+interface FeedRepository {
+    /**
+     * Fetches the list of polls and returns the result.
+     */
+    suspend fun getPolls(page: Int): Result<Poll>
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
new file mode 100644
index 00000000..01b4af75
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
@@ -0,0 +1,13 @@
+package com.bounswe.predictionpolls.domain.feed
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.poll.Poll
+import javax.inject.Inject
+
+class GetFeedUseCase @Inject constructor(
+    private val feedRepository: FeedRepository
+) {
+    suspend operator fun invoke(page: Int): Result<Poll> {
+        return feedRepository.getPolls(page)
+    }
+}
\ No newline at end of file

From 998b57c6f40a114a3f5e73ab4d1dadcc3ecaee5f Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Tue, 21 Nov 2023 16:51:12 +0300
Subject: [PATCH 054/246] implement create poll backend requests

---
 .../request/CreateContinuousPollRequest.kt    | 23 ++++++++
 .../request/CreateDiscretePollRequest.kt      | 18 ++++++
 .../remote/repositories/PollRepository.kt     | 57 +++++++++++++++++++
 .../data/remote/services/PollService.kt       | 18 ++++++
 .../predictionpolls/di/RepositoryModule.kt    | 10 ++++
 .../predictionpolls/di/ServiceModule.kt       |  9 +++
 6 files changed, 135 insertions(+)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
new file mode 100644
index 00000000..12c430bb
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
@@ -0,0 +1,23 @@
+package com.bounswe.predictionpolls.data.remote.model.request
+
+data class CreateContinuousPollRequest(
+    val question: String,
+    val openVisibility: Boolean,
+    val setDueDate: Boolean,
+    val dueDatePoll: String?,
+    val numericFieldValue: Int?,
+    val selectedTimeUnit: TimeUnit?,
+    val pollType: PollRequestType,
+) {
+    enum class TimeUnit(val value: String) {
+        MINUTE("min"),
+        HOUR("h"),
+        DAY("day"),
+        MONTH("mth"),
+    }
+
+    enum class PollRequestType(val value: String) {
+        NUMERIC("numeric"),
+        DATE("date"),
+    }
+}
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt
new file mode 100644
index 00000000..0b928fe5
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt
@@ -0,0 +1,18 @@
+package com.bounswe.predictionpolls.data.remote.model.request
+
+data class CreateDiscretePollRequest(
+    val question: String,
+    val choices: List<String>,
+    val openVisibility: Boolean,
+    val setDueDate: Boolean,
+    val dueDatePoll: String?,
+    val numericFieldValue: Int?,
+    val selectedTimeUnit: TimeUnit?,
+) {
+    enum class TimeUnit(val value: String) {
+        MINUTE("min"),
+        HOUR("h"),
+        DAY("day"),
+        MONTH("mth"),
+    }
+}
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
new file mode 100644
index 00000000..2bc64837
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
@@ -0,0 +1,57 @@
+package com.bounswe.predictionpolls.data.remote.repositories
+
+import com.bounswe.predictionpolls.core.BaseRepository
+import com.bounswe.predictionpolls.data.remote.model.request.CreateContinuousPollRequest
+import com.bounswe.predictionpolls.data.remote.model.request.CreateDiscretePollRequest
+import com.bounswe.predictionpolls.data.remote.services.PollService
+
+class PollRepository(
+    private val pollService: PollService
+): BaseRepository()  {
+    suspend fun createContinuousPoll(
+        question: String,
+        openVisibility: Boolean,
+        setDueDate: Boolean,
+        dueDatePoll: String? = null,
+        numericFieldValue: Int? = null,
+        selectedTimeUnit: CreateContinuousPollRequest.TimeUnit? = null,
+        pollType: CreateContinuousPollRequest.PollRequestType
+    ){
+        val request = CreateContinuousPollRequest(
+            question,
+            openVisibility,
+            setDueDate,
+            dueDatePoll,
+            numericFieldValue,
+            selectedTimeUnit,
+            pollType
+        )
+        execute {
+            pollService.createContinuousPoll(request)
+        }
+    }
+
+    suspend fun createDiscretePoll(
+        question: String,
+        choices: List<String>,
+        openVisibility: Boolean,
+        setDueDate: Boolean,
+        dueDatePoll: String? = null,
+        numericFieldValue: Int? = null,
+        selectedTimeUnit: CreateDiscretePollRequest.TimeUnit? = null,
+    ){
+        val request = CreateDiscretePollRequest(
+            question,
+            choices,
+            openVisibility,
+            setDueDate,
+            dueDatePoll,
+            numericFieldValue,
+            selectedTimeUnit,
+        )
+
+        execute {
+            pollService.createDiscretePoll(request)
+        }
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
new file mode 100644
index 00000000..6809067f
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
@@ -0,0 +1,18 @@
+package com.bounswe.predictionpolls.data.remote.services
+
+import com.bounswe.predictionpolls.data.remote.model.request.CreateContinuousPollRequest
+import com.bounswe.predictionpolls.data.remote.model.request.CreateDiscretePollRequest
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface PollService {
+    @POST("/polls/discrete")
+    suspend fun createDiscretePoll(
+        @Body createDiscretePollRequest: CreateDiscretePollRequest
+    )
+
+    @POST("/polls/continuous")
+    suspend fun createContinuousPoll(
+        @Body createContinuousPollRequest: CreateContinuousPollRequest
+    )
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt
index 4252d720..01f7d655 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt
@@ -2,7 +2,9 @@ package com.bounswe.predictionpolls.di
 
 import com.bounswe.predictionpolls.data.remote.TokenManager
 import com.bounswe.predictionpolls.data.remote.repositories.AuthRepository
+import com.bounswe.predictionpolls.data.remote.repositories.PollRepository
 import com.bounswe.predictionpolls.data.remote.services.AuthService
+import com.bounswe.predictionpolls.data.remote.services.PollService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -20,4 +22,12 @@ object RepositoryModule {
     ): AuthRepository {
         return AuthRepository(authService, tokenManager)
     }
+
+    @Provides
+    @Singleton
+    fun providePollRepository(
+        pollService: PollService,
+    ): PollRepository {
+        return PollRepository(pollService)
+    }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ServiceModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ServiceModule.kt
index 462817bc..6a36a94c 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ServiceModule.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ServiceModule.kt
@@ -1,6 +1,7 @@
 package com.bounswe.predictionpolls.di
 
 import com.bounswe.predictionpolls.data.remote.services.AuthService
+import com.bounswe.predictionpolls.data.remote.services.PollService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -18,4 +19,12 @@ object ServiceModule {
     ): AuthService {
         return retrofit.create(AuthService::class.java)
     }
+
+    @Provides
+    @Singleton
+    fun providePollService(
+        @AuthenticatedRetrofit retrofit: Retrofit
+    ): PollService {
+        return retrofit.create(PollService::class.java)
+    }
 }
\ No newline at end of file

From 563aa04cd421bc39c022a2da76fc2008871b2074 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Tue, 21 Nov 2023 23:58:25 +0300
Subject: [PATCH 055/246] add username column to polls

---
 prediction-polls/backend/src/schema.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 0a74ca1a..c05d69b6 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -24,6 +24,7 @@ CREATE TABLE refresh_tokens (
 CREATE TABLE polls (
     id INT AUTO_INCREMENT PRIMARY KEY,
     question VARCHAR(255) NOT NULL,
+    username VARCHAR(255) NOT NULL,
     poll_type ENUM('discrete', 'continuous') NOT NULL,
     openVisibility BOOLEAN NOT NULL,
     setDueDate BOOLEAN NOT NULL,

From f5f08d44cfda0e5fa5b891f5d0451a9f25afbd21 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Tue, 21 Nov 2023 23:58:39 +0300
Subject: [PATCH 056/246] implement poll creation with username

---
 prediction-polls/backend/src/repositories/PollDB.js  | 12 ++++++------
 prediction-polls/backend/src/services/PollService.js |  7 +++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 916cdb61..53525328 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -59,16 +59,16 @@ async function getContinuousPollWithId(pollId){
     }
 }
 
-async function addDiscretePoll(question, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
+async function addDiscretePoll(question, username, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
     const connection = await pool.getConnection();
 
-    const sql_poll = 'INSERT INTO polls (question, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?)';
+    const sql_poll = 'INSERT INTO polls (question, username, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
     const sql_discrete_poll = 'INSERT INTO discrete_polls (id) VALUES (?)';
     const sql_choice = 'INSERT INTO discrete_poll_choices (choice_text, poll_id) VALUES (?, ?)';
 
     try {
         await connection.beginTransaction()
-        const [resultSetHeader] = await connection.query(sql_poll, [question, 'discrete', openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
+        const [resultSetHeader] = await connection.query(sql_poll, [question, username, 'discrete', openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
         poll_id = resultSetHeader.insertId;
 
         if (!poll_id) {
@@ -93,14 +93,14 @@ async function addDiscretePoll(question, choices, openVisibility, setDueDate, du
     }
 }
 
-async function addContinuousPoll(question, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
+async function addContinuousPoll(question, username, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
     const connection = await pool.getConnection();
 
-    const sql_poll = 'INSERT INTO polls (question, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?)';
+    const sql_poll = 'INSERT INTO polls (question, username, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
     const sql_continuous_poll = 'INSERT INTO continuous_polls (id, cont_poll_type) VALUES (?, ?)' 
 
     try {
-        const [resultSetHeader] = await connection.query(sql_poll, [question, 'continuous', openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
+        const [resultSetHeader] = await connection.query(sql_poll, [question, username, 'continuous', openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
         poll_id = resultSetHeader.insertId;
 
         if (!poll_id) {
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 5772abd6..f0e53e36 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -1,4 +1,5 @@
 const db = require("../repositories/PollDB.js");
+const { findUser } = require('../repositories/AuthorizationDB.js');
 const errorCodes = require("../errorCodes.js")
 
 function getPolls(req,res){
@@ -73,8 +74,9 @@ function addDiscretePoll(req,res){
     const numericFieldValue = req.body.numericFieldValue;
     const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
     const selectedTimeUnit = req.body.selectedTimeUnit;
+    const username = req.user.name;
 
-    db.addDiscretePoll(question, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
+    db.addDiscretePoll(question, username, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
     .then((result) => {
         res.end(result.toString());
     })
@@ -138,8 +140,9 @@ function addContinuousPoll(req,res){
     const numericFieldValue = req.body.numericFieldValue;
     const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
     const selectedTimeUnit = req.body.selectedTimeUnit;
+    const username = req.user.name;
 
-    db.addContinuousPoll(question, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
+    db.addContinuousPoll(question, username, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
     .then((result) => {
         res.end(result.toString());
     })

From 011b3e0f9160f3e036b9f5b266267827cfd79477 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Wed, 22 Nov 2023 12:07:14 +0300
Subject: [PATCH 057/246] update swagger reflecting changes

---
 .../backend/src/routes/PollRouter.js          | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 184f2842..63e55fba 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -26,20 +26,50 @@ const router = express.Router();
  *                     type: integer
  *                   question:
  *                     type: string
+ *                   username:
+ *                     type: string
  *                   poll_type:
  *                     type: string
+ *                   openVisibility:
+ *                     type: integer
+ *                   setDueDate:
+ *                     type: integer
+ *                   dueDatePoll:
+ *                     type: string
+ *                   numericFieldValue:
+ *                     type: integer
+ *                   selectedTimeUnit:
+ *                     type: string
  *             examples:
  *               genericExample:
  *                 value:
  *                   - id: 1
  *                     question: "Who will become POTUS?"
+ *                     username: "user1234"
  *                     poll_type: "discrete"
+ *                     openVisibility: 1 
+ *                     setDueDate: 1 
+ *                     dueDatePoll: "2023-11-20T21:00:00.000Z"
+ *                     numericFieldValue: 2 
+ *                     selectedTimeUnit: "min"
  *                   - id: 2
  *                     question: "Test3?"
+ *                     username: "GoodGambler"
  *                     poll_type: "continuous"
+ *                     openVisibility: 0 
+ *                     setDueDate: 0 
+ *                     dueDatePoll: null
+ *                     numericFieldValue: null
+ *                     selectedTimeUnit: null
  *                   - id: 3
  *                     question: "Who will become POTUS?"
+ *                     username: "GhostDragon"
  *                     poll_type: "discrete"
+ *                     openVisibility: 1 
+ *                     setDueDate: 1 
+ *                     dueDatePoll: "2023-11-20T21:00:00.000Z"
+ *                     numericFieldValue: 3
+ *                     selectedTimeUnit: "h"
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -90,6 +120,8 @@ router.get('/', service.getPolls);
  *                   type: integer
  *                 question:
  *                   type: string
+ *                 username:
+ *                   type: string
  *                 poll_type:
  *                   type: string
  *                 poll:
@@ -120,6 +152,7 @@ router.get('/', service.getPolls);
  *                 value:
  *                   id: 1
  *                   question: "Who will become POTUS?"
+ *                   username: "user123"
  *                   poll_type: "discrete"
  *                   poll:
  *                     id: 1
@@ -136,11 +169,10 @@ router.get('/', service.getPolls);
  *                 value:
  *                   id: 2
  *                   question: "Test question?"
+ *                   username: "GhostDragon"
  *                   poll_type: "continuous"
  *                   poll:
  *                     id: 2
- *                     min_value: 6
- *                     max_value: 10
  *                   choices:
  *                     - 7
  *                     - 8   

From 10064fbd9cd662689500819f2111901401caaaae Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Wed, 22 Nov 2023 12:17:16 +0300
Subject: [PATCH 058/246] polls/{pollId} swagger update

---
 .../backend/src/routes/PollRouter.js          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 63e55fba..b5f746e1 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -124,6 +124,16 @@ router.get('/', service.getPolls);
  *                   type: string
  *                 poll_type:
  *                   type: string
+ *                 openVisibility:
+ *                   type: integer
+ *                 setDueDate:
+ *                   type: integer
+ *                 dueDatePoll:
+ *                   type: string
+ *                 numericFieldValue:
+ *                   type: integer
+ *                 selectedTimeUnit:
+ *                   type: string
  *                 poll:
  *                   type: object
  *                   properties:
@@ -154,6 +164,11 @@ router.get('/', service.getPolls);
  *                   question: "Who will become POTUS?"
  *                   username: "user123"
  *                   poll_type: "discrete"
+ *                   openVisibility: 1 
+ *                   setDueDate: 1 
+ *                   dueDatePoll: "2023-11-20T21:00:00.000Z"
+ *                   numericFieldValue: 2 
+ *                   selectedTimeUnit: "min"
  *                   poll:
  *                     id: 1
  *                   choices:
@@ -171,6 +186,11 @@ router.get('/', service.getPolls);
  *                   question: "Test question?"
  *                   username: "GhostDragon"
  *                   poll_type: "continuous"
+ *                   openVisibility: 0 
+ *                   setDueDate: 0 
+ *                   dueDatePoll: null
+ *                   numericFieldValue: null
+ *                   selectedTimeUnit: null
  *                   poll:
  *                     id: 2
  *                   choices:

From f5064c51f3ef77999f45b9d15ee03110c7f5c0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hebun=20=C5=9Eim=C5=9Fek?=
 <hebunsimsek@Hebuns-MacBook-Air.local>
Date: Wed, 22 Nov 2023 15:55:35 +0300
Subject: [PATCH 059/246] Update AuthorizationService.js

---
 prediction-polls/backend/src/services/AuthorizationService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index d79211f1..eaaa2894 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -18,7 +18,7 @@ function homePage(req, res){
     }
 
     // Birthday validation
-    if (!isValidBirthday(birthday)) {
+    if (birthday && !isValidBirthday(birthday)) {
         return res.status(400).send('Invalid or unreasonable birthday');
     }
 

From ce615599dbac1e941f9630bd227e201ba2ad54cb Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Wed, 22 Nov 2023 19:54:32 +0300
Subject: [PATCH 060/246] create feed ui state

---
 .../predictionpolls/ui/feed/FeedUiState.kt        | 15 +++++++++++++++
 .../predictionpolls/ui/feed/FeedViewModel.kt      |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
new file mode 100644
index 00000000..b635f62c
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
@@ -0,0 +1,15 @@
+package com.bounswe.predictionpolls.ui.feed
+
+import com.bounswe.predictionpolls.domain.poll.Poll
+
+sealed interface FeedUiState {
+    data object Loading : FeedUiState
+    data class HasFeed(val feed: List<Poll>) : FeedUiState
+
+    /**
+     * Represents the case where there is no feed to show. This case is practically equivalent to HasFeed(emptyList()) but is used to make the code more readable.
+     */
+    data object NoFeed : FeedUiState
+
+    data class Error(val message: String) : FeedUiState
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt
index 0efe2034..12399f6b 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt
@@ -1,10 +1,11 @@
 package com.bounswe.predictionpolls.ui.feed
 
 import androidx.lifecycle.ViewModel
+import com.bounswe.predictionpolls.domain.feed.GetFeedUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
-class FeedViewModel @Inject constructor() : ViewModel() {
+class FeedViewModel @Inject constructor(private val getFeedUseCase: GetFeedUseCase) : ViewModel() {
 
 }
\ No newline at end of file

From 8dddf66e1306cd7aaea43a64008632d3413a794b Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Wed, 22 Nov 2023 20:09:27 +0300
Subject: [PATCH 061/246] update feed view model

---
 .../domain/feed/FeedRepository.kt             |  2 +-
 .../domain/feed/GetFeedUseCase.kt             |  2 +-
 .../predictionpolls/ui/feed/FeedUiState.kt    |  2 +-
 .../predictionpolls/ui/feed/FeedViewModel.kt  | 32 +++++++++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt
index 07815a5b..d0c3d244 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/FeedRepository.kt
@@ -7,5 +7,5 @@ interface FeedRepository {
     /**
      * Fetches the list of polls and returns the result.
      */
-    suspend fun getPolls(page: Int): Result<Poll>
+    suspend fun getPolls(page: Int): Result<List<Poll>>
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
index 01b4af75..b8b53eb1 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
@@ -7,7 +7,7 @@ import javax.inject.Inject
 class GetFeedUseCase @Inject constructor(
     private val feedRepository: FeedRepository
 ) {
-    suspend operator fun invoke(page: Int): Result<Poll> {
+    suspend operator fun invoke(page: Int): Result<List<Poll>> {
         return feedRepository.getPolls(page)
     }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
index b635f62c..6360686b 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
@@ -4,7 +4,7 @@ import com.bounswe.predictionpolls.domain.poll.Poll
 
 sealed interface FeedUiState {
     data object Loading : FeedUiState
-    data class HasFeed(val feed: List<Poll>) : FeedUiState
+    data class HasFeed(val feed: List<Poll>, val feedPage: Int) : FeedUiState
 
     /**
      * Represents the case where there is no feed to show. This case is practically equivalent to HasFeed(emptyList()) but is used to make the code more readable.
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt
index 12399f6b..4ce368b8 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedViewModel.kt
@@ -1,11 +1,43 @@
 package com.bounswe.predictionpolls.ui.feed
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.domain.feed.GetFeedUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class FeedViewModel @Inject constructor(private val getFeedUseCase: GetFeedUseCase) : ViewModel() {
 
+    private val _feedUiState: MutableStateFlow<FeedUiState> = MutableStateFlow(FeedUiState.Loading)
+    val feedUiState: StateFlow<FeedUiState>
+        get() = _feedUiState.asStateFlow()
+
+
+    fun fetchFeed(page: Int) = viewModelScope.launch(Dispatchers.IO) {
+        _feedUiState.update { FeedUiState.Loading }
+
+        val newState = when (val result = getFeedUseCase(page)) {
+            is Result.Success -> {
+                if (result.data.isEmpty()) {
+                    FeedUiState.NoFeed
+                } else {
+                    FeedUiState.HasFeed(result.data, page)
+                }
+            }
+
+            is Result.Error -> FeedUiState.Error(
+                result.exception.message ?: "Unknown error"
+            )
+        }
+
+        _feedUiState.update { newState }
+    }
 }
\ No newline at end of file

From 124c5363f0852b4d06c6b6e572b143e6d079f167 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Wed, 22 Nov 2023 20:29:47 +0300
Subject: [PATCH 062/246] update feed screen

---
 .../poll/ContinuousVoteInputType.kt           |   2 +-
 .../predictionpolls/domain/poll/Poll.kt       |   7 +-
 .../predictionpolls/domain/poll/PollOption.kt |   2 +-
 .../ui/common/poll/ContinuousVoteOption.kt    |   2 +
 .../predictionpolls/ui/feed/FeedScreen.kt     | 138 +++++++++++++-----
 .../predictionpolls/ui/feed/FeedUiState.kt    |   3 +-
 6 files changed, 113 insertions(+), 41 deletions(-)
 rename prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/{ui/common => domain}/poll/ContinuousVoteInputType.kt (94%)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/ContinuousVoteInputType.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/ContinuousVoteInputType.kt
similarity index 94%
rename from prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/ContinuousVoteInputType.kt
rename to prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/ContinuousVoteInputType.kt
index 16ca676a..f8d433c9 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/ContinuousVoteInputType.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/ContinuousVoteInputType.kt
@@ -1,4 +1,4 @@
-package com.bounswe.predictionpolls.ui.common.poll
+package com.bounswe.predictionpolls.domain.poll
 
 import androidx.compose.ui.text.input.KeyboardType
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
index 5bb0eb1d..ac66f096 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
@@ -11,6 +11,7 @@ sealed interface Poll {
     val dueDate: String
     val rejectionText: String
     val commentCount: Int
+    val tags: List<String>
 
     data class ContinuousPoll(
         override val creatorProfilePictureUri: String,
@@ -19,7 +20,8 @@ sealed interface Poll {
         override val pollQuestionTitle: String,
         override val rejectionText: String,
         override val commentCount: Int,
-        val options: ImmutableList<PollOption.ContinuousPollOption>
+        override val tags: List<String>,
+        val inputType: ContinuousVoteInputType,
     ) : Poll
 
     data class DiscretePoll(
@@ -29,5 +31,8 @@ sealed interface Poll {
         override val pollQuestionTitle: String,
         override val rejectionText: String,
         override val commentCount: Int,
+        override val tags: List<String>,
+        val options: ImmutableList<PollOption.DiscreteOption>
+
     ) : Poll
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt
index 0c0f00cd..439b4009 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/PollOption.kt
@@ -1,5 +1,5 @@
 package com.bounswe.predictionpolls.domain.poll
 
 sealed interface PollOption {
-    data class ContinuousPollOption(val id: String, val text: String, val voteCount: Int): PollOption
+    data class DiscreteOption(val id: String, val text: String, val voteCount: Int) : PollOption
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/ContinuousVoteOption.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/ContinuousVoteOption.kt
index e83e3104..e60ac4d4 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/ContinuousVoteOption.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/ContinuousVoteOption.kt
@@ -32,6 +32,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.bounswe.predictionpolls.domain.poll.ContinuousVoteInputType
+import com.bounswe.predictionpolls.domain.poll.toKeyboardType
 import com.bounswe.predictionpolls.ui.theme.MontserratFontFamily
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
index a670325f..2ec91e33 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
@@ -1,59 +1,123 @@
 package com.bounswe.predictionpolls.ui.feed
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import com.bounswe.predictionpolls.domain.poll.Poll
+import com.bounswe.predictionpolls.domain.poll.PollOption
+import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
-import java.util.Date
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
-fun FeedScreen(modifier: Modifier = Modifier) {
+fun FeedScreen(feedUiState: FeedUiState, modifier: Modifier = Modifier) {
     var text by rememberSaveable { mutableStateOf("") } // this might be stored in VM. I am not sure how we will use this parameter so I will store it here for now..
-    Column {
+    Column(modifier = modifier) {
         FeedSearchBar(text = text, onTextChanged = { text = it })
-        LazyColumn(modifier = modifier) {
-            items(10) {
-                PollComposable(
-                    pollCreatorProfilePictureUri = "https://picsum.photos/id/237/200/300",
-                    pollCreatorName = "John Doe",
-                    tags = listOf("Basketball", "NBA", "Lebron James"),
-                    pollQuestionTitle = "When was Lebron James drafted?",
-                    optionsContent = {
-                        Column {
-                            DiscreteVoteOption(
-                                optionName = "2003",
-                                voteCount = 100,
-                                fillPercentage = 0.25f,
-                                isSelected = true
-                            )
-                            DiscreteVoteOption(
-                                optionName = "2004",
-                                voteCount = 200,
-                                fillPercentage = 0.5f,
-                                isSelected = false
-                            )
-                            DiscreteVoteOption(
-                                optionName = "2005",
-                                voteCount = 100,
-                                fillPercentage = 0.25f,
-                                isSelected = false
-                            )
-                        }
+        when (feedUiState) {
+            is FeedUiState.Loading -> {
+                FeedLoading()
+            }
+
+            is FeedUiState.NoFeed -> {
+                NoFeedDisplay()
+            }
 
+            is FeedUiState.HasFeed -> {
+                Polls(polls = feedUiState.feed)
+            }
 
-                    },
-                    dueDate = Date(),
-                    rejectionText = "Last 5 days",
-                    commentCount = 127
-                )
+            is FeedUiState.Error -> {
+                FeedError(errorMessage = feedUiState.message)
             }
         }
+
+
+    }
+
+}
+
+@Composable
+private fun FeedError(errorMessage: String, modifier: Modifier = Modifier) {
+    Box(modifier = modifier) {
+        Text(text = errorMessage, modifier = Modifier.align(Alignment.Center))
+    }
+}
+
+@Composable
+private fun NoFeedDisplay(modifier: Modifier = Modifier) {
+    Box(modifier = modifier) {
+        Text(text = "No feed to show")
     }
+}
 
-}
\ No newline at end of file
+@Composable
+private fun FeedLoading(modifier: Modifier = Modifier) {
+    Box(modifier) {
+        CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+    }
+}
+
+
+@Composable
+private fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
+    LazyColumn(modifier = modifier) {
+        items(polls) {
+            PollComposable(
+                pollCreatorProfilePictureUri = it.creatorProfilePictureUri,
+                pollCreatorName = it.pollCreatorName,
+                tags = it.tags,
+                pollQuestionTitle = it.pollQuestionTitle,
+                optionsContent = {
+                    when (it) {
+                        is Poll.ContinuousPoll -> {
+                            ContinuousVoteOption(
+                                title = "Enter your vote",
+                                vote = "",
+                                isVotingEnabled = false,
+                                voteType = it.inputType,
+                                onVoteInputChanged = {}
+                            )
+                        }
+
+                        is Poll.DiscretePoll -> {
+                            DiscretePollOptions(it.options)
+                        }
+                    }
+                },
+                dueDate = it.dueDate,
+                rejectionText = it.rejectionText,
+                commentCount = it.commentCount
+            )
+        }
+    }
+}
+
+@Composable
+private fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
+    val totalVotes = remember(options) {
+        options.sumOf { it.voteCount }
+    }
+    Column {
+        options.forEach {
+            DiscreteVoteOption(
+                optionName = it.text,
+                voteCount = it.voteCount,
+                fillPercentage = it.voteCount.toFloat() / totalVotes,
+                isSelected = false
+            )
+        }
+    }
+}
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
index 6360686b..4feb4545 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedUiState.kt
@@ -1,10 +1,11 @@
 package com.bounswe.predictionpolls.ui.feed
 
 import com.bounswe.predictionpolls.domain.poll.Poll
+import kotlinx.collections.immutable.ImmutableList
 
 sealed interface FeedUiState {
     data object Loading : FeedUiState
-    data class HasFeed(val feed: List<Poll>, val feedPage: Int) : FeedUiState
+    data class HasFeed(val feed: ImmutableList<Poll>, val feedPage: Int) : FeedUiState
 
     /**
      * Represents the case where there is no feed to show. This case is practically equivalent to HasFeed(emptyList()) but is used to make the code more readable.

From 901a576d0a91db2563218be49968458eae50b916 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Wed, 22 Nov 2023 20:38:13 +0300
Subject: [PATCH 063/246] update feed screen nav graph

---
 prediction-polls/android/app/build.gradle.kts    |  3 +++
 .../domain/feed/GetFeedUseCase.kt                | 16 +++++++++++++---
 .../ui/feed/FeedScreenNavigation.kt              | 13 +++++++++++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/prediction-polls/android/app/build.gradle.kts b/prediction-polls/android/app/build.gradle.kts
index bc5c2a99..b2eb9d36 100644
--- a/prediction-polls/android/app/build.gradle.kts
+++ b/prediction-polls/android/app/build.gradle.kts
@@ -77,6 +77,8 @@ android {
 dependencies {
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2")
+
     implementation("androidx.activity:activity-compose:1.8.0")
     implementation(platform("androidx.compose:compose-bom:2023.10.00"))
     implementation("androidx.compose.ui:ui")
@@ -139,4 +141,5 @@ dependencies {
     // Used for creating stable domain classes. Check stability meaning in terms of compose if you do not know what I mean.
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6")
 
+
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
index b8b53eb1..f3bf8fe2 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/feed/GetFeedUseCase.kt
@@ -2,12 +2,22 @@ package com.bounswe.predictionpolls.domain.feed
 
 import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.domain.poll.Poll
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import javax.inject.Inject
 
 class GetFeedUseCase @Inject constructor(
     private val feedRepository: FeedRepository
 ) {
-    suspend operator fun invoke(page: Int): Result<List<Poll>> {
-        return feedRepository.getPolls(page)
-    }
+    suspend operator fun invoke(page: Int): Result<ImmutableList<Poll>> =
+        when (val result = feedRepository.getPolls(page)) {
+            is Result.Success -> {
+                Result.Success(result.data.toImmutableList())
+            }
+
+            is Result.Error -> {
+                Result.Error(result.exception)
+            }
+        }
+
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
index 6c38c67c..90f07a74 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
@@ -1,6 +1,9 @@
 package com.bounswe.predictionpolls.ui.feed
 
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
@@ -11,8 +14,14 @@ const val FEED_ROUTE = "feed"
 
 fun NavGraphBuilder.feedScreen(navController: NavController) {
     composable(FEED_ROUTE) {
-        val feedViewModel: FeedViewModel = hiltViewModel() // will be used later
-        FeedScreen()
+        val feedViewModel: FeedViewModel = hiltViewModel()
+        LaunchedEffect(Unit) {
+            // fetch the feed if it is not already fetched
+            if (feedViewModel.feedUiState.value !is FeedUiState.HasFeed)
+                feedViewModel.fetchFeed(0)
+        }
+        val feedUiState by feedViewModel.feedUiState.collectAsStateWithLifecycle()
+        FeedScreen(feedUiState)
     }
 }
 

From 7cd9e450ade4cca9b645780d1e2abb5b6321ec09 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Wed, 22 Nov 2023 20:46:52 +0300
Subject: [PATCH 064/246] refactor polls

---
 .../ui/common/poll/PollsComposable.kt         | 66 +++++++++++++++++++
 .../predictionpolls/ui/feed/FeedScreen.kt     | 52 +--------------
 .../ui/profile/ProfileScreen.kt               |  2 +-
 3 files changed, 68 insertions(+), 52 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
new file mode 100644
index 00000000..9aabce2c
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -0,0 +1,66 @@
+package com.bounswe.predictionpolls.ui.common.poll
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import com.bounswe.predictionpolls.domain.poll.Poll
+import com.bounswe.predictionpolls.domain.poll.PollOption
+import kotlinx.collections.immutable.ImmutableList
+
+
+/**
+ * Displays polls in a lazy list. This composable can be used in profile screen and feed screen where continuous flow of polls are expected.
+ */
+@Composable
+fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
+    LazyColumn(modifier = modifier) {
+        items(polls) {
+            PollComposable(
+                pollCreatorProfilePictureUri = it.creatorProfilePictureUri,
+                pollCreatorName = it.pollCreatorName,
+                tags = it.tags,
+                pollQuestionTitle = it.pollQuestionTitle,
+                optionsContent = {
+                    when (it) {
+                        is Poll.ContinuousPoll -> {
+                            ContinuousVoteOption(
+                                title = "Enter your vote",
+                                vote = "",
+                                isVotingEnabled = false,
+                                voteType = it.inputType,
+                                onVoteInputChanged = {}
+                            )
+                        }
+
+                        is Poll.DiscretePoll -> {
+                            DiscretePollOptions(it.options)
+                        }
+                    }
+                },
+                dueDate = it.dueDate,
+                rejectionText = it.rejectionText,
+                commentCount = it.commentCount
+            )
+        }
+    }
+}
+
+@Composable
+private fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
+    val totalVotes = remember(options) {
+        options.sumOf { it.voteCount }
+    }
+    Column {
+        options.forEach {
+            DiscreteVoteOption(
+                optionName = it.text,
+                voteCount = it.voteCount,
+                fillPercentage = it.voteCount.toFloat() / totalVotes,
+                isSelected = false
+            )
+        }
+    }
+}
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
index 2ec91e33..e5da70a5 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
@@ -19,6 +19,7 @@ import com.bounswe.predictionpolls.domain.poll.PollOption
 import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
+import com.bounswe.predictionpolls.ui.common.poll.Polls
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -70,54 +71,3 @@ private fun FeedLoading(modifier: Modifier = Modifier) {
     }
 }
 
-
-@Composable
-private fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
-    LazyColumn(modifier = modifier) {
-        items(polls) {
-            PollComposable(
-                pollCreatorProfilePictureUri = it.creatorProfilePictureUri,
-                pollCreatorName = it.pollCreatorName,
-                tags = it.tags,
-                pollQuestionTitle = it.pollQuestionTitle,
-                optionsContent = {
-                    when (it) {
-                        is Poll.ContinuousPoll -> {
-                            ContinuousVoteOption(
-                                title = "Enter your vote",
-                                vote = "",
-                                isVotingEnabled = false,
-                                voteType = it.inputType,
-                                onVoteInputChanged = {}
-                            )
-                        }
-
-                        is Poll.DiscretePoll -> {
-                            DiscretePollOptions(it.options)
-                        }
-                    }
-                },
-                dueDate = it.dueDate,
-                rejectionText = it.rejectionText,
-                commentCount = it.commentCount
-            )
-        }
-    }
-}
-
-@Composable
-private fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
-    val totalVotes = remember(options) {
-        options.sumOf { it.voteCount }
-    }
-    Column {
-        options.forEach {
-            DiscreteVoteOption(
-                optionName = it.text,
-                voteCount = it.voteCount,
-                fillPercentage = it.voteCount.toFloat() / totalVotes,
-                isSelected = false
-            )
-        }
-    }
-}
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
index 4f291f2d..65cb4126 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
@@ -86,7 +86,7 @@ private fun ProfileScreenPreview() {
 
                         },
                         modifier = Modifier.padding(16.dp),
-                        dueDate = Date(),
+                        dueDate = "",
                         rejectionText = "Last 5 days",
                         commentCount = 530
                     )

From 3f7a5523bf3fd2d13b5e4ab7215b782fc75ae703 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Wed, 22 Nov 2023 21:02:04 +0300
Subject: [PATCH 065/246] create feed repository impl

---
 .../predictionpolls/data/feed/FeedApi.kt      |  4 ++++
 .../data/feed/FeedRemoteDataSource.kt         | 12 ++++++++++
 .../data/feed/FeedRemoteDataSourceImpl.kt     | 14 +++++++++++
 .../data/feed/FeedRepositoryImpl.kt           | 24 +++++++++++++++++++
 .../data/feed/model/PollResponse.kt           | 20 ++++++++++++++++
 5 files changed, 74 insertions(+)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSource.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt
new file mode 100644
index 00000000..1e357aa1
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt
@@ -0,0 +1,4 @@
+package com.bounswe.predictionpolls.data.feed
+
+interface FeedApi {
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSource.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSource.kt
new file mode 100644
index 00000000..febd0c77
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSource.kt
@@ -0,0 +1,12 @@
+package com.bounswe.predictionpolls.data.feed
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.data.feed.model.PollResponse
+import com.bounswe.predictionpolls.domain.poll.Poll
+
+interface FeedRemoteDataSource {
+    /**
+     * Fetches the list of polls and returns the result.
+     */
+    suspend fun getPolls(page: Int): Result<List<PollResponse>>
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
new file mode 100644
index 00000000..15b7eca6
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
@@ -0,0 +1,14 @@
+package com.bounswe.predictionpolls.data.feed
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.data.feed.model.PollResponse
+import com.bounswe.predictionpolls.domain.poll.Poll
+import javax.inject.Inject
+
+class FeedRemoteDataSourceImpl @Inject constructor(
+    private val feedApi: FeedApi
+) : FeedRemoteDataSource {
+    override suspend fun getPolls(page: Int): Result<List<PollResponse>> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt
new file mode 100644
index 00000000..e13eaa66
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt
@@ -0,0 +1,24 @@
+package com.bounswe.predictionpolls.data.feed
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.data.feed.model.toPoll
+import com.bounswe.predictionpolls.domain.feed.FeedRepository
+import com.bounswe.predictionpolls.domain.poll.Poll
+import javax.inject.Inject
+
+class FeedRepositoryImpl @Inject constructor(
+    private val feedRemoteDataSource: FeedRemoteDataSource
+) : FeedRepository {
+    override suspend fun getPolls(page: Int): Result<List<Poll>> =
+        when (val result = feedRemoteDataSource.getPolls(page)) {
+            is Result.Success -> {
+                val polls = result.data.map { it.toPoll() }
+                Result.Success(polls)
+            }
+
+            is Result.Error -> {
+                Result.Error(result.exception)
+            }
+        }
+
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
new file mode 100644
index 00000000..ece7214d
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
@@ -0,0 +1,20 @@
+package com.bounswe.predictionpolls.data.feed.model
+
+import com.bounswe.predictionpolls.domain.poll.ContinuousVoteInputType
+import com.bounswe.predictionpolls.domain.poll.Poll
+
+data class PollResponse(val title: String?) // TODO: Implement this class
+
+// TODO: Implement this extension function
+fun PollResponse.toPoll(): Poll {
+    return Poll.ContinuousPoll(
+        "",
+        "",
+        "",
+        "",
+        "",
+        0,
+        emptyList(),
+        ContinuousVoteInputType.Date
+    )
+}

From 8496e90712cf7306d406d0698fefda5bf1e93e3b Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Wed, 22 Nov 2023 21:15:32 +0300
Subject: [PATCH 066/246] implement dependency injection

---
 .../data/feed/FeedRemoteDataSourceImpl.kt     |  4 ++--
 .../bounswe/predictionpolls/di/FeedModule.kt  | 24 +++++++++++++++++++
 .../predictionpolls/ui/vote/PollVote.kt       |  7 +++---
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
index 15b7eca6..02bad0e5 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
@@ -2,11 +2,11 @@ package com.bounswe.predictionpolls.data.feed
 
 import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.data.feed.model.PollResponse
-import com.bounswe.predictionpolls.domain.poll.Poll
 import javax.inject.Inject
 
+// TODO: Implement this class
 class FeedRemoteDataSourceImpl @Inject constructor(
-    private val feedApi: FeedApi
+//    private val feedApi: FeedApi
 ) : FeedRemoteDataSource {
     override suspend fun getPolls(page: Int): Result<List<PollResponse>> {
         TODO("Not yet implemented")
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt
new file mode 100644
index 00000000..ab3258f0
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt
@@ -0,0 +1,24 @@
+package com.bounswe.predictionpolls.di
+
+import com.bounswe.predictionpolls.data.feed.FeedRemoteDataSource
+import com.bounswe.predictionpolls.data.feed.FeedRemoteDataSourceImpl
+import com.bounswe.predictionpolls.data.feed.FeedRepositoryImpl
+import com.bounswe.predictionpolls.domain.feed.FeedRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+@InstallIn(ViewModelComponent::class)
+@Module
+abstract class FeedModule {
+    @Binds
+    abstract fun bindFeedRepository(
+        feedRepositoryImpl: FeedRepositoryImpl
+    ): FeedRepository
+
+    @Binds
+    abstract fun bindFeedRemoteDataSource(
+        feedRemoteDataSourceImpl: FeedRemoteDataSourceImpl
+    ): FeedRemoteDataSource
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt
index 066a3e16..f6f49dc9 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt
@@ -23,12 +23,11 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.bounswe.predictionpolls.R
-import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteInputType
+import com.bounswe.predictionpolls.domain.poll.ContinuousVoteInputType
 import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
 import com.bounswe.predictionpolls.ui.theme.MontserratFontFamily
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
-import java.util.Date
 
 /**
  * This composable represents the vote screen for a poll.
@@ -116,8 +115,8 @@ private fun PollVotePreview() {
                 pollCreatorName = "Zehra Eser",
                 tags = listOf("Basketball", "Cleveland Cavaliers", "Lebron James"),
                 pollQuestionTitle = "Who is the best basketball player of all time?",
-                optionsContent = { /*TODO*/ },
-                dueDate = Date(),
+                optionsContent = {  },
+                dueDate = "",
                 rejectionText = "Last 5 days",
                 commentCount = 145
             )

From fa95e256ae24522553e25266e00a786bfe9cec2e Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Thu, 23 Nov 2023 00:03:22 +0300
Subject: [PATCH 067/246] create profile screen view model

---
 .../domain/profile/GetProfileInfoUseCase.kt   |  13 +++
 .../domain/profile/ProfileInfo.kt             |  12 ++
 .../domain/profile/ProfileRepository.kt       |   8 ++
 .../ui/profile/ProfileScreen.kt               |   1 -
 .../ui/profile/ProfileScreenUiState.kt        |  23 ++++
 .../ui/profile/ProfileScreenViewModel.kt      | 109 ++++++++++++++++++
 6 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileRepository.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenUiState.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
new file mode 100644
index 00000000..7a7c3500
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
@@ -0,0 +1,13 @@
+package com.bounswe.predictionpolls.domain.profile
+
+import com.bounswe.predictionpolls.common.Result
+import javax.inject.Inject
+
+class GetProfileInfoUseCase @Inject constructor(
+    private val profileRepository: ProfileRepository
+) {
+
+    suspend operator fun invoke(userId: Int): Result<ProfileInfo> =
+        profileRepository.getProfileInfo(userId)
+
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
new file mode 100644
index 00000000..bc9f775a
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
@@ -0,0 +1,12 @@
+package com.bounswe.predictionpolls.domain.profile
+
+import kotlinx.collections.immutable.ImmutableList
+
+data class ProfileInfo(
+    val username: String,
+    val userFullName: String,
+    val coverPhotoUri: String,
+    val profilePictureUri: String,
+    val userDescription: String,
+    val badgeUris: ImmutableList<String>
+)
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileRepository.kt
new file mode 100644
index 00000000..2075be37
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileRepository.kt
@@ -0,0 +1,8 @@
+package com.bounswe.predictionpolls.domain.profile
+
+import com.bounswe.predictionpolls.common.Result
+
+interface ProfileRepository {
+    suspend fun getProfileInfo(userId: Int): Result<ProfileInfo>
+
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
index 65cb4126..c9a9abf9 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
@@ -13,7 +13,6 @@ import androidx.compose.ui.unit.dp
 import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
-import java.util.Date
 
 /**
  * This composable is used to display profile information and polls of a user.
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenUiState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenUiState.kt
new file mode 100644
index 00000000..920e673a
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenUiState.kt
@@ -0,0 +1,23 @@
+package com.bounswe.predictionpolls.ui.profile
+
+import com.bounswe.predictionpolls.domain.poll.Poll
+import com.bounswe.predictionpolls.domain.profile.ProfileInfo
+import kotlinx.collections.immutable.ImmutableList
+
+sealed interface ProfileScreenUiState {
+    data object Loading : ProfileScreenUiState
+
+    /**
+     * Indicates that the profile info cannot be fetched.
+     */
+    data class Error(val message: String) : ProfileScreenUiState
+
+    /**
+     * Indicates that the profile info is fetched successfully but feed cannot be fetched.
+     */
+    data class ProfileInfoFetched(val profileInfo: ProfileInfo, val errorMessage: String) : ProfileScreenUiState
+
+
+    data class ProfileAndFeedFetched(val profileInfo: ProfileInfo, val feed: ImmutableList<Poll>) : ProfileScreenUiState
+
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
new file mode 100644
index 00000000..da9ee6b5
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
@@ -0,0 +1,109 @@
+package com.bounswe.predictionpolls.ui.profile
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.feed.GetFeedUseCase
+import com.bounswe.predictionpolls.domain.poll.Poll
+import com.bounswe.predictionpolls.domain.profile.GetProfileInfoUseCase
+import com.bounswe.predictionpolls.domain.profile.ProfileInfo
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+private data class ProfileScreenViewModelState(
+    val profileInfo: ProfileInfo? = null,
+    val feed: ImmutableList<Poll>? = null,
+    val isLoading: Boolean = true,
+    val error: String? = null
+) {
+    fun toProfileScreenUiState(): ProfileScreenUiState {
+        return if (isLoading) {
+            ProfileScreenUiState.Loading
+        } else {
+            if (profileInfo == null) {
+                ProfileScreenUiState.Error(error ?: "Unknown error")
+            } else {
+                if (feed == null) {
+                    ProfileScreenUiState.ProfileInfoFetched(profileInfo, error ?: "Unknown error")
+                } else {
+                    ProfileScreenUiState.ProfileAndFeedFetched(profileInfo, feed)
+                }
+            }
+        }
+    }
+}
+
+
+@HiltViewModel
+class ProfileScreenViewModel @Inject constructor(
+    private val getProfileInfoUseCase: GetProfileInfoUseCase,
+    private val getFeedUseCase: GetFeedUseCase
+) : ViewModel() {
+
+    private val _profileScreenUiState: MutableStateFlow<ProfileScreenViewModelState> =
+        MutableStateFlow(ProfileScreenViewModelState())
+
+    val profileScreenUiState: StateFlow<ProfileScreenUiState>
+        get() = _profileScreenUiState
+            .map { it.toProfileScreenUiState() }
+            .stateIn(viewModelScope, SharingStarted.Eagerly, ProfileScreenUiState.Loading)
+
+
+    fun fetchProfileInfo(userId: Int) = viewModelScope.launch {
+        _profileScreenUiState.update { it.copy(isLoading = true) }
+        when (val result = getProfileInfoUseCase(userId)) {
+            is Result.Success -> {
+                _profileScreenUiState.update {
+                    it.copy(
+                        isLoading = false,
+                        profileInfo = result.data,
+                        error = null
+                    )
+                }
+            }
+
+            is Result.Error -> {
+                _profileScreenUiState.update {
+                    it.copy(
+                        isLoading = false,
+                        error = result.exception.message,
+                        profileInfo = null
+                    )
+                }
+            }
+        }
+    }
+
+    fun fetchFeed(page: Int) = viewModelScope.launch {
+        _profileScreenUiState.update { it.copy(isLoading = true) }
+
+        when (val result = getFeedUseCase(page)) {
+            is Result.Success -> {
+                _profileScreenUiState.update {
+                    it.copy(
+                        isLoading = false,
+                        feed = result.data,
+                    )
+                }
+            }
+
+            is Result.Error -> {
+                _profileScreenUiState.update {
+                    it.copy(
+                        isLoading = false,
+                        error = result.exception.message,
+                        feed = null
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

From db8821a8cb1127dd4922b74faf53d0efc51fa2d0 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Thu, 23 Nov 2023 00:21:14 +0300
Subject: [PATCH 068/246] create profile screen nav route

---
 .../ui/common/poll/PollsComposable.kt         |  2 +-
 .../ui/profile/ProfileScreen.kt               | 96 ++++++++++++++++++-
 .../ui/profile/ProfileScreenNavigation.kt     | 31 ++++++
 3 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
index 9aabce2c..d6bac585 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -49,7 +49,7 @@ fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
 }
 
 @Composable
-private fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
+fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
     val totalVotes = remember(options) {
         options.sumOf { it.voteCount }
     }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
index c9a9abf9..fe91cfcf 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
@@ -5,23 +5,113 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.bounswe.predictionpolls.domain.poll.Poll
+import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
+import com.bounswe.predictionpolls.ui.common.poll.DiscretePollOptions
 import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 
+
+@Composable
+fun ProfileScreen(profileScreenUiState: ProfileScreenUiState, modifier: Modifier = Modifier) {
+    InternalProfileScreen(
+        modifier = modifier,
+        profileInformation = {
+            when (profileScreenUiState) {
+                is ProfileScreenUiState.Loading -> {
+                    CircularProgressIndicator()
+                }
+
+                is ProfileScreenUiState.Error -> {
+                    Text(text = profileScreenUiState.message)
+                }
+
+                is ProfileScreenUiState.ProfileInfoFetched -> {
+                    val profileInfo = profileScreenUiState.profileInfo
+                    ProfileCard(
+                        username = profileInfo.username,
+                        userFullName = profileInfo.userFullName,
+                        coverPhotoUri = profileInfo.coverPhotoUri,
+                        profilePictureUri = profileInfo.profilePictureUri,
+                        userDescription = profileInfo.userDescription,
+                        badgeUris = profileInfo.badgeUris,
+                        onProfileEditPressed = { /*TODO*/ },
+                        onRequestsClicked = { /*TODO*/ })
+                }
+
+                is ProfileScreenUiState.ProfileAndFeedFetched -> {
+                    val profileInfo = profileScreenUiState.profileInfo
+                    ProfileCard(
+                        username = profileInfo.username,
+                        userFullName = profileInfo.userFullName,
+                        coverPhotoUri = profileInfo.coverPhotoUri,
+                        profilePictureUri = profileInfo.profilePictureUri,
+                        userDescription = profileInfo.userDescription,
+                        badgeUris = profileInfo.badgeUris,
+                        onProfileEditPressed = { /*TODO*/ },
+                        onRequestsClicked = { /*TODO*/ })
+                }
+            }
+        },
+        polls = {
+            when (profileScreenUiState) {
+                is ProfileScreenUiState.ProfileAndFeedFetched -> {
+                    items(profileScreenUiState.feed) {
+                        PollComposable(
+                            pollCreatorProfilePictureUri = it.creatorProfilePictureUri,
+                            pollCreatorName = it.pollCreatorName,
+                            tags = it.tags,
+                            pollQuestionTitle = it.pollQuestionTitle,
+                            optionsContent = {
+                                when (it) {
+                                    is Poll.ContinuousPoll -> {
+                                        ContinuousVoteOption(
+                                            title = "Enter your vote",
+                                            vote = "",
+                                            isVotingEnabled = false,
+                                            voteType = it.inputType,
+                                            onVoteInputChanged = {}
+                                        )
+                                    }
+
+                                    is Poll.DiscretePoll -> {
+                                        DiscretePollOptions(it.options)
+                                    }
+                                }
+                            },
+                            dueDate = it.dueDate,
+                            rejectionText = it.rejectionText,
+                            commentCount = it.commentCount
+                        )
+                    }
+                }
+
+                else -> {
+                    // Do nothing
+                }
+            }
+        }
+
+    )
+
+}
+
 /**
  * This composable is used to display profile information and polls of a user.
- * @param profileInformation is a function that has access to lazy list scope of the profile screen that displays profile information of a user.
  * @param polls is a function that has access to lazy list scope of the profile screen that displays polls of a user.
  * Since these items have access to the lazy list scope, they can be added to the lazy list.
  */
 @Composable
-fun ProfileScreen(
+private fun InternalProfileScreen(
     profileInformation: @Composable () -> Unit,
     polls: LazyListScope.() -> Unit,
     modifier: Modifier = Modifier
@@ -41,7 +131,7 @@ fun ProfileScreen(
 @Composable
 private fun ProfileScreenPreview() {
     PredictionPollsTheme {
-        ProfileScreen(
+        InternalProfileScreen(
             profileInformation = {
                 ProfileCard(
                     username = "can.gezer13",
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
new file mode 100644
index 00000000..1830ab34
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
@@ -0,0 +1,31 @@
+package com.bounswe.predictionpolls.ui.profile
+
+import androidx.compose.runtime.getValue
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
+import androidx.navigation.Navigator
+import androidx.navigation.compose.composable
+
+const val PROFILE_SCREEN_ROUTE = "profile"
+
+fun NavGraphBuilder.profileScreen(navController: NavController) {
+    composable(PROFILE_SCREEN_ROUTE) {
+        val profileViewModel: ProfileScreenViewModel = hiltViewModel()
+
+
+        val profileScreenUiState by profileViewModel.profileScreenUiState.collectAsStateWithLifecycle()
+
+        ProfileScreen(profileScreenUiState)
+
+    }
+}
+
+fun NavController.navigateToFeedScreen(
+    navOptions: NavOptions? = null,
+    block: Navigator.Extras? = null
+) {
+    navigate(PROFILE_SCREEN_ROUTE, navOptions, block)
+}
\ No newline at end of file

From fb24ca53682e33b84e71463deab7f9dbef5d3974 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Thu, 23 Nov 2023 00:27:03 +0300
Subject: [PATCH 069/246] create profile info repository impl

---
 .../data/profile/ProfileApi.kt                |  4 ++++
 .../profile/ProfileInfoInfoRepositoryImpl.kt  | 24 +++++++++++++++++++
 .../profile/ProfileInfoRemoteDataSource.kt    |  9 +++++++
 .../ProfileInfoRemoteDataSourceImpl.kt        | 12 ++++++++++
 .../data/profile/model/ProfileInfoResponse.kt | 12 ++++++++++
 .../domain/profile/GetProfileInfoUseCase.kt   |  4 ++--
 ...Repository.kt => ProfileInfoRepository.kt} |  2 +-
 7 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
 rename prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/{ProfileRepository.kt => ProfileInfoRepository.kt} (83%)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
new file mode 100644
index 00000000..05059917
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
@@ -0,0 +1,4 @@
+package com.bounswe.predictionpolls.data.profile
+
+interface ProfileApi {
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
new file mode 100644
index 00000000..300d8b3f
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
@@ -0,0 +1,24 @@
+package com.bounswe.predictionpolls.data.profile
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.profile.ProfileInfo
+import com.bounswe.predictionpolls.domain.profile.ProfileInfoRepository
+import javax.inject.Inject
+
+class ProfileInfoInfoRepositoryImpl @Inject constructor(
+    private val profileInfoRemoteDataSource: ProfileInfoRemoteDataSource
+) : ProfileInfoRepository {
+    override suspend fun getProfileInfo(userId: Int): Result<ProfileInfo> {
+        profileInfoRemoteDataSource.fetchProfileInfo(userId).let { result ->
+            return when (result) {
+                is Result.Success -> {
+                    Result.Success(result.data.toProfileInfo())
+                }
+
+                is Result.Error -> {
+                    Result.Error(result.exception)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
new file mode 100644
index 00000000..d9c1b981
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
@@ -0,0 +1,9 @@
+package com.bounswe.predictionpolls.data.profile
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
+
+interface ProfileInfoRemoteDataSource {
+
+    suspend fun fetchProfileInfo(userId: Int): Result<ProfileInfoResponse>
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
new file mode 100644
index 00000000..210456e3
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
@@ -0,0 +1,12 @@
+package com.bounswe.predictionpolls.data.profile
+
+import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
+import javax.inject.Inject
+
+class ProfileInfoRemoteDataSourceImpl @Inject constructor(
+    private val profileApi: ProfileApi
+) : ProfileInfoRemoteDataSource {
+    override suspend fun fetchProfileInfo(userId: Int): Result<ProfileInfoResponse> {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
new file mode 100644
index 00000000..56070c8a
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
@@ -0,0 +1,12 @@
+package com.bounswe.predictionpolls.data.profile.model
+
+import com.bounswe.predictionpolls.domain.profile.ProfileInfo
+import kotlinx.collections.immutable.persistentListOf
+
+// TODO: Implement this class when backend decides on the response format.
+data class ProfileInfoResponse(val name: String) {
+
+    fun toProfileInfo(): ProfileInfo {
+        return ProfileInfo("", "", "", "", "", persistentListOf())
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
index 7a7c3500..b6f4392d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
@@ -4,10 +4,10 @@ import com.bounswe.predictionpolls.common.Result
 import javax.inject.Inject
 
 class GetProfileInfoUseCase @Inject constructor(
-    private val profileRepository: ProfileRepository
+    private val profileInfoRepository: ProfileInfoRepository
 ) {
 
     suspend operator fun invoke(userId: Int): Result<ProfileInfo> =
-        profileRepository.getProfileInfo(userId)
+        profileInfoRepository.getProfileInfo(userId)
 
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
similarity index 83%
rename from prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileRepository.kt
rename to prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
index 2075be37..62547ec7 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
@@ -2,7 +2,7 @@ package com.bounswe.predictionpolls.domain.profile
 
 import com.bounswe.predictionpolls.common.Result
 
-interface ProfileRepository {
+interface ProfileInfoRepository {
     suspend fun getProfileInfo(userId: Int): Result<ProfileInfo>
 
 }
\ No newline at end of file

From bbe933cd5127e73e9a52049f3c39ef84c948ffd2 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 13:33:55 +0300
Subject: [PATCH 070/246] change choices -> options

---
 prediction-polls/backend/src/services/PollService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index f0e53e36..dc879698 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -51,7 +51,7 @@ function getDiscretePollWithId(req,res, responseBody){
 
                 Promise.all(choicesWithVoteCount)
                 .then((updatedChoices) => {
-                    responseBody = { ...responseBody, "poll": rows[0], "choices": updatedChoices };
+                    responseBody = { ...responseBody, "poll": rows[0], "options": updatedChoices };
                     res.json(responseBody);
                 })
             })
@@ -117,7 +117,7 @@ function getContinuousPollWithId(req,res, responseBody){
         } else {
             db.getContinuousPollVotes(pollId)
             .then((choices) => {
-                responseBody = {...responseBody, "poll": rows[0], "choices": choices}
+                responseBody = {...responseBody, "poll": rows[0], "options": choices}
                 res.json(responseBody)
             })
         }

From aa662dc0474602ded75714a086e55f0f01706d4b Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 13:36:05 +0300
Subject: [PATCH 071/246] remove unnecessary "poll" property

---
 prediction-polls/backend/src/services/PollService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index dc879698..2ce3c4a3 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -51,7 +51,7 @@ function getDiscretePollWithId(req,res, responseBody){
 
                 Promise.all(choicesWithVoteCount)
                 .then((updatedChoices) => {
-                    responseBody = { ...responseBody, "poll": rows[0], "options": updatedChoices };
+                    responseBody = { ...responseBody, "options": updatedChoices };
                     res.json(responseBody);
                 })
             })
@@ -117,7 +117,7 @@ function getContinuousPollWithId(req,res, responseBody){
         } else {
             db.getContinuousPollVotes(pollId)
             .then((choices) => {
-                responseBody = {...responseBody, "poll": rows[0], "options": choices}
+                responseBody = {...responseBody, "options": choices}
                 res.json(responseBody)
             })
         }

From 7d783902b9c97a39b3b3ebf1aeb5ab6dcf66c0f4 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 13:36:50 +0300
Subject: [PATCH 072/246] add cont_poll_type to continuous polls

---
 prediction-polls/backend/src/services/PollService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 2ce3c4a3..9385ccd6 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -117,7 +117,7 @@ function getContinuousPollWithId(req,res, responseBody){
         } else {
             db.getContinuousPollVotes(pollId)
             .then((choices) => {
-                responseBody = {...responseBody, "options": choices}
+                responseBody = {...responseBody, "cont_poll_type": rows[0].cont_poll_type, "options": choices}
                 res.json(responseBody)
             })
         }

From 81b2364d6fd6aba43adcffc9e746cd86d2ddd8c7 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 13:41:34 +0300
Subject: [PATCH 073/246] change dueDatePoll -> closingDate

---
 prediction-polls/backend/src/schema.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index c05d69b6..fa65ec6e 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -28,7 +28,7 @@ CREATE TABLE polls (
     poll_type ENUM('discrete', 'continuous') NOT NULL,
     openVisibility BOOLEAN NOT NULL,
     setDueDate BOOLEAN NOT NULL,
-    dueDatePoll DATE,
+    closingDate DATE,
     numericFieldValue INT,
     selectedTimeUnit ENUM('min', 'h', 'day', 'mth')
 );

From a7a440e1951d72a85d60e3949d02834b697cdb11 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 13:53:20 +0300
Subject: [PATCH 074/246] add additional properties requested

---
 .../backend/src/services/PollService.js       | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 9385ccd6..329f42ab 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -20,12 +20,25 @@ function getPollWithId(req, res) {
         if (rows.length === 0) {
             res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
         } else {
-            const pollType = rows[0].poll_type;
-            const responseBody = rows[0];
+            const pollObject = rows[0];
+            const pollType = pollObject.poll_type;
+            const properties = {
+                "id": pollObject.id,
+                "question": pollObject.question,
+                "tags": [],
+                "creatorName": pollObject.username,
+                "creatorUsername": pollObject.username,
+                "creatorImage": null,
+                "pollType": pollObject.poll_type,
+                "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+                "isOpen": true,
+                "comments": []
+            }
+
             if (pollType === 'discrete') {
-                getDiscretePollWithId(req, res, responseBody);
+                getDiscretePollWithId(req, res, properties);
             } else if (pollType === 'continuous') {
-                getContinuousPollWithId(req, res, responseBody);
+                getContinuousPollWithId(req, res, properties);
             }
         }
     })

From 1e8226ca98ffd03bf87f95c2d7cbab9ce1a6fdfc Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 14:04:49 +0300
Subject: [PATCH 075/246] remove getDiscretePollWithId

---
 .../backend/src/services/PollService.js       | 48 ++++++-------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 329f42ab..59772bd0 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -36,44 +36,26 @@ function getPollWithId(req, res) {
             }
 
             if (pollType === 'discrete') {
-                getDiscretePollWithId(req, res, properties);
-            } else if (pollType === 'continuous') {
-                getContinuousPollWithId(req, res, properties);
-            }
-        }
-    })
-}
-
-function getDiscretePollWithId(req,res, responseBody){
-    const pollId = req.params.pollId;
-
-    db.getDiscretePollWithId(pollId)
-    .then((rows) => {
-        if (rows.length === 0) {
-            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
-        } else {
-            db.getDiscretePollChoices(pollId)
-            .then((choices) => {
+                db.getDiscretePollChoices(pollId)
+                .then((choices) => {
                 
-                const choicesWithVoteCount = choices.map((choice) => {
-                    return db.getDiscreteVoteCount(choice.id)
-                    .then((voterCount) => {
-                        return { ...choice, voter_count: voterCount };
+                    const choicesWithVoteCount = choices.map((choice) => {
+                        return db.getDiscreteVoteCount(choice.id)
+                        .then((voterCount) => {
+                            return { ...choice, voter_count: voterCount };
+                        })
+                    });
+
+                    Promise.all(choicesWithVoteCount)
+                    .then((options) => {
+                        res.json({...properties, "options": options});
                     })
-                });
-
-                Promise.all(choicesWithVoteCount)
-                .then((updatedChoices) => {
-                    responseBody = { ...responseBody, "options": updatedChoices };
-                    res.json(responseBody);
                 })
-            })
+            } else if (pollType === 'continuous') {
+                getContinuousPollWithId(req, res, properties);
+            }
         }
     })
-    .catch((error) => {
-        console.error(error);
-        res.status(500).json({error: errorCodes.DATABASE_ERROR});
-    })
 }
 
 function addDiscretePoll(req,res){

From 7b3537bf8ff4828bd1c632781b12e53316ea702d Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 14:08:42 +0300
Subject: [PATCH 076/246] remove getcontinuousPollWithId

---
 .../backend/src/services/PollService.js       | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 59772bd0..a8a80c15 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -52,7 +52,17 @@ function getPollWithId(req, res) {
                     })
                 })
             } else if (pollType === 'continuous') {
-                getContinuousPollWithId(req, res, properties);
+                db.getContinuousPollWithId(pollId)
+                .then((rows) => {
+                    if (rows.length === 0) {
+                        res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
+                    } else {
+                        db.getContinuousPollVotes(pollId)
+                        .then((choices) => {
+                            res.json({...properties, "cont_poll_type": rows[0].cont_poll_type, "options": choices});
+                        })
+                    }
+                })
             }
         }
     })
@@ -102,27 +112,6 @@ function validateAddDiscretePoll(body) {
     return true;
 }
 
-function getContinuousPollWithId(req,res, responseBody){
-    const pollId = req.params.pollId;
-
-    db.getContinuousPollWithId(pollId)
-    .then((rows) => {
-        if (rows.length === 0) {
-            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
-        } else {
-            db.getContinuousPollVotes(pollId)
-            .then((choices) => {
-                responseBody = {...responseBody, "cont_poll_type": rows[0].cont_poll_type, "options": choices}
-                res.json(responseBody)
-            })
-        }
-    })
-    .catch((error) => {
-        console.error(error);
-        res.status(500).json({error: errorCodes.DATABASE_ERROR});
-    })
-}
-
 function addContinuousPoll(req,res){
     if (!validateAddContinuousPoll(req.body)) {
         return res.status(400).json({error: errorCodes.BAD_CONT_POLL_REQUEST_ERROR});

From bbdd536cd1125f89fa87715d07a6030773b4873f Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 14:48:09 +0300
Subject: [PATCH 077/246] add closingDate

---
 prediction-polls/backend/src/services/PollService.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index a8a80c15..3cc731a3 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -30,6 +30,7 @@ function getPollWithId(req, res) {
                 "creatorUsername": pollObject.username,
                 "creatorImage": null,
                 "pollType": pollObject.poll_type,
+                "closingDate": pollObject.closingDate,
                 "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
                 "isOpen": true,
                 "comments": []

From c44b8a710ec0a770e9d821a3f1589a2af4ce63df Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 14:51:40 +0300
Subject: [PATCH 078/246] change dueDatePoll -> closingDate in sql queries

---
 .../backend/src/routes/PollRouter.js          | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index b5f746e1..06eccf20 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -120,25 +120,26 @@ router.get('/', service.getPolls);
  *                   type: integer
  *                 question:
  *                   type: string
- *                 username:
+ *                 tags:
+ *                   type: array
+ *                   items: 
+ *                     type: string
+ *                 creatorName:
  *                   type: string
- *                 poll_type:
+ *                 creatorUsername:
+ *                   type: string
+ *                 creatorImage:
+ *                   type: string
+ *                 pollType:
+ *                   type: string
+ *                 closingDate:
+ *                   type: string
+ *                 rejectVotes:
  *                   type: string
- *                 openVisibility:
- *                   type: integer
  *                 setDueDate:
  *                   type: integer
  *                 dueDatePoll:
  *                   type: string
- *                 numericFieldValue:
- *                   type: integer
- *                 selectedTimeUnit:
- *                   type: string
- *                 poll:
- *                   type: object
- *                   properties:
- *                     id:
- *                       type: integer
  *                 choices:
  *                   oneOf:
  *                     - type: array
@@ -162,15 +163,14 @@ router.get('/', service.getPolls);
  *                 value:
  *                   id: 1
  *                   question: "Who will become POTUS?"
- *                   username: "user123"
- *                   poll_type: "discrete"
- *                   openVisibility: 1 
+ *                   tags: ["tag1", "tag2"]
+ *                   creatorName: "user123"
+ *                   creatorUsername: "GhostDragon"
+ *                   creatorImage: null
+ *                   pollType: "discrete"
+ *                   rejectVotes: "5 min"
  *                   setDueDate: 1 
- *                   dueDatePoll: "2023-11-20T21:00:00.000Z"
- *                   numericFieldValue: 2 
- *                   selectedTimeUnit: "min"
- *                   poll:
- *                     id: 1
+ *                   closingDate: "2023-11-20T21:00:00.000Z"
  *                   choices:
  *                     - id: 1
  *                       choice_text: "Trumpo"
@@ -184,15 +184,14 @@ router.get('/', service.getPolls);
  *                 value:
  *                   id: 2
  *                   question: "Test question?"
- *                   username: "GhostDragon"
- *                   poll_type: "continuous"
- *                   openVisibility: 0 
+ *                   tags: ["tag1", "tag2"]
+ *                   creatorName: "GhostDragon"
+ *                   creatorUsername: "GhostDragon"
+ *                   creatorImage: null
+ *                   pollType: "continuous"
+ *                   rejectVotes: "2 hr"
  *                   setDueDate: 0 
- *                   dueDatePoll: null
- *                   numericFieldValue: null
- *                   selectedTimeUnit: null
- *                   poll:
- *                     id: 2
+ *                   closingDate: null
  *                   choices:
  *                     - 7
  *                     - 8   

From a8419e1af05c6e753897d62e2efe60974f006f95 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 14:52:06 +0300
Subject: [PATCH 079/246] change dueDatePoll -> closingDate in sql queries

---
 prediction-polls/backend/src/repositories/PollDB.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 53525328..8d825b90 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -62,7 +62,7 @@ async function getContinuousPollWithId(pollId){
 async function addDiscretePoll(question, username, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
     const connection = await pool.getConnection();
 
-    const sql_poll = 'INSERT INTO polls (question, username, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
+    const sql_poll = 'INSERT INTO polls (question, username, poll_type, openVisibility, setDueDate, closingDate, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
     const sql_discrete_poll = 'INSERT INTO discrete_polls (id) VALUES (?)';
     const sql_choice = 'INSERT INTO discrete_poll_choices (choice_text, poll_id) VALUES (?, ?)';
 
@@ -96,7 +96,7 @@ async function addDiscretePoll(question, username, choices, openVisibility, setD
 async function addContinuousPoll(question, username, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
     const connection = await pool.getConnection();
 
-    const sql_poll = 'INSERT INTO polls (question, username, poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
+    const sql_poll = 'INSERT INTO polls (question, username, poll_type, openVisibility, setDueDate, closingDate, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
     const sql_continuous_poll = 'INSERT INTO continuous_polls (id, cont_poll_type) VALUES (?, ?)' 
 
     try {

From 42242e4cc6a1c0900e0bfd8a8e80be3b9bbaff8a Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 14:58:20 +0300
Subject: [PATCH 080/246] update swagger

---
 prediction-polls/backend/src/routes/PollRouter.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 06eccf20..f84690bc 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -132,14 +132,14 @@ router.get('/', service.getPolls);
  *                   type: string
  *                 pollType:
  *                   type: string
- *                 closingDate:
- *                   type: string
  *                 rejectVotes:
  *                   type: string
  *                 setDueDate:
  *                   type: integer
- *                 dueDatePoll:
+ *                 closingDate:
  *                   type: string
+ *                 isOpen:
+ *                   type: integer
  *                 choices:
  *                   oneOf:
  *                     - type: array
@@ -171,6 +171,7 @@ router.get('/', service.getPolls);
  *                   rejectVotes: "5 min"
  *                   setDueDate: 1 
  *                   closingDate: "2023-11-20T21:00:00.000Z"
+ *                   isOpen: 1 
  *                   choices:
  *                     - id: 1
  *                       choice_text: "Trumpo"
@@ -192,6 +193,8 @@ router.get('/', service.getPolls);
  *                   rejectVotes: "2 hr"
  *                   setDueDate: 0 
  *                   closingDate: null
+ *                   isOpen: 1 
+ *                   cont_poll_type: "numeric"
  *                   choices:
  *                     - 7
  *                     - 8   

From af0364bd755b9d0c0107c3837f8e7deff0ef4a1c Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 18:26:22 +0300
Subject: [PATCH 081/246] Add google errors and update auth errors

---
 prediction-polls/backend/src/errorCodes.js | 55 ++++++++++++++++++++--
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index cf03e7c1..5dee5f74 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -5,28 +5,33 @@ const errorCodes = {
     message: 'An unexpected error occurred.',
   },
 
-  ACCESS_TOKEN_INVALID_ERROR: {
+  INTERNAL_SERVER_ERROR: {
     code: 1001,
+    message: "Something went wrong",
+  },
+
+  ACCESS_TOKEN_INVALID_ERROR: {
+    code: 1002,
     message: 'The access token is invalid.',
   },
 
   REFRESH_TOKEN_INVALID_ERROR: {
-    code: 1002,
+    code: 1003,
     message: 'The refresh token is invalid.',
   },
 
   ACCESS_TOKEN_NEEDED_ERROR: {
-    code: 1003,
+    code: 1004,
     message: 'A access token is needed',
   },
 
   REFRESH_TOKEN_NEEDED_ERROR: {
-    code: 1004,
+    code: 1005,
     message: 'A refresh token is needed',
   },
 
   REGISTRATION_FAILED: {
-    code: 1005,
+    code: 1006,
     message: 'Registration failed'
   },
 
@@ -65,6 +70,46 @@ const errorCodes = {
     message: 'Password is wrong',
   },
 
+  INVALID_EMAIL: {
+    code: 2007,
+    message: 'Email does not meet required criteria',
+  },
+
+  INVALID_DATE: {
+    code: 2008,
+    message: 'Date does not meet required criteria',
+  },
+
+  INVALID_PASSWORD: {
+    code: 2009,
+    message: 'Password does not meet required criteria',
+  },
+
+  GOOGLE_LOGIN_FAILED: {
+    code: 2100,
+    message: 'Google authentication failed',
+  },
+
+  GOOGLE_LOGIN_BODY_EMPTY: {
+    code: 2101,
+    message: 'Google login requires code or googleId',
+  },
+
+  GOOGLE_LOGIN_INVALID_GOOGLE_CODE: {
+    code: 2102,
+    message: 'Given google code is not valid',
+  },
+
+  GOOGLE_LOGIN_INVALID_GOOGLE_ID: {
+    code: 2103,
+    message: 'Given google id is not valid',
+  },
+
+  GOOGLE_LOGIN_NONVERIFIED_GOOGLE_ACCOUNT: {
+    code: 2104,
+    message: 'Google account is not verified',
+  },
+
   PROFILE_NOT_FOUND: {
     code: 3000,
     message: 'Profile not found.',

From 3092dd633fc3cfc4df15e47f8de7b590a1525d52 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 18:26:36 +0300
Subject: [PATCH 082/246] Add new errors as responses

---
 .../src/repositories/AuthorizationDB.js       | 12 +++----
 .../src/services/AuthorizationService.js      | 36 +++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/AuthorizationDB.js b/prediction-polls/backend/src/repositories/AuthorizationDB.js
index 722d27b0..f1e64025 100644
--- a/prediction-polls/backend/src/repositories/AuthorizationDB.js
+++ b/prediction-polls/backend/src/repositories/AuthorizationDB.js
@@ -34,8 +34,7 @@ async function checkCredentials(username, password) {
         const [rows] = await pool.query(sql, values);
         return rows;
     } catch (error) {
-        console.error(error);
-        return false;
+        return {error:errorCodes.WRONG_PASSWORD};
     }
 }
 
@@ -52,9 +51,10 @@ async function addUser(username, password,email,birthday){
         const values = [username, email, password, birthday];
     
         const [result] = await pool.query(sql, values);
-        return {"success":true,"error":undefined, "userid": result.insertId} ;
+
+        return {userId: result.insertId} ;
       } catch (error) {
-        return {"success":false,"error":error} ;
+        return {error:error} ;
       }
   }
 
@@ -152,14 +152,14 @@ async function saveEmailVerificationToken(userId, token) {
     const sql = 'UPDATE users SET email_verification_token = ? WHERE id = ?';
     const values = [token, userId];
 
-    return pool.query(sql, values);
+    return await pool.query(sql, values);
 }
 
 async function verifyEmail(token) {
     const sql = 'UPDATE users SET email_verified = TRUE WHERE email_verification_token = ?';
     const values = [token];
 
-    return pool.query(sql, values);
+    return await pool.query(sql, values);
 }
 const nodemailer = require('nodemailer');
 
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index bff6d63e..ff7bdc78 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -14,32 +14,32 @@ function homePage(req, res){
 
     // Email validation
     if (!isValidEmail(email)) {
-        return res.status(400).send('Invalid email format');
+        return res.status(400).json({error:errorCodes.INVALID_EMAIL});
     }
 
     // Birthday validation
     if (!isValidBirthday(birthday)) {
-        return res.status(400).send('Invalid or unreasonable birthday');
+        return res.status(400).send({error:errorCodes.INVALID_DATE});
     }
 
     // Check if username or email is in use
     const { usernameInUse, emailInUse, error } = await db.isUsernameOrEmailInUse(username, email);
     
     if (error) {
-        return res.status(500).send('Internal server error');
+        return res.status(500).json({error:errorCodes.DATABASE_ERROR});
     }
 
     if (usernameInUse) {
-        return res.status(400).send('Username is already in use');
+        return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
     }
 
     if (emailInUse) {
-        return res.status(400).send('Email is already in use');
+        return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
     }
 
     // Validate password
     if (!isValidPassword(password)) {
-        return res.status(400).send('Password does not meet the required criteria');
+        return res.status(400).send({error:errorCodes.INVALID_PASSWORD});
     }
     const verificationToken = generateVerificationToken();
     await db.saveEmailVerificationToken(username, verificationToken);
@@ -48,11 +48,12 @@ function homePage(req, res){
     const { success, error: addUserError } = await db.addUser(username, password, email, birthday);
 
     if (!success) {
-        return res.status(400).send('Registration failed: ' + addUserError);
+        return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
     } else {
-        res.status(201).send("Registration successful");
+        res.status(201).send({status:"success"});
     }
 }
+
 async function sendVerificationEmail(email, token) {
   const transporter = db.createTransporter();
   const verificationUrl = `http://ec2-3-78-169-139.eu-central-1.compute.amazonaws.com:3000/verify-email?token=${token}`;
@@ -67,8 +68,7 @@ async function sendVerificationEmail(email, token) {
   try {
       await transporter.sendMail(mailOptions);
   } catch (error) {
-      console.error("Error sending email: ", error);
-      // Handle email sending error
+      res.status(500).send({error:errorCodes.INTERNAL_SERVER_ERROR})
   }
 }
 const crypto = require('crypto');
@@ -107,9 +107,9 @@ function isValidEmail(email) {
 
 function createAccessTokenFromRefreshToken(req, res){
     const refreshToken = req.body.refreshToken;
-    if (refreshToken == null) return res.status(400).json({ code: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.code, message: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.message });
+    if (refreshToken == null) return res.status(400).json({ error: errorCodes.REFRESH_TOKEN_NEEDED_ERROR});
     jwt.verify(refreshToken,process.env.REFRESH_TOKEN_SECRET, (err, user) => {
-      if (err) return res.status(401).json({ code: errorCodes.REFRESH_TOKEN_INVALID_ERROR.code, message: errorCodes.REFRESH_TOKEN_INVALID_ERROR.message })
+      if (err) return res.status(401).json({ error: errorCodes.REFRESH_TOKEN_INVALID_ERROR })
       const accessToken = generateAccessToken({name : user.name, id : user.id});
       res.status(201).json({accessToken:accessToken});
     }) 
@@ -119,16 +119,16 @@ async function logIn(req,res){
     // Authorize User  
     const username = req.body.username;
     const password = req.body.password;
+
     let [userAuthenticated] = await db.checkCredentials(username,password);
     if (!userAuthenticated) {
-      res.status(401).json({ code: errorCodes.USER_NOT_FOUND.code, message: errorCodes.USER_NOT_FOUND.message });
-      return;
+      return res.status(401).json({ error: errorCodes.USER_NOT_FOUND });
     }
 
     const user = {name : username, id: userAuthenticated.id};
     const accesToken = generateAccessToken(user);
     const refreshToken = generateRefreshToken(user);
-    db.addRefreshToken(refreshToken);
+    await db.addRefreshToken(refreshToken);
     res.status(201).json({accessToken: accesToken, refreshToken: refreshToken})
 }
 
@@ -138,17 +138,17 @@ async function logOut(req, res) {
     if (tokenDeleted){
       res.status(204).send("Token deleted successfully");
     } else {
-      res.status(404).json({ code: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.code, message: errorCodes.REFRESH_TOKEN_NEEDED_ERROR.message });
+      res.status(404).json({ error: errorCodes.REFRESH_TOKEN_INVALID_ERROR });
     }
 }
 
 function authorizeAccessToken(req, res, next) {
     const authHeader = req.headers["authorization"];
     const token = authHeader && authHeader.split(" ")[1];
-    if (token == null) return res.sendStatus(400).json({ code: errorCodes.ACCESS_TOKEN_NULL.code, message: errorCodes.ACCESS_TOKEN_NULL.message });
+    if (token == null) return res.sendStatus(400).json({ error: errorCodes.ACCESS_TOKEN_NEEDED_ERROR});
   
     jwt.verify(token, process.env.ACCESS_TOKEN_SECRET, (err, user) => {
-      if (err) return  res.status(401).json({ code: errorCodes.ACCESS_TOKEN_INVALID_ERROR.code, message: errorCodes.ACCESS_TOKEN_INVALID_ERROR.message });
+      if (err) return  res.status(401).json({ error: errorCodes.ACCESS_TOKEN_INVALID_ERROR });
 
       req.user = user;
       next();

From d3c32334f9671173ed5623a7452a64681230b111 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 18:26:50 +0300
Subject: [PATCH 083/246] Add google errors as responses

---
 .../backend/src/services/AuthGoogleService.js | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/prediction-polls/backend/src/services/AuthGoogleService.js b/prediction-polls/backend/src/services/AuthGoogleService.js
index 8c9559c5..07e8acac 100644
--- a/prediction-polls/backend/src/services/AuthGoogleService.js
+++ b/prediction-polls/backend/src/services/AuthGoogleService.js
@@ -2,6 +2,7 @@ const qs = require("querystring");
 const axios = require("axios");
 const db = require("../repositories/AuthorizationDB.js");
 const crypto = require('crypto');
+const errorCodes = require("../errorCodes.js");
 
 
 const { generateAccessToken, generateRefreshToken } = require('./AuthorizationService.js');
@@ -18,7 +19,7 @@ async function googleLogIn(req,res){
       googleLogInWithCode(code,res);
     }
     else{
-      res.status(400).send("Invalid Body");
+      res.status(400).send({error:errorCodes.GOOGLE_LOGIN_BODY_EMPTY});
     }
 }
   
@@ -27,18 +28,18 @@ async function googleLogInWithCode(code,res){
     try {
       // get the id and access token with the code
       const { token_error, id_token, access_token } = await getGoogleOAuthTokens({ code });
-      if(token_error){return res.status(403).send("Invalid Code")}
+      if(token_error){return res.status(403).json({error:errorCodes.GOOGLE_LOGIN_INVALID_GOOGLE_CODE}) };
   
       // get user with tokens
       const googleUser = await getGoogleUser({ id_token, access_token });
-      if(googleUser.error){return res.status(403).send(googleUser.error)}
+      if(googleUser.error){return res.status(403).json({error:errorCodes.GOOGLE_LOGIN_INVALID_GOOGLE_CODE}) };
   
       if (!( googleUser.verified_email || googleUser.email_verified)) {
-        return res.status(403).send("Google account is not verified");
+        return res.status(403).json({error:errorCodes.GOOGLE_LOGIN_NONVERIFIED_GOOGLE_ACCOUNT});
       }
 
       const generatedPassword = generateRandomPassword(12);
-      const { success, error, userid} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
+      const { error, userid} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
 
       const user = {name : googleUser.given_name, id: userid};
       const accesToken = generateAccessToken(user);
@@ -47,23 +48,23 @@ async function googleLogInWithCode(code,res){
       res.json({accessToken: accesToken, refreshToken: refreshToken})
   
     } catch (error) {
-      return res.status(500).send("Google Auth Failed");
+      return res.status(500).json({error:errorCodes.GOOGLE_LOGIN_FAILED});
     }
   }
 
   async function googleLogInWithGoogleId(googleId,res){
     try {
       const googleUser = await getGoogleIdTokenData(googleId)
-      if(googleUser.error){return res.status(403).send("Invalid Google Id")}
+      if(googleUser.error){return res.status(403).json({error:errorCodes.GOOGLE_LOGIN_INVALID_GOOGLEID})}
 
       if (!( googleUser.verified_email || googleUser.email_verified)) {
-        return res.status(403).send("Google account is not verified");
+        return res.status(403).json({error:errorCodes.GOOGLE_LOGIN_NONVERIFIED_GOOGLE_ACCOUNT});
       }
 
       const generatedPassword = generateRandomPassword(12);
-      const { success, error, userid} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
+      const {error, userId} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
 
-      const user = {name : googleUser.given_name, id: userid};
+      const user = {name : googleUser.given_name, id: userId};
       const accesToken = generateAccessToken(user);
       const refreshToken = generateRefreshToken(user);
 
@@ -71,7 +72,7 @@ async function googleLogInWithCode(code,res){
       res.json({accessToken: accesToken, refreshToken: refreshToken})
 
     } catch (error) {
-      return res.status(500).send("Google Auth Failed");
+      return res.status(500).json({error:errorCodes.GOOGLE_LOGIN_FAILED});
     }
 
   }
@@ -100,7 +101,7 @@ async function googleLogInWithCode(code,res){
       );
       return res.data;
     } catch (error) {
-      return {token_error:error.message};
+      return {token_error:error};
     }
   }
   
@@ -119,7 +120,7 @@ async function googleLogInWithCode(code,res){
       );
       return res.data;
     } catch (error) {
-      return {"error":error.message};
+      return {error:error};
     }
   }
 
@@ -130,7 +131,7 @@ async function googleLogInWithCode(code,res){
       );
       return res.data;
     } catch (error) {
-      return {"error":error.message};
+      return {error:error};
     }
   }
 

From 63e2c39d9ae151e59bb3e32e306ba7235efdad8d Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 20:06:17 +0300
Subject: [PATCH 084/246] /polls GET returns all polls

---
 .../backend/src/services/PollService.js       | 46 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 3cc731a3..8f013cae 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -5,7 +5,51 @@ const errorCodes = require("../errorCodes.js")
 function getPolls(req,res){
     db.getPolls()
     .then((rows) => {
-        res.json(rows);
+        const pollObjects = rows.map((pollObject) => {
+            const properties =  {
+                "id": pollObject.id,
+                "question": pollObject.question,
+                "tags": [],
+                "creatorName": pollObject.username,
+                "creatorUsername": pollObject.username,
+                "creatorImage": null,
+                "pollType": pollObject.poll_type,
+                "closingDate": pollObject.closingDate,
+                "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+                "isOpen": true,
+                "comments": []
+            }
+            if (properties.pollType === 'discrete') {
+                return db.getDiscretePollChoices(properties.id)
+                .then((choices) => {
+                
+                    const choicesWithVoteCount = choices.map((choice) => {
+                        return db.getDiscreteVoteCount(choice.id)
+                        .then((voterCount) => {
+                            return { ...choice, voter_count: voterCount };
+                        })
+                    });
+
+                    return Promise.all(choicesWithVoteCount)
+                    .then((options) => {
+                        return {...properties, "options": options};
+                    })
+                })
+            } else if (properties.pollType === 'continuous') {
+                return db.getContinuousPollWithId(properties.id)
+                .then((rows) => {
+                    return db.getContinuousPollVotes(properties.id)
+                    .then((choices) => {
+                        return {...properties, "cont_poll_type": rows[0].cont_poll_type, "options": choices};
+                    })
+                })
+            }
+
+        });
+        Promise.all(pollObjects)
+        .then((result) => {
+            res.json(result);
+        })
     })
     .catch((error) => {
         console.error(error);

From d9c05b197aec7786d07eb1c1002679664e33c06d Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 20:25:37 +0300
Subject: [PATCH 085/246] update swagger for /polls

---
 .../backend/src/routes/PollRouter.js          | 116 ++++++++++++------
 1 file changed, 79 insertions(+), 37 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index f84690bc..680c42ec 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -20,56 +20,96 @@ const router = express.Router();
  *               type: array
  *               items:
  *                 type: object
- *                 required: ["id", "question", "poll_type"]
+ *                 required: ["id", "question", "tags", "creatorName", "creatorUsername", "creatorImage", "pollType", "closingDate", "rejectVotes", "isOpen", "comments", "options"]
  *                 properties: 
  *                   id:
  *                     type: integer
  *                   question:
  *                     type: string
- *                   username:
+ *                   tags:
+ *                     type: array
+ *                     items: 
+ *                       type: string
+ *                   creatorName:
  *                     type: string
- *                   poll_type:
+ *                   creatorUsername:
  *                     type: string
- *                   openVisibility:
- *                     type: integer
- *                   setDueDate:
- *                     type: integer
- *                   dueDatePoll:
+ *                   creatorImage:
  *                     type: string
- *                   numericFieldValue:
- *                     type: integer
- *                   selectedTimeUnit:
+ *                   pollType:
+ *                     type: string
+ *                   closingDate:
+ *                     type: string
+ *                   rejectVotes:
  *                     type: string
+ *                   isOpen:
+ *                     type: boolean
+ *                   cont_poll_type:
+ *                     type: string
+ *                   comments:
+ *                     type: array
+ *                     items: 
+ *                       type: object
+ *                       properties:
+ *                         id:
+ *                           type: integer
+ *                         content:
+ *                           type: string
+ *                   options:
+ *                     oneOf:
+ *                       - type: array
+ *                         items:
+ *                           type: object
+ *                           properties:
+ *                             id:
+ *                               type: integer
+ *                             choice_text:
+ *                               type: string
+ *                             poll_id:
+ *                               type: integer
+ *                             voter_count:
+ *                               type: integer
+ *                       - type: array
+ *                         items:
+ *                           type: integer
  *             examples:
  *               genericExample:
  *                 value:
  *                   - id: 1
  *                     question: "Who will become POTUS?"
- *                     username: "user1234"
- *                     poll_type: "discrete"
- *                     openVisibility: 1 
+ *                     tags: ["tag1", "tag2"]
+ *                     creatorName: "user123"
+ *                     creatorUsername: "GhostDragon"
+ *                     creatorImage: null
+ *                     pollType: "discrete"
+ *                     rejectVotes: "5 min"
  *                     setDueDate: 1 
- *                     dueDatePoll: "2023-11-20T21:00:00.000Z"
- *                     numericFieldValue: 2 
- *                     selectedTimeUnit: "min"
+ *                     closingDate: "2023-11-20T21:00:00.000Z"
+ *                     isOpen: 1 
+ *                     options:
+ *                       - id: 1
+ *                         choice_text: "Trumpo"
+ *                         poll_id: 1
+ *                         voter_count: 0
+ *                       - id: 2
+ *                         choice_text: "Biden"
+ *                         poll_id: 1
+ *                         voter_count: 1
  *                   - id: 2
- *                     question: "Test3?"
- *                     username: "GoodGambler"
- *                     poll_type: "continuous"
- *                     openVisibility: 0 
+ *                     question: "Test question?"
+ *                     tags: ["tag1", "tag2"]
+ *                     creatorName: "GhostDragon"
+ *                     creatorUsername: "GhostDragon"
+ *                     creatorImage: null
+ *                     pollType: "continuous"
+ *                     rejectVotes: "2 hr"
  *                     setDueDate: 0 
- *                     dueDatePoll: null
- *                     numericFieldValue: null
- *                     selectedTimeUnit: null
- *                   - id: 3
- *                     question: "Who will become POTUS?"
- *                     username: "GhostDragon"
- *                     poll_type: "discrete"
- *                     openVisibility: 1 
- *                     setDueDate: 1 
- *                     dueDatePoll: "2023-11-20T21:00:00.000Z"
- *                     numericFieldValue: 3
- *                     selectedTimeUnit: "h"
+ *                     closingDate: null
+ *                     isOpen: 1 
+ *                     cont_poll_type: "numeric"
+ *                     options:
+ *                       - 7
+ *                       - 8   
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -114,7 +154,7 @@ router.get('/', service.getPolls);
  *           application/json:
  *             schema:
  *               type: object
- *               required: ["id", "question", "poll_type", "poll", "choices"]
+ *               required: ["id", "question", "poll_type", "poll", "options"]
  *               properties:
  *                 id:
  *                   type: integer
@@ -140,7 +180,9 @@ router.get('/', service.getPolls);
  *                   type: string
  *                 isOpen:
  *                   type: integer
- *                 choices:
+ *                 cont_poll_type:
+ *                   type: string
+ *                 options:
  *                   oneOf:
  *                     - type: array
  *                       items:
@@ -172,7 +214,7 @@ router.get('/', service.getPolls);
  *                   setDueDate: 1 
  *                   closingDate: "2023-11-20T21:00:00.000Z"
  *                   isOpen: 1 
- *                   choices:
+ *                   options:
  *                     - id: 1
  *                       choice_text: "Trumpo"
  *                       poll_id: 1
@@ -195,7 +237,7 @@ router.get('/', service.getPolls);
  *                   closingDate: null
  *                   isOpen: 1 
  *                   cont_poll_type: "numeric"
- *                   choices:
+ *                   options:
  *                     - 7
  *                     - 8   
  *       404:

From 545d79f9677f65829bda2f6a1054c5402459d521 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Thu, 23 Nov 2023 21:05:45 +0300
Subject: [PATCH 086/246] implement create poll screen ui

---
 .../bounswe/predictionpolls/MainActivity.kt   |   2 +
 .../ui/create/CreatePollNavigation.kt         |  23 +
 .../ui/create/CreatePollScreen.kt             | 402 ++++++++++++++++++
 .../ui/create/CreatePollScreenEvent.kt        |  16 +
 .../ui/create/CreatePollScreenState.kt        | 122 ++++++
 .../ui/create/CreatePollViewModel.kt          |  58 +++
 .../app/src/main/res/drawable/ic_delete.xml   |   9 +
 .../app/src/main/res/values/strings.xml       |  13 +
 8 files changed, 645 insertions(+)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollNavigation.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
 create mode 100644 prediction-polls/android/app/src/main/res/drawable/ic_delete.xml

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index 19f430de..84a3ea83 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -5,6 +5,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
+import com.bounswe.predictionpolls.ui.create.createPollScreen
 import com.bounswe.predictionpolls.ui.feed.feedScreen
 import com.bounswe.predictionpolls.ui.leaderboard.leaderboardScreen
 import com.bounswe.predictionpolls.ui.login.loginScreen
@@ -27,6 +28,7 @@ class MainActivity : ComponentActivity() {
                     signupScreen(navController)
                     feedScreen(navController)
                     leaderboardScreen(navController)
+                    createPollScreen()
                 }
             }
         }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollNavigation.kt
new file mode 100644
index 00000000..0f7f437e
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollNavigation.kt
@@ -0,0 +1,23 @@
+package com.bounswe.predictionpolls.ui.create
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
+import androidx.navigation.Navigator
+import androidx.navigation.compose.composable
+
+const val CREATE_POLL_ROUTE = "create_poll"
+
+fun NavGraphBuilder.createPollScreen() {
+    composable(CREATE_POLL_ROUTE) {
+        CreatePollScreen()
+    }
+}
+
+fun NavController.navigateToCreatePollScreen(
+    navOptions: NavOptions? = null,
+    block: Navigator.Extras? = null
+) {
+    navigate(CREATE_POLL_ROUTE, navOptions, block)
+}
+
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
new file mode 100644
index 00000000..c227c6db
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
@@ -0,0 +1,402 @@
+package com.bounswe.predictionpolls.ui.create
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+import com.bounswe.predictionpolls.R
+import com.bounswe.predictionpolls.ui.common.CustomInputField
+import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
+import com.bounswe.predictionpolls.utils.DateTransformation
+
+@Composable
+fun CreatePollScreen(
+    viewModel: CreatePollViewModel = hiltViewModel()
+) {
+    CreatePollScreenUI(
+        question = viewModel.screenState.question,
+        onQuestionChanged = { viewModel.onEvent(CreatePollScreenEvent.OnQuestionChanged(it)) },
+        activePollType = viewModel.screenState.pollType,
+        onPollTypeChanged = { viewModel.onEvent(CreatePollScreenEvent.OnPollTypeChanged(it)) },
+        options = viewModel.screenState.discreteOptions,
+        onOptionChanged = { option, position ->
+            viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionChanged(option, position))
+        },
+        onOptionAdded = { viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionAdded) },
+        onOptionRemoved = { viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionRemoved(it)) },
+        activeInputType = viewModel.screenState.continuousInputType,
+        onInputTypeChanged = { viewModel.onEvent(CreatePollScreenEvent.OnContinuousInputTypeChanged(it)) },
+        isDueDateChecked = viewModel.screenState.isDueDateEnabled,
+        onDueDateChecked = { viewModel.onEvent(CreatePollScreenEvent.OnDueDateChecked(it)) },
+        lastAcceptValue = viewModel.screenState.dueDate,
+        onLastAcceptValueChanged = { viewModel.onEvent(CreatePollScreenEvent.OnDueDateChanged(it)) },
+        isDistributionVisible = viewModel.screenState.isDistributionVisible,
+        onDistributionVisibilityChanged = { viewModel.onEvent(CreatePollScreenEvent.OnDistributionVisibilityChanged(it)) },
+        onCreatePollClicked = { viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked) },
+    )
+}
+
+@Composable
+private fun CreatePollScreenUI(
+    question: String = "",
+    onQuestionChanged: (String) -> Unit = {},
+    activePollType: CreatePollScreenState.PollType = CreatePollScreenState.PollType.DISCRETE,
+    onPollTypeChanged: (CreatePollScreenState.PollType) -> Unit = {},
+    options: List<String> = listOf(""),
+    onOptionChanged: (String, Int) -> Unit = { _, _ -> },
+    onOptionAdded: () -> Unit = {},
+    onOptionRemoved: (Int) -> Unit = {},
+    activeInputType: CreatePollScreenState.ContinuousInputType = CreatePollScreenState.ContinuousInputType.DATE,
+    onInputTypeChanged: (CreatePollScreenState.ContinuousInputType) -> Unit = {},
+    isDueDateChecked: Boolean = false,
+    onDueDateChecked: (Boolean) -> Unit = {},
+    lastAcceptValue: String = "",
+    onLastAcceptValueChanged: (String) -> Unit = {},
+    isDistributionVisible: Boolean = false,
+    onDistributionVisibilityChanged: (Boolean) -> Unit = {},
+    onCreatePollClicked: () -> Unit = {},
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(top = 24.dp, start = 16.dp, end = 16.dp),
+        verticalArrangement = Arrangement.spacedBy(24.dp)
+    ) {
+        ScreenHeader()
+        CustomInputField(
+            modifier = Modifier.fillMaxWidth(),
+            labelId = R.string.poll_create_screen_question,
+            text = question,
+            onTextChanged = onQuestionChanged,
+        )
+        PollTypeChoice(
+            activePollType = activePollType,
+            onPollTypeChanged = onPollTypeChanged,
+        )
+        if (activePollType == CreatePollScreenState.PollType.DISCRETE) {
+            DiscretePollOptions(
+                options = options,
+                onOptionChanged = onOptionChanged,
+                onOptionAdded = onOptionAdded,
+                onOptionRemoved = onOptionRemoved,
+            )
+        } else {
+            ContinuousPollInputType(
+                activeInputType = activeInputType,
+                onInputTypeChanged = onInputTypeChanged,
+            )
+        }
+        DueDateRow(
+            isDueDateChecked = isDueDateChecked,
+            onDueDateChecked = onDueDateChecked,
+        )
+        PollEndTime(
+            lastAcceptValue = lastAcceptValue,
+            onLastAcceptValueChanged = onLastAcceptValueChanged,
+        )
+        DistributionVisibility(
+            isDistributionVisible = isDistributionVisible,
+            onDistributionVisibilityChanged = onDistributionVisibilityChanged,
+        )
+        Row(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Spacer(modifier = Modifier.weight(1f))
+            TextButton(
+                onClick = {
+                    onCreatePollClicked()
+                },
+                colors = ButtonDefaults.textButtonColors(
+                    containerColor = MaterialTheme.colorScheme.primary,
+                ),
+                shape = RoundedCornerShape(8.dp),
+            ) {
+                Text(
+                    modifier = Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
+                    text = stringResource(id = R.string.poll_create_action),
+                    color = MaterialTheme.colorScheme.onPrimary,
+                    style = MaterialTheme.typography.titleLarge,
+                    fontSize = 14.sp,
+                    lineHeight = 17.sp
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun PollTypeChoice(
+    activePollType: CreatePollScreenState.PollType = CreatePollScreenState.PollType.DISCRETE,
+    onPollTypeChanged: (CreatePollScreenState.PollType) -> Unit = {},
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        Text(
+            text = stringResource(id = R.string.poll_create_screen_type),
+            color = MaterialTheme.colorScheme.onBackground,
+            style = MaterialTheme.typography.titleLarge,
+            fontSize = 14.sp,
+            lineHeight = 17.sp
+        )
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+        ) {
+            CreatePollScreenState.PollType.entries.forEach {
+                TextButton(
+                    onClick = {
+                        onPollTypeChanged(it)
+                    },
+                    colors = ButtonDefaults.textButtonColors(
+                        containerColor = if (activePollType == it) {
+                            MaterialTheme.colorScheme.primary
+                        } else {
+                            MaterialTheme.colorScheme.primary.copy(alpha = 0.7f)
+                        },
+                    ),
+                    shape = RoundedCornerShape(8.dp),
+                    modifier = Modifier.weight(1f)
+                ) {
+                    Text(
+                        modifier = Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
+                        text = it.type,
+                        color = MaterialTheme.colorScheme.onPrimary,
+                        style = MaterialTheme.typography.titleLarge,
+                        fontSize = 14.sp,
+                        lineHeight = 17.sp
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ScreenHeader() {
+    Text(
+        text = stringResource(id = R.string.poll_create_screen_title),
+        color = MaterialTheme.colorScheme.primary,
+        style = MaterialTheme.typography.titleLarge,
+        fontSize = 20.sp,
+        lineHeight = 24.sp
+    )
+}
+
+@Composable
+private fun DiscretePollOptions(
+    options: List<String>,
+    onOptionChanged: (String, Int) -> Unit = { _, _ -> },
+    onOptionAdded: () -> Unit = {},
+    onOptionRemoved: (Int) -> Unit = {},
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        Text(
+            text = stringResource(id = R.string.poll_create_screen_enter_options),
+            color = MaterialTheme.colorScheme.onBackground,
+            style = MaterialTheme.typography.titleLarge,
+            fontSize = 14.sp,
+            lineHeight = 17.sp
+        )
+        options.forEachIndexed { index, option ->
+            CustomInputField(
+                modifier = Modifier.fillMaxWidth(),
+                text = option,
+                onTextChanged = { onOptionChanged(it, index) },
+                trailingIconId = R.drawable.ic_delete,
+                trailingIconContentDescription = R.string.poll_create_screen_cd_delete,
+                onTrailingIconClicked = { onOptionRemoved(index) },
+            )
+        }
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+        ) {
+            Spacer(modifier = Modifier.weight(1f))
+            TextButton(
+                onClick = {
+                    onOptionAdded()
+                },
+                colors = ButtonDefaults.textButtonColors(
+                    containerColor = MaterialTheme.colorScheme.primary,
+                ),
+                shape = RoundedCornerShape(8.dp),
+            ) {
+                Text(
+                    modifier = Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
+                    text = stringResource(id = R.string.poll_create_screen_add_options),
+                    color = MaterialTheme.colorScheme.onPrimary,
+                    style = MaterialTheme.typography.titleLarge,
+                    fontSize = 14.sp,
+                    lineHeight = 17.sp
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun DueDateRow(
+    isDueDateChecked: Boolean,
+    onDueDateChecked: (Boolean) -> Unit = {},
+    dueDate: String = "",
+    onDueDateChanged: (String) -> Unit = {},
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Checkbox(checked = isDueDateChecked, onCheckedChange = onDueDateChecked)
+            Text(
+                text = stringResource(id = R.string.poll_create_due_date),
+                color = MaterialTheme.colorScheme.onBackground,
+                style = MaterialTheme.typography.titleLarge,
+                fontSize = 14.sp,
+                lineHeight = 17.sp
+            )
+        }
+        Spacer(modifier = Modifier.width(32.dp))
+        if (isDueDateChecked) {
+            CustomInputField(
+                text = dueDate,
+                onTextChanged = onDueDateChanged,
+                trailingIconId = R.drawable.ic_calendar,
+                trailingIconContentDescription = R.string.cd_calendar,
+                visualTransformation = DateTransformation(),
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Number
+                ),
+            )
+        } else {
+            Spacer(modifier = Modifier.weight(1f))
+        }
+    }
+}
+
+@Composable
+private fun PollEndTime(
+    lastAcceptValue: String = "",
+    onLastAcceptValueChanged: (String) -> Unit = {},
+) {
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        Text(
+            text = stringResource(id = R.string.poll_create_screen_poll_end),
+            color = MaterialTheme.colorScheme.onBackground,
+            style = MaterialTheme.typography.titleLarge,
+            fontSize = 14.sp,
+            lineHeight = 17.sp
+        )
+        Spacer(modifier = Modifier.weight(1f))
+        CustomInputField(
+            text = lastAcceptValue,
+            onTextChanged = onLastAcceptValueChanged,
+            keyboardOptions = KeyboardOptions(
+                keyboardType = KeyboardType.Number
+            ),
+        )
+    }
+}
+
+@Composable
+private fun DistributionVisibility(
+    isDistributionVisible: Boolean,
+    onDistributionVisibilityChanged: (Boolean) -> Unit = {},
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Checkbox(checked = isDistributionVisible, onCheckedChange = onDistributionVisibilityChanged)
+        Text(
+            text = stringResource(id = R.string.poll_create_screen_distribution_visibility),
+            color = MaterialTheme.colorScheme.onBackground,
+            style = MaterialTheme.typography.titleLarge,
+            fontSize = 14.sp,
+            lineHeight = 17.sp
+        )
+    }
+}
+
+@Composable
+private fun ContinuousPollInputType(
+    activeInputType: CreatePollScreenState.ContinuousInputType = CreatePollScreenState.ContinuousInputType.DATE,
+    onInputTypeChanged: (CreatePollScreenState.ContinuousInputType) -> Unit = {},
+) {
+    Column(
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        Text(
+            text = stringResource(id = R.string.poll_create_screen_choose_continuous_type),
+            color = MaterialTheme.colorScheme.onBackground,
+            style = MaterialTheme.typography.titleLarge,
+            fontSize = 14.sp,
+            lineHeight = 17.sp
+        )
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+        ) {
+            CreatePollScreenState.ContinuousInputType.entries.forEach {
+                TextButton(
+                    onClick = {
+                        onInputTypeChanged(it)
+                    },
+                    colors = ButtonDefaults.textButtonColors(
+                        containerColor = if (activeInputType == it) {
+                            MaterialTheme.colorScheme.primary
+                        } else {
+                            MaterialTheme.colorScheme.primary.copy(alpha = 0.7f)
+                        },
+                    ),
+                    shape = RoundedCornerShape(8.dp),
+                    modifier = Modifier.weight(1f)
+                ) {
+                    Text(
+                        modifier = Modifier.padding(vertical = 6.dp, horizontal = 12.dp),
+                        text = it.type,
+                        color = MaterialTheme.colorScheme.onPrimary,
+                        style = MaterialTheme.typography.titleLarge,
+                        fontSize = 14.sp,
+                        lineHeight = 17.sp
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun CreatePollScreenPreview() {
+    PredictionPollsTheme {
+        CreatePollScreenUI()
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
new file mode 100644
index 00000000..bda09f5d
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
@@ -0,0 +1,16 @@
+package com.bounswe.predictionpolls.ui.create
+
+sealed class CreatePollScreenEvent {
+    data class OnQuestionChanged(val question: String): CreatePollScreenEvent()
+    data class OnPollTypeChanged(val pollType: CreatePollScreenState.PollType): CreatePollScreenEvent()
+    data class OnDiscreteOptionChanged(val option: String, val position: Int): CreatePollScreenEvent()
+    data object OnDiscreteOptionAdded: CreatePollScreenEvent()
+    data class OnDiscreteOptionRemoved(val position: Int): CreatePollScreenEvent()
+    data class OnContinuousInputTypeChanged(val inputType: CreatePollScreenState.ContinuousInputType): CreatePollScreenEvent()
+    data class OnDueDateChecked(val isChecked: Boolean): CreatePollScreenEvent()
+    data class OnDueDateChanged(val dueDate: String): CreatePollScreenEvent()
+    data class OnLastAcceptValueChanged(val value: String): CreatePollScreenEvent()
+    data class OnAcceptValueTypeChanged(val type: CreatePollScreenState.AcceptValueType): CreatePollScreenEvent()
+    data class OnDistributionVisibilityChanged(val isChecked: Boolean): CreatePollScreenEvent()
+    data object OnCreatePollClicked: CreatePollScreenEvent()
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt
new file mode 100644
index 00000000..8cdcee52
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt
@@ -0,0 +1,122 @@
+package com.bounswe.predictionpolls.ui.create
+
+import com.bounswe.predictionpolls.data.remote.model.request.CreateContinuousPollRequest
+import com.bounswe.predictionpolls.data.remote.model.request.CreateDiscretePollRequest
+
+data class CreatePollScreenState(
+    val question: String = "",
+    val pollType: PollType = PollType.DISCRETE,
+    val discreteOptions: List<String> = listOf(""),
+    val continuousInputType: ContinuousInputType = ContinuousInputType.DATE,
+    val isDueDateEnabled: Boolean = false,
+    val dueDate: String = "",
+    val lastAcceptValue: String = "",
+    val acceptValueType: AcceptValueType = AcceptValueType.MINUTE,
+    val isDistributionVisible: Boolean = false,
+) {
+    enum class PollType(val type: String) {
+        DISCRETE("Multiple Choice"),
+        CONTINUOUS("Customized")
+    }
+
+    enum class ContinuousInputType(val type: String) {
+        DATE("Date"),
+        NUMERIC("Numeric");
+
+        fun toContinuousRequestType(): CreateContinuousPollRequest.PollRequestType {
+            return when (this) {
+                DATE -> CreateContinuousPollRequest.PollRequestType.DATE
+                NUMERIC -> CreateContinuousPollRequest.PollRequestType.NUMERIC
+            }
+        }
+    }
+
+    enum class AcceptValueType(val type: String) {
+        MINUTE("Minute"),
+        HOUR("Hour"),
+        DAY("Day"),
+        MONTH("Month");
+
+        fun toDiscreteRequestType(): CreateDiscretePollRequest.TimeUnit {
+            return when (this) {
+                MINUTE -> CreateDiscretePollRequest.TimeUnit.MINUTE
+                HOUR -> CreateDiscretePollRequest.TimeUnit.HOUR
+                DAY -> CreateDiscretePollRequest.TimeUnit.DAY
+                MONTH -> CreateDiscretePollRequest.TimeUnit.MONTH
+            }
+        }
+
+        fun toContinuousRequestType(): CreateContinuousPollRequest.TimeUnit {
+            return when (this) {
+                MINUTE -> CreateContinuousPollRequest.TimeUnit.MINUTE
+                HOUR -> CreateContinuousPollRequest.TimeUnit.HOUR
+                DAY -> CreateContinuousPollRequest.TimeUnit.DAY
+                MONTH -> CreateContinuousPollRequest.TimeUnit.MONTH
+            }
+        }
+    }
+
+    fun reduce(event: CreatePollScreenEvent): CreatePollScreenState {
+        return when (event) {
+            is CreatePollScreenEvent.OnQuestionChanged -> {
+                this.copy(question = event.question)
+            }
+
+            is CreatePollScreenEvent.OnPollTypeChanged -> {
+                this.copy(pollType = event.pollType)
+            }
+
+            is CreatePollScreenEvent.OnDiscreteOptionChanged -> {
+                this.copy(
+                    discreteOptions = discreteOptions.mapIndexed { index, option ->
+                        if (index == event.position) {
+                            event.option
+                        } else {
+                            option
+                        }
+                    }
+                )
+            }
+
+            is CreatePollScreenEvent.OnDiscreteOptionAdded -> {
+                this.copy(discreteOptions = discreteOptions + "")
+            }
+
+            is CreatePollScreenEvent.OnDiscreteOptionRemoved -> {
+                this.copy(
+                    discreteOptions = discreteOptions.filterIndexed { index, _ ->
+                        index != event.position
+                    }
+                )
+            }
+
+            is CreatePollScreenEvent.OnDueDateChecked -> {
+                this.copy(isDueDateEnabled = event.isChecked)
+            }
+
+            is CreatePollScreenEvent.OnDueDateChanged -> {
+                this.copy(dueDate = event.dueDate)
+            }
+
+            is CreatePollScreenEvent.OnLastAcceptValueChanged -> {
+                this.copy(lastAcceptValue = event.value)
+            }
+
+            is CreatePollScreenEvent.OnAcceptValueTypeChanged -> {
+                this.copy(acceptValueType = event.type)
+            }
+
+            is CreatePollScreenEvent.OnDistributionVisibilityChanged -> {
+                this.copy(isDistributionVisible = event.isChecked)
+            }
+
+            is CreatePollScreenEvent.OnContinuousInputTypeChanged -> {
+                this.copy(continuousInputType = event.inputType)
+            }
+
+            else -> {
+                this
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
new file mode 100644
index 00000000..d0e5896d
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
@@ -0,0 +1,58 @@
+package com.bounswe.predictionpolls.ui.create
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import com.bounswe.predictionpolls.core.BaseViewModel
+import com.bounswe.predictionpolls.data.remote.repositories.PollRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class CreatePollViewModel @Inject constructor(
+    private val pollRepository: PollRepository
+): BaseViewModel() {
+    var screenState by mutableStateOf(CreatePollScreenState())
+        private set
+
+    fun onEvent(event: CreatePollScreenEvent) {
+        screenState = screenState.reduce(event)
+        when (event) {
+            is CreatePollScreenEvent.OnCreatePollClicked -> {
+                onCreatePoll()
+            }
+            else -> {}
+        }
+    }
+
+    private fun onCreatePoll() {
+        launchCatching(
+            trackJobProgress = true
+        ) {
+            when(screenState.pollType){
+                CreatePollScreenState.PollType.DISCRETE -> {
+                    pollRepository.createDiscretePoll(
+                        screenState.question,
+                        screenState.discreteOptions,
+                        screenState.isDistributionVisible,
+                        screenState.isDueDateEnabled,
+                        screenState.dueDate,
+                        screenState.lastAcceptValue.filter { it.isDigit() }.toInt(),
+                        screenState.acceptValueType.toDiscreteRequestType(),
+                    )
+                }
+                CreatePollScreenState.PollType.CONTINUOUS -> {
+                    pollRepository.createContinuousPoll(
+                        screenState.question,
+                        screenState.isDistributionVisible,
+                        screenState.isDueDateEnabled,
+                        screenState.dueDate,
+                        screenState.lastAcceptValue.filter { it.isDigit() }.toInt(),
+                        screenState.acceptValueType.toContinuousRequestType(),
+                        screenState.continuousInputType.toContinuousRequestType(),
+                    )
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/res/drawable/ic_delete.xml b/prediction-polls/android/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 00000000..e133f9a0
--- /dev/null
+++ b/prediction-polls/android/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M304.61,800q-26.85,0 -45.73,-18.88Q240,762.23 240,735.39L240,240h-40v-40h160v-30.77h240L600,200h160v40h-40v495.39Q720,763 701.5,781.5 683,800 655.39,800h-350.77ZM680,240L280,240v495.39q0,10.77 6.92,17.69T304.61,760h350.77q9.23,0 16.92,-7.69Q680,744.61 680,735.39L680,240ZM392.31,680h40v-360h-40v360ZM527.69,680h40v-360h-40v360ZM280,240v520,-520Z"/>
+</vector>
diff --git a/prediction-polls/android/app/src/main/res/values/strings.xml b/prediction-polls/android/app/src/main/res/values/strings.xml
index 69b2d756..9ea55b46 100644
--- a/prediction-polls/android/app/src/main/res/values/strings.xml
+++ b/prediction-polls/android/app/src/main/res/values/strings.xml
@@ -66,4 +66,17 @@
     <string name="vote_screen_text">Choose one of the options you want to vote for</string>
     <string name="vote_screen_vote_button_text">Vote</string>
     <string name="poll_vote_input_title">Vote points</string>
+
+    <string name="poll_create_screen_title">Create Poll</string>
+    <string name="poll_create_screen_question">Enter the question title</string>
+    <string name="poll_create_screen_type">Choose input type</string>
+    <string name="poll_create_screen_add_options">Add Option</string>
+    <string name="poll_create_screen_enter_options">Enter the options</string>
+    <string name="poll_create_screen_poll_end">Don\'t accept any votes in last</string>
+    <string name="poll_create_screen_cd_delete">Delete the option</string>
+    <string name="poll_create_due_date">Set Due Date</string>
+    <string name="poll_create_screen_create_button">Create</string>
+    <string name="poll_create_screen_choose_continuous_type">Choose customized input type</string>
+    <string name="poll_create_screen_distribution_visibility">Open distribution visibility</string>
+    <string name="poll_create_action">Create</string>
 </resources>
\ No newline at end of file

From b3e97e6b796b60e98f3c9899f9b227f7b4a0f2eb Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 21:37:44 +0300
Subject: [PATCH 087/246] Update schema.sql

A small change in schema
---
 prediction-polls/backend/src/schema.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index fa65ec6e..e7e91f4a 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -75,7 +75,7 @@ CREATE TABLE profiles (
     userId INT NOT NULL,
     username VARCHAR(255) NOT NULL,
     email VARCHAR(255) NOT NULL,
-    profile_picture_data MEDIUMBLOB,
+    profile_picture MEDIUMBLOB,
     biography VARCHAR(5000),
     birthday DATETIME,
     isHidden BOOLEAN DEFAULT False,

From 07aa24a9165c80d70b2c8295f9f1b5c4ee222dba Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 21:38:29 +0300
Subject: [PATCH 088/246] Added auto profile generation to sign up

---
 .../src/services/AuthorizationService.js      | 82 ++++++++++---------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index a3795f85..6930bb68 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -1,6 +1,7 @@
 require('dotenv').config();
 const jwt = require("jsonwebtoken");
 const db = require("../repositories/AuthorizationDB.js");
+const profileDb = require("../repositories/ProfileDB.js");
 const errorCodes = require("../errorCodes.js")
 
 const bcrypt = require('bcrypt')
@@ -9,51 +10,56 @@ function homePage(req, res){
     res.status(200).json({"username":req.user.name,"key":"very-secret"});
   }
 
-  async function signup(req, res) {
-    const { username, password, email, birthday } = req.body;
+async function signup(req, res) {
+  const { username, password, email, birthday } = req.body;
 
-    // Email validation
-    if (!isValidEmail(email)) {
-        return res.status(400).json({error:errorCodes.INVALID_EMAIL});
-    }
+  // Email validation
+  if (!isValidEmail(email)) {
+      return res.status(400).json({error:errorCodes.INVALID_EMAIL});
+  }
 
-    // Birthday validation
-    if (birthday && !isValidBirthday(birthday)) {
-        return res.status(400).send({error:errorCodes.INVALID_DATE});
+  // Birthday validation
+  if (birthday && !isValidBirthday(birthday)) {
+      return res.status(400).send({error:errorCodes.INVALID_DATE});
 
-    }
+  }
 
-    // Check if username or email is in use
-    const { usernameInUse, emailInUse, error } = await db.isUsernameOrEmailInUse(username, email);
-    
-    if (error) {
-        return res.status(500).json({error:errorCodes.DATABASE_ERROR});
-    }
+  // Check if username or email is in use
+  const { usernameInUse, emailInUse, error } = await db.isUsernameOrEmailInUse(username, email);
+  
+  if (error) {
+      return res.status(500).json({error:errorCodes.DATABASE_ERROR});
+  }
 
-    if (usernameInUse) {
-        return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
-    }
+  if (usernameInUse) {
+      return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
+  }
 
-    if (emailInUse) {
-        return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
-    }
+  if (emailInUse) {
+      return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
+  }
 
-    // Validate password
-    if (!isValidPassword(password)) {
-        return res.status(400).send({error:errorCodes.INVALID_PASSWORD});
-    }
-    const verificationToken = generateVerificationToken();
-    userData = await db.findUser({username: username})
-    await db.saveEmailVerificationToken(userData.id, verificationToken);
-    await sendVerificationEmail(email, verificationToken);
-    // Attempt to add user
-    const { success, error: addUserError } = await db.addUser(username, password, email, birthday);
-
-    if (!success) {
-        return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
-    } else {
-        res.status(201).send({status:"success"});
-    }
+  // Validate password
+  if (!isValidPassword(password)) {
+      return res.status(400).send({error:errorCodes.INVALID_PASSWORD});
+  }
+  // Attempt to add user
+  const { userId, error: addUserError } = await db.addUser(username, password, email, birthday);
+  if (error) {
+    return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
+  }
+
+  const result = await profileDb.addProfile(userId,username,email);
+  if(!result.profileId){
+    return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
+  }
+
+  const verificationToken = generateVerificationToken();
+  await db.saveEmailVerificationToken(userId, verificationToken);
+  await sendVerificationEmail(email, verificationToken);
+
+  res.status(201).send({status:"success"});
+  
 }
 
 async function sendVerificationEmail(email, token) {

From da029301f2d59fe4f0bfe63ac9d8169d44426f0d Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 21:38:58 +0300
Subject: [PATCH 089/246] Remove addProfile endpoint

---
 .../backend/src/routes/ProfileRouter.js       | 40 -------------------
 .../backend/src/services/ProfileService.js    | 25 +-----------
 2 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 4665b0be..7f13a588 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -128,46 +128,6 @@ router.get('/', service.getProfile);
  */
 router.get('/:profileId', service.getProfileWithProfileId);
 
-/**
- * @swagger
- * /profiles:
- *   post:
- *     tags:
- *       - profiles
- *     description: Add a new profile. UserId, username and email only one of them have to be added. The others wont be used
- *     requestBody:
- *       required: true
- *       content:
- *         application/json:
- *           schema:
- *             $ref: '#/components/schemas/Profile'
- *     responses:
- *       201:
- *         description: Profile created successfully
- *         content:
- *           application/json:
- *             schema:
- *               $ref: '#/components/schemas/Profile'
- *       400:
- *         description: Bad Request
- *         content:
- *           application/json:
- *             schema:
- *               type: object
- *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
- *             examples:
- *               ProfileNotFound:
- *                 value:
- *                   error:
- *                     code: 3002,
- *                     message: Profile could not be created.
- */
-router.post('/', service.addProfile);
-
 /**
  * @swagger
  * /profiles:
diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 479715f4..8f46bc59 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -34,29 +34,6 @@ async function getProfileWithProfileId(req,res){
     }
 }
 
-async function addProfile(req,res){
-    const {userId,username,email,profile_picture,biography, birthday, isHidden} = req.body;
-    try{
-        const result = await authDb.findUser({userId,username,email})
-        if(result.error){
-            throw result.error;
-        }
-        const {profileId,error} = await db.addProfile({userId:result.id,username:result.username,email:result.email,profile_picture,biography, birthday, isHidden});
-        if(error){
-            throw error;
-        }
-
-        const result_profile = await db.getProfileWithUserId(result.id);
-        if(result_profile.error){
-            throw result_profile.error;
-        }
-
-        return res.status(200).json(result_profile.profile);
-    }catch(error){
-        return res.status(400).json({error:error});
-    }
-}
-
 async function updateProfile(req,res){
     const {userId,username,email,profile_picture,biography, birthday, isHidden} = req.body;
 
@@ -81,4 +58,4 @@ async function updateProfile(req,res){
     }
 }
 
-module.exports = {getProfile,getProfileWithProfileId,addProfile,updateProfile}
\ No newline at end of file
+module.exports = {getProfile,getProfileWithProfileId,updateProfile}
\ No newline at end of file

From 58e98aa3ea81eb06d1a509995d8f39f71bc9ea3d Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 21:39:14 +0300
Subject: [PATCH 090/246] Update addProfile function

---
 .../backend/src/repositories/ProfileDB.js             | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index 2762b619..c4f44e49 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -41,14 +41,7 @@ async function getProfileWithUserId(userId){
     }
 }
 
-async function addProfile({
-    userId,
-    username,
-    email,
-    profile_picture,
-    biography,
-    birthday ,
-    isHidden}){
+async function addProfile(userId, username, email){
 
     try {
         const {error} = await getProfileWithUserId(userId);
@@ -57,7 +50,7 @@ async function addProfile({
         }
 
         const sql = 'INSERT INTO profiles (userId, username, email, profile_picture, biography, birthday, isHidden) VALUES (?, ?, ?, ?, ?, ?, ?)';
-        values = [userId,username,email,profile_picture,biography,birthday,isHidden]   
+        values = [userId,username,email,null,null,null,null]
         const [resultSetHeader] = await pool.query(sql, values);
         if(!resultSetHeader.insertId){
             throw {error:errorCodes.PROFILE_COULD_NOT_BE_CREATED};

From 081d6a0516f0c225bbb93543e1ce96e474976bf4 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 21:55:30 +0300
Subject: [PATCH 091/246] Add get my profile logic

---
 .../backend/src/services/ProfileService.js    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 8f46bc59..4c00e793 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -34,6 +34,25 @@ async function getProfileWithProfileId(req,res){
     }
 }
 
+async function getMyProfile(req,res){
+    const userId = req.user.id;
+    try{
+        const result = await authDb.findUser({userId})
+        if(result.error){
+            throw result.error;
+        }
+    
+        const {profile,error} = await db.getProfileWithUserId(result.id);
+        if(error){
+            throw error;
+        }
+        return res.status(200).json(profile);
+        
+    }catch(error){
+        return res.status(400).json({error:error});
+    }
+}
+
 async function updateProfile(req,res){
     const {userId,username,email,profile_picture,biography, birthday, isHidden} = req.body;
 
@@ -58,4 +77,4 @@ async function updateProfile(req,res){
     }
 }
 
-module.exports = {getProfile,getProfileWithProfileId,updateProfile}
\ No newline at end of file
+module.exports = {getProfile,getProfileWithProfileId,getMyProfile,updateProfile}
\ No newline at end of file

From 0b2fa0e2f2c1093ee24c139826b1e65b0605661d Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 21:55:38 +0300
Subject: [PATCH 092/246] Update swagger

---
 .../backend/src/routes/ProfileRouter.js       | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 7f13a588..6c50ce2e 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -87,6 +87,46 @@ const router = express.Router();
  */
 router.get('/', service.getProfile);
 
+/**
+ * @swagger
+ * /profiles:
+ *   get:
+ *     tags:
+ *       - profiles
+ *     description: Get your profile.  
+ *     responses:
+ *       200:
+ *         description: Successful response
+ *         content:
+ *           application/json:
+ *             schema:
+ *               schema:
+ *               $ref: '#/components/schemas/Profile'
+ *       400:
+ *         description: Bad Request
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 message:
+ *                   type: string
+ *                 code:
+ *                   type: integer
+ *             examples:
+ *               userNotFoundWithUserId:
+ *                 value:
+ *                   error:
+ *                     code: 2001,
+ *                     message: User with the given user id not found
+ *               ProfileNotFound:
+ *                 value:
+ *                   error:
+ *                     code: 3000,
+ *                     message: Profile not found,
+ */
+router.get('/myProfile',authenticator.authorizeAccessToken ,service.getMyProfile);
+
 /**
  * @swagger
  * /profiles/{profileId}:

From 72ef22bc9f07418d9cf35dbb941d8df44a4b511a Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 22:16:01 +0300
Subject: [PATCH 093/246] add schemas

---
 .../backend/src/routes/PollRouter.js          | 268 ++++++------------
 1 file changed, 86 insertions(+), 182 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 680c42ec..13bc67a4 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -3,6 +3,77 @@ const service = require("../services/PollService.js");
 const express = require('express');
 const router = express.Router();
 
+/**
+ * @swagger
+ * components:
+ *   objects:
+ *     pollObject:
+ *       type: object
+ *       required: ["id", "question", "tags", "creatorName", "creatorUsername", "creatorImage", "pollType", "closingDate", "rejectVotes", "isOpen", "comments", "options"]
+ *       properties: 
+ *         id:
+ *           type: integer
+ *         question:
+ *           type: string
+ *         tags:
+ *           type: array
+ *           items: 
+ *             type: string
+ *         creatorName:
+ *           type: string
+ *         creatorUsername:
+ *           type: string
+ *         creatorImage:
+ *           type: string
+ *         pollType:
+ *           type: string
+ *         closingDate:
+ *           type: string
+ *         rejectVotes:
+ *           type: string
+ *         isOpen:
+ *           type: boolean
+ *         cont_poll_type:
+ *           type: string
+ *         comments:
+ *           type: array
+ *           items: 
+ *             type: object
+ *             properties:
+ *               id:
+ *                 type: integer
+ *               content:
+ *                 type: string
+ *         options:
+ *           oneOf:
+ *             - type: array
+ *               items:
+ *                 type: object
+ *                 properties:
+ *                   id:
+ *                     type: integer
+ *                   choice_text:
+ *                     type: string
+ *                   poll_id:
+ *                     type: integer
+ *                   voter_count:
+ *                     type: integer
+ *             - type: array
+ *               items:
+ *                 type: integer
+ * 
+ *   schemas:
+ *     error:
+ *       type: object
+ *       properties:
+ *         error:
+ *           type: object
+ *           properties:
+ *            message:
+ *              type: string
+ *            code:
+ *              type: integer
+ */
 
 /**
  * @swagger
@@ -19,59 +90,7 @@ const router = express.Router();
  *             schema:
  *               type: array
  *               items:
- *                 type: object
- *                 required: ["id", "question", "tags", "creatorName", "creatorUsername", "creatorImage", "pollType", "closingDate", "rejectVotes", "isOpen", "comments", "options"]
- *                 properties: 
- *                   id:
- *                     type: integer
- *                   question:
- *                     type: string
- *                   tags:
- *                     type: array
- *                     items: 
- *                       type: string
- *                   creatorName:
- *                     type: string
- *                   creatorUsername:
- *                     type: string
- *                   creatorImage:
- *                     type: string
- *                   pollType:
- *                     type: string
- *                   closingDate:
- *                     type: string
- *                   rejectVotes:
- *                     type: string
- *                   isOpen:
- *                     type: boolean
- *                   cont_poll_type:
- *                     type: string
- *                   comments:
- *                     type: array
- *                     items: 
- *                       type: object
- *                       properties:
- *                         id:
- *                           type: integer
- *                         content:
- *                           type: string
- *                   options:
- *                     oneOf:
- *                       - type: array
- *                         items:
- *                           type: object
- *                           properties:
- *                             id:
- *                               type: integer
- *                             choice_text:
- *                               type: string
- *                             poll_id:
- *                               type: integer
- *                             voter_count:
- *                               type: integer
- *                       - type: array
- *                         items:
- *                           type: integer
+ *                 $ref: '#/components/objects/pollObject'
  *             examples:
  *               genericExample:
  *                 value:
@@ -83,9 +102,9 @@ const router = express.Router();
  *                     creatorImage: null
  *                     pollType: "discrete"
  *                     rejectVotes: "5 min"
- *                     setDueDate: 1 
  *                     closingDate: "2023-11-20T21:00:00.000Z"
  *                     isOpen: 1 
+ *                     comments: []
  *                     options:
  *                       - id: 1
  *                         choice_text: "Trumpo"
@@ -103,10 +122,10 @@ const router = express.Router();
  *                     creatorImage: null
  *                     pollType: "continuous"
  *                     rejectVotes: "2 hr"
- *                     setDueDate: 0 
  *                     closingDate: null
  *                     isOpen: 1 
  *                     cont_poll_type: "numeric"
+ *                     comments: []
  *                     options:
  *                       - 7
  *                       - 8   
@@ -115,15 +134,7 @@ const router = express.Router();
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                    message:
- *                      type: string
- *                    code:
- *                      type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               databaseError:
  *                 value:
@@ -153,53 +164,7 @@ router.get('/', service.getPolls);
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               required: ["id", "question", "poll_type", "poll", "options"]
- *               properties:
- *                 id:
- *                   type: integer
- *                 question:
- *                   type: string
- *                 tags:
- *                   type: array
- *                   items: 
- *                     type: string
- *                 creatorName:
- *                   type: string
- *                 creatorUsername:
- *                   type: string
- *                 creatorImage:
- *                   type: string
- *                 pollType:
- *                   type: string
- *                 rejectVotes:
- *                   type: string
- *                 setDueDate:
- *                   type: integer
- *                 closingDate:
- *                   type: string
- *                 isOpen:
- *                   type: integer
- *                 cont_poll_type:
- *                   type: string
- *                 options:
- *                   oneOf:
- *                     - type: array
- *                       items:
- *                         type: object
- *                         properties:
- *                           id:
- *                             type: integer
- *                           choice_text:
- *                             type: string
- *                           poll_id:
- *                             type: integer
- *                           voter_count:
- *                             type: integer
- *                     - type: array
- *                       items:
- *                         type: integer
- * 
+ *               $ref: '#/components/objects/pollObject'
  *             examples:
  *               discrete:
  *                 value:
@@ -211,9 +176,9 @@ router.get('/', service.getPolls);
  *                   creatorImage: null
  *                   pollType: "discrete"
  *                   rejectVotes: "5 min"
- *                   setDueDate: 1 
  *                   closingDate: "2023-11-20T21:00:00.000Z"
  *                   isOpen: 1 
+ *                   comments: [] 
  *                   options:
  *                     - id: 1
  *                       choice_text: "Trumpo"
@@ -233,10 +198,10 @@ router.get('/', service.getPolls);
  *                   creatorImage: null
  *                   pollType: "continuous"
  *                   rejectVotes: "2 hr"
- *                   setDueDate: 0 
  *                   closingDate: null
  *                   isOpen: 1 
  *                   cont_poll_type: "numeric"
+ *                   comments: []
  *                   options:
  *                     - 7
  *                     - 8   
@@ -245,15 +210,7 @@ router.get('/', service.getPolls);
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                    message:
- *                      type: string
- *                    code:
- *                      type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               NO_SUCH_POLL_ERROR:
  *                 value:
@@ -265,15 +222,7 @@ router.get('/', service.getPolls);
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                    message:
- *                      type: string
- *                    code:
- *                      type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               databaseError:
  *                 value:
@@ -343,15 +292,7 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                     message:
- *                       type: string
- *                     code:
- *                       type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               badRequest:
  *                 value:
@@ -368,15 +309,7 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                     message:
- *                       type: string
- *                     code:
- *                       type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               ACCESS_TOKEN_INVALID_ERROR:
  *                 value:
@@ -388,15 +321,7 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                     message:
- *                       type: string
- *                     code:
- *                       type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               databaseError:
  *                 value:
@@ -475,15 +400,7 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                     message:
- *                       type: string
- *                     code:
- *                       type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               badRequest:
  *                 value:
@@ -495,12 +412,7 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 message:
- *                   type: string
- *                 code:
- *                   type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               ACCESS_TOKEN_INVALID_ERROR:
  *                 value:
@@ -512,15 +424,7 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *         content:
  *           application/json:
  *             schema:
- *               type: object
- *               properties:
- *                 error:
- *                   type: object
- *                   properties:
- *                     message:
- *                       type: string
- *                     code:
- *                       type: integer
+ *               $ref: '#/components/schemas/error'
  *             examples:
  *               databaseError:
  *                 value:

From 5135601f2529a099451749a528c44bac7d40f212 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 22:19:54 +0300
Subject: [PATCH 094/246] distinguish error codes

---
 prediction-polls/backend/src/errorCodes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index 5dee5f74..3b147a05 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -131,12 +131,12 @@ const errorCodes = {
   },
 
   DATABASE_ERROR: {
-    code: 3000,
+    code: 3004,
     message: 'Error while accessing the database.',
   },
 
   NO_SUCH_POLL_ERROR: {
-    code: 3001,
+    code: 3005,
     message: 'No such poll found.'
   },
 

From 0c7dc55e17b45f251ec8b7b410794f422a6c7f8a Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Thu, 23 Nov 2023 22:32:27 +0300
Subject: [PATCH 095/246] fix error codes

---
 .../backend/src/routes/PollRouter.js             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 13bc67a4..2764b507 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -140,7 +140,7 @@ const router = express.Router();
  *                 value:
  *                   error:
  *                     message: Error while accessing the database.
- *                     code: 3000
+ *                     code: 3004
  */
 router.get('/', service.getPolls);
 
@@ -216,7 +216,7 @@ router.get('/', service.getPolls);
  *                 value:
  *                   error:
  *                     message: No such poll found.
- *                     code: 3001
+ *                     code: 3005
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -228,7 +228,7 @@ router.get('/', service.getPolls);
  *                 value:
  *                   error:
  *                     message: Error while accessing the database.
- *                     code: 3000
+ *                     code: 3004
  */
 router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId);
 
@@ -303,7 +303,7 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *                 value:
  *                   error:
  *                     message: The access token is invalid.
- *                     code: 1001
+ *                     code: 1002
  *       401:
  *         description: Unauthorized
  *         content:
@@ -315,7 +315,7 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *                 value:
  *                   error:
  *                     message: The access token is invalid.
- *                     code: 1001
+ *                     code: 1002
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -327,7 +327,7 @@ router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId
  *                 value:
  *                   error:
  *                     message: Error while accessing the database.
- *                     code: 3000
+ *                     code: 3004
  */
 router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscretePoll);
 
@@ -418,7 +418,7 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *                 value:
  *                   error:
  *                     message: The access token is invalid.
- *                     code: 1001
+ *                     code: 1002
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -430,7 +430,7 @@ router.post('/discrete', authenticator.authorizeAccessToken, service.addDiscrete
  *                 value:
  *                   error:
  *                     message: Error while accessing the database.
- *                     code: 3000
+ *                     code: 3004
  */
 router.post('/continuous', authenticator.authorizeAccessToken, service.addContinuousPoll);
 

From 990c91c0be9ee53e50f543d0322d5e6f960b0447 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 22:40:48 +0300
Subject: [PATCH 096/246] Add new badge class to schema

---
 prediction-polls/backend/src/schema.sql | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index e7e91f4a..2ecc25a6 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -81,4 +81,12 @@ CREATE TABLE profiles (
     isHidden BOOLEAN DEFAULT False,
     unique(userId),
     FOREIGN KEY (userId) REFERENCES users(id)
+);
+
+CREATE TABLE badges (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    userRank INT NOT NULL,
+    topic VARCHAR(255) NOT NULL,
+    userId INT,
+    FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL
 );
\ No newline at end of file

From 510b4ba287ff543dc444b42685d25e0b86f986e6 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 22:41:10 +0300
Subject: [PATCH 097/246] Implement select badges

---
 .../backend/src/repositories/ProfileDB.js     | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index c4f44e49..223b92d8 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -106,10 +106,23 @@ async function updateProfile({
 
 
 async function getProfileIsHidden(profileId){
-    profile = await getProfileWithProfileId(profileId);
-    return profile.isHidden;
+    result = await getProfileWithProfileId(profileId);
+    return result.profile.isHidden;
 }
 
+async function getBadges(userId){
+    const sql = 'SELECT * FROM badges WHERE userId= ?';
 
-module.exports = {getProfileWithProfileId,getProfileWithUserId,addProfile,updateProfile}
+    try {
+        const [rows] = await pool.query(sql, [userId]);
+        const badges = rows.map(badge => {return {topic:badge.topic,rank:badge.userRank}})
+        
+        return {badges:badges};
+    } catch (error) {
+        return {error:errorCodes.DATABASE_ERROR};
+    }
+}
+
+
+module.exports = {getProfileWithProfileId,getProfileWithUserId,addProfile,updateProfile,getBadges}
     
\ No newline at end of file

From 22b593531b4fe5479ab0f2baa9595ad82e297ead Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Thu, 23 Nov 2023 22:41:27 +0300
Subject: [PATCH 098/246] print badges on profile

---
 .../backend/src/services/ProfileService.js         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 4c00e793..472d5eda 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -14,6 +14,13 @@ async function getProfile(req,res){
         if(error){
             throw error;
         }
+
+        const {badges,error:badge_error} = await db.getBadges(result.id);
+        if(badge_error){
+            throw badge_error;
+        }
+        profile.badges = badges;
+
         return res.status(200).json(profile);
         
     }catch(error){
@@ -28,6 +35,13 @@ async function getProfileWithProfileId(req,res){
         if(error){
             throw error
         }
+
+        const {badges,error:badge_error} = await db.getBadges(result.id);
+        if(badge_error){
+            throw badge_error;
+        }
+        profile.badges = badges;
+
         res.status(200).json(profile);
     }catch(error){
         return res.status(400).json({error:error});

From 5352a06a7307a4297a68704cee86cd0b7092401d Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Thu, 23 Nov 2023 22:47:11 +0300
Subject: [PATCH 099/246] improve create poll screen

---
 .../request/CreateContinuousPollRequest.kt    |   4 +-
 .../request/CreateDiscretePollRequest.kt      |   2 +-
 .../remote/repositories/PollRepository.kt     |   6 +-
 .../ui/common/CustomDatePicker.kt             |  63 +++++++
 .../ui/common/CustomInputField.kt             |   5 +-
 .../ui/create/CreatePollScreen.kt             | 175 +++++++++++++++++-
 .../ui/create/CreatePollScreenEvent.kt        |   2 +
 .../ui/create/CreatePollScreenState.kt        |  40 +++-
 .../ui/create/CreatePollViewModel.kt          |  51 ++++-
 .../app/src/main/res/values/strings.xml       |   7 +-
 10 files changed, 325 insertions(+), 30 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomDatePicker.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
index 12c430bb..1846d2ed 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
@@ -6,8 +6,8 @@ data class CreateContinuousPollRequest(
     val setDueDate: Boolean,
     val dueDatePoll: String?,
     val numericFieldValue: Int?,
-    val selectedTimeUnit: TimeUnit?,
-    val pollType: PollRequestType,
+    val selectedTimeUnit: String,
+    val pollType: String,
 ) {
     enum class TimeUnit(val value: String) {
         MINUTE("min"),
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt
index 0b928fe5..0080492d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateDiscretePollRequest.kt
@@ -7,7 +7,7 @@ data class CreateDiscretePollRequest(
     val setDueDate: Boolean,
     val dueDatePoll: String?,
     val numericFieldValue: Int?,
-    val selectedTimeUnit: TimeUnit?,
+    val selectedTimeUnit: String,
 ) {
     enum class TimeUnit(val value: String) {
         MINUTE("min"),
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
index 2bc64837..702c4a4a 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
@@ -14,8 +14,8 @@ class PollRepository(
         setDueDate: Boolean,
         dueDatePoll: String? = null,
         numericFieldValue: Int? = null,
-        selectedTimeUnit: CreateContinuousPollRequest.TimeUnit? = null,
-        pollType: CreateContinuousPollRequest.PollRequestType
+        selectedTimeUnit: String,
+        pollType: String,
     ){
         val request = CreateContinuousPollRequest(
             question,
@@ -38,7 +38,7 @@ class PollRepository(
         setDueDate: Boolean,
         dueDatePoll: String? = null,
         numericFieldValue: Int? = null,
-        selectedTimeUnit: CreateDiscretePollRequest.TimeUnit? = null,
+        selectedTimeUnit: String
     ){
         val request = CreateDiscretePollRequest(
             question,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomDatePicker.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomDatePicker.kt
new file mode 100644
index 00000000..f70dc1ac
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomDatePicker.kt
@@ -0,0 +1,63 @@
+package com.bounswe.predictionpolls.ui.common
+
+import androidx.compose.material3.DatePicker
+import androidx.compose.material3.DatePickerDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberDatePickerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.intl.Locale
+import com.bounswe.predictionpolls.R
+import com.bounswe.predictionpolls.extensions.toTimeDateString
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CustomDatePicker(
+    isDatePickerVisible: Boolean = false,
+    onDismissRequest: () -> Unit = {},
+    onDateChanged: (String) -> Unit = {},
+) {
+    if (isDatePickerVisible.not()) return
+
+    val locale = Locale.current
+    val datePickerState = rememberDatePickerState()
+    val confirmEnabled = remember {
+        derivedStateOf { datePickerState.selectedDateMillis != null }
+    }
+
+    DatePickerDialog(
+        onDismissRequest = onDismissRequest,
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    datePickerState.selectedDateMillis?.let {
+                        onDateChanged(it.toTimeDateString(locale))
+                    }
+                    onDismissRequest()
+                },
+                enabled = confirmEnabled.value
+            ) {
+                Text(
+                    text = stringResource(id = R.string.confirm),
+                )
+            }
+        },
+        dismissButton = {
+            TextButton(
+                onClick = {
+                    onDismissRequest()
+                }
+            ) {
+                Text(
+                    text = stringResource(id = R.string.cancel),
+                )
+            }
+        },
+    ) {
+        DatePicker(state = datePickerState)
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomInputField.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomInputField.kt
index 679300f6..4abe1f8e 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomInputField.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CustomInputField.kt
@@ -56,10 +56,13 @@ fun CustomInputField(
     visualTransformation: VisualTransformation = VisualTransformation.None,
 ) {
     Column(
+        modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
         TextField(
-            modifier = modifier.border(1.dp, borderColor.copy(alpha = 0.2f), shape),
+            modifier = Modifier
+                .fillMaxWidth()
+                .border(1.dp, borderColor.copy(alpha = 0.2f), shape),
             value = text,
             onValueChange = onTextChanged,
             label = if (labelId != null) {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
index c227c6db..61aa4ae5 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
@@ -1,31 +1,52 @@
 package com.bounswe.predictionpolls.ui.create
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Checkbox
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.PopupProperties
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.bounswe.predictionpolls.R
+import com.bounswe.predictionpolls.ui.common.CustomDatePicker
 import com.bounswe.predictionpolls.ui.common.CustomInputField
+import com.bounswe.predictionpolls.ui.common.ErrorDialog
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 import com.bounswe.predictionpolls.utils.DateTransformation
 
@@ -45,14 +66,47 @@ fun CreatePollScreen(
         onOptionAdded = { viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionAdded) },
         onOptionRemoved = { viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionRemoved(it)) },
         activeInputType = viewModel.screenState.continuousInputType,
-        onInputTypeChanged = { viewModel.onEvent(CreatePollScreenEvent.OnContinuousInputTypeChanged(it)) },
+        onInputTypeChanged = {
+            viewModel.onEvent(
+                CreatePollScreenEvent.OnContinuousInputTypeChanged(
+                    it
+                )
+            )
+        },
         isDueDateChecked = viewModel.screenState.isDueDateEnabled,
         onDueDateChecked = { viewModel.onEvent(CreatePollScreenEvent.OnDueDateChecked(it)) },
-        lastAcceptValue = viewModel.screenState.dueDate,
-        onLastAcceptValueChanged = { viewModel.onEvent(CreatePollScreenEvent.OnDueDateChanged(it)) },
+        dueDate = viewModel.screenState.dueDate,
+        onDueDateChanged = { viewModel.onEvent(CreatePollScreenEvent.OnDueDateChanged(it)) },
+        lastAcceptValue = viewModel.screenState.lastAcceptValue,
+        onLastAcceptValueChanged = {
+            viewModel.onEvent(
+                CreatePollScreenEvent.OnLastAcceptValueChanged(
+                    it
+                )
+            )
+        },
+        selectedLastAcceptValueType = viewModel.screenState.acceptValueType,
+        onLastAcceptValueTypeChanged = {
+            viewModel.onEvent(
+                CreatePollScreenEvent.OnAcceptValueTypeChanged(
+                    it
+                )
+            )
+        },
         isDistributionVisible = viewModel.screenState.isDistributionVisible,
-        onDistributionVisibilityChanged = { viewModel.onEvent(CreatePollScreenEvent.OnDistributionVisibilityChanged(it)) },
+        onDistributionVisibilityChanged = {
+            viewModel.onEvent(
+                CreatePollScreenEvent.OnDistributionVisibilityChanged(
+                    it
+                )
+            )
+        },
         onCreatePollClicked = { viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked) },
+        errorId = viewModel.screenState.inputValidationError,
+        networkError = viewModel.error,
+        onDismissErrorDialog = { viewModel.onEvent(CreatePollScreenEvent.OnErrorDismissed) },
+        isDatePickerVisible = viewModel.screenState.isDatePickerVisible,
+        onDatePickerVisibilityChanged = { viewModel.onEvent(CreatePollScreenEvent.ToggleDatePicker) },
     )
 }
 
@@ -70,16 +124,28 @@ private fun CreatePollScreenUI(
     onInputTypeChanged: (CreatePollScreenState.ContinuousInputType) -> Unit = {},
     isDueDateChecked: Boolean = false,
     onDueDateChecked: (Boolean) -> Unit = {},
+    dueDate: String = "",
+    onDueDateChanged: (String) -> Unit = {},
     lastAcceptValue: String = "",
     onLastAcceptValueChanged: (String) -> Unit = {},
+    selectedLastAcceptValueType: CreatePollScreenState.AcceptValueType = CreatePollScreenState.AcceptValueType.DAY,
+    onLastAcceptValueTypeChanged: (CreatePollScreenState.AcceptValueType) -> Unit = {},
     isDistributionVisible: Boolean = false,
     onDistributionVisibilityChanged: (Boolean) -> Unit = {},
     onCreatePollClicked: () -> Unit = {},
+    errorId: Int? = null,
+    networkError: String? = null,
+    onDismissErrorDialog: () -> Unit = {},
+    isDatePickerVisible: Boolean = false,
+    onDatePickerVisibilityChanged: () -> Unit = {},
 ) {
+    val scrollState = rememberScrollState()
+
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(top = 24.dp, start = 16.dp, end = 16.dp),
+            .padding(top = 24.dp, start = 16.dp, end = 16.dp)
+            .verticalScroll(scrollState),
         verticalArrangement = Arrangement.spacedBy(24.dp)
     ) {
         ScreenHeader()
@@ -109,10 +175,15 @@ private fun CreatePollScreenUI(
         DueDateRow(
             isDueDateChecked = isDueDateChecked,
             onDueDateChecked = onDueDateChecked,
+            dueDate = dueDate,
+            onDueDateChanged = onDueDateChanged,
+            toggleDatePicker = onDatePickerVisibilityChanged,
         )
         PollEndTime(
             lastAcceptValue = lastAcceptValue,
             onLastAcceptValueChanged = onLastAcceptValueChanged,
+            onLastAcceptValueTypeChanged = onLastAcceptValueTypeChanged,
+            selectedLastAcceptValueType = selectedLastAcceptValueType,
         )
         DistributionVisibility(
             isDistributionVisible = isDistributionVisible,
@@ -142,6 +213,15 @@ private fun CreatePollScreenUI(
             }
         }
     }
+    ErrorDialog(
+        error = errorId?.let { stringResource(id = it) } ?: networkError,
+        onDismiss = { onDismissErrorDialog() }
+    )
+    CustomDatePicker(
+        isDatePickerVisible = isDatePickerVisible,
+        onDismissRequest = onDatePickerVisibilityChanged,
+        onDateChanged = { onDueDateChanged(it) }
+    )
 }
 
 @Composable
@@ -262,6 +342,7 @@ private fun DueDateRow(
     onDueDateChecked: (Boolean) -> Unit = {},
     dueDate: String = "",
     onDueDateChanged: (String) -> Unit = {},
+    toggleDatePicker: () -> Unit = {},
 ) {
     Row(
         modifier = Modifier.fillMaxWidth(),
@@ -288,6 +369,7 @@ private fun DueDateRow(
                 trailingIconId = R.drawable.ic_calendar,
                 trailingIconContentDescription = R.string.cd_calendar,
                 visualTransformation = DateTransformation(),
+                onTrailingIconClicked = { toggleDatePicker() },
                 keyboardOptions = KeyboardOptions(
                     keyboardType = KeyboardType.Number
                 ),
@@ -302,27 +384,104 @@ private fun DueDateRow(
 private fun PollEndTime(
     lastAcceptValue: String = "",
     onLastAcceptValueChanged: (String) -> Unit = {},
+    selectedLastAcceptValueType: CreatePollScreenState.AcceptValueType,
+    onLastAcceptValueTypeChanged: (CreatePollScreenState.AcceptValueType) -> Unit,
 ) {
     Row(
         modifier = Modifier.fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(16.dp)
+        horizontalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         Text(
             text = stringResource(id = R.string.poll_create_screen_poll_end),
             color = MaterialTheme.colorScheme.onBackground,
             style = MaterialTheme.typography.titleLarge,
             fontSize = 14.sp,
-            lineHeight = 17.sp
+            lineHeight = 17.sp,
+            softWrap = true,
+            overflow = TextOverflow.Visible,
+            modifier = Modifier.width(IntrinsicSize.Max)
         )
-        Spacer(modifier = Modifier.weight(1f))
         CustomInputField(
+            modifier = Modifier.weight(1f),
             text = lastAcceptValue,
             onTextChanged = onLastAcceptValueChanged,
             keyboardOptions = KeyboardOptions(
                 keyboardType = KeyboardType.Number
             ),
         )
+        LastAcceptValueTypeSelection(
+            selectedItem = selectedLastAcceptValueType.type,
+            onLastAcceptValueTypeChanged = onLastAcceptValueTypeChanged,
+        )
+    }
+}
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+private fun LastAcceptValueTypeSelection(
+    selectedItem: String,
+    onLastAcceptValueTypeChanged: (CreatePollScreenState.AcceptValueType) -> Unit,
+) {
+    var expanded by remember { mutableStateOf(false) }
+    val shape = RoundedCornerShape(8.dp)
+
+    Column {
+        Row(
+            modifier = Modifier
+                .background(MaterialTheme.colorScheme.primary, shape)
+                .clip(shape = shape)
+                .clickable {
+                    expanded = expanded.not()
+                }
+                .padding(vertical = 12.dp, horizontal = 16.dp),
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = selectedItem,
+                color = MaterialTheme.colorScheme.onPrimary,
+                style = MaterialTheme.typography.labelMedium,
+                fontSize = 14.sp,
+                lineHeight = 17.sp,
+                textAlign = TextAlign.Center,
+            )
+            Icon(
+                painter = painterResource(id = R.drawable.ic_back),
+                contentDescription = stringResource(id = R.string.poll_create_screen_poll_end_selection),
+                modifier = Modifier.rotate(-90f),
+                tint = MaterialTheme.colorScheme.onPrimary,
+            )
+        }
+
+        DropdownMenu(
+            expanded = expanded,
+            onDismissRequest = { expanded = false },
+            properties = PopupProperties(
+                usePlatformDefaultWidth = false,
+            ),
+            modifier = Modifier
+                .background(MaterialTheme.colorScheme.primary)
+        ) {
+            CreatePollScreenState.AcceptValueType.entries.forEach { item ->
+                DropdownMenuItem(
+                    onClick = {
+                        onLastAcceptValueTypeChanged(item)
+                        expanded = false
+                    },
+                    text = {
+                        Text(
+                            text = item.type,
+                            color = MaterialTheme.colorScheme.onPrimary,
+                            style = MaterialTheme.typography.labelMedium,
+                            fontSize = 14.sp,
+                            lineHeight = 17.sp,
+                            textAlign = TextAlign.Center,
+                        )
+                    }
+                )
+            }
+        }
     }
 }
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
index bda09f5d..4e5fa6ea 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
@@ -13,4 +13,6 @@ sealed class CreatePollScreenEvent {
     data class OnAcceptValueTypeChanged(val type: CreatePollScreenState.AcceptValueType): CreatePollScreenEvent()
     data class OnDistributionVisibilityChanged(val isChecked: Boolean): CreatePollScreenEvent()
     data object OnCreatePollClicked: CreatePollScreenEvent()
+    data object OnErrorDismissed: CreatePollScreenEvent()
+    data object ToggleDatePicker: CreatePollScreenEvent()
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt
index 8cdcee52..6b552dfd 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenState.kt
@@ -1,18 +1,23 @@
 package com.bounswe.predictionpolls.ui.create
 
+import androidx.annotation.StringRes
+import com.bounswe.predictionpolls.R
 import com.bounswe.predictionpolls.data.remote.model.request.CreateContinuousPollRequest
 import com.bounswe.predictionpolls.data.remote.model.request.CreateDiscretePollRequest
+import com.bounswe.predictionpolls.extensions.isValidDate
 
 data class CreatePollScreenState(
     val question: String = "",
     val pollType: PollType = PollType.DISCRETE,
-    val discreteOptions: List<String> = listOf(""),
+    val discreteOptions: List<String> = listOf("",""),
     val continuousInputType: ContinuousInputType = ContinuousInputType.DATE,
     val isDueDateEnabled: Boolean = false,
     val dueDate: String = "",
     val lastAcceptValue: String = "",
     val acceptValueType: AcceptValueType = AcceptValueType.MINUTE,
     val isDistributionVisible: Boolean = false,
+    @StringRes val inputValidationError: Int? = null,
+    val isDatePickerVisible: Boolean = false,
 ) {
     enum class PollType(val type: String) {
         DISCRETE("Multiple Choice"),
@@ -56,6 +61,15 @@ data class CreatePollScreenState(
         }
     }
 
+    val isQuestionValid: Boolean
+        get() = question.isNotBlank()
+
+    val isDiscreteOptionsValid: Boolean
+        get() = pollType == PollType.CONTINUOUS ||  discreteOptions.all { it.isNotBlank() }
+
+    val isDueDateValid: Boolean
+        get() =  isDueDateEnabled.not() || dueDate.none { it.isDigit().not() } && dueDate.isValidDate()
+
     fun reduce(event: CreatePollScreenEvent): CreatePollScreenState {
         return when (event) {
             is CreatePollScreenEvent.OnQuestionChanged -> {
@@ -83,11 +97,17 @@ data class CreatePollScreenState(
             }
 
             is CreatePollScreenEvent.OnDiscreteOptionRemoved -> {
-                this.copy(
-                    discreteOptions = discreteOptions.filterIndexed { index, _ ->
-                        index != event.position
-                    }
-                )
+                if (discreteOptions.size <= 2) {
+                    this.copy(
+                        inputValidationError = R.string.poll_create_screen_option_count_error
+                    )
+                } else {
+                    this.copy(
+                        discreteOptions = discreteOptions.filterIndexed { index, _ ->
+                            index != event.position
+                        }
+                    )
+                }
             }
 
             is CreatePollScreenEvent.OnDueDateChecked -> {
@@ -114,6 +134,14 @@ data class CreatePollScreenState(
                 this.copy(continuousInputType = event.inputType)
             }
 
+            is CreatePollScreenEvent.OnErrorDismissed -> {
+                this.copy(inputValidationError = null)
+            }
+
+            is CreatePollScreenEvent.ToggleDatePicker -> {
+                this.copy(isDatePickerVisible = !isDatePickerVisible)
+            }
+
             else -> {
                 this
             }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
index d0e5896d..5e3777ea 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
@@ -3,6 +3,7 @@ package com.bounswe.predictionpolls.ui.create
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import com.bounswe.predictionpolls.R
 import com.bounswe.predictionpolls.core.BaseViewModel
 import com.bounswe.predictionpolls.data.remote.repositories.PollRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -11,7 +12,7 @@ import javax.inject.Inject
 @HiltViewModel
 class CreatePollViewModel @Inject constructor(
     private val pollRepository: PollRepository
-): BaseViewModel() {
+) : BaseViewModel() {
     var screenState by mutableStateOf(CreatePollScreenState())
         private set
 
@@ -21,35 +22,69 @@ class CreatePollViewModel @Inject constructor(
             is CreatePollScreenEvent.OnCreatePollClicked -> {
                 onCreatePoll()
             }
+
+            is CreatePollScreenEvent.OnErrorDismissed -> {
+                error = null
+            }
+
             else -> {}
         }
     }
 
+    private fun isInputValid(): Boolean {
+        if (screenState.isQuestionValid.not()) {
+            screenState =
+                screenState.copy(inputValidationError = R.string.poll_create_screen_question_error)
+            return false
+        } else if (screenState.isDiscreteOptionsValid.not()) {
+            screenState =
+                screenState.copy(inputValidationError = R.string.poll_create_screen_options_error)
+            return false
+        } else if (screenState.isDueDateValid.not()) {
+            screenState =
+                screenState.copy(inputValidationError = R.string.poll_create_due_date_error)
+            return false
+        }
+        return true
+    }
+
     private fun onCreatePoll() {
+        if (isInputValid().not()) return
+
+        val formattedDueDate = if (screenState.isDueDateEnabled) {
+            screenState.dueDate.run {
+                "${substring(4, 8)}/${substring(2, 4)}/${substring(0, 2)}"
+            }
+        } else {
+            null
+        }
+
         launchCatching(
-            trackJobProgress = true
+            trackJobProgress = true,
+            maxRetryCount = 1
         ) {
-            when(screenState.pollType){
+            when (screenState.pollType) {
                 CreatePollScreenState.PollType.DISCRETE -> {
                     pollRepository.createDiscretePoll(
                         screenState.question,
                         screenState.discreteOptions,
                         screenState.isDistributionVisible,
                         screenState.isDueDateEnabled,
-                        screenState.dueDate,
+                        formattedDueDate,
                         screenState.lastAcceptValue.filter { it.isDigit() }.toInt(),
-                        screenState.acceptValueType.toDiscreteRequestType(),
+                        screenState.acceptValueType.toDiscreteRequestType().value,
                     )
                 }
+
                 CreatePollScreenState.PollType.CONTINUOUS -> {
                     pollRepository.createContinuousPoll(
                         screenState.question,
                         screenState.isDistributionVisible,
                         screenState.isDueDateEnabled,
-                        screenState.dueDate,
+                        formattedDueDate,
                         screenState.lastAcceptValue.filter { it.isDigit() }.toInt(),
-                        screenState.acceptValueType.toContinuousRequestType(),
-                        screenState.continuousInputType.toContinuousRequestType(),
+                        screenState.acceptValueType.toContinuousRequestType().value,
+                        screenState.continuousInputType.toContinuousRequestType().value,
                     )
                 }
             }
diff --git a/prediction-polls/android/app/src/main/res/values/strings.xml b/prediction-polls/android/app/src/main/res/values/strings.xml
index 9ea55b46..50faf5d9 100644
--- a/prediction-polls/android/app/src/main/res/values/strings.xml
+++ b/prediction-polls/android/app/src/main/res/values/strings.xml
@@ -69,12 +69,17 @@
 
     <string name="poll_create_screen_title">Create Poll</string>
     <string name="poll_create_screen_question">Enter the question title</string>
+    <string name="poll_create_screen_question_error">Question cannot be empty</string>
     <string name="poll_create_screen_type">Choose input type</string>
     <string name="poll_create_screen_add_options">Add Option</string>
     <string name="poll_create_screen_enter_options">Enter the options</string>
-    <string name="poll_create_screen_poll_end">Don\'t accept any votes in last</string>
+    <string name="poll_create_screen_options_error">Every option must be filled</string>
+    <string name="poll_create_screen_option_count_error">At least 2 options must exist.</string>
+    <string name="poll_create_screen_poll_end">Don\'t accept any\nvotes in last</string>
+    <string name="poll_create_screen_poll_end_selection">Enter the options</string>
     <string name="poll_create_screen_cd_delete">Delete the option</string>
     <string name="poll_create_due_date">Set Due Date</string>
+    <string name="poll_create_due_date_error">Due date must be valid date</string>
     <string name="poll_create_screen_create_button">Create</string>
     <string name="poll_create_screen_choose_continuous_type">Choose customized input type</string>
     <string name="poll_create_screen_distribution_visibility">Open distribution visibility</string>

From 8184fe232653f47a299ffb53ba8d978faee764f6 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 09:00:11 +0300
Subject: [PATCH 100/246] implement profile info response

---
 .../common/PredictionPollsError.kt            |  3 +++
 .../data/profile/ProfileApi.kt                |  7 +++++
 .../data/profile/model/ProfileInfoResponse.kt | 26 ++++++++++++++++---
 .../domain/profile/ProfileInfo.kt             |  4 +--
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/PredictionPollsError.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/PredictionPollsError.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/PredictionPollsError.kt
new file mode 100644
index 00000000..157fe09b
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/common/PredictionPollsError.kt
@@ -0,0 +1,3 @@
+package com.bounswe.predictionpolls.common
+
+data class PredictionPollsError(val code: String, val message: String)
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
index 05059917..539a6060 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
@@ -1,4 +1,11 @@
 package com.bounswe.predictionpolls.data.profile
 
+import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
+import retrofit2.http.GET
+import retrofit2.http.Path
+
 interface ProfileApi {
+
+    @GET("profile/{profileId}")
+    suspend fun fetchProfileInfo(@Path("profileId") profileId: String): ProfileInfoResponse
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
index 56070c8a..a6d60559 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
@@ -1,12 +1,30 @@
 package com.bounswe.predictionpolls.data.profile.model
 
+import com.bounswe.predictionpolls.common.PredictionPollsError
 import com.bounswe.predictionpolls.domain.profile.ProfileInfo
+import com.google.gson.annotations.SerializedName
 import kotlinx.collections.immutable.persistentListOf
 
-// TODO: Implement this class when backend decides on the response format.
-data class ProfileInfoResponse(val name: String) {
 
-    fun toProfileInfo(): ProfileInfo {
-        return ProfileInfo("", "", "", "", "", persistentListOf())
+data class ProfileInfoResponse(
+    @SerializedName("error")
+    val predictionPollsError: PredictionPollsError?,
+    val userId: Int?,
+    val username: String?,
+    val email: String?,
+    @SerializedName("profile_picture")
+    val profilePicture: String?,
+    val coverPicture: String?,
+    val biography: String?,
+    val isHidden: Int?,
+) {
+
+    fun toProfileInfo(): ProfileInfo? {
+        return if (predictionPollsError == null &&  username != null && biography != null) {
+            ProfileInfo(username, "", coverPicture, profilePicture, biography, persistentListOf())
+        } else {
+            null
+        }
     }
+
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
index bc9f775a..50a5672e 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
@@ -5,8 +5,8 @@ import kotlinx.collections.immutable.ImmutableList
 data class ProfileInfo(
     val username: String,
     val userFullName: String,
-    val coverPhotoUri: String,
-    val profilePictureUri: String,
+    val coverPhotoUri: String?,
+    val profilePictureUri: String?,
     val userDescription: String,
     val badgeUris: ImmutableList<String>
 )

From 297a4c00564003a297a3537a9acc5195c5a414ae Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 09:04:41 +0300
Subject: [PATCH 101/246] implemenet profile repository

---
 .../data/profile/ProfileInfoInfoRepositoryImpl.kt    | 12 +++++++++++-
 .../data/profile/ProfileInfoRemoteDataSourceImpl.kt  | 12 ++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
index 300d8b3f..9f307e16 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
@@ -12,7 +12,17 @@ class ProfileInfoInfoRepositoryImpl @Inject constructor(
         profileInfoRemoteDataSource.fetchProfileInfo(userId).let { result ->
             return when (result) {
                 is Result.Success -> {
-                    Result.Success(result.data.toProfileInfo())
+                    val profileInfo = result.data.toProfileInfo()
+                    if (profileInfo != null) {
+                        Result.Success(profileInfo)
+                    } else {
+                        Result.Error(
+                            Exception(
+                                result.data.predictionPollsError?.message
+                                    ?: "ProfileInfoResponse is not valid"
+                            )
+                        )
+                    }
                 }
 
                 is Result.Error -> {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
index 210456e3..6fa91441 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
@@ -1,12 +1,20 @@
 package com.bounswe.predictionpolls.data.profile
 
+import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 class ProfileInfoRemoteDataSourceImpl @Inject constructor(
     private val profileApi: ProfileApi
 ) : ProfileInfoRemoteDataSource {
-    override suspend fun fetchProfileInfo(userId: Int): Result<ProfileInfoResponse> {
-        TODO("Not yet implemented")
+    override suspend fun fetchProfileInfo(userId: Int): Result<ProfileInfoResponse> = withContext(Dispatchers.IO) {
+        try {
+            val response = profileApi.fetchProfileInfo(userId.toString())
+            Result.Success(response)
+        } catch (e: Exception) {
+            Result.Error(e)
+        }
     }
 }
\ No newline at end of file

From 79b8c001873fe170c22241e2f1ba9038f5029856 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 15:18:37 +0300
Subject: [PATCH 102/246] create poll response

---
 .../data/feed/model/PollResponse.kt           | 153 ++++++++++++++++--
 .../predictionpolls/domain/poll/Poll.kt       |  18 +--
 2 files changed, 149 insertions(+), 22 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
index ece7214d..31cf6dbc 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
@@ -1,20 +1,147 @@
 package com.bounswe.predictionpolls.data.feed.model
 
+
 import com.bounswe.predictionpolls.domain.poll.ContinuousVoteInputType
 import com.bounswe.predictionpolls.domain.poll.Poll
+import com.bounswe.predictionpolls.domain.poll.PollOption
+import com.google.gson.*
+import com.google.gson.annotations.SerializedName
+import com.google.gson.reflect.TypeToken
+import kotlinx.collections.immutable.toImmutableList
+import java.lang.reflect.Type
 
-data class PollResponse(val title: String?) // TODO: Implement this class
-
-// TODO: Implement this extension function
-fun PollResponse.toPoll(): Poll {
-    return Poll.ContinuousPoll(
-        "",
-        "",
-        "",
-        "",
-        "",
-        0,
-        emptyList(),
-        ContinuousVoteInputType.Date
+data class PollResponse(
+    val id: Int,
+    val question: String,
+    val tags: List<String>,
+    val creatorName: String,
+    val creatorUsername: String,
+    val creatorImage: String?,
+    val pollType: String,
+    val rejectVotes: String?,
+    val setDueDate: Int,
+    val closingDate: String?,
+    val isOpen: Int,
+    @SerializedName("cont_poll_type")
+    val contPollType: String?,
+    val options: List<Any> // This can be a mix of Option and Int, handled during deserialization
+) {
+    data class Option(
+        val id: Int,
+        @SerializedName("choice_text")
+        val choiceText: String,
+        @SerializedName("poll_id")
+        val pollId: Int,
+        @SerializedName("voter_count")
+        val voterCount: Int
     )
+
+
+    /**
+     * Converts the [PollResponse] to [Poll]. Throws [IllegalArgumentException] if the poll type is unknown
+     */
+    fun toPollDomainModel(): Poll =
+        when (pollType) {
+            "continuous" -> {
+                Poll.ContinuousPoll(
+                    creatorProfilePictureUri = creatorImage,
+                    dueDate = closingDate,
+                    pollCreatorName = creatorName,
+                    pollQuestionTitle = question,
+                    rejectionText = rejectVotes,
+                    commentCount = 0,
+                    tags = tags,
+                    inputType = when (contPollType) {
+                        "numeric" -> ContinuousVoteInputType.Decimal
+                        "date" -> ContinuousVoteInputType.Date
+                        else -> ContinuousVoteInputType.Text
+                    }
+                )
+            }
+
+            "discrete" -> {
+                val options = options.map {
+                    val option = it as Option
+                    PollOption.DiscreteOption(
+                        id = option.id.toString(),
+                        text = option.choiceText,
+                        voteCount = option.voterCount
+                    )
+                }
+                Poll.DiscretePoll(
+                    creatorProfilePictureUri = creatorImage,
+                    dueDate = closingDate,
+                    pollCreatorName = creatorName,
+                    pollQuestionTitle = question,
+                    rejectionText = rejectVotes,
+                    commentCount = 0,
+                    tags = tags,
+                    options = options.toImmutableList()
+                )
+            }
+
+            else -> {
+                throw IllegalArgumentException("Unknown poll type: $pollType")
+            }
+        }
 }
+
+class PollDeserializer : JsonDeserializer<PollResponse> {
+    override fun deserialize(
+        json: JsonElement,
+        typeOfT: Type,
+        context: JsonDeserializationContext
+    ): PollResponse {
+        val jsonObject = json.asJsonObject
+        val id = jsonObject.get("id").asInt
+        val question = jsonObject.get("question").asString
+        val tags = context.deserialize<List<String>>(
+            jsonObject.get("tags"),
+            object : TypeToken<List<String>>() {}.type
+        )
+        val creatorName = jsonObject.get("creatorName").asString
+        val creatorUsername = jsonObject.get("creatorUsername").asString
+        val creatorImage = jsonObject.get("creatorImage")?.asString
+        val pollType = jsonObject.get("pollType").asString
+        val rejectVotes = jsonObject.get("rejectVotes").asString
+        val setDueDate = jsonObject.get("setDueDate").asInt
+        val closingDate = jsonObject.get("closingDate")?.asString
+        val isOpen = jsonObject.get("isOpen").asInt
+        val contPollType = jsonObject.get("cont_poll_type")?.asString
+        val optionsJson = jsonObject.get("options").asJsonArray
+        val options = mutableListOf<Any>()
+        if (pollType == "continuous") {
+            options.addAll(
+                context.deserialize<List<String>>(
+                    optionsJson,
+                    object : TypeToken<List<Int>>() {}.type
+                )
+            )
+        } else {
+            options.addAll(
+                context.deserialize<List<PollResponse.Option>>(
+                    optionsJson,
+                    object : TypeToken<List<PollResponse.Option>>() {}.type
+                )
+            )
+        }
+
+        return PollResponse(
+            id,
+            question,
+            tags,
+            creatorName,
+            creatorUsername,
+            creatorImage,
+            pollType,
+            rejectVotes,
+            setDueDate,
+            closingDate,
+            isOpen,
+            contPollType,
+            options
+        )
+    }
+}
+
+
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
index ac66f096..3060bc9a 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
@@ -5,31 +5,31 @@ import kotlinx.collections.immutable.ImmutableList
 
 @Immutable
 sealed interface Poll {
-    val creatorProfilePictureUri: String
+    val creatorProfilePictureUri: String?
     val pollCreatorName: String
     val pollQuestionTitle: String
-    val dueDate: String
-    val rejectionText: String
+    val dueDate: String?
+    val rejectionText: String?
     val commentCount: Int
     val tags: List<String>
 
     data class ContinuousPoll(
-        override val creatorProfilePictureUri: String,
-        override val dueDate: String,
+        override val creatorProfilePictureUri: String?,
+        override val dueDate: String?,
         override val pollCreatorName: String,
         override val pollQuestionTitle: String,
-        override val rejectionText: String,
+        override val rejectionText: String?,
         override val commentCount: Int,
         override val tags: List<String>,
         val inputType: ContinuousVoteInputType,
     ) : Poll
 
     data class DiscretePoll(
-        override val creatorProfilePictureUri: String,
-        override val dueDate: String,
+        override val creatorProfilePictureUri: String?,
+        override val dueDate: String?,
         override val pollCreatorName: String,
         override val pollQuestionTitle: String,
-        override val rejectionText: String,
+        override val rejectionText: String?,
         override val commentCount: Int,
         override val tags: List<String>,
         val options: ImmutableList<PollOption.DiscreteOption>

From 81fc2ec33e76ae78a5b9cbc381462941a36e7bdf Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 15:35:58 +0300
Subject: [PATCH 103/246] implement dependency injection

---
 .../com/bounswe/predictionpolls/MainActivity.kt    |  3 ++-
 .../bounswe/predictionpolls/data/feed/FeedApi.kt   |  8 ++++++++
 .../data/feed/FeedRemoteDataSourceImpl.kt          | 14 ++++++++++----
 .../data/feed/FeedRepositoryImpl.kt                | 13 +++++++++++--
 .../data/feed/model/PollResponse.kt                |  2 +-
 .../com/bounswe/predictionpolls/di/FeedModule.kt   | 10 ++++++++++
 .../bounswe/predictionpolls/di/NetworkModule.kt    |  3 +++
 .../ui/common/poll/PollComposable.kt               |  2 +-
 .../ui/common/poll/PollCreatorProfile.kt           |  4 ++--
 .../ui/common/poll/PollsComposable.kt              |  4 ++--
 10 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index 19f430de..7f3247d5 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -5,6 +5,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
+import com.bounswe.predictionpolls.ui.feed.FEED_ROUTE
 import com.bounswe.predictionpolls.ui.feed.feedScreen
 import com.bounswe.predictionpolls.ui.leaderboard.leaderboardScreen
 import com.bounswe.predictionpolls.ui.login.loginScreen
@@ -21,7 +22,7 @@ class MainActivity : ComponentActivity() {
         setContent {
             PredictionPollsTheme {
                 val navController = rememberNavController()
-                NavHost(navController = navController, startDestination = MAIN_ROUTE) {
+                NavHost(navController = navController, startDestination = FEED_ROUTE) {
                     mainScreen(navController)
                     loginScreen(navController)
                     signupScreen(navController)
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt
index 1e357aa1..bf47d67d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedApi.kt
@@ -1,4 +1,12 @@
 package com.bounswe.predictionpolls.data.feed
 
+import com.bounswe.predictionpolls.data.feed.model.PollResponse
+import retrofit2.http.GET
+
 interface FeedApi {
+    /**
+     * Fetches the list of polls and returns the result.
+     */
+    @GET("/polls")
+    suspend fun getPolls(): List<PollResponse>
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
index 02bad0e5..530f021a 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRemoteDataSourceImpl.kt
@@ -2,13 +2,19 @@ package com.bounswe.predictionpolls.data.feed
 
 import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.data.feed.model.PollResponse
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
-// TODO: Implement this class
 class FeedRemoteDataSourceImpl @Inject constructor(
-//    private val feedApi: FeedApi
+    private val feedApi: FeedApi
 ) : FeedRemoteDataSource {
-    override suspend fun getPolls(page: Int): Result<List<PollResponse>> {
-        TODO("Not yet implemented")
+    override suspend fun getPolls(page: Int): Result<List<PollResponse>> = withContext(Dispatchers.IO) {
+        try {
+            val response = feedApi.getPolls()
+            Result.Success(response)
+        } catch (e: Exception) {
+            Result.Error(e)
+        }
     }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt
index e13eaa66..eec1f506 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/FeedRepositoryImpl.kt
@@ -1,18 +1,27 @@
 package com.bounswe.predictionpolls.data.feed
 
+import android.util.Log
 import com.bounswe.predictionpolls.common.Result
-import com.bounswe.predictionpolls.data.feed.model.toPoll
 import com.bounswe.predictionpolls.domain.feed.FeedRepository
 import com.bounswe.predictionpolls.domain.poll.Poll
 import javax.inject.Inject
 
+private const val TAG = "FeedRepositoryImpl"
+
 class FeedRepositoryImpl @Inject constructor(
     private val feedRemoteDataSource: FeedRemoteDataSource
 ) : FeedRepository {
     override suspend fun getPolls(page: Int): Result<List<Poll>> =
         when (val result = feedRemoteDataSource.getPolls(page)) {
             is Result.Success -> {
-                val polls = result.data.map { it.toPoll() }
+                val polls = result.data.mapNotNull {
+                    try {
+                        it.toPollDomainModel()
+                    } catch (e: Exception) {
+                        Log.e(TAG, "getPolls: $it cannot be converted to Poll")
+                        null
+                    }
+                }
                 Result.Success(polls)
             }
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
index 31cf6dbc..5104bbd1 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
@@ -86,7 +86,7 @@ data class PollResponse(
         }
 }
 
-class PollDeserializer : JsonDeserializer<PollResponse> {
+class PollResponseDeserializer : JsonDeserializer<PollResponse> {
     override fun deserialize(
         json: JsonElement,
         typeOfT: Type,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt
index ab3258f0..48c7f650 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/FeedModule.kt
@@ -1,17 +1,21 @@
 package com.bounswe.predictionpolls.di
 
+import com.bounswe.predictionpolls.data.feed.FeedApi
 import com.bounswe.predictionpolls.data.feed.FeedRemoteDataSource
 import com.bounswe.predictionpolls.data.feed.FeedRemoteDataSourceImpl
 import com.bounswe.predictionpolls.data.feed.FeedRepositoryImpl
 import com.bounswe.predictionpolls.domain.feed.FeedRepository
 import dagger.Binds
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ViewModelComponent
+import retrofit2.Retrofit
 
 @InstallIn(ViewModelComponent::class)
 @Module
 abstract class FeedModule {
+
     @Binds
     abstract fun bindFeedRepository(
         feedRepositoryImpl: FeedRepositoryImpl
@@ -21,4 +25,10 @@ abstract class FeedModule {
     abstract fun bindFeedRemoteDataSource(
         feedRemoteDataSourceImpl: FeedRemoteDataSourceImpl
     ): FeedRemoteDataSource
+
+    companion object {
+        @Provides
+        fun provideFeedApi(@UnauthenticatedRetrofit retrofit: Retrofit): FeedApi =
+            retrofit.create(FeedApi::class.java)
+    }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/NetworkModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/NetworkModule.kt
index e581d0d5..f7b9c6c0 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/NetworkModule.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/NetworkModule.kt
@@ -2,6 +2,8 @@ package com.bounswe.predictionpolls.di
 
 import android.content.Context
 import com.bounswe.predictionpolls.BuildConfig
+import com.bounswe.predictionpolls.data.feed.model.PollResponse
+import com.bounswe.predictionpolls.data.feed.model.PollResponseDeserializer
 import com.bounswe.predictionpolls.data.remote.TokenManager
 import com.bounswe.predictionpolls.data.remote.interceptors.AuthInterceptor
 import com.bounswe.predictionpolls.data.remote.interceptors.ResponseInterceptor
@@ -26,6 +28,7 @@ object NetworkModule {
     @Singleton
     fun provideGson(): Gson {
         return GsonBuilder()
+            .registerTypeAdapter(PollResponse::class.java, PollResponseDeserializer())
             .serializeNulls()
             .create()
     }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
index 698f551a..cf1ea17d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
@@ -36,7 +36,7 @@ import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 
 @Composable
 fun PollComposable(
-    pollCreatorProfilePictureUri: String,
+    pollCreatorProfilePictureUri: String?,
     pollCreatorName: String,
     tags: List<String>,
     pollQuestionTitle: String,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt
index 9a0cb8c6..5cb64f5e 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt
@@ -25,7 +25,7 @@ import com.bounswe.predictionpolls.ui.theme.MontserratFontFamily
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 
 @Composable
-fun PollCreatorProfile(imageUri: String, userName: String, modifier: Modifier = Modifier) {
+fun PollCreatorProfile(imageUri: String?, userName: String, modifier: Modifier = Modifier) {
     Row(modifier = modifier.wrapContentSize(), verticalAlignment = CenterVertically) {
         PollProfilePicture(imageUri = imageUri, modifier = Modifier.size(48.dp))
         Spacer(modifier = Modifier.width(16.dp))
@@ -54,7 +54,7 @@ fun PollCreatorProfilePreview() {
 }
 
 @Composable
-private fun PollProfilePicture(imageUri: String, modifier: Modifier = Modifier) {
+private fun PollProfilePicture(imageUri: String?, modifier: Modifier = Modifier) {
     AsyncImage(
         model = ImageRequest.Builder(LocalContext.current)
             .data(imageUri)
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
index 9aabce2c..f13074ba 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -40,8 +40,8 @@ fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
                         }
                     }
                 },
-                dueDate = it.dueDate,
-                rejectionText = it.rejectionText,
+                dueDate = it.dueDate ?: "",
+                rejectionText = it.rejectionText ?: "",
                 commentCount = it.commentCount
             )
         }

From bf2bb3c395526d9d924c8444ec309da40143652d Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 15:39:18 +0300
Subject: [PATCH 104/246] implement feed route paddings

---
 .../bounswe/predictionpolls/MainActivity.kt   |  2 +-
 .../predictionpolls/ui/feed/FeedScreen.kt     | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index 7f3247d5..f7e0b37f 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -22,7 +22,7 @@ class MainActivity : ComponentActivity() {
         setContent {
             PredictionPollsTheme {
                 val navController = rememberNavController()
-                NavHost(navController = navController, startDestination = FEED_ROUTE) {
+                NavHost(navController = navController, startDestination = MAIN_ROUTE) {
                     mainScreen(navController)
                     loginScreen(navController)
                     signupScreen(navController)
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
index e5da70a5..2d753429 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
@@ -2,38 +2,42 @@ package com.bounswe.predictionpolls.ui.feed
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import com.bounswe.predictionpolls.domain.poll.Poll
-import com.bounswe.predictionpolls.domain.poll.PollOption
-import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
-import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
-import com.bounswe.predictionpolls.ui.common.poll.PollComposable
+import androidx.compose.ui.unit.dp
 import com.bounswe.predictionpolls.ui.common.poll.Polls
-import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun FeedScreen(feedUiState: FeedUiState, modifier: Modifier = Modifier) {
     var text by rememberSaveable { mutableStateOf("") } // this might be stored in VM. I am not sure how we will use this parameter so I will store it here for now..
-    Column(modifier = modifier) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(16.dp)
+    ) {
         FeedSearchBar(text = text, onTextChanged = { text = it })
+        Spacer(modifier = Modifier.height(16.dp))
         when (feedUiState) {
             is FeedUiState.Loading -> {
                 FeedLoading()
             }
 
             is FeedUiState.NoFeed -> {
-                NoFeedDisplay()
+                NoFeedDisplay(
+                    modifier = Modifier
+                        .fillMaxSize()
+                )
             }
 
             is FeedUiState.HasFeed -> {
@@ -60,7 +64,7 @@ private fun FeedError(errorMessage: String, modifier: Modifier = Modifier) {
 @Composable
 private fun NoFeedDisplay(modifier: Modifier = Modifier) {
     Box(modifier = modifier) {
-        Text(text = "No feed to show")
+        Text(text = "No feed to show", modifier = Modifier.align(Alignment.Center))
     }
 }
 

From ba855b918454485fde36c325051983f4af20b9d0 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 19:39:02 +0300
Subject: [PATCH 105/246] Add automatic profile generation for google users

---
 .../backend/src/services/AuthGoogleService.js      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/AuthGoogleService.js b/prediction-polls/backend/src/services/AuthGoogleService.js
index 07e8acac..d6a13815 100644
--- a/prediction-polls/backend/src/services/AuthGoogleService.js
+++ b/prediction-polls/backend/src/services/AuthGoogleService.js
@@ -39,9 +39,14 @@ async function googleLogInWithCode(code,res){
       }
 
       const generatedPassword = generateRandomPassword(12);
-      const { error, userid} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
+      const { error, userId} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
 
-      const user = {name : googleUser.given_name, id: userid};
+      const result = await profileDb.addProfile(userId,googleUser.given_name,googleUser.email);
+      if(!result.profileId){
+        return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
+      }
+
+      const user = {name : googleUser.given_name, id: userId};
       const accesToken = generateAccessToken(user);
       const refreshToken = generateRefreshToken(user);
       db.addRefreshToken(refreshToken);
@@ -64,6 +69,11 @@ async function googleLogInWithCode(code,res){
       const generatedPassword = generateRandomPassword(12);
       const {error, userId} = await db.addUser(googleUser.given_name,generatedPassword,googleUser.email,null);
 
+      const result = await profileDb.addProfile(userId,googleUser.given_name,googleUser.email);
+      if(!result.profileId){
+        return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
+      }
+
       const user = {name : googleUser.given_name, id: userId};
       const accesToken = generateAccessToken(user);
       const refreshToken = generateRefreshToken(user);

From 8d86c7546cfd9d844f32d2246661a5e8fbd77498 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 19:39:18 +0300
Subject: [PATCH 106/246] Update profile swagger

---
 prediction-polls/backend/src/routes/ProfileRouter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 6c50ce2e..2d29eacc 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -89,7 +89,7 @@ router.get('/', service.getProfile);
 
 /**
  * @swagger
- * /profiles:
+ * /profiles/myProfile:
  *   get:
  *     tags:
  *       - profiles

From 51dd6647281dfbad64924484d3d295cb87fd2975 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:27:13 +0300
Subject: [PATCH 107/246] Add new photo upload route

---
 prediction-polls/backend/src/routes/ProfileRouter.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 2d29eacc..b8db5687 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -1,8 +1,12 @@
 const authenticator = require("../services/AuthorizationService.js");
 const service = require("../services/ProfileService.js");
+const multer = require('multer');
 const express = require('express');
 const router = express.Router();
 
+const storage = multer.memoryStorage()
+const upload = multer({ storage: storage })
+
 /**
  * @swagger
  * components:
@@ -168,6 +172,8 @@ router.get('/myProfile',authenticator.authorizeAccessToken ,service.getMyProfile
  */
 router.get('/:profileId', service.getProfileWithProfileId);
 
+router.post("/photo",authenticator.authorizeAccessToken,upload.single('image'),service.uploadImagetoS3);
+
 /**
  * @swagger
  * /profiles:

From 1e3b909641f27cd6a5678ba0a838ac93ca46218f Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:27:29 +0300
Subject: [PATCH 108/246] Add new image handling logic

---
 .../backend/src/services/ProfileService.js    | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 472d5eda..579fa647 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -1,5 +1,57 @@
 const db = require("../repositories/ProfileDB.js");
 const authDb = require("../repositories/AuthorizationDB.js");
+const {S3Client,PutObjectCommand,GetObjectCommand} = require('aws-sdk');
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner"
+
+const generateFileName = (bytes = 32) => crypto.randomBytes(bytes).toString('hex');
+
+const bucketName = process.env.AWS_BUCKET_NAME
+const region = process.env.AWS_BUCKET_REGION
+const accessKeyId = process.env.AWS_ACCESS_KEY
+const secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY
+
+const s3Client = new S3Client({
+    region,
+    credentials: {
+      accessKeyId,
+      secretAccessKey
+    }
+  })
+
+
+async function getImagefromS3(imageName){
+    const params = {
+        Bucket: bucketName,
+        Key: imageName
+      }
+    
+      const command = new GetObjectCommand(params);
+      const seconds = 60
+      const url = await getSignedUrl(s3Client, command, { expiresIn: seconds });
+    
+      return url
+}
+
+async function uploadImagetoS3(req,res){
+    const userId = req.user.id;
+    const file = req.file
+    const caption = req.body.caption
+    const imageName = generateFileName()
+
+    const fileBuffer = req.file.buffer
+    
+    const uploadParams = {
+        Bucket: bucketName,
+        Body: fileBuffer,
+        Key: imageName,
+        ContentType: req.file.mimetype
+    }
+      
+    await s3Client.send(new PutObjectCommand(uploadParams));
+
+    await db.updateProfile({userId,profile_picture:imageName});
+}
+
 
 
 async function getProfile(req,res){
@@ -15,6 +67,10 @@ async function getProfile(req,res){
             throw error;
         }
 
+        if(profile.profile_picture){
+            profile.profile_picture = await getImagefromS3(profile.profile_picture);
+        }
+
         const {badges,error:badge_error} = await db.getBadges(result.id);
         if(badge_error){
             throw badge_error;
@@ -91,4 +147,4 @@ async function updateProfile(req,res){
     }
 }
 
-module.exports = {getProfile,getProfileWithProfileId,getMyProfile,updateProfile}
\ No newline at end of file
+module.exports = {getProfile,getProfileWithProfileId,getMyProfile,updateProfile,uploadImagetoS3}
\ No newline at end of file

From 9baa9bee0711a8ad47c6882eeffc4e384067b586 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:27:34 +0300
Subject: [PATCH 109/246] Update package.json

---
 prediction-polls/backend/package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prediction-polls/backend/package.json b/prediction-polls/backend/package.json
index 0616d341..c49485c1 100644
--- a/prediction-polls/backend/package.json
+++ b/prediction-polls/backend/package.json
@@ -11,6 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "aws-sdk": "^2.1502.0",
     "axios": "^1.6.0",
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
@@ -18,6 +19,7 @@
     "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "jsonwebtoken": "^9.0.2",
+    "multer": "^1.4.5-lts.1",
     "mysql2": "^3.6.2",
     "nodemailer": "^6.9.7",
     "querystring": "^0.2.1",

From 2a557cff024545493a45f5b9eedb030ac342ae5c Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 21:34:50 +0300
Subject: [PATCH 110/246] fix profile backend

---
 .../bounswe/predictionpolls/MainActivity.kt   |  5 ++-
 .../data/profile/ProfileApi.kt                |  6 ++--
 .../profile/ProfileInfoRemoteDataSource.kt    |  2 +-
 .../ProfileInfoRemoteDataSourceImpl.kt        | 15 ++++----
 ...ryImpl.kt => ProfileInfoRepositoryImpl.kt} |  6 ++--
 .../data/profile/model/ProfileInfoResponse.kt |  2 +-
 .../predictionpolls/di/ProfileModule.kt       | 34 +++++++++++++++++++
 .../domain/profile/GetProfileInfoUseCase.kt   |  4 +--
 .../domain/profile/ProfileInfo.kt             |  2 +-
 .../domain/profile/ProfileInfoRepository.kt   |  2 +-
 .../predictionpolls/ui/profile/ProfileCard.kt | 14 ++++----
 .../ui/profile/ProfileScreenNavigation.kt     | 11 +++++-
 .../ui/profile/ProfileScreenViewModel.kt      |  4 +--
 13 files changed, 77 insertions(+), 30 deletions(-)
 rename prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/{ProfileInfoInfoRepositoryImpl.kt => ProfileInfoRepositoryImpl.kt} (83%)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index 19f430de..1e7cd1b5 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -10,6 +10,8 @@ import com.bounswe.predictionpolls.ui.leaderboard.leaderboardScreen
 import com.bounswe.predictionpolls.ui.login.loginScreen
 import com.bounswe.predictionpolls.ui.main.MAIN_ROUTE
 import com.bounswe.predictionpolls.ui.main.mainScreen
+import com.bounswe.predictionpolls.ui.profile.PROFILE_SCREEN_ROUTE
+import com.bounswe.predictionpolls.ui.profile.profileScreen
 import com.bounswe.predictionpolls.ui.signup.signupScreen
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 import dagger.hilt.android.AndroidEntryPoint
@@ -21,12 +23,13 @@ class MainActivity : ComponentActivity() {
         setContent {
             PredictionPollsTheme {
                 val navController = rememberNavController()
-                NavHost(navController = navController, startDestination = MAIN_ROUTE) {
+                NavHost(navController = navController, startDestination = PROFILE_SCREEN_ROUTE) {
                     mainScreen(navController)
                     loginScreen(navController)
                     signupScreen(navController)
                     feedScreen(navController)
                     leaderboardScreen(navController)
+                    profileScreen(navController)
                 }
             }
         }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
index 539a6060..05dd036f 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
@@ -2,10 +2,10 @@ package com.bounswe.predictionpolls.data.profile
 
 import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
 import retrofit2.http.GET
-import retrofit2.http.Path
+import retrofit2.http.Query
 
 interface ProfileApi {
 
-    @GET("profile/{profileId}")
-    suspend fun fetchProfileInfo(@Path("profileId") profileId: String): ProfileInfoResponse
+    @GET("profiles")
+    suspend fun fetchProfileInfo(@Query("username") username: String): ProfileInfoResponse
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
index d9c1b981..d09331a2 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
@@ -5,5 +5,5 @@ import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
 
 interface ProfileInfoRemoteDataSource {
 
-    suspend fun fetchProfileInfo(userId: Int): Result<ProfileInfoResponse>
+    suspend fun fetchProfileInfo(username: String): Result<ProfileInfoResponse>
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
index 6fa91441..a6ff9d11 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
@@ -9,12 +9,13 @@ import javax.inject.Inject
 class ProfileInfoRemoteDataSourceImpl @Inject constructor(
     private val profileApi: ProfileApi
 ) : ProfileInfoRemoteDataSource {
-    override suspend fun fetchProfileInfo(userId: Int): Result<ProfileInfoResponse> = withContext(Dispatchers.IO) {
-        try {
-            val response = profileApi.fetchProfileInfo(userId.toString())
-            Result.Success(response)
-        } catch (e: Exception) {
-            Result.Error(e)
+    override suspend fun fetchProfileInfo(username: String): Result<ProfileInfoResponse> =
+        withContext(Dispatchers.IO) {
+            try {
+                val response = profileApi.fetchProfileInfo(username)
+                Result.Success(response)
+            } catch (e: Exception) {
+                Result.Error(e)
+            }
         }
-    }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRepositoryImpl.kt
similarity index 83%
rename from prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
rename to prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRepositoryImpl.kt
index 9f307e16..4df38551 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoInfoRepositoryImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRepositoryImpl.kt
@@ -5,11 +5,11 @@ import com.bounswe.predictionpolls.domain.profile.ProfileInfo
 import com.bounswe.predictionpolls.domain.profile.ProfileInfoRepository
 import javax.inject.Inject
 
-class ProfileInfoInfoRepositoryImpl @Inject constructor(
+class ProfileInfoRepositoryImpl @Inject constructor(
     private val profileInfoRemoteDataSource: ProfileInfoRemoteDataSource
 ) : ProfileInfoRepository {
-    override suspend fun getProfileInfo(userId: Int): Result<ProfileInfo> {
-        profileInfoRemoteDataSource.fetchProfileInfo(userId).let { result ->
+    override suspend fun getProfileInfo(username: String): Result<ProfileInfo> {
+        profileInfoRemoteDataSource.fetchProfileInfo(username).let { result ->
             return when (result) {
                 is Result.Success -> {
                     val profileInfo = result.data.toProfileInfo()
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
index a6d60559..1a97f744 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/model/ProfileInfoResponse.kt
@@ -20,7 +20,7 @@ data class ProfileInfoResponse(
 ) {
 
     fun toProfileInfo(): ProfileInfo? {
-        return if (predictionPollsError == null &&  username != null && biography != null) {
+        return if (predictionPollsError == null &&  username != null) {
             ProfileInfo(username, "", coverPicture, profilePicture, biography, persistentListOf())
         } else {
             null
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt
new file mode 100644
index 00000000..a6859268
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt
@@ -0,0 +1,34 @@
+package com.bounswe.predictionpolls.di
+
+import com.bounswe.predictionpolls.data.profile.ProfileApi
+import com.bounswe.predictionpolls.data.profile.ProfileInfoRemoteDataSource
+import com.bounswe.predictionpolls.data.profile.ProfileInfoRemoteDataSourceImpl
+import com.bounswe.predictionpolls.data.profile.ProfileInfoRepositoryImpl
+import com.bounswe.predictionpolls.domain.profile.ProfileInfoRepository
+import dagger.Binds
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import retrofit2.Retrofit
+
+@InstallIn(ViewModelComponent::class)
+@Module
+abstract class ProfileModule {
+    @Binds
+    abstract fun bindProfileInfoRepository(
+        profileInfoRepository: ProfileInfoRepositoryImpl
+    ): ProfileInfoRepository
+
+    @Binds
+    abstract fun bindProfileInfoRemoteDataSource(
+        profileInfoRemoteDataSourceImpl: ProfileInfoRemoteDataSourceImpl
+    ): ProfileInfoRemoteDataSource
+
+    companion object {
+        @Provides
+        fun provideProfileApi(@UnauthenticatedRetrofit unauthenticatedRetrofit: Retrofit): ProfileApi =
+            unauthenticatedRetrofit.create(ProfileApi::class.java)
+
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
index b6f4392d..67f25999 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetProfileInfoUseCase.kt
@@ -7,7 +7,7 @@ class GetProfileInfoUseCase @Inject constructor(
     private val profileInfoRepository: ProfileInfoRepository
 ) {
 
-    suspend operator fun invoke(userId: Int): Result<ProfileInfo> =
-        profileInfoRepository.getProfileInfo(userId)
+    suspend operator fun invoke(username: String): Result<ProfileInfo> =
+        profileInfoRepository.getProfileInfo(username)
 
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
index 50a5672e..1a6c4553 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfo.kt
@@ -7,6 +7,6 @@ data class ProfileInfo(
     val userFullName: String,
     val coverPhotoUri: String?,
     val profilePictureUri: String?,
-    val userDescription: String,
+    val userDescription: String?,
     val badgeUris: ImmutableList<String>
 )
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
index 62547ec7..a4bdcf54 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
@@ -3,6 +3,6 @@ package com.bounswe.predictionpolls.domain.profile
 import com.bounswe.predictionpolls.common.Result
 
 interface ProfileInfoRepository {
-    suspend fun getProfileInfo(userId: Int): Result<ProfileInfo>
+    suspend fun getProfileInfo(username: String): Result<ProfileInfo>
 
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
index 9da9cc33..098c40db 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
@@ -46,9 +46,9 @@ import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 fun ProfileCard(
     username: String,
     userFullName: String,
-    coverPhotoUri: String,
-    profilePictureUri: String,
-    userDescription: String,
+    coverPhotoUri: String?,
+    profilePictureUri: String?,
+    userDescription: String?,
     badgeUris: List<String>,
     onProfileEditPressed: () -> Unit,
     onRequestsClicked: () -> Unit,
@@ -178,7 +178,7 @@ private fun ProfileEditButton(onProfileEditPressed: () -> Unit, modifier: Modifi
 }
 
 @Composable
-private fun CoverPhoto(imageUri: String, modifier: Modifier) {
+private fun CoverPhoto(imageUri: String?, modifier: Modifier) {
     AsyncImage(
         model = imageUri,
         contentDescription = "User Badge",
@@ -239,7 +239,7 @@ private fun Badges(badgeUris: List<String>, modifier: Modifier = Modifier) {
 }
 
 @Composable
-private fun ProfilePicture(imageUri: String, modifier: Modifier = Modifier) {
+private fun ProfilePicture(imageUri: String?, modifier: Modifier = Modifier) {
     AsyncImage(
         model = imageUri,
         contentDescription = "User profile picture",
@@ -252,9 +252,9 @@ private fun ProfilePicture(imageUri: String, modifier: Modifier = Modifier) {
 }
 
 @Composable
-private fun UserDescription(description: String, modifier: Modifier = Modifier) {
+private fun UserDescription(description: String?, modifier: Modifier = Modifier) {
     Text(
-        text = description, modifier = modifier,
+        text = description?:"", modifier = modifier,
         maxLines = 5,
         overflow = TextOverflow.Ellipsis,
         color = MaterialTheme.colorScheme.scrim,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
index 1830ab34..2f7e7e6d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
@@ -1,5 +1,6 @@
 package com.bounswe.predictionpolls.ui.profile
 
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -13,9 +14,17 @@ const val PROFILE_SCREEN_ROUTE = "profile"
 
 fun NavGraphBuilder.profileScreen(navController: NavController) {
     composable(PROFILE_SCREEN_ROUTE) {
-        val profileViewModel: ProfileScreenViewModel = hiltViewModel()
 
+        val username = "ahmetknk" // TODO: fetch this from navController arguments
 
+        val profileViewModel: ProfileScreenViewModel = hiltViewModel()
+        LaunchedEffect(key1 = Unit) {
+            if (
+                profileViewModel.profileScreenUiState.value is ProfileScreenUiState.Loading ||
+                profileViewModel.profileScreenUiState.value is ProfileScreenUiState.Error
+            )
+                profileViewModel.fetchProfileInfo(username)
+        }
         val profileScreenUiState by profileViewModel.profileScreenUiState.collectAsStateWithLifecycle()
 
         ProfileScreen(profileScreenUiState)
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
index da9ee6b5..afaccaaa 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
@@ -57,9 +57,9 @@ class ProfileScreenViewModel @Inject constructor(
             .stateIn(viewModelScope, SharingStarted.Eagerly, ProfileScreenUiState.Loading)
 
 
-    fun fetchProfileInfo(userId: Int) = viewModelScope.launch {
+    fun fetchProfileInfo(username: String) = viewModelScope.launch {
         _profileScreenUiState.update { it.copy(isLoading = true) }
-        when (val result = getProfileInfoUseCase(userId)) {
+        when (val result = getProfileInfoUseCase(username)) {
             is Result.Success -> {
                 _profileScreenUiState.update {
                     it.copy(

From f3b0f672556ec38c76bbd12f074dab9f74b0f965 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:49:30 +0300
Subject: [PATCH 111/246] s3 client structture has been updated

---
 .../backend/src/services/ProfileService.js    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 579fa647..22b66ae4 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -1,7 +1,8 @@
 const db = require("../repositories/ProfileDB.js");
 const authDb = require("../repositories/AuthorizationDB.js");
-const {S3Client,PutObjectCommand,GetObjectCommand} = require('aws-sdk');
-import { getSignedUrl } from "@aws-sdk/s3-request-presigner"
+const aws = require('aws-sdk');
+const {PutObjectCommand,GetObjectCommand} = require('aws-sdk');
+const { getSignedUrl } = require('aws-sdk');
 
 const generateFileName = (bytes = 32) => crypto.randomBytes(bytes).toString('hex');
 
@@ -10,13 +11,13 @@ const region = process.env.AWS_BUCKET_REGION
 const accessKeyId = process.env.AWS_ACCESS_KEY
 const secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY
 
-const s3Client = new S3Client({
-    region,
-    credentials: {
-      accessKeyId,
-      secretAccessKey
-    }
-  })
+aws.config.update({
+    accessKeyId: accessKeyId,
+    secretAccessKey: secretAccessKey,
+    region: region, 
+});
+
+const s3Client = new aws.S3();
 
 
 async function getImagefromS3(imageName){

From 3e7dbce9265b4f42a7b658383f07e45633f23ed6 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 21:50:09 +0300
Subject: [PATCH 112/246] Send access token needed error

---
 prediction-polls/backend/src/services/AuthorizationService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 6930bb68..25a9de97 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -153,7 +153,7 @@ async function logOut(req, res) {
 function authorizeAccessToken(req, res, next) {
     const authHeader = req.headers["authorization"];
     const token = authHeader && authHeader.split(" ")[1];
-    if (token == null) return res.sendStatus(400).json({ error: errorCodes.ACCESS_TOKEN_NEEDED_ERROR});
+    if (token == null) return res.status(400).json({ error: errorCodes.ACCESS_TOKEN_NEEDED_ERROR});
   
     jwt.verify(token, process.env.ACCESS_TOKEN_SECRET, (err, user) => {
       if (err) return  res.status(401).json({ error: errorCodes.ACCESS_TOKEN_INVALID_ERROR });

From e09aace0035bd8714479f07f1dc32bdbf7771d23 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 21:57:49 +0300
Subject: [PATCH 113/246] remove min max value

---
 .../backend/src/services/PollService.js           | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 8f013cae..215b1155 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -222,17 +222,10 @@ function voteContinuousPoll(req,res){
 
     db.getContinuousPollWithId(pollId)
     .then((result) => {
-        const minValue = result[0].min_value;
-        const maxValue = result[0].max_value;
-        const choiceValid = minValue <= choice && choice <= maxValue;
-        if (!choiceValid) {
-            res.status(400).json({error: errorCodes.CHOICE_OUT_OF_BOUNDS_ERROR});
-        } else {
-            db.voteContinuousPoll(pollId, userId, choice)
-            .then(() => {
-                res.json({ message: "Vote Successful" });
-            })
-        }
+        db.voteContinuousPoll(pollId, userId, choice)
+        .then(() => {
+            res.json({ message: "Vote Successful" });
+        })
     })
 }
 

From 13761bd0decc003b92ad2ac9c0cf2654be161be9 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 22:02:32 +0300
Subject: [PATCH 114/246] change success message

---
 prediction-polls/backend/src/services/PollService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 215b1155..666e7316 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -224,7 +224,7 @@ function voteContinuousPoll(req,res){
     .then((result) => {
         db.voteContinuousPoll(pollId, userId, choice)
         .then(() => {
-            res.json({ message: "Vote Successful" });
+            res.json({ success: true });
         })
     })
 }

From f6005161119e5c1e0224a47d0300006656af7bfa Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 22:02:37 +0300
Subject: [PATCH 115/246] update schema

---
 prediction-polls/backend/src/schema.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 2ecc25a6..92639e12 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -65,7 +65,8 @@ CREATE TABLE continuous_poll_selections (
     id INT PRIMARY KEY AUTO_INCREMENT,
     poll_id INT,
     user_id INT, 
-    selected_value FLOAT NOT NULL,
+    float_value FLOAT,
+    date_value DATE,
     FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
 );

From a51e8b781dda4de5ec17495a75c2e9435ede0e9c Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 22:07:28 +0300
Subject: [PATCH 116/246] fix deserializer

---
 .../data/feed/model/PollResponse.kt           | 36 +++++++++++++------
 .../ui/profile/ProfileScreen.kt               |  4 +--
 .../ui/profile/ProfileScreenNavigation.kt     |  4 ++-
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
index 5104bbd1..243c75f2 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
@@ -19,9 +19,8 @@ data class PollResponse(
     val creatorImage: String?,
     val pollType: String,
     val rejectVotes: String?,
-    val setDueDate: Int,
     val closingDate: String?,
-    val isOpen: Int,
+    val isOpen: Boolean,
     @SerializedName("cont_poll_type")
     val contPollType: String?,
     val options: List<Any> // This can be a mix of Option and Int, handled during deserialization
@@ -100,14 +99,32 @@ class PollResponseDeserializer : JsonDeserializer<PollResponse> {
             object : TypeToken<List<String>>() {}.type
         )
         val creatorName = jsonObject.get("creatorName").asString
-        val creatorUsername = jsonObject.get("creatorUsername").asString
-        val creatorImage = jsonObject.get("creatorImage")?.asString
+        val creatorUsername =
+            jsonObject.get("creatorUsername").asString
+
+
+        val creatorImage = try {
+            jsonObject.get("creatorImage").asString
+        } catch (e: Exception) {
+            null
+        }
         val pollType = jsonObject.get("pollType").asString
-        val rejectVotes = jsonObject.get("rejectVotes").asString
-        val setDueDate = jsonObject.get("setDueDate").asInt
-        val closingDate = jsonObject.get("closingDate")?.asString
-        val isOpen = jsonObject.get("isOpen").asInt
-        val contPollType = jsonObject.get("cont_poll_type")?.asString
+        val rejectVotes = try {
+            jsonObject.get("rejectVotes").asString
+        } catch (e: Exception) {
+            null
+        }
+        val closingDate = try {
+            jsonObject.get("closingDate").asString
+        } catch (e: Exception) {
+            null
+        }
+        val isOpen = jsonObject.get("isOpen").asBoolean
+        val contPollType = try {
+            jsonObject.get("cont_poll_type")?.asString
+        } catch (e: Exception) {
+            null
+        }
         val optionsJson = jsonObject.get("options").asJsonArray
         val options = mutableListOf<Any>()
         if (pollType == "continuous") {
@@ -135,7 +152,6 @@ class PollResponseDeserializer : JsonDeserializer<PollResponse> {
             creatorImage,
             pollType,
             rejectVotes,
-            setDueDate,
             closingDate,
             isOpen,
             contPollType,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
index fe91cfcf..3d15e380 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
@@ -88,8 +88,8 @@ fun ProfileScreen(profileScreenUiState: ProfileScreenUiState, modifier: Modifier
                                     }
                                 }
                             },
-                            dueDate = it.dueDate,
-                            rejectionText = it.rejectionText,
+                            dueDate = it.dueDate ?: "",
+                            rejectionText = it.rejectionText ?: "",
                             commentCount = it.commentCount
                         )
                     }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
index 2f7e7e6d..332604d6 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
@@ -22,8 +22,10 @@ fun NavGraphBuilder.profileScreen(navController: NavController) {
             if (
                 profileViewModel.profileScreenUiState.value is ProfileScreenUiState.Loading ||
                 profileViewModel.profileScreenUiState.value is ProfileScreenUiState.Error
-            )
+            ) {
                 profileViewModel.fetchProfileInfo(username)
+                profileViewModel.fetchFeed(0)
+            }
         }
         val profileScreenUiState by profileViewModel.profileScreenUiState.collectAsStateWithLifecycle()
 

From e2084359e3191d1885544a8c92aa31d472548378 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 22:18:28 +0300
Subject: [PATCH 117/246] fix division by 0 bug

---
 .../predictionpolls/ui/common/poll/PollsComposable.kt       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
index 7a4f758d..c0e99148 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -51,8 +51,12 @@ fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
 @Composable
 fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
     val totalVotes = remember(options) {
-        options.sumOf { it.voteCount }
+        val sum = options.sumOf { it.voteCount }
+        if (sum == 0) {
+            1
+        } else sum
     }
+
     Column {
         options.forEach {
             DiscreteVoteOption(

From 1ea5627b8ee99b567a9fbc46048a850dcace4468 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:37:35 +0300
Subject: [PATCH 118/246] Add points to profile

---
 .../backend/src/repositories/ProfileDB.js     | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index 223b92d8..7f916fc4 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -49,8 +49,8 @@ async function addProfile(userId, username, email){
             throw {error:errorCodes.USER_ALREADY_HAS_PROFILE};
         }
 
-        const sql = 'INSERT INTO profiles (userId, username, email, profile_picture, biography, birthday, isHidden) VALUES (?, ?, ?, ?, ?, ?, ?)';
-        values = [userId,username,email,null,null,null,null]
+        const sql = 'INSERT INTO profiles (userId, username, email, points, profile_picture, biography, birthday, isHidden) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
+        values = [userId,username,email,10000,null,null,null,null]
         const [resultSetHeader] = await pool.query(sql, values);
         if(!resultSetHeader.insertId){
             throw {error:errorCodes.PROFILE_COULD_NOT_BE_CREATED};
@@ -123,6 +123,33 @@ async function getBadges(userId){
     }
 }
 
+async function updatePoints(userId,additional_points){
 
-module.exports = {getProfileWithProfileId,getProfileWithUserId,addProfile,updateProfile,getBadges}
+    const find_points_sql = 'SELECT * FROM profiles WHERE userId= ?';
+
+    try {
+        const [rows] = await pool.query(sql, [userId,new_points]);
+        const current_points = rows[0].points
+
+        if(current_points + additional_points < 0){
+            return {error:errorCodes.INSUFFICIENT_POINTS_ERROR};
+        }
+        
+    } catch (error) {
+        return {error:errorCodes.DATABASE_ERROR};
+    }
+    
+    const sql = 'UPDATE profiles SET points = ? WHERE userId = ?';
+
+    try {
+        const [resultSetHeader] = await pool.query(sql, [userId,current_points + additional_points]);
+        
+        return {status:"success"};
+    } catch (error) {
+        return {error:errorCodes.DATABASE_ERROR};
+    }
+}
+
+
+module.exports = {getProfileWithProfileId,getProfileWithUserId,addProfile,updateProfile,getBadges,updatePoints}
     
\ No newline at end of file

From 2028f4187dcfd17a1bbf23c46d831cce3a20ba82 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:38:08 +0300
Subject: [PATCH 119/246] Add point decrease in vote poll

---
 .../backend/src/services/PollService.js       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 8f013cae..f3bf38da 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -1,4 +1,5 @@
 const db = require("../repositories/PollDB.js");
+const {updatePoints} = require("../repositories/ProfileDB.js");
 const { findUser } = require('../repositories/AuthorizationDB.js');
 const errorCodes = require("../errorCodes.js")
 
@@ -196,6 +197,15 @@ function voteDiscretePoll(req,res){
     const pollId = req.params.pollId;
     const userId = req.user.id;
     const choiceId = req.body.choiceId;
+    const points = req.body.points;
+
+    if(!points){
+        points = 10;
+    }
+
+    if(points <= 0){
+        res.status(404).json({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
+    }
 
     db.getDiscretePollChoices(pollId)
     .then((choices) => {
@@ -205,6 +215,15 @@ function voteDiscretePoll(req,res){
         } else {
             db.voteDiscretePoll(pollId, userId, choiceId)
             .then(() => {
+                updatePoints(userId,-1 * points).then((result) => { 
+                    if(result.error){
+                        res.status(400).json({ error: result.error });
+                    }
+                    else{
+                        res.status(200).json({ message: "Vote Successful" });
+                    }
+                })
+
                 res.json({ message: "Vote Successful" });
             })
         }

From 9d0c73b4a0efa26ea67543fd2bccd82622ef9b53 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:38:15 +0300
Subject: [PATCH 120/246] Update schema.sql

---
 prediction-polls/backend/src/schema.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 2ecc25a6..326983fc 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -56,6 +56,7 @@ CREATE TABLE discrete_polls_selections (
     poll_id INT,
     choice_id INT,
     user_id INT,
+    given_points INT,
     FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (choice_id) REFERENCES discrete_poll_choices(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
@@ -66,6 +67,7 @@ CREATE TABLE continuous_poll_selections (
     poll_id INT,
     user_id INT, 
     selected_value FLOAT NOT NULL,
+    given_points INT,
     FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
 );
@@ -75,6 +77,7 @@ CREATE TABLE profiles (
     userId INT NOT NULL,
     username VARCHAR(255) NOT NULL,
     email VARCHAR(255) NOT NULL,
+    points INT NOT NULL,
     profile_picture MEDIUMBLOB,
     biography VARCHAR(5000),
     birthday DATETIME,

From 1ad2f349afd75599b3d06044ef0bfbb5dcfa91f2 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:38:18 +0300
Subject: [PATCH 121/246] Update errorCodes.js

---
 prediction-polls/backend/src/errorCodes.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index 3b147a05..8a6b09a4 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -140,6 +140,16 @@ const errorCodes = {
     message: 'No such poll found.'
   },
 
+  INSUFFICIENT_POINTS_ERROR: {
+    code: 3006,
+    message: 'User does not have enough points'
+  },
+
+  USER_MUST_GIVE_POINTS_ERROR: {
+    code: 3007,
+    message: 'User has to put points to be able to vote polls'
+  },
+
   BAD_DISCRETE_POLL_REQUEST_ERROR: {
     code: 4000,
     message: 'Bad request body for creating a discrete poll.'

From ccbe489f3dbc80c728726a2e86e7f92fc4f048ea Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 22:42:36 +0300
Subject: [PATCH 122/246] include contPollType

---
 prediction-polls/backend/src/services/PollService.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 666e7316..690acd36 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -222,7 +222,8 @@ function voteContinuousPoll(req,res){
 
     db.getContinuousPollWithId(pollId)
     .then((result) => {
-        db.voteContinuousPoll(pollId, userId, choice)
+        const contPollType = result[0].cont_poll_type;
+        db.voteContinuousPoll(pollId, userId, choice, contPollType)
         .then(() => {
             res.json({ success: true });
         })

From 6a772e7b561ac58baca075e1e461171e98484360 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 22:43:27 +0300
Subject: [PATCH 123/246] add date choice functionality

---
 .../backend/src/repositories/PollDB.js          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 8d825b90..8d63bea5 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -1,4 +1,5 @@
-const mysql = require('mysql2')
+const mysql = require('mysql2');
+const { addRefreshToken } = require('./AuthorizationDB');
 
 require('dotenv').config();
 
@@ -160,14 +161,18 @@ async function voteDiscretePoll(pollId, userId, choiceId){
 
 }
 
-async function voteContinuousPoll(pollId, userId, choice){
+async function voteContinuousPoll(pollId, userId, choice, contPollType){
     const deleteExistingSql = "DELETE FROM continuous_poll_selections WHERE poll_id = ? AND user_id = ?"
-    const addVoteSql = "INSERT INTO continuous_poll_selections (poll_id, user_id, selected_value) VALUES (?, ?, ?)"
+    const addVoteSql = "INSERT INTO continuous_poll_selections (poll_id, user_id, float_value, date_value) VALUES (?, ?, ?, ?)"
 
     try {
         // TODO: Consider making this a transaction, commit
         deleteResult = await pool.query(deleteExistingSql, [pollId, userId]);
-        addResult = await pool.query(addVoteSql, [pollId, userId, choice]);
+        if (contPollType === "numeric") {
+            addResult = await pool.query(addVoteSql, [pollId, userId, choice, null]);
+        } else if (contPollType === "date") {
+            addResult = await pool.query(addVoteSql, [pollId, userId, null, choice]);
+        }
     } catch (error) { 
         console.error('voteContinuousPoll(): Database Error');
         throw error;
@@ -176,10 +181,10 @@ async function voteContinuousPoll(pollId, userId, choice){
 }
 
 async function getContinuousPollVotes(pollId) {
-    const sql = "SELECT selected_value FROM continuous_poll_selections";
+    const sql = "SELECT float_value, date_value FROM continuous_poll_selections WHERE poll_id = ?";
 
     try {
-        [rows, fields] = await pool.query(sql);
+        [rows, fields] = await pool.query(sql, [pollId]);
         return rows;
     } catch (error) { 
         console.error('getContinuousPollVotes(): Database Error');

From e433183b5023549b85d9b854b999ed8c79a70ddc Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 22:58:56 +0300
Subject: [PATCH 124/246] make voting a transaction

---
 .../backend/src/repositories/PollDB.js        | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 8d63bea5..a6da4803 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -151,12 +151,16 @@ async function voteDiscretePoll(pollId, userId, choiceId){
     const addVoteSql = "INSERT INTO discrete_polls_selections (poll_id, choice_id, user_id) VALUES (?, ?, ?)"
 
     try {
-        // TODO: Consider making this a transaction, commit
-        deleteResult = await pool.query(deleteExistingSql, [pollId, userId]);
-        addResult = await pool.query(addVoteSql, [pollId, choiceId, userId]);
+        await connection.beginTransaction()
+
+        deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
+        addResult = await connection.query(addVoteSql, [pollId, choiceId, userId]);
     } catch (error) { 
+        await connection.rollback();
         console.error('voteDiscretePoll(): Database Error');
         throw error;
+    } finally {
+        connection.release();
     }
 
 }
@@ -166,16 +170,23 @@ async function voteContinuousPoll(pollId, userId, choice, contPollType){
     const addVoteSql = "INSERT INTO continuous_poll_selections (poll_id, user_id, float_value, date_value) VALUES (?, ?, ?, ?)"
 
     try {
-        // TODO: Consider making this a transaction, commit
-        deleteResult = await pool.query(deleteExistingSql, [pollId, userId]);
+        await connection.beginTransaction()
+
+        deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
         if (contPollType === "numeric") {
-            addResult = await pool.query(addVoteSql, [pollId, userId, choice, null]);
+            addResult = await connection.query(addVoteSql, [pollId, userId, choice, null]);
         } else if (contPollType === "date") {
-            addResult = await pool.query(addVoteSql, [pollId, userId, null, choice]);
+            addResult = await connection.query(addVoteSql, [pollId, userId, null, choice]);
+        } else {
+            await connection.rollback();
         }
+        connection.commit();
     } catch (error) { 
+        await connection.rollback();
         console.error('voteContinuousPoll(): Database Error');
         throw error;
+    } finally {
+        connection.release();
     }
     
 }

From 1ed4f7edcf9de9714c718a307aa28af2a8e2c227 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 22:59:04 +0300
Subject: [PATCH 125/246] update swagger

---
 .../backend/src/routes/PollRouter.js          | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 2764b507..5be6368d 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -60,8 +60,12 @@ const router = express.Router();
  *                     type: integer
  *             - type: array
  *               items:
- *                 type: integer
- * 
+ *                 type: object
+ *                 properties:
+ *                   float_value:
+ *                     type: integer
+ *                   date_value:
+ *                     type: string
  *   schemas:
  *     error:
  *       type: object
@@ -127,8 +131,10 @@ const router = express.Router();
  *                     cont_poll_type: "numeric"
  *                     comments: []
  *                     options:
- *                       - 7
- *                       - 8   
+ *                       - float_value: 7
+ *                         date_value: null
+ *                       - float_value: 8
+ *                         date_value: null
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -203,8 +209,10 @@ router.get('/', service.getPolls);
  *                   cont_poll_type: "numeric"
  *                   comments: []
  *                   options:
- *                     - 7
- *                     - 8   
+ *                       - float_value: 7
+ *                         date_value: null
+ *                       - float_value: 8
+ *                         date_value: null
  *       404:
  *         description: Resource Not Found
  *         content:
@@ -494,8 +502,11 @@ router.post('/discrete/:pollId/vote',authenticator.authorizeAccessToken, service
  *             type: object
  *             properties:
  *               choice:
- *                 type: integer
- *                 example: 9
+ *                 oneOf:
+ *                   - type: integer
+ *                     example: 9
+ *                   - type: string
+ *                     example: 2023-11-26
  *     responses:
  *       201:
  *         description: Vote submitted successfully

From 9e28d2b40d5ca39d80cc0f06454cd1c61989b2b6 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 23:23:28 +0300
Subject: [PATCH 126/246] add connection and commit

---
 prediction-polls/backend/src/repositories/PollDB.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index a6da4803..5e71cf58 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -147,6 +147,8 @@ async function getDiscreteVoteCount(choiceid) {
 }
 
 async function voteDiscretePoll(pollId, userId, choiceId){
+    const connection = await pool.getConnection();
+
     const deleteExistingSql = "DELETE FROM discrete_polls_selections WHERE poll_id = ? AND user_id = ?"
     const addVoteSql = "INSERT INTO discrete_polls_selections (poll_id, choice_id, user_id) VALUES (?, ?, ?)"
 
@@ -155,6 +157,8 @@ async function voteDiscretePoll(pollId, userId, choiceId){
 
         deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
         addResult = await connection.query(addVoteSql, [pollId, choiceId, userId]);
+
+        connection.commit();
     } catch (error) { 
         await connection.rollback();
         console.error('voteDiscretePoll(): Database Error');
@@ -166,6 +170,8 @@ async function voteDiscretePoll(pollId, userId, choiceId){
 }
 
 async function voteContinuousPoll(pollId, userId, choice, contPollType){
+    const connection = await pool.getConnection();
+
     const deleteExistingSql = "DELETE FROM continuous_poll_selections WHERE poll_id = ? AND user_id = ?"
     const addVoteSql = "INSERT INTO continuous_poll_selections (poll_id, user_id, float_value, date_value) VALUES (?, ?, ?, ?)"
 

From 5c59f6d8d80fb9266bd6a4a3c324dc8f203e162d Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 23:37:58 +0300
Subject: [PATCH 127/246] Update swagger

---
 prediction-polls/backend/src/routes/PollRouter.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 2764b507..82217d03 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -459,6 +459,9 @@ router.post('/continuous', authenticator.authorizeAccessToken, service.addContin
  *               choiceId:
  *                 type: integer
  *                 example: 2
+ *               points:
+ *                 type: integer
+ *                 example: 25
  *     responses:
  *       201:
  *         description: Vote submitted successfully
@@ -496,6 +499,9 @@ router.post('/discrete/:pollId/vote',authenticator.authorizeAccessToken, service
  *               choice:
  *                 type: integer
  *                 example: 9
+ *               points:
+ *                 type: integer
+ *                 example: 25
  *     responses:
  *       201:
  *         description: Vote submitted successfully

From 11cbfa117e7d3dddc289fdcff9c2143cfaad7b88 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 23:49:33 +0300
Subject: [PATCH 128/246] return contPoll selected values properly

---
 prediction-polls/backend/src/services/PollService.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 690acd36..a74931b6 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -40,7 +40,8 @@ function getPolls(req,res){
                 .then((rows) => {
                     return db.getContinuousPollVotes(properties.id)
                     .then((choices) => {
-                        return {...properties, "cont_poll_type": rows[0].cont_poll_type, "options": choices};
+                        const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
+                        return {...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices};
                     })
                 })
             }
@@ -104,7 +105,8 @@ function getPollWithId(req, res) {
                     } else {
                         db.getContinuousPollVotes(pollId)
                         .then((choices) => {
-                            res.json({...properties, "cont_poll_type": rows[0].cont_poll_type, "options": choices});
+                            const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
+                            res.json({...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices});
                         })
                     }
                 })

From 2e380726c6f093c26ca7d4b4ada2f67491529201 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 23:53:27 +0300
Subject: [PATCH 129/246] create poll vote screen

---
 .../ui/common/poll/PollsComposable.kt         |   9 +-
 .../ui/profile/ProfileScreen.kt               |   4 +-
 .../predictionpolls/ui/vote/PollVoteScreen.kt | 109 ++++++++++++++++++
 .../ui/vote/PollVoteScreenUiState.kt          |  19 +++
 4 files changed, 136 insertions(+), 5 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
index c0e99148..4154af05 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -36,7 +36,7 @@ fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
                         }
 
                         is Poll.DiscretePoll -> {
-                            DiscretePollOptions(it.options)
+                            ReadOnlyDiscretePollOptions(it.options)
                         }
                     }
                 },
@@ -49,7 +49,10 @@ fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
 }
 
 @Composable
-fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
+fun ReadOnlyDiscretePollOptions(
+    options: ImmutableList<PollOption.DiscreteOption>,
+    modifier: Modifier = Modifier
+) {
     val totalVotes = remember(options) {
         val sum = options.sumOf { it.voteCount }
         if (sum == 0) {
@@ -57,7 +60,7 @@ fun DiscretePollOptions(options: ImmutableList<PollOption.DiscreteOption>) {
         } else sum
     }
 
-    Column {
+    Column(modifier) {
         options.forEach {
             DiscreteVoteOption(
                 optionName = it.text,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
index 3d15e380..b0cec400 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
@@ -15,7 +15,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.bounswe.predictionpolls.domain.poll.Poll
 import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
-import com.bounswe.predictionpolls.ui.common.poll.DiscretePollOptions
+import com.bounswe.predictionpolls.ui.common.poll.ReadOnlyDiscretePollOptions
 import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
@@ -84,7 +84,7 @@ fun ProfileScreen(profileScreenUiState: ProfileScreenUiState, modifier: Modifier
                                     }
 
                                     is Poll.DiscretePoll -> {
-                                        DiscretePollOptions(it.options)
+                                        ReadOnlyDiscretePollOptions(it.options)
                                     }
                                 }
                             },
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
new file mode 100644
index 00000000..436b7a10
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
@@ -0,0 +1,109 @@
+package com.bounswe.predictionpolls.ui.vote
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
+import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
+import com.bounswe.predictionpolls.ui.common.poll.PollComposable
+
+@Composable
+fun PollVoteScreen(
+    state: PollVoteScreenUiState,
+    onPointsReservedChanged: (Int) -> Unit,
+    onVotePressed: () -> Unit,
+    onVoteInputChanged: (String) -> Unit, // either the vote input or the selected option id is passed as a string
+    modifier: Modifier = Modifier
+) {
+    when (state) {
+        is PollVoteScreenUiState.Loading -> {
+            VotePollLoadingComposable(modifier = modifier)
+        }
+
+        is PollVoteScreenUiState.Error -> {
+            VotePollErrorComposable(modifier = modifier)
+        }
+
+        is PollVoteScreenUiState.DiscretePoll -> {
+            PollVote(
+                pollContent = {
+                    val poll = state.poll
+                    PollComposable(
+                        pollCreatorProfilePictureUri = poll.creatorProfilePictureUri,
+                        pollCreatorName = poll.pollCreatorName,
+                        tags = poll.tags,
+                        pollQuestionTitle = poll.pollQuestionTitle,
+                        optionsContent = {
+                            val sumOfTotalVotes = remember(poll.options) {
+                                val sum = poll.options.sumOf { it.voteCount }
+                                if (sum == 0) -1 else sum// to prevent division by 0
+                            }
+                            poll.options.forEachIndexed { index, discreteOption ->
+                                DiscreteVoteOption(
+                                    optionName = discreteOption.text,
+                                    voteCount = discreteOption.voteCount,
+                                    fillPercentage = discreteOption.voteCount / sumOfTotalVotes.toFloat(),
+                                    isSelected = discreteOption.id == state.currentVoteId,
+                                    optionPrefix = (10 + index).toChar().toString() + ") ",
+                                    modifier = Modifier.clickable {
+                                        onVoteInputChanged(discreteOption.id)
+                                    }
+                                )
+                            }
+                        },
+                        dueDate = poll.dueDate ?: "",
+                        rejectionText = poll.rejectionText ?: "",
+                        commentCount = 0
+                    )
+                },
+                currentPointsReserved = state.currentPointsReserved,
+                onPointsReservedChanged = onPointsReservedChanged,
+                onVotePressed = onVotePressed,
+                modifier = modifier
+            )
+
+        }
+
+        is PollVoteScreenUiState.ContinuousPoll -> {
+            val poll = state.poll
+            PollComposable(
+                pollCreatorProfilePictureUri = poll.creatorProfilePictureUri,
+                pollCreatorName = poll.pollCreatorName,
+                tags = poll.tags,
+                pollQuestionTitle = poll.pollQuestionTitle,
+                optionsContent = {
+                    ContinuousVoteOption(
+                        title = "Enter your vote",
+                        vote = state.currentVoteInput ?: "",
+                        isVotingEnabled = true,
+                        voteType = poll.inputType,
+                        onVoteInputChanged = onVoteInputChanged
+                    )
+                },
+                dueDate = poll.dueDate ?: "",
+                rejectionText = poll.rejectionText ?: "",
+                commentCount = 0
+            )
+
+        }
+    }
+}
+
+@Composable
+private fun VotePollErrorComposable(modifier: Modifier = Modifier) {
+    Box(modifier = modifier) {
+        Text(text = "An error occurred", modifier = Modifier.align(Alignment.Center))
+    }
+}
+
+@Composable
+private fun VotePollLoadingComposable(modifier: Modifier = Modifier) {
+    Box(modifier = modifier) {
+        CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt
new file mode 100644
index 00000000..a901f0ca
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt
@@ -0,0 +1,19 @@
+package com.bounswe.predictionpolls.ui.vote
+
+import com.bounswe.predictionpolls.domain.poll.Poll
+
+sealed interface PollVoteScreenUiState {
+    data object Loading : PollVoteScreenUiState
+    data class Error(val message: String) : PollVoteScreenUiState
+    data class DiscretePoll(
+        val poll: Poll.DiscretePoll,
+        val currentVoteId: String?,
+        val currentPointsReserved: Int
+    ) : PollVoteScreenUiState
+
+    data class ContinuousPoll(
+        val poll: Poll.ContinuousPoll,
+        val currentVoteInput: String?,
+        val currentPointsReserved: Int
+    ) : PollVoteScreenUiState
+}
\ No newline at end of file

From 79e63fc8b93e48a85d27663781cd0b25ade12aae Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Fri, 24 Nov 2023 23:54:58 +0300
Subject: [PATCH 130/246] move commit statement

---
 prediction-polls/backend/src/repositories/PollDB.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 5e71cf58..4b06383e 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -181,12 +181,13 @@ async function voteContinuousPoll(pollId, userId, choice, contPollType){
         deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
         if (contPollType === "numeric") {
             addResult = await connection.query(addVoteSql, [pollId, userId, choice, null]);
+            connection.commit();
         } else if (contPollType === "date") {
             addResult = await connection.query(addVoteSql, [pollId, userId, null, choice]);
+            connection.commit();
         } else {
             await connection.rollback();
         }
-        connection.commit();
     } catch (error) { 
         await connection.rollback();
         console.error('voteContinuousPoll(): Database Error');

From 88b4aa3d1e6136e2f8beec5184229c1e0452627a Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Fri, 24 Nov 2023 23:58:54 +0300
Subject: [PATCH 131/246] add error case

---
 .../predictionpolls/data/feed/model/PollResponse.kt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
index 243c75f2..662957f3 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
@@ -1,6 +1,7 @@
 package com.bounswe.predictionpolls.data.feed.model
 
 
+import com.bounswe.predictionpolls.common.PredictionPollsError
 import com.bounswe.predictionpolls.domain.poll.ContinuousVoteInputType
 import com.bounswe.predictionpolls.domain.poll.Poll
 import com.bounswe.predictionpolls.domain.poll.PollOption
@@ -11,6 +12,8 @@ import kotlinx.collections.immutable.toImmutableList
 import java.lang.reflect.Type
 
 data class PollResponse(
+    @SerializedName("error")
+    val predictionPollsError: PredictionPollsError?,
     val id: Int,
     val question: String,
     val tags: List<String>,
@@ -92,6 +95,15 @@ class PollResponseDeserializer : JsonDeserializer<PollResponse> {
         context: JsonDeserializationContext
     ): PollResponse {
         val jsonObject = json.asJsonObject
+        val error = try {
+            val errorJson = jsonObject.get("error").asJsonObject
+            PredictionPollsError(
+                errorJson.get("code").asString,
+                errorJson.get("message").asString
+            )
+        } catch (e: Exception) {
+            null
+        }
         val id = jsonObject.get("id").asInt
         val question = jsonObject.get("question").asString
         val tags = context.deserialize<List<String>>(
@@ -144,6 +156,7 @@ class PollResponseDeserializer : JsonDeserializer<PollResponse> {
         }
 
         return PollResponse(
+            error,
             id,
             question,
             tags,

From f95f0c762cd962fd583dd0d4272fc1383adac3b6 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 00:06:20 +0300
Subject: [PATCH 132/246] update swagger

---
 .../backend/src/routes/PollRouter.js          | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 5be6368d..a38b9faf 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -60,12 +60,11 @@ const router = express.Router();
  *                     type: integer
  *             - type: array
  *               items:
- *                 type: object
- *                 properties:
- *                   float_value:
- *                     type: integer
- *                   date_value:
- *                     type: string
+ *                 oneOf:
+ *                   - type: integer
+ *                     example: 9
+ *                   - type: string
+ *                     example: 2023-11-26
  *   schemas:
  *     error:
  *       type: object
@@ -131,10 +130,8 @@ const router = express.Router();
  *                     cont_poll_type: "numeric"
  *                     comments: []
  *                     options:
- *                       - float_value: 7
- *                         date_value: null
- *                       - float_value: 8
- *                         date_value: null
+ *                       - 7
+ *                       - 8
  *       500:
  *         description: Internal Server Error
  *         content:
@@ -194,7 +191,7 @@ router.get('/', service.getPolls);
  *                       choice_text: "Biden"
  *                       poll_id: 1
  *                       voter_count: 1
- *               continuous:
+ *               continuousNumeric:
  *                 value:
  *                   id: 2
  *                   question: "Test question?"
@@ -209,10 +206,25 @@ router.get('/', service.getPolls);
  *                   cont_poll_type: "numeric"
  *                   comments: []
  *                   options:
- *                       - float_value: 7
- *                         date_value: null
- *                       - float_value: 8
- *                         date_value: null
+ *                       - 7
+ *                       - 8
+ *               continuousDate:
+ *                 value:
+ *                   id: 2
+ *                   question: "Test question?"
+ *                   tags: ["tag1", "tag2"]
+ *                   creatorName: "GhostDragon"
+ *                   creatorUsername: "GhostDragon"
+ *                   creatorImage: null
+ *                   pollType: "continuous"
+ *                   rejectVotes: "2 hr"
+ *                   closingDate: null
+ *                   isOpen: 1 
+ *                   cont_poll_type: "date"
+ *                   comments: []
+ *                   options:
+ *                       - "2023-12-22T21:00:00.000Z"
+ *                       - "2023-12-24T21:00:00.000Z"
  *       404:
  *         description: Resource Not Found
  *         content:

From dd64ea34d18989cf23c3a78e5ef484aaf0ec4490 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:37:35 +0300
Subject: [PATCH 133/246] Add points to profile

---
 .../backend/src/repositories/ProfileDB.js     | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index 223b92d8..7f916fc4 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -49,8 +49,8 @@ async function addProfile(userId, username, email){
             throw {error:errorCodes.USER_ALREADY_HAS_PROFILE};
         }
 
-        const sql = 'INSERT INTO profiles (userId, username, email, profile_picture, biography, birthday, isHidden) VALUES (?, ?, ?, ?, ?, ?, ?)';
-        values = [userId,username,email,null,null,null,null]
+        const sql = 'INSERT INTO profiles (userId, username, email, points, profile_picture, biography, birthday, isHidden) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
+        values = [userId,username,email,10000,null,null,null,null]
         const [resultSetHeader] = await pool.query(sql, values);
         if(!resultSetHeader.insertId){
             throw {error:errorCodes.PROFILE_COULD_NOT_BE_CREATED};
@@ -123,6 +123,33 @@ async function getBadges(userId){
     }
 }
 
+async function updatePoints(userId,additional_points){
 
-module.exports = {getProfileWithProfileId,getProfileWithUserId,addProfile,updateProfile,getBadges}
+    const find_points_sql = 'SELECT * FROM profiles WHERE userId= ?';
+
+    try {
+        const [rows] = await pool.query(sql, [userId,new_points]);
+        const current_points = rows[0].points
+
+        if(current_points + additional_points < 0){
+            return {error:errorCodes.INSUFFICIENT_POINTS_ERROR};
+        }
+        
+    } catch (error) {
+        return {error:errorCodes.DATABASE_ERROR};
+    }
+    
+    const sql = 'UPDATE profiles SET points = ? WHERE userId = ?';
+
+    try {
+        const [resultSetHeader] = await pool.query(sql, [userId,current_points + additional_points]);
+        
+        return {status:"success"};
+    } catch (error) {
+        return {error:errorCodes.DATABASE_ERROR};
+    }
+}
+
+
+module.exports = {getProfileWithProfileId,getProfileWithUserId,addProfile,updateProfile,getBadges,updatePoints}
     
\ No newline at end of file

From 46b8c9051882b9bef3a0b2489d3f35e84741bb2c Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:38:08 +0300
Subject: [PATCH 134/246] Add point decrease in vote poll

---
 .../backend/src/services/PollService.js       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index a74931b6..161f2f9c 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -1,4 +1,5 @@
 const db = require("../repositories/PollDB.js");
+const {updatePoints} = require("../repositories/ProfileDB.js");
 const { findUser } = require('../repositories/AuthorizationDB.js');
 const errorCodes = require("../errorCodes.js")
 
@@ -198,6 +199,15 @@ function voteDiscretePoll(req,res){
     const pollId = req.params.pollId;
     const userId = req.user.id;
     const choiceId = req.body.choiceId;
+    const points = req.body.points;
+
+    if(!points){
+        points = 10;
+    }
+
+    if(points <= 0){
+        res.status(404).json({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
+    }
 
     db.getDiscretePollChoices(pollId)
     .then((choices) => {
@@ -207,6 +217,15 @@ function voteDiscretePoll(req,res){
         } else {
             db.voteDiscretePoll(pollId, userId, choiceId)
             .then(() => {
+                updatePoints(userId,-1 * points).then((result) => { 
+                    if(result.error){
+                        res.status(400).json({ error: result.error });
+                    }
+                    else{
+                        res.status(200).json({ message: "Vote Successful" });
+                    }
+                })
+
                 res.json({ message: "Vote Successful" });
             })
         }

From a5a61cc5bb4c4ae38f61549fd0b9d322f600b6ea Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:38:15 +0300
Subject: [PATCH 135/246] Update schema.sql

---
 prediction-polls/backend/src/schema.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 92639e12..ba4ce0eb 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -56,6 +56,7 @@ CREATE TABLE discrete_polls_selections (
     poll_id INT,
     choice_id INT,
     user_id INT,
+    given_points INT,
     FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (choice_id) REFERENCES discrete_poll_choices(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
@@ -67,6 +68,7 @@ CREATE TABLE continuous_poll_selections (
     user_id INT, 
     float_value FLOAT,
     date_value DATE,
+    given_points INT,
     FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
 );
@@ -76,6 +78,7 @@ CREATE TABLE profiles (
     userId INT NOT NULL,
     username VARCHAR(255) NOT NULL,
     email VARCHAR(255) NOT NULL,
+    points INT NOT NULL,
     profile_picture MEDIUMBLOB,
     biography VARCHAR(5000),
     birthday DATETIME,

From 111cccc9c70d4848a4974dae36185f5b5c53e4cc Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 22:38:18 +0300
Subject: [PATCH 136/246] Update errorCodes.js

---
 prediction-polls/backend/src/errorCodes.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/prediction-polls/backend/src/errorCodes.js b/prediction-polls/backend/src/errorCodes.js
index 3b147a05..8a6b09a4 100644
--- a/prediction-polls/backend/src/errorCodes.js
+++ b/prediction-polls/backend/src/errorCodes.js
@@ -140,6 +140,16 @@ const errorCodes = {
     message: 'No such poll found.'
   },
 
+  INSUFFICIENT_POINTS_ERROR: {
+    code: 3006,
+    message: 'User does not have enough points'
+  },
+
+  USER_MUST_GIVE_POINTS_ERROR: {
+    code: 3007,
+    message: 'User has to put points to be able to vote polls'
+  },
+
   BAD_DISCRETE_POLL_REQUEST_ERROR: {
     code: 4000,
     message: 'Bad request body for creating a discrete poll.'

From 21f96aced82424f0b23917697776e443b4c88fa0 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Fri, 24 Nov 2023 23:37:58 +0300
Subject: [PATCH 137/246] Update swagger

---
 prediction-polls/backend/src/routes/PollRouter.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index a38b9faf..2cd91737 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -479,6 +479,9 @@ router.post('/continuous', authenticator.authorizeAccessToken, service.addContin
  *               choiceId:
  *                 type: integer
  *                 example: 2
+ *               points:
+ *                 type: integer
+ *                 example: 25
  *     responses:
  *       201:
  *         description: Vote submitted successfully
@@ -519,6 +522,9 @@ router.post('/discrete/:pollId/vote',authenticator.authorizeAccessToken, service
  *                     example: 9
  *                   - type: string
  *                     example: 2023-11-26
+ *                 points:
+ *                   type: integer
+ *                   example: 25
  *     responses:
  *       201:
  *         description: Vote submitted successfully

From 164621f07cc80c7bd4867b961791b3d343eac33b Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 11:10:55 +0300
Subject: [PATCH 138/246] Update schema.sql

---
 prediction-polls/backend/src/schema.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index f012558e..cdc588e2 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -69,7 +69,6 @@ CREATE TABLE continuous_poll_selections (
     given_points INT,
     float_value FLOAT,
     date_value DATE,
-    given_points INT,
     FOREIGN KEY (poll_id) REFERENCES polls(id),
     FOREIGN KEY (user_id) REFERENCES users(id)
 );

From e94628767abaf684ab89127ac9a08bf802246927 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 11:14:08 +0300
Subject: [PATCH 139/246] Add points to continuous poll

---
 .../backend/src/services/PollService.js       | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 161f2f9c..7864f58e 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -225,8 +225,6 @@ function voteDiscretePoll(req,res){
                         res.status(200).json({ message: "Vote Successful" });
                     }
                 })
-
-                res.json({ message: "Vote Successful" });
             })
         }
     })
@@ -240,13 +238,29 @@ function voteContinuousPoll(req,res){
     const pollId = req.params.pollId;
     const userId = req.user.id;
     const choice = req.body.choice;
+    const points = req.body.points;
+
+    if(!points){
+        points = 10;
+    }
+
+    if(points <= 0){
+        res.status(404).json({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
+    }
 
     db.getContinuousPollWithId(pollId)
     .then((result) => {
         const contPollType = result[0].cont_poll_type;
         db.voteContinuousPoll(pollId, userId, choice, contPollType)
         .then(() => {
-            res.json({ success: true });
+            updatePoints(userId,-1 * points).then((result) => { 
+                if(result.error){
+                    res.status(400).json({ error: result.error });
+                }
+                else{
+                    res.status(200).json({ message: "Vote Successful" });
+                }
+            })
         })
     })
 }

From 25d89214888e6d61c38a0eaa67b0f371d5e88c09 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 12:52:36 +0300
Subject: [PATCH 140/246] implement point

---
 .../backend/src/repositories/PollDB.js        | 35 +++++++++++--
 .../backend/src/repositories/ProfileDB.js     | 13 ++---
 .../backend/src/services/PollService.js       | 51 +++++++++----------
 3 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 4b06383e..c166e34b 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -1,5 +1,7 @@
 const mysql = require('mysql2');
-const { addRefreshToken } = require('./AuthorizationDB');
+const { addRefreshToken, deleteRefreshToken } = require('./AuthorizationDB');
+const { updatePoints } = require('./ProfileDB');
+const errorCodes = require("../errorCodes.js");
 
 require('dotenv').config();
 
@@ -146,19 +148,32 @@ async function getDiscreteVoteCount(choiceid) {
     }
 }
 
-async function voteDiscretePoll(pollId, userId, choiceId){
+async function voteDiscretePoll(pollId, userId, choiceId, pointsSpent){
     const connection = await pool.getConnection();
 
     const deleteExistingSql = "DELETE FROM discrete_polls_selections WHERE poll_id = ? AND user_id = ?"
     const addVoteSql = "INSERT INTO discrete_polls_selections (poll_id, choice_id, user_id) VALUES (?, ?, ?)"
+    const findPointsSql = 'SELECT * FROM profiles WHERE userId= ?';
+    const updatePointSql = 'UPDATE profiles SET points = ? WHERE userId = ?';
 
     try {
         await connection.beginTransaction()
 
         deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
         addResult = await connection.query(addVoteSql, [pollId, choiceId, userId]);
+        const [rows] = await connection.query(findPointsSql, [userId]);
+        const current_points = rows[0].points;
 
+        if(current_points - pointsSpent < 0){
+            connection.rollback()
+            throw {error: errorCodes.INSUFFICIENT_POINTS_ERROR};
+        }
+
+        const [resultSetHeader] = await connection.query(updatePointSql, [current_points - pointsSpent, userId]);
+        
         connection.commit();
+        return {status:"success"};
+
     } catch (error) { 
         await connection.rollback();
         console.error('voteDiscretePoll(): Database Error');
@@ -169,11 +184,13 @@ async function voteDiscretePoll(pollId, userId, choiceId){
 
 }
 
-async function voteContinuousPoll(pollId, userId, choice, contPollType){
+async function voteContinuousPoll(pollId, userId, choice, contPollType, pointsSpent){
     const connection = await pool.getConnection();
 
     const deleteExistingSql = "DELETE FROM continuous_poll_selections WHERE poll_id = ? AND user_id = ?"
     const addVoteSql = "INSERT INTO continuous_poll_selections (poll_id, user_id, float_value, date_value) VALUES (?, ?, ?, ?)"
+    const findPointsSql = 'SELECT points FROM profiles WHERE userId= ?';
+    const updatePointSql = 'UPDATE profiles SET points = ? WHERE userId = ?';
 
     try {
         await connection.beginTransaction()
@@ -181,13 +198,21 @@ async function voteContinuousPoll(pollId, userId, choice, contPollType){
         deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
         if (contPollType === "numeric") {
             addResult = await connection.query(addVoteSql, [pollId, userId, choice, null]);
-            connection.commit();
         } else if (contPollType === "date") {
             addResult = await connection.query(addVoteSql, [pollId, userId, null, choice]);
-            connection.commit();
         } else {
             await connection.rollback();
         }
+        const [rows] = await connection.query(findPointsSql, [userId]);
+        const current_points = rows[0].points;
+
+        if(current_points - pointsSpent < 0){
+            connection.rollback()
+            throw {error: errorCodes.INSUFFICIENT_POINTS_ERROR};
+        }
+
+        const [resultSetHeader] = await connection.query(updatePointSql, [current_points - pointsSpent, userId]);
+        connection.commit();
     } catch (error) { 
         await connection.rollback();
         console.error('voteContinuousPoll(): Database Error');
diff --git a/prediction-polls/backend/src/repositories/ProfileDB.js b/prediction-polls/backend/src/repositories/ProfileDB.js
index 7f916fc4..459ab60c 100644
--- a/prediction-polls/backend/src/repositories/ProfileDB.js
+++ b/prediction-polls/backend/src/repositories/ProfileDB.js
@@ -126,25 +126,20 @@ async function getBadges(userId){
 async function updatePoints(userId,additional_points){
 
     const find_points_sql = 'SELECT * FROM profiles WHERE userId= ?';
+    const sql = 'UPDATE profiles SET points = ? WHERE userId = ?';
 
     try {
-        const [rows] = await pool.query(sql, [userId,new_points]);
+        const [rows] = await pool.query(find_points_sql, [userId]);
         const current_points = rows[0].points
 
         if(current_points + additional_points < 0){
             return {error:errorCodes.INSUFFICIENT_POINTS_ERROR};
         }
-        
-    } catch (error) {
-        return {error:errorCodes.DATABASE_ERROR};
-    }
-    
-    const sql = 'UPDATE profiles SET points = ? WHERE userId = ?';
 
-    try {
-        const [resultSetHeader] = await pool.query(sql, [userId,current_points + additional_points]);
+        const [resultSetHeader] = await pool.query(sql, [current_points + additional_points, userId]);
         
         return {status:"success"};
+        
     } catch (error) {
         return {error:errorCodes.DATABASE_ERROR};
     }
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 7864f58e..06b5c08c 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -201,10 +201,6 @@ function voteDiscretePoll(req,res){
     const choiceId = req.body.choiceId;
     const points = req.body.points;
 
-    if(!points){
-        points = 10;
-    }
-
     if(points <= 0){
         res.status(404).json({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
     }
@@ -215,22 +211,25 @@ function voteDiscretePoll(req,res){
         if (!choiceExists) {
             res.status(404).json({error: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR});
         } else {
-            db.voteDiscretePoll(pollId, userId, choiceId)
+            db.voteDiscretePoll(pollId, userId, choiceId, points ? points : 10)
             .then(() => {
-                updatePoints(userId,-1 * points).then((result) => { 
-                    if(result.error){
-                        res.status(400).json({ error: result.error });
-                    }
-                    else{
-                        res.status(200).json({ message: "Vote Successful" });
-                    }
-                })
+                res.status(200).json({ message: "Vote Successful" });
+            })
+            .catch((error) => {
+                if (error) {
+                    res.status(400).json(error);
+                } else {
+                    res.status(500).json({error: errorCodes.DATABASE_ERROR});
+                }
             })
         }
     })
     .catch((error) => {
-        console.error(error);
-        res.status(500).json({error: errorCodes.DATABASE_ERROR});
+        if (error) {
+            res.status(400).json(error);
+        } else {
+            res.status(500).json({error: errorCodes.DATABASE_ERROR});
+        }
     })
 }
 
@@ -240,10 +239,6 @@ function voteContinuousPoll(req,res){
     const choice = req.body.choice;
     const points = req.body.points;
 
-    if(!points){
-        points = 10;
-    }
-
     if(points <= 0){
         res.status(404).json({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
     }
@@ -251,16 +246,16 @@ function voteContinuousPoll(req,res){
     db.getContinuousPollWithId(pollId)
     .then((result) => {
         const contPollType = result[0].cont_poll_type;
-        db.voteContinuousPoll(pollId, userId, choice, contPollType)
+        db.voteContinuousPoll(pollId, userId, choice, contPollType, points ? points : 10)
         .then(() => {
-            updatePoints(userId,-1 * points).then((result) => { 
-                if(result.error){
-                    res.status(400).json({ error: result.error });
-                }
-                else{
-                    res.status(200).json({ message: "Vote Successful" });
-                }
-            })
+            res.status(200).json({ message: "Vote Successful" });
+        })
+        .catch((error) => {
+            if (error) {
+                res.status(400).json(error);
+            } else {
+                res.status(500).json({error: errorCodes.DATABASE_ERROR});
+            }
         })
     })
 }

From 95a50711b4d9a1d7616663478ca2f0a7d873c864 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 15:18:27 +0300
Subject: [PATCH 141/246] Add Tag logic

---
 .../backend/src/repositories/PollDB.js        |  15 +-
 .../backend/src/services/PollService.js       | 165 +++++++++---------
 2 files changed, 99 insertions(+), 81 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index c166e34b..219db918 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -235,9 +235,22 @@ async function getContinuousPollVotes(pollId) {
     }
 }
 
+async function getTagsOfPoll(pollId) {
+    const sql = "SELECT * FROM tags WHERE poll_id = ?";
+
+    try {
+        [rows] = await pool.query(sql, [pollId]);
+        return rows;
+    } catch (error) { 
+        console.error('getTagsOfPoll(): Database Error');
+        throw error;
+    }
+}
+
+
 
 
 module.exports = {getPolls, getPollWithId, getDiscretePollWithId, getContinuousPollWithId, 
     addDiscretePoll,addContinuousPoll, getDiscretePollChoices, getDiscreteVoteCount, voteDiscretePoll, voteContinuousPoll,
-    getContinuousPollVotes}
+    getContinuousPollVotes,getTagsOfPoll}
     
\ No newline at end of file
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 06b5c08c..5b7e76b9 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -7,46 +7,47 @@ function getPolls(req,res){
     db.getPolls()
     .then((rows) => {
         const pollObjects = rows.map((pollObject) => {
-            const properties =  {
-                "id": pollObject.id,
-                "question": pollObject.question,
-                "tags": [],
-                "creatorName": pollObject.username,
-                "creatorUsername": pollObject.username,
-                "creatorImage": null,
-                "pollType": pollObject.poll_type,
-                "closingDate": pollObject.closingDate,
-                "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
-                "isOpen": true,
-                "comments": []
-            }
-            if (properties.pollType === 'discrete') {
-                return db.getDiscretePollChoices(properties.id)
-                .then((choices) => {
-                
-                    const choicesWithVoteCount = choices.map((choice) => {
-                        return db.getDiscreteVoteCount(choice.id)
-                        .then((voterCount) => {
-                            return { ...choice, voter_count: voterCount };
-                        })
-                    });
+            db.getTagsOfPoll(pollId).then((tag_rows) => {
+                const properties =  {
+                    "id": pollObject.id,
+                    "question": pollObject.question,
+                    "tags": tag_rows,
+                    "creatorName": pollObject.username,
+                    "creatorUsername": pollObject.username,
+                    "creatorImage": null,
+                    "pollType": pollObject.poll_type,
+                    "closingDate": pollObject.closingDate,
+                    "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+                    "isOpen": true,
+                    "comments": []
+                }
+                if (properties.pollType === 'discrete') {
+                    return db.getDiscretePollChoices(properties.id)
+                    .then((choices) => {
+                    
+                        const choicesWithVoteCount = choices.map((choice) => {
+                            return db.getDiscreteVoteCount(choice.id)
+                            .then((voterCount) => {
+                                return { ...choice, voter_count: voterCount };
+                            })
+                        });
 
-                    return Promise.all(choicesWithVoteCount)
-                    .then((options) => {
-                        return {...properties, "options": options};
+                        return Promise.all(choicesWithVoteCount)
+                        .then((options) => {
+                            return {...properties, "options": options};
+                        })
                     })
-                })
-            } else if (properties.pollType === 'continuous') {
-                return db.getContinuousPollWithId(properties.id)
-                .then((rows) => {
-                    return db.getContinuousPollVotes(properties.id)
-                    .then((choices) => {
-                        const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
-                        return {...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices};
+                } else if (properties.pollType === 'continuous') {
+                    return db.getContinuousPollWithId(properties.id)
+                    .then((rows) => {
+                        return db.getContinuousPollVotes(properties.id)
+                        .then((choices) => {
+                            const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
+                            return {...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices};
+                        })
                     })
-                })
-            }
-
+                }
+            })
         });
         Promise.all(pollObjects)
         .then((result) => {
@@ -66,52 +67,56 @@ function getPollWithId(req, res) {
         if (rows.length === 0) {
             res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
         } else {
-            const pollObject = rows[0];
-            const pollType = pollObject.poll_type;
-            const properties = {
-                "id": pollObject.id,
-                "question": pollObject.question,
-                "tags": [],
-                "creatorName": pollObject.username,
-                "creatorUsername": pollObject.username,
-                "creatorImage": null,
-                "pollType": pollObject.poll_type,
-                "closingDate": pollObject.closingDate,
-                "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
-                "isOpen": true,
-                "comments": []
-            }
+            db.getTagsOfPoll(pollId).then((tag_rows) => {
+                const pollObject = rows[0];
+                const pollType = pollObject.poll_type;
+                const properties = {
+                    "id": pollObject.id,
+                    "question": pollObject.question,
+                    "tags": tag_rows,
+                    "creatorName": pollObject.username,
+                    "creatorUsername": pollObject.username,
+                    "creatorImage": null,
+                    "pollType": pollObject.poll_type,
+                    "closingDate": pollObject.closingDate,
+                    "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+                    "isOpen": true,
+                    "comments": []
+                }
 
-            if (pollType === 'discrete') {
-                db.getDiscretePollChoices(pollId)
-                .then((choices) => {
-                
-                    const choicesWithVoteCount = choices.map((choice) => {
-                        return db.getDiscreteVoteCount(choice.id)
-                        .then((voterCount) => {
-                            return { ...choice, voter_count: voterCount };
-                        })
-                    });
+                if (pollType === 'discrete') {
+                    db.getDiscretePollChoices(pollId)
+                    .then((choices) => {
+                    
+                        const choicesWithVoteCount = choices.map((choice) => {
+                            return db.getDiscreteVoteCount(choice.id)
+                            .then((voterCount) => {
+                                return { ...choice, voter_count: voterCount };
+                            })
+                        });
 
-                    Promise.all(choicesWithVoteCount)
-                    .then((options) => {
-                        res.json({...properties, "options": options});
-                    })
-                })
-            } else if (pollType === 'continuous') {
-                db.getContinuousPollWithId(pollId)
-                .then((rows) => {
-                    if (rows.length === 0) {
-                        res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
-                    } else {
-                        db.getContinuousPollVotes(pollId)
-                        .then((choices) => {
-                            const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
-                            res.json({...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices});
+                        Promise.all(choicesWithVoteCount)
+                        .then((options) => {
+                            res.json({...properties, "options": options});
                         })
-                    }
-                })
-            }
+                    })
+                } else if (pollType === 'continuous') {
+                    db.getContinuousPollWithId(pollId)
+                    .then((rows) => {
+                        if (rows.length === 0) {
+                            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
+                        } else {
+                            db.getContinuousPollVotes(pollId)
+                            .then((choices) => {
+                                const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
+                                res.json({...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices});
+                            })
+                        }
+                    })
+                }
+            }).catch(() => {
+                
+            })
         }
     })
 }

From 72ce73f364676294409ae8610a3ce8e95b618827 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 15:18:34 +0300
Subject: [PATCH 142/246] Add tag to schema

---
 prediction-polls/backend/src/schema.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index cdc588e2..cf2bcf7d 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -93,4 +93,11 @@ CREATE TABLE badges (
     topic VARCHAR(255) NOT NULL,
     userId INT,
     FOREIGN KEY (userId) REFERENCES users(id) ON DELETE SET NULL
+);
+
+CREATE TABLE tags (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    topic VARCHAR(255) NOT NULL,
+    poll_id INT,
+    FOREIGN KEY (poll_id) REFERENCES polls(id) ON DELETE SET NULL
 );
\ No newline at end of file

From d581d21a11368f71aceb42ae7ac2329b9e066617 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sat, 25 Nov 2023 17:04:26 +0300
Subject: [PATCH 143/246] updated css of create poll page

I have changed the size of the main container for better apperance and used variables for colors to make them adaptive to dark theme.
---
 .../frontend/src/Pages/Create/Create.module.css             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/Create.module.css b/prediction-polls/frontend/src/Pages/Create/Create.module.css
index 08524e99..5f0622d3 100644
--- a/prediction-polls/frontend/src/Pages/Create/Create.module.css
+++ b/prediction-polls/frontend/src/Pages/Create/Create.module.css
@@ -1,7 +1,7 @@
 .page {
     display: flex;
     background-color: var(--neutral-white);
-    width: 100%;
+    width: 75%;
   }
   
   @media (max-width: 640px) {
@@ -15,7 +15,7 @@
     padding: 20px;
     border: 1px solid #ccc;
     border-radius: 8px;
-    background-color: #fff;
+    background-color: var(--neutral-white);
     width: 60%;
   }
   
@@ -32,7 +32,7 @@
     padding-left: 25px;
     padding-right: 25px;
     border:none;
-    color: #fff;
+    color: var(--neutral-white);
   }
 
   .optButton:hover {

From 69416ef706cd68b9f4a97221ff82aec4a3c0d28c Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 17:06:16 +0300
Subject: [PATCH 144/246] make polls GET async

---
 .../backend/src/repositories/PollDB.js        |  2 +-
 .../backend/src/services/PollService.js       | 94 ++++++++-----------
 2 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 219db918..e83592e4 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -21,7 +21,7 @@ async function getPolls(){
         return rows
     } catch (error) {
         console.error('getDiscretePolls(): Database Error');
-        throw error;
+        throw {error: errorCodes.DATABASE_ERROR};
     }
 }
 
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 5b7e76b9..2903c2cd 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -3,61 +3,49 @@ const {updatePoints} = require("../repositories/ProfileDB.js");
 const { findUser } = require('../repositories/AuthorizationDB.js');
 const errorCodes = require("../errorCodes.js")
 
-function getPolls(req,res){
-    db.getPolls()
-    .then((rows) => {
-        const pollObjects = rows.map((pollObject) => {
-            db.getTagsOfPoll(pollId).then((tag_rows) => {
-                const properties =  {
-                    "id": pollObject.id,
-                    "question": pollObject.question,
-                    "tags": tag_rows,
-                    "creatorName": pollObject.username,
-                    "creatorUsername": pollObject.username,
-                    "creatorImage": null,
-                    "pollType": pollObject.poll_type,
-                    "closingDate": pollObject.closingDate,
-                    "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
-                    "isOpen": true,
-                    "comments": []
-                }
-                if (properties.pollType === 'discrete') {
-                    return db.getDiscretePollChoices(properties.id)
-                    .then((choices) => {
-                    
-                        const choicesWithVoteCount = choices.map((choice) => {
-                            return db.getDiscreteVoteCount(choice.id)
-                            .then((voterCount) => {
-                                return { ...choice, voter_count: voterCount };
-                            })
-                        });
+async function getPolls(req,res){
+    try {
+        const rows = await db.getPolls();
+        const pollObjects = await Promise.all(rows.map(async (pollObject) => {
+            const tag_rows = await db.getTagsOfPoll(pollObject.id);
 
-                        return Promise.all(choicesWithVoteCount)
-                        .then((options) => {
-                            return {...properties, "options": options};
-                        })
-                    })
-                } else if (properties.pollType === 'continuous') {
-                    return db.getContinuousPollWithId(properties.id)
-                    .then((rows) => {
-                        return db.getContinuousPollVotes(properties.id)
-                        .then((choices) => {
-                            const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
-                            return {...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices};
-                        })
-                    })
-                }
-            })
-        });
-        Promise.all(pollObjects)
-        .then((result) => {
-            res.json(result);
-        })
-    })
-    .catch((error) => {
+            const properties = {
+                "id": pollObject.id,
+                "question": pollObject.question,
+                "tags": tag_rows,
+                "creatorName": pollObject.username,
+                "creatorUsername": pollObject.username,
+                "creatorImage": null,
+                "pollType": pollObject.poll_type,
+                "closingDate": pollObject.closingDate,
+                "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+                "isOpen": true,
+                "comments": []
+            };
+
+            if (properties.pollType === 'discrete') {
+                const choices = await db.getDiscretePollChoices(properties.id);
+
+                const choicesWithVoteCount = await Promise.all(choices.map(async (choice) => {
+                    const voterCount = await db.getDiscreteVoteCount(choice.id);
+                    return { ...choice, voter_count: voterCount };
+                }));
+
+                return { ...properties, "options": choicesWithVoteCount };
+            } else if (properties.pollType === 'continuous') {
+                const contPollRows = await db.getContinuousPollWithId(properties.id);
+                const choices = await db.getContinuousPollVotes(properties.id);
+
+                const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
+
+                return { ...properties, "cont_poll_type": contPollRows[0].cont_poll_type, "options": newChoices };
+            }
+        }))
+        res.json(pollObjects);
+    } catch (error) {
         console.error(error);
-        res.status(500).json({error: errorCodes.DATABASE_ERROR});
-    })
+        res.status(500).json(error);
+    }
 }
 
 function getPollWithId(req, res) {

From 39d9400a489dbeea74584f8d0e8372b4cb4d3f85 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sat, 25 Nov 2023 17:09:29 +0300
Subject: [PATCH 145/246] Pointdata, Input Validation, Fix misunderstanding

I have added points indicator to the page. I have fixed a misunderstanding which is explained in issue #441. I have added user input validation which is crucial for the functionality. User is not able to create a poll if certain requirements are not satisfied.
---
 .../frontend/src/Pages/Create/index.jsx       | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index 1faee6f4..1a374f9f 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -4,6 +4,8 @@ import styles from './Create.module.css'
 import { useState } from 'react';
 import { Button, Input, DatePicker, Checkbox, Select } from 'antd';
 import { useNavigate } from 'react-router-dom';
+import pointData from "../../MockData/PointList.json"
+import PointsButton from "../../Components/PointsButton"; 
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -13,17 +15,25 @@ function Create() {
   const [pollType, setPollType] = useState('');
   const [showMultipleChoiceInputs, setShowMultipleChoiceInputs] = useState(false);
   const [additionalChoices, setAdditionalChoices] = useState(['']);
-  const [customizedType, setCustomizedType] = useState('text');
-  const [selectedDate, setSelectedDate] = useState(null);
-  const [customizedNumeric, setCustomizedNumeric] = useState('');
+  const [customizedType, setCustomizedType] = useState('');
   const [setDueDate, setSetDueDate] = useState(false);
   const [dueDatePoll, setDueDatePoll] = useState(null);
   const [numericFieldValue, setNumericFieldValue] = useState('');
   const [selectedTimeUnit, setSelectedTimeUnit] = useState('min');
-  const [openVisibility, setOpenVisibility] = useState(false);
+  const [openVisibility, setOpenVisibility] = useState(false); 
   const url = process.env.REACT_APP_BACKEND_LINK; 
   const navigate = useNavigate()
 
+
+  const choices = additionalChoices.filter(choice => choice.trim() !== '')
+  const isSubmitDisabled = question.trim() === '' || 
+                            pollType === '' || 
+                           (pollType === 'multipleChoice' && choices.length < 2) ||
+                           (setDueDate && numericFieldValue.trim() === '') ||
+                           (setDueDate && dueDatePoll === null) ||
+                           (setDueDate && numericFieldValue <= 0) ||
+                           (pollType === 'customized' && customizedType === '');             
+
   const handleOpenVisibilityChange = (e) => {
     setOpenVisibility(e.target.checked);
   };
@@ -34,6 +44,8 @@ function Create() {
 
   const handleSetDueDateChange = (e) => {
     setSetDueDate(e.target.checked);
+    setDueDatePoll(null);
+    setNumericFieldValue(''); 
   };
 
   const handleQuestionChange = (e) => {
@@ -43,7 +55,6 @@ function Create() {
   const handlePollTypeChange = (type) => {
     setPollType(type);
     setShowMultipleChoiceInputs(type === 'multipleChoice');
-    setSelectedDate(null);
   };
 
   const handleAddChoice = () => {
@@ -66,11 +77,6 @@ function Create() {
     setCustomizedType(type);
   };
 
-  const handleDateChange = (date) => {
-    setSelectedDate(date);
-  };
-
-
   const handleSubmit = async () => {
 
     if (pollType === 'multipleChoice' && setDueDate) {
@@ -141,7 +147,6 @@ function Create() {
 
       const customizedData = {
         question: question,
-        selectedDate: selectedDate ? selectedDate.format() : null, // Convert selectedDate to a string format if it exists
         setDueDate: setDueDate,
         dueDatePoll: dueDatePoll ? dueDatePoll.format() : null, // Convert dueDatePoll to a string format if it exists
         numericFieldValue: numericFieldValue,
@@ -173,7 +178,6 @@ function Create() {
 
       const customizedData = {
         question: question,
-        selectedDate: selectedDate ? selectedDate.format() : null, // Convert selectedDate to a string format if it exists
         setDueDate: setDueDate,
       };
 
@@ -202,7 +206,6 @@ function Create() {
 
       const customizedData = {
         question: question,
-        customizedNumeric: customizedNumeric,
         setDueDate: setDueDate,
         dueDatePoll: dueDatePoll ? dueDatePoll.format() : null, // Convert dueDatePoll to a string format if it exists
         numericFieldValue: numericFieldValue,
@@ -234,7 +237,6 @@ function Create() {
 
       const customizedData = {
         question: question,
-        customizedNumeric: customizedNumeric,
         setDueDate: setDueDate,
       };
 
@@ -347,21 +349,8 @@ function Create() {
             >
               Numeric
             </Button>
-            {customizedType === 'date' && (
-              <div className={styles.datePickerContainer}>
-                <DatePicker onChange={handleDateChange} />
-              </div>
-            )}
-            {customizedType === 'numeric' && (
-              <div className={styles.numericInputContainer} >
-                <Input
-                  style={{ width: '50%' }}
-                  type="number"
-                  placeholder="Enter numeric answer"
-                  onChange={(e) => setCustomizedNumeric(e.target.value)}
-                />
-              </div>
-            )}
+            
+            
           </div>
         )}
         <div className={styles.setDueDateContainer}>
@@ -397,10 +386,12 @@ function Create() {
         <div className={styles.submitContainer}>
           <Button
             className={styles.submitButton}
-            onClick={handleSubmit}>
+            onClick={handleSubmit}
+            disabled={isSubmitDisabled}>
             Create Poll
           </Button>
         </div>
+        <PointsButton points={pointData.points}/> 
       </div>
     </div>
   );

From 78d895fa99ae83f6c7f6eb0f74f5e9e102d2f99a Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 17:12:38 +0300
Subject: [PATCH 146/246] make getPollWithId async

---
 .../backend/src/repositories/PollDB.js        |   2 +-
 .../backend/src/services/PollService.js       | 107 ++++++++----------
 2 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index e83592e4..4e39a19e 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -33,7 +33,7 @@ async function getPollWithId(pollId){
         return rows;
     } catch (error) {
         console.error('getPollWithID(): Database Error');
-        throw error;
+        throw {error: errorCodes.DATABASE_ERROR};
     }
 }
 
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 2903c2cd..255ff76f 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -48,65 +48,58 @@ async function getPolls(req,res){
     }
 }
 
-function getPollWithId(req, res) {
-    const pollId = req.params.pollId;
-    db.getPollWithId(pollId)
-    .then((rows) => {
+async function getPollWithId(req, res) {
+    try {
+        const pollId = req.params.pollId;
+        const rows = await db.getPollWithId(pollId);
+    
         if (rows.length === 0) {
-            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
-        } else {
-            db.getTagsOfPoll(pollId).then((tag_rows) => {
-                const pollObject = rows[0];
-                const pollType = pollObject.poll_type;
-                const properties = {
-                    "id": pollObject.id,
-                    "question": pollObject.question,
-                    "tags": tag_rows,
-                    "creatorName": pollObject.username,
-                    "creatorUsername": pollObject.username,
-                    "creatorImage": null,
-                    "pollType": pollObject.poll_type,
-                    "closingDate": pollObject.closingDate,
-                    "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
-                    "isOpen": true,
-                    "comments": []
-                }
-
-                if (pollType === 'discrete') {
-                    db.getDiscretePollChoices(pollId)
-                    .then((choices) => {
-                    
-                        const choicesWithVoteCount = choices.map((choice) => {
-                            return db.getDiscreteVoteCount(choice.id)
-                            .then((voterCount) => {
-                                return { ...choice, voter_count: voterCount };
-                            })
-                        });
-
-                        Promise.all(choicesWithVoteCount)
-                        .then((options) => {
-                            res.json({...properties, "options": options});
-                        })
-                    })
-                } else if (pollType === 'continuous') {
-                    db.getContinuousPollWithId(pollId)
-                    .then((rows) => {
-                        if (rows.length === 0) {
-                            res.status(404).json({error: errorCodes.NO_SUCH_POLL_ERROR});
-                        } else {
-                            db.getContinuousPollVotes(pollId)
-                            .then((choices) => {
-                                const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
-                                res.json({...properties, "cont_poll_type": rows[0].cont_poll_type, "options": newChoices});
-                            })
-                        }
-                    })
-                }
-            }).catch(() => {
-                
-            })
+            res.status(404).json({ error: errorCodes.NO_SUCH_POLL_ERROR });
+            return;
         }
-    })
+    
+        const tag_rows = await db.getTagsOfPoll(pollId);
+        const pollObject = rows[0];
+        const pollType = pollObject.poll_type;
+        const properties = {
+            "id": pollObject.id,
+            "question": pollObject.question,
+            "tags": tag_rows,
+            "creatorName": pollObject.username,
+            "creatorUsername": pollObject.username,
+            "creatorImage": null,
+            "pollType": pollObject.poll_type,
+            "closingDate": pollObject.closingDate,
+            "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+            "isOpen": true,
+            "comments": []
+        };
+    
+        if (pollType === 'discrete') {
+            const choices = await db.getDiscretePollChoices(pollId);
+    
+            const choicesWithVoteCount = await Promise.all(choices.map(async (choice) => {
+                const voterCount = await db.getDiscreteVoteCount(choice.id);
+                return { ...choice, voter_count: voterCount };
+            }));
+    
+            res.json({ ...properties, "options": choicesWithVoteCount });
+        } else if (pollType === 'continuous') {
+            const contPollRows = await db.getContinuousPollWithId(pollId);
+    
+            if (contPollRows.length === 0) {
+                res.status(404).json({ error: errorCodes.NO_SUCH_POLL_ERROR });
+                return;
+            }
+    
+            const choices = await db.getContinuousPollVotes(pollId);
+            const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
+            res.json({ ...properties, "cont_poll_type": contPollRows[0].cont_poll_type, "options": newChoices });
+        }
+    } catch (error) {
+        console.error(error);
+        res.status(500).json(error);
+    }
 }
 
 function addDiscretePoll(req,res){

From 2f739cfff00c91662e8dd0ee1a35869e7713750d Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 17:26:00 +0300
Subject: [PATCH 147/246] make addDiscretePoll async

---
 .../backend/src/repositories/PollDB.js        |  2 +-
 .../backend/src/services/PollService.js       | 52 ++++++++++++-------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 4e39a19e..71ca3d54 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -90,7 +90,7 @@ async function addDiscretePoll(question, username, choices, openVisibility, setD
     } catch (error) {
         console.error('addDiscretePoll(): Database Error');
         await connection.rollback();
-        throw error;
+        throw {error: errorCodes.DATABASE_ERROR};
     } finally {
         connection.release();
     }
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 255ff76f..670bb59f 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -102,29 +102,43 @@ async function getPollWithId(req, res) {
     }
 }
 
-function addDiscretePoll(req,res){
-    if (!validateAddDiscretePoll(req.body)) {
-        return res.status(400).json({error: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR});
-    }
-    const question = req.body.question;
-    const choices = req.body.choices;
-    const openVisibility = req.body.openVisibility;
-    const setDueDate = req.body.setDueDate;
-    const numericFieldValue = req.body.numericFieldValue;
-    const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
-    const selectedTimeUnit = req.body.selectedTimeUnit;
-    const username = req.user.name;
+async function addDiscretePoll(req, res) {
+    try {
+        if (!validateAddDiscretePoll(req.body)) {
+            return res.status(400).json({ error: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR });
+        }
 
-    db.addDiscretePoll(question, username, choices, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
-    .then((result) => {
-        res.end(result.toString());
-    })
-    .catch((error) => {
+        const question = req.body.question;
+        const choices = req.body.choices;
+        const openVisibility = req.body.openVisibility;
+        const setDueDate = req.body.setDueDate;
+        const numericFieldValue = req.body.numericFieldValue;
+        const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
+        const selectedTimeUnit = req.body.selectedTimeUnit;
+        const username = req.user.name;
+
+        const result = await db.addDiscretePoll(
+            question,
+            username,
+            choices,
+            openVisibility,
+            setDueDate,
+            dueDatePoll,
+            numericFieldValue,
+            selectedTimeUnit
+        );
+        console.log(result);
+
+        res.json({
+            success: true
+        });
+    } catch (error) {
         console.error(error);
-        res.status(500).json({error: errorCodes.DATABASE_ERROR});
-    });
+        res.status(500).json(error);
+    }
 }
 
+
 function validateAddDiscretePoll(body) {
     if (
         typeof body !== 'object' ||

From a0e1bffccdafebdf6ed4d1bffe769fc962bc02f4 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sat, 25 Nov 2023 17:33:00 +0300
Subject: [PATCH 148/246] due date validation

Due date of a poll cannot be in the past. I have added a validation for it also.
---
 prediction-polls/frontend/src/Pages/Create/index.jsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index 1a374f9f..852324b7 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -31,8 +31,16 @@ function Create() {
                            (pollType === 'multipleChoice' && choices.length < 2) ||
                            (setDueDate && numericFieldValue.trim() === '') ||
                            (setDueDate && dueDatePoll === null) ||
-                           (setDueDate && numericFieldValue <= 0) ||
-                           (pollType === 'customized' && customizedType === '');             
+                           (setDueDate && isFutureDate(dueDatePoll) === false) ||
+                           (setDueDate && numericFieldValue < 0) ||
+                           (pollType === 'customized' && customizedType === '');  
+  
+  function isFutureDate(date) {
+    const currentDate = new Date();
+    return date.isAfter(currentDate);
+  }
+
+  
 
   const handleOpenVisibilityChange = (e) => {
     setOpenVisibility(e.target.checked);

From 4c2e843f7a64f6c64e84a6e3c3267ea2df14e103 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 17:33:40 +0300
Subject: [PATCH 149/246] make addContinuousPoll Async

---
 .../backend/src/repositories/PollDB.js        |  8 +--
 .../backend/src/services/PollService.js       | 54 +++++++++++--------
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 71ca3d54..9d6c7ddf 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -76,7 +76,7 @@ async function addDiscretePoll(question, username, choices, openVisibility, setD
 
         if (!poll_id) {
             await connection.rollback();
-            return false;
+            throw {error: errorCodes.DATABASE_ERROR};
         }
 
         await connection.query(sql_discrete_poll, [poll_id]);
@@ -86,7 +86,7 @@ async function addDiscretePoll(question, username, choices, openVisibility, setD
         }))
 
         await connection.commit();
-        return true;
+        return poll_id;
     } catch (error) {
         console.error('addDiscretePoll(): Database Error');
         await connection.rollback();
@@ -108,13 +108,13 @@ async function addContinuousPoll(question, username, cont_poll_type, openVisibil
 
         if (!poll_id) {
             await connection.rollback();
-            return false;
+            throw {error: errorCodes.DATABASE_ERROR};
         }
 
         await connection.query(sql_continuous_poll, [poll_id, cont_poll_type]);
 
         await connection.commit();
-        return true;
+        return poll_id;
     } catch (error) {
         console.error('addContinuousPoll(): Database Error');
         await connection.rollback();
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 670bb59f..6b166c50 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -127,10 +127,10 @@ async function addDiscretePoll(req, res) {
             numericFieldValue,
             selectedTimeUnit
         );
-        console.log(result);
 
         res.json({
-            success: true
+            success: true,
+            newPollId: result
         });
     } catch (error) {
         console.error(error);
@@ -160,28 +160,40 @@ function validateAddDiscretePoll(body) {
     return true;
 }
 
-function addContinuousPoll(req,res){
-    if (!validateAddContinuousPoll(req.body)) {
-        return res.status(400).json({error: errorCodes.BAD_CONT_POLL_REQUEST_ERROR});
-    }
+async function addContinuousPoll(req, res) {
+    try {
+        if (!validateAddContinuousPoll(req.body)) {
+            return res.status(400).json({ error: errorCodes.BAD_CONT_POLL_REQUEST_ERROR });
+        }
 
-    const question = req.body.question;
-    const cont_poll_type = req.body.cont_poll_type;
-    const openVisibility = req.body.openVisibility;
-    const setDueDate = req.body.setDueDate;
-    const numericFieldValue = req.body.numericFieldValue;
-    const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
-    const selectedTimeUnit = req.body.selectedTimeUnit;
-    const username = req.user.name;
+        const question = req.body.question;
+        const cont_poll_type = req.body.cont_poll_type;
+        const openVisibility = req.body.openVisibility;
+        const setDueDate = req.body.setDueDate;
+        const numericFieldValue = req.body.numericFieldValue;
+        const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
+        const selectedTimeUnit = req.body.selectedTimeUnit;
+        const username = req.user.name;
 
-    db.addContinuousPoll(question, username, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit)
-    .then((result) => {
-        res.end(result.toString());
-    })
-    .catch((error) => {
+        const result = await db.addContinuousPoll(
+            question,
+            username,
+            cont_poll_type,
+            openVisibility,
+            setDueDate,
+            dueDatePoll,
+            numericFieldValue,
+            selectedTimeUnit
+        );
+
+        res.json({
+            success: true,
+            newPollId: result
+        });
+    } catch (error) {
         console.error(error);
-        res.status(500).json({error: errorCodes.DATABASE_ERROR});
-    });
+        res.status(500).json(error);
+    }
 }
 
 function validateAddContinuousPoll(body) {

From a2ed684780795e0a1363266d5298f0ff2b0d7037 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 17:45:50 +0300
Subject: [PATCH 150/246] make voteDiscretePoll async

---
 .../backend/src/services/PollService.js       | 48 ++++++++-----------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 6b166c50..a213b349 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -207,42 +207,34 @@ function validateAddContinuousPoll(body) {
     return true;
 }
 
-function voteDiscretePoll(req,res){
-    const pollId = req.params.pollId;
-    const userId = req.user.id;
-    const choiceId = req.body.choiceId;
-    const points = req.body.points;
-
-    if(points <= 0){
-        res.status(404).json({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
-    }
-
-    db.getDiscretePollChoices(pollId)
-    .then((choices) => {
+async function voteDiscretePoll(req,res){
+    try {
+        const pollId = req.params.pollId;
+        const userId = req.user.id;
+        const choiceId = req.body.choiceId;
+        const points = req.body.points;
+    
+        if (points <= 0) {
+            res.status(404).json({ error: errorCodes.USER_MUST_GIVE_POINTS_ERROR });
+            return;
+        }
+    
+        const choices = await db.getDiscretePollChoices(pollId);
         const choiceExists = choices.some(choice => choice.id === choiceId);
+    
         if (!choiceExists) {
-            res.status(404).json({error: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR});
+            res.status(404).json({ error: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR });
         } else {
-            db.voteDiscretePoll(pollId, userId, choiceId, points ? points : 10)
-            .then(() => {
-                res.status(200).json({ message: "Vote Successful" });
-            })
-            .catch((error) => {
-                if (error) {
-                    res.status(400).json(error);
-                } else {
-                    res.status(500).json({error: errorCodes.DATABASE_ERROR});
-                }
-            })
+            await db.voteDiscretePoll(pollId, userId, choiceId, points ? points : 10);
+            res.status(200).json({ message: "Vote Successful" });
         }
-    })
-    .catch((error) => {
+    } catch (error) {
         if (error) {
             res.status(400).json(error);
         } else {
-            res.status(500).json({error: errorCodes.DATABASE_ERROR});
+            res.status(500).json({ error: errorCodes.DATABASE_ERROR });
         }
-    })
+    }
 }
 
 function voteContinuousPoll(req,res){

From aee1fd85f3a6b5b073851e6bf8f4f783d71b03f6 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 17:48:26 +0300
Subject: [PATCH 151/246] make voteContinuousPoll async

---
 .../backend/src/services/PollService.js       | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index a213b349..b7a9df41 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -237,31 +237,30 @@ async function voteDiscretePoll(req,res){
     }
 }
 
-function voteContinuousPoll(req,res){
-    const pollId = req.params.pollId;
-    const userId = req.user.id;
-    const choice = req.body.choice;
-    const points = req.body.points;
+async function voteContinuousPoll(req, res) {
+    try {
+        const pollId = req.params.pollId;
+        const userId = req.user.id;
+        const choice = req.body.choice;
+        const points = req.body.points;
 
-    if(points <= 0){
-        res.status(404).json({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
-    }
+        if (points <= 0) {
+            res.status(404).json({ error: errorCodes.USER_MUST_GIVE_POINTS_ERROR });
+            return;
+        }
 
-    db.getContinuousPollWithId(pollId)
-    .then((result) => {
+        const result = await db.getContinuousPollWithId(pollId);
         const contPollType = result[0].cont_poll_type;
-        db.voteContinuousPoll(pollId, userId, choice, contPollType, points ? points : 10)
-        .then(() => {
-            res.status(200).json({ message: "Vote Successful" });
-        })
-        .catch((error) => {
-            if (error) {
-                res.status(400).json(error);
-            } else {
-                res.status(500).json({error: errorCodes.DATABASE_ERROR});
-            }
-        })
-    })
+
+        await db.voteContinuousPoll(pollId, userId, choice, contPollType, points ? points : 10);
+        res.status(200).json({ message: "Vote Successful" });
+    } catch (error) {
+        if (error) {
+            res.status(400).json(error);
+        } else {
+            res.status(500).json({ error: errorCodes.DATABASE_ERROR });
+        }
+    }
 }
 
 module.exports = {getPolls, getPollWithId, addDiscretePoll, addContinuousPoll, voteDiscretePoll, voteContinuousPoll}
\ No newline at end of file

From 6f9f454bad0346d2a70f7404e8f67e2ccabdee2f Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 20:46:20 +0300
Subject: [PATCH 152/246] remove openVisibility from cont poll

---
 prediction-polls/backend/src/repositories/PollDB.js  | 4 ++--
 prediction-polls/backend/src/services/PollService.js | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 9d6c7ddf..b2c7420c 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -96,14 +96,14 @@ async function addDiscretePoll(question, username, choices, openVisibility, setD
     }
 }
 
-async function addContinuousPoll(question, username, cont_poll_type, openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
+async function addContinuousPoll(question, username, cont_poll_type, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit){
     const connection = await pool.getConnection();
 
     const sql_poll = 'INSERT INTO polls (question, username, poll_type, openVisibility, setDueDate, closingDate, numericFieldValue, selectedTimeUnit) VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
     const sql_continuous_poll = 'INSERT INTO continuous_polls (id, cont_poll_type) VALUES (?, ?)' 
 
     try {
-        const [resultSetHeader] = await connection.query(sql_poll, [question, username, 'continuous', openVisibility, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
+        const [resultSetHeader] = await connection.query(sql_poll, [question, username, 'continuous', false, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
         poll_id = resultSetHeader.insertId;
 
         if (!poll_id) {
diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index b7a9df41..092870ed 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -168,7 +168,6 @@ async function addContinuousPoll(req, res) {
 
         const question = req.body.question;
         const cont_poll_type = req.body.cont_poll_type;
-        const openVisibility = req.body.openVisibility;
         const setDueDate = req.body.setDueDate;
         const numericFieldValue = req.body.numericFieldValue;
         const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
@@ -179,7 +178,6 @@ async function addContinuousPoll(req, res) {
             question,
             username,
             cont_poll_type,
-            openVisibility,
             setDueDate,
             dueDatePoll,
             numericFieldValue,

From 4f77c71e42dfd9331cb9013d53b115c7b419ba89 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sat, 25 Nov 2023 20:46:35 +0300
Subject: [PATCH 153/246] api request change

Backend api needed continuos poll type while requesting. it is added
---
 prediction-polls/frontend/src/Pages/Create/index.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index 852324b7..b8ee3129 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -40,8 +40,6 @@ function Create() {
     return date.isAfter(currentDate);
   }
 
-  
-
   const handleOpenVisibilityChange = (e) => {
     setOpenVisibility(e.target.checked);
   };
@@ -159,6 +157,7 @@ function Create() {
         dueDatePoll: dueDatePoll ? dueDatePoll.format() : null, // Convert dueDatePoll to a string format if it exists
         numericFieldValue: numericFieldValue,
         selectedTimeUnit: selectedTimeUnit,
+        cont_poll_type: customizedType,
       };
 
       try {
@@ -187,6 +186,7 @@ function Create() {
       const customizedData = {
         question: question,
         setDueDate: setDueDate,
+        cont_poll_type: customizedType,
       };
 
       try {
@@ -218,6 +218,7 @@ function Create() {
         dueDatePoll: dueDatePoll ? dueDatePoll.format() : null, // Convert dueDatePoll to a string format if it exists
         numericFieldValue: numericFieldValue,
         selectedTimeUnit: selectedTimeUnit,
+        cont_poll_type: customizedType,
       };
 
       try {
@@ -246,6 +247,7 @@ function Create() {
       const customizedData = {
         question: question,
         setDueDate: setDueDate,
+        cont_poll_type: customizedType,
       };
 
       try {

From bb1e6f4b97d30654c5b664a7b4e5d6c35f0a1c2c Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 20:58:28 +0300
Subject: [PATCH 154/246] implement voter_count visibility

---
 prediction-polls/backend/src/services/PollService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 092870ed..a7f35a30 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -80,7 +80,7 @@ async function getPollWithId(req, res) {
     
             const choicesWithVoteCount = await Promise.all(choices.map(async (choice) => {
                 const voterCount = await db.getDiscreteVoteCount(choice.id);
-                return { ...choice, voter_count: voterCount };
+                return { ...choice, voter_count: pollObject.openVisibility ? voterCount : null };
             }));
     
             res.json({ ...properties, "options": choicesWithVoteCount });
@@ -94,7 +94,7 @@ async function getPollWithId(req, res) {
     
             const choices = await db.getContinuousPollVotes(pollId);
             const newChoices = choices.map(item => item.float_value ? item.float_value : item.date_value);
-            res.json({ ...properties, "cont_poll_type": contPollRows[0].cont_poll_type, "options": newChoices });
+            res.json({ ...properties, "cont_poll_type": contPollRows[0].cont_poll_type/*, "options": newChoices */});
         }
     } catch (error) {
         console.error(error);

From fc721dd012bf9df30e717b6fb7bb233e9866fde8 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sat, 25 Nov 2023 21:06:28 +0300
Subject: [PATCH 155/246] sidebar apperance

while user is at the create page, create page should be selected from sidebar. I have added it
---
 prediction-polls/frontend/src/Pages/Create/index.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index b8ee3129..8053246b 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -278,9 +278,8 @@ function Create() {
 
   return (
     <div className={styles.page}>
-      <Menu mode="horizontal" defaultSelectedKeys={['create']}>
-        <Menu.Item key="create">Create</Menu.Item>
-      </Menu>
+      
+      <Menu currentPage="Create" /> 
       <div className={styles.createContainer}>
         <div className={styles.questionContainer}>
           <label htmlFor="question">Enter the question title</label>

From b8133850005d6d46bada0098840e541b9ad01451 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 21:31:57 +0300
Subject: [PATCH 156/246] Update schema.sql

---
 prediction-polls/backend/src/schema.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 2ecc25a6..eb9f6291 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -75,7 +75,7 @@ CREATE TABLE profiles (
     userId INT NOT NULL,
     username VARCHAR(255) NOT NULL,
     email VARCHAR(255) NOT NULL,
-    profile_picture MEDIUMBLOB,
+    profile_picture VARCHAR(255),
     biography VARCHAR(5000),
     birthday DATETIME,
     isHidden BOOLEAN DEFAULT False,

From 984ae6f4a4abc0d0fcc53bf24708f3a1e81a80f2 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 21:32:18 +0300
Subject: [PATCH 157/246] Update AuthorizationService.js

---
 prediction-polls/backend/src/services/AuthorizationService.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 6930bb68..25a9de97 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -153,7 +153,7 @@ async function logOut(req, res) {
 function authorizeAccessToken(req, res, next) {
     const authHeader = req.headers["authorization"];
     const token = authHeader && authHeader.split(" ")[1];
-    if (token == null) return res.sendStatus(400).json({ error: errorCodes.ACCESS_TOKEN_NEEDED_ERROR});
+    if (token == null) return res.status(400).json({ error: errorCodes.ACCESS_TOKEN_NEEDED_ERROR});
   
     jwt.verify(token, process.env.ACCESS_TOKEN_SECRET, (err, user) => {
       if (err) return  res.status(401).json({ error: errorCodes.ACCESS_TOKEN_INVALID_ERROR });

From 1d0be4035dc2e8670891f55b0ecd777488ee6722 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 21:32:27 +0300
Subject: [PATCH 158/246] Update package.json

---
 prediction-polls/backend/package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prediction-polls/backend/package.json b/prediction-polls/backend/package.json
index c49485c1..cfab128d 100644
--- a/prediction-polls/backend/package.json
+++ b/prediction-polls/backend/package.json
@@ -11,6 +11,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.456.0",
+    "@aws-sdk/s3-request-presigner": "^3.456.0",
     "aws-sdk": "^2.1502.0",
     "axios": "^1.6.0",
     "bcrypt": "^5.1.1",

From 511f283e3e472ea8b4aaad93a3d4dfef6a9bd8c0 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 21:33:17 +0300
Subject: [PATCH 159/246] Update ProfileService.js

---
 .../backend/src/services/ProfileService.js    | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 22b66ae4..42e08c81 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -1,8 +1,8 @@
 const db = require("../repositories/ProfileDB.js");
 const authDb = require("../repositories/AuthorizationDB.js");
+const crypto = require('crypto');
 const aws = require('aws-sdk');
-const {PutObjectCommand,GetObjectCommand} = require('aws-sdk');
-const { getSignedUrl } = require('aws-sdk');
+const { GetObjectCommand } = require('@aws-sdk/client-s3');
 
 const generateFileName = (bytes = 32) => crypto.randomBytes(bytes).toString('hex');
 
@@ -23,14 +23,20 @@ const s3Client = new aws.S3();
 async function getImagefromS3(imageName){
     const params = {
         Bucket: bucketName,
-        Key: imageName
-      }
-    
-      const command = new GetObjectCommand(params);
-      const seconds = 60
-      const url = await getSignedUrl(s3Client, command, { expiresIn: seconds });
+        Key: imageName,
+        Expires: 60*5 // Time in seconds
+      };
+
+    const command = new GetObjectCommand(params);
     
-      return url
+    try {
+        const signedUrl = await s3Client.getSignedUrl('getObject', params);
+
+        return signedUrl;
+    } catch (error) {
+        console.error("Error generating signed URL:", error);
+        throw {error:error}; 
+    }
 }
 
 async function uploadImagetoS3(req,res){
@@ -48,9 +54,15 @@ async function uploadImagetoS3(req,res){
         ContentType: req.file.mimetype
     }
       
-    await s3Client.send(new PutObjectCommand(uploadParams));
-
-    await db.updateProfile({userId,profile_picture:imageName});
+    try {
+        await s3Client.putObject(uploadParams).promise();
+        console.log(imageName)
+        await db.updateProfile({ userId, profile_picture: imageName });
+        res.status(200).send("Image uploaded successfully!");
+    } catch (error) {
+        console.error("Error uploading image to S3:", error);
+        res.status(500).send({error:error});
+    }
 }
 
 

From 69ccf9857891e2be8c864836371d696ababa2230 Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sat, 25 Nov 2023 21:58:29 +0300
Subject: [PATCH 160/246] url change

the request to backend for sign up was wrong as the url changed. I fixed it.
---
 prediction-polls/frontend/src/Pages/Auth/SignUp/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Auth/SignUp/index.jsx b/prediction-polls/frontend/src/Pages/Auth/SignUp/index.jsx
index b30765cd..ee775ccb 100644
--- a/prediction-polls/frontend/src/Pages/Auth/SignUp/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Auth/SignUp/index.jsx
@@ -33,7 +33,7 @@ function SignUp() {
         formattedValues.birthday = undefined;
       }
 
-      const res = await fetch(process.env.REACT_APP_BACKEND_LINK + "/signup", {
+      const res = await fetch(process.env.REACT_APP_BACKEND_LINK + "/auth/signup", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -152,7 +152,7 @@ function SignUp() {
                 message: "Password must be at least 8 characters!",
               },
               {
-                pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d]{8,}$/,
+                pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d]{8,}$/, 
                 message:
                   "Password must include uppercase, lowercase, and a number!",
               },

From a176f0ab000a32afc04bd86480c6a51b88fcb59e Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:04:13 +0300
Subject: [PATCH 161/246] Handle error management for getUrl

---
 .../backend/src/services/ProfileService.js             | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index 42e08c81..c231d1e9 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -32,10 +32,10 @@ async function getImagefromS3(imageName){
     try {
         const signedUrl = await s3Client.getSignedUrl('getObject', params);
 
-        return signedUrl;
+        return {signedUrl:signedUrl};
     } catch (error) {
         console.error("Error generating signed URL:", error);
-        throw {error:error}; 
+        return {error:error};
     }
 }
 
@@ -81,7 +81,11 @@ async function getProfile(req,res){
         }
 
         if(profile.profile_picture){
-            profile.profile_picture = await getImagefromS3(profile.profile_picture);
+            result = await getImagefromS3(profile.profile_picture);
+            if(result.error){
+                throw result.error;
+            }
+            profile.profile_picture = result.signedUrl;
         }
 
         const {badges,error:badge_error} = await db.getBadges(result.id);

From 77c409662c444b596af91e0867fcd8170f48e6e8 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:29:52 +0300
Subject: [PATCH 162/246] Update swagger of adding profile photo

---
 .../backend/src/routes/ProfileRouter.js       | 37 ++++++++++++++++++-
 .../backend/src/services/ProfileService.js    |  5 +--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index b8db5687..4ce646bc 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -172,7 +172,42 @@ router.get('/myProfile',authenticator.authorizeAccessToken ,service.getMyProfile
  */
 router.get('/:profileId', service.getProfileWithProfileId);
 
-router.post("/photo",authenticator.authorizeAccessToken,upload.single('image'),service.uploadImagetoS3);
+
+/**
+ * @swagger
+ * /profiles/profilePhoto:
+ *   post:
+ *     tags:
+ *       - profiles
+ *     description: Upload profile photo.
+ *     requestBody:
+ *       description: Image content
+ *       required: true
+ *       content:
+ *         multipart/form-data:
+ *           schema:
+ *             type: object
+ *             properties:
+ *               image:
+ *                 type: binary
+ *     responses:
+ *       200:
+ *         description: Successful response
+ *         content:
+ *           application/json:
+ *             schema:
+ *               type: object
+ *               properties:
+ *                 status:
+ *                   type: string
+ *             examples:
+ *               value:
+ *                 status:
+ *                   Image uploaded successfully!
+ *       400:
+ *         description: Bad Request
+ */
+router.post("/profilePhoto",authenticator.authorizeAccessToken,upload.single('image'),service.uploadImagetoS3);
 
 /**
  * @swagger
diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index c231d1e9..aa364245 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -42,10 +42,9 @@ async function getImagefromS3(imageName){
 async function uploadImagetoS3(req,res){
     const userId = req.user.id;
     const file = req.file
-    const caption = req.body.caption
     const imageName = generateFileName()
 
-    const fileBuffer = req.file.buffer
+    const fileBuffer = file.buffer
     
     const uploadParams = {
         Bucket: bucketName,
@@ -58,7 +57,7 @@ async function uploadImagetoS3(req,res){
         await s3Client.putObject(uploadParams).promise();
         console.log(imageName)
         await db.updateProfile({ userId, profile_picture: imageName });
-        res.status(200).send("Image uploaded successfully!");
+        res.status(200).send({status:"Image uploaded successfully!"});
     } catch (error) {
         console.error("Error uploading image to S3:", error);
         res.status(500).send({error:error});

From dcdc94faa1753efb0450181f6a006b48d20275a1 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sat, 25 Nov 2023 22:33:22 +0300
Subject: [PATCH 163/246] bugfix checkCredentials

---
 .../src/repositories/AuthorizationDB.js       |  2 +-
 .../src/services/AuthorizationService.js      | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/AuthorizationDB.js b/prediction-polls/backend/src/repositories/AuthorizationDB.js
index f1e64025..db6bb5a1 100644
--- a/prediction-polls/backend/src/repositories/AuthorizationDB.js
+++ b/prediction-polls/backend/src/repositories/AuthorizationDB.js
@@ -34,7 +34,7 @@ async function checkCredentials(username, password) {
         const [rows] = await pool.query(sql, values);
         return rows;
     } catch (error) {
-        return {error:errorCodes.WRONG_PASSWORD};
+        throw {error:errorCodes.WRONG_PASSWORD};
     }
 }
 
diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 25a9de97..4c5bb063 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -127,17 +127,22 @@ async function logIn(req,res){
     // Authorize User  
     const username = req.body.username;
     const password = req.body.password;
-
-    let [userAuthenticated] = await db.checkCredentials(username,password);
-    if (!userAuthenticated) {
-      return res.status(401).json({ error: errorCodes.USER_NOT_FOUND });
+    try {
+      let [userAuthenticated] = await db.checkCredentials(username,password);
+      if (!userAuthenticated) {
+        return res.status(401).json({ error: errorCodes.USER_NOT_FOUND });
+      }
+
+      const user = {name : username, id: userAuthenticated.id};
+      const accesToken = generateAccessToken(user);
+      const refreshToken = generateRefreshToken(user);
+      await db.addRefreshToken(refreshToken);
+      res.status(201).json({accessToken: accesToken, refreshToken: refreshToken})
+
+    } catch (error) {
+        return res.status(401).json({ error: errorCodes.USER_NOT_FOUND });
     }
 
-    const user = {name : username, id: userAuthenticated.id};
-    const accesToken = generateAccessToken(user);
-    const refreshToken = generateRefreshToken(user);
-    await db.addRefreshToken(refreshToken);
-    res.status(201).json({accessToken: accesToken, refreshToken: refreshToken})
 }
 
 async function logOut(req, res) {

From 58927588f38580f71214d7d080e8d4b9c1eaac5e Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:34:55 +0300
Subject: [PATCH 164/246] Remove console.log

---
 prediction-polls/backend/src/services/ProfileService.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index aa364245..e8af9dc5 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -26,15 +26,12 @@ async function getImagefromS3(imageName){
         Key: imageName,
         Expires: 60*5 // Time in seconds
       };
-
-    const command = new GetObjectCommand(params);
     
     try {
         const signedUrl = await s3Client.getSignedUrl('getObject', params);
 
         return {signedUrl:signedUrl};
     } catch (error) {
-        console.error("Error generating signed URL:", error);
         return {error:error};
     }
 }
@@ -55,11 +52,9 @@ async function uploadImagetoS3(req,res){
       
     try {
         await s3Client.putObject(uploadParams).promise();
-        console.log(imageName)
         await db.updateProfile({ userId, profile_picture: imageName });
         res.status(200).send({status:"Image uploaded successfully!"});
     } catch (error) {
-        console.error("Error uploading image to S3:", error);
         res.status(500).send({error:error});
     }
 }

From a20077be81d21c39362e0adf1b3e89f9c77a2263 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Sat, 25 Nov 2023 22:47:40 +0300
Subject: [PATCH 165/246] Hot fix

---
 prediction-polls/backend/src/services/ProfileService.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index e8af9dc5..a86d9e7c 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -75,11 +75,11 @@ async function getProfile(req,res){
         }
 
         if(profile.profile_picture){
-            result = await getImagefromS3(profile.profile_picture);
-            if(result.error){
-                throw result.error;
+            const image_result = await getImagefromS3(profile.profile_picture);
+            if(image_result.error){
+                throw image_result.error;
             }
-            profile.profile_picture = result.signedUrl;
+            profile.profile_picture = image_result.signedUrl;
         }
 
         const {badges,error:badge_error} = await db.getBadges(result.id);

From e0d63ccc07ffcdeb89712c427bddb8d6dd742403 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Sun, 26 Nov 2023 02:21:11 +0300
Subject: [PATCH 166/246] create poll vote viewmodel

---
 .../domain/poll/VotePollRepository.kt         | 12 ++++
 .../domain/poll/VotePollUseCase.kt            | 21 ++++++
 .../ui/vote/PollVoteScreenUiState.kt          |  6 +-
 .../ui/vote/PollVoteViewModel.kt              | 66 +++++++++++++++++++
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollUseCase.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt
new file mode 100644
index 00000000..ecea4cd9
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt
@@ -0,0 +1,12 @@
+package com.bounswe.predictionpolls.domain.poll
+
+import com.bounswe.predictionpolls.common.Result
+
+interface VotePollRepository {
+
+    suspend fun voteForDiscretePoll(pollId: String, points: Int, voteId: String): Result<Unit>
+
+
+    suspend fun voteForContinuousPoll(pollId: String, points: Int, voteInput: String): Result<Unit>
+
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollUseCase.kt
new file mode 100644
index 00000000..7edb41f7
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollUseCase.kt
@@ -0,0 +1,21 @@
+package com.bounswe.predictionpolls.domain.poll
+
+import com.bounswe.predictionpolls.common.Result
+import javax.inject.Inject
+
+class VotePollUseCase @Inject constructor(
+    private val votePollRepository: VotePollRepository
+) {
+
+    suspend fun voteForDiscretePoll(pollId: String, points: Int, voteId: String): Result<Unit> {
+        return votePollRepository.voteForDiscretePoll(pollId, points, voteId)
+    }
+
+    suspend fun voteForContinuousPoll(
+        pollId: String,
+        points: Int,
+        voteInput: String
+    ): Result<Unit> {
+        return votePollRepository.voteForContinuousPoll(pollId, points, voteInput)
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt
index a901f0ca..04712930 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreenUiState.kt
@@ -8,12 +8,14 @@ sealed interface PollVoteScreenUiState {
     data class DiscretePoll(
         val poll: Poll.DiscretePoll,
         val currentVoteId: String?,
-        val currentPointsReserved: Int
+        val currentPointsReserved: Int,
+        val toastMessage: String?
     ) : PollVoteScreenUiState
 
     data class ContinuousPoll(
         val poll: Poll.ContinuousPoll,
         val currentVoteInput: String?,
-        val currentPointsReserved: Int
+        val currentPointsReserved: Int,
+        val toastMessage: String?
     ) : PollVoteScreenUiState
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
new file mode 100644
index 00000000..6bac2f45
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
@@ -0,0 +1,66 @@
+package com.bounswe.predictionpolls.ui.vote
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.poll.VotePollUseCase
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+
+@HiltViewModel
+class PollVoteViewModel @Inject constructor(private val votePollUseCase: VotePollUseCase) :
+    ViewModel() {
+
+    private val _state = MutableStateFlow<PollVoteScreenUiState>(PollVoteScreenUiState.Loading)
+
+    val state: StateFlow<PollVoteScreenUiState>
+        get() = _state.asStateFlow()
+
+    fun voteForDiscretePoll(pollId: String, points: Int, voteId: String) = viewModelScope.launch {
+        when (val result = votePollUseCase.voteForContinuousPoll(pollId, points, voteId)) {
+            is Result.Success -> {
+                _state.update { (it as PollVoteScreenUiState.DiscretePoll).copy(toastMessage = "Successfully voted") }
+            }
+
+            is Result.Error -> {
+                _state.update { (it as PollVoteScreenUiState.DiscretePoll).copy(toastMessage = "Error: ${result.exception.message}") }
+            }
+        }
+    }
+
+    fun voteForContinuousPoll(pollId: String, points: Int, voteInput: String) =
+        viewModelScope.launch {
+            when (val result = votePollUseCase.voteForContinuousPoll(pollId, points, voteInput)) {
+                is Result.Success -> {
+                    _state.update { (it as PollVoteScreenUiState.ContinuousPoll).copy(toastMessage = "Successfully voted") }
+                }
+
+                is Result.Error -> {
+                    _state.update { (it as PollVoteScreenUiState.ContinuousPoll).copy(toastMessage = "Error: ${result.exception.message}") }
+                }
+            }
+        }
+
+    fun consumeToastMessage() = viewModelScope.launch {
+        when (val state = _state.value) {
+            is PollVoteScreenUiState.DiscretePoll -> {
+                _state.update { state.copy(toastMessage = null) }
+            }
+
+            is PollVoteScreenUiState.ContinuousPoll -> {
+                _state.update { state.copy(toastMessage = null) }
+            }
+
+            else -> {
+                // do nothing
+            }
+        }
+    }
+
+}
\ No newline at end of file

From 20e949d00b4d71c130022a9e693e0cbead763686 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Sun, 26 Nov 2023 02:45:26 +0300
Subject: [PATCH 167/246] update poll

---
 .../data/feed/model/PollResponse.kt           |  2 +
 .../data/remote/services/PollService.kt       | 17 ++++++
 .../data/vote/DiscreteVotePollRequest.kt      |  6 ++
 .../data/vote/VotePollRepository.kt           | 58 +++++++++++++++++++
 .../data/vote/VotePollResponse.kt             |  6 ++
 .../predictionpolls/di/VotePollModule.kt      | 17 ++++++
 .../predictionpolls/domain/poll/Poll.kt       |  3 +
 .../ui/vote/PollVoteNavGraph.kt               | 58 +++++++++++++++++++
 .../ui/vote/PollVoteViewModel.kt              | 41 +++++++++++++
 9 files changed, 208 insertions(+)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollResponse.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/VotePollModule.kt
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
index 662957f3..fdfa30ff 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
@@ -46,6 +46,7 @@ data class PollResponse(
         when (pollType) {
             "continuous" -> {
                 Poll.ContinuousPoll(
+                    polId = id.toString(),
                     creatorProfilePictureUri = creatorImage,
                     dueDate = closingDate,
                     pollCreatorName = creatorName,
@@ -71,6 +72,7 @@ data class PollResponse(
                     )
                 }
                 Poll.DiscretePoll(
+                    polId = id.toString(),
                     creatorProfilePictureUri = creatorImage,
                     dueDate = closingDate,
                     pollCreatorName = creatorName,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
index 6809067f..205168bc 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
@@ -2,8 +2,12 @@ package com.bounswe.predictionpolls.data.remote.services
 
 import com.bounswe.predictionpolls.data.remote.model.request.CreateContinuousPollRequest
 import com.bounswe.predictionpolls.data.remote.model.request.CreateDiscretePollRequest
+import com.bounswe.predictionpolls.data.vote.ContinuousPollRequest
+import com.bounswe.predictionpolls.data.vote.DiscreteVotePollRequest
+import com.bounswe.predictionpolls.data.vote.VotePollResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
+import retrofit2.http.Path
 
 interface PollService {
     @POST("/polls/discrete")
@@ -15,4 +19,17 @@ interface PollService {
     suspend fun createContinuousPoll(
         @Body createContinuousPollRequest: CreateContinuousPollRequest
     )
+
+    @POST("/polls/discrete/{pollId}/vote")
+    suspend fun voteForDiscretePoll(
+        @Path("pollId") pollId: String,
+        @Body discretePollRequest: DiscreteVotePollRequest
+    ): VotePollResponse
+
+    @POST("/polls/continuous/{pollId}/vote")
+    suspend fun voteForContinuousPoll(
+        @Path("pollId") pollId: String,
+        @Body continuousPollRequest: ContinuousPollRequest
+    ): VotePollResponse
+
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt
new file mode 100644
index 00000000..bfe469a3
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt
@@ -0,0 +1,6 @@
+package com.bounswe.predictionpolls.data.vote
+
+data class DiscreteVotePollRequest(val choiceId: String, val points: String)
+
+data class ContinuousPollRequest(val choice: String, val points: String)
+
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
new file mode 100644
index 00000000..80765acd
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
@@ -0,0 +1,58 @@
+package com.bounswe.predictionpolls.data.vote
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.data.remote.services.PollService
+import com.bounswe.predictionpolls.domain.poll.VotePollRepository
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class VotePollRepositoryImpl @Inject constructor(
+    private val votePollApi: PollService
+) : VotePollRepository {
+    override suspend fun voteForDiscretePoll(
+        pollId: String,
+        points: Int,
+        voteId: String
+    ): Result<Unit> =
+        withContext(Dispatchers.IO) {
+            try {
+                val result = votePollApi.voteForDiscretePoll(
+                    pollId,
+                    DiscreteVotePollRequest(
+                        voteId,
+                        points.toString()
+                    )
+                )
+                if (result.error != null) {
+                    return@withContext Result.Error(Exception(result.error))
+                }
+                return@withContext Result.Success(Unit)
+            } catch (e: Exception) {
+                return@withContext Result.Error(e)
+            }
+        }
+
+    override suspend fun voteForContinuousPoll(
+        pollId: String,
+        points: Int,
+        voteInput: String
+    ): Result<Unit> =
+        withContext(Dispatchers.IO) {
+            try {
+                val result = votePollApi.voteForContinuousPoll(
+                    pollId,
+                    ContinuousPollRequest(
+                        points.toString(),
+                        voteInput
+                    )
+                )
+                if (result.error != null) {
+                    return@withContext Result.Error(Exception(result.error))
+                }
+                return@withContext Result.Success(Unit)
+            } catch (e: Exception) {
+                return@withContext Result.Error(e)
+            }
+        }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollResponse.kt
new file mode 100644
index 00000000..c215014c
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollResponse.kt
@@ -0,0 +1,6 @@
+package com.bounswe.predictionpolls.data.vote
+
+
+data class VotePollResponse(
+    val error: String?
+)
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/VotePollModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/VotePollModule.kt
new file mode 100644
index 00000000..859524f8
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/VotePollModule.kt
@@ -0,0 +1,17 @@
+package com.bounswe.predictionpolls.di
+
+import com.bounswe.predictionpolls.data.vote.VotePollRepositoryImpl
+import com.bounswe.predictionpolls.domain.poll.VotePollRepository
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+
+@InstallIn(ViewModelComponent::class)
+@Module
+abstract class VotePollModule {
+    @Binds
+    abstract fun bindVotePollRepository(
+        votePollRepositoryImpl: VotePollRepositoryImpl
+    ): VotePollRepository
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
index 3060bc9a..cc79a702 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/Poll.kt
@@ -5,6 +5,7 @@ import kotlinx.collections.immutable.ImmutableList
 
 @Immutable
 sealed interface Poll {
+    val polId: String
     val creatorProfilePictureUri: String?
     val pollCreatorName: String
     val pollQuestionTitle: String
@@ -14,6 +15,7 @@ sealed interface Poll {
     val tags: List<String>
 
     data class ContinuousPoll(
+        override val polId: String,
         override val creatorProfilePictureUri: String?,
         override val dueDate: String?,
         override val pollCreatorName: String,
@@ -25,6 +27,7 @@ sealed interface Poll {
     ) : Poll
 
     data class DiscretePoll(
+        override val polId: String,
         override val creatorProfilePictureUri: String?,
         override val dueDate: String?,
         override val pollCreatorName: String,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
new file mode 100644
index 00000000..19162e76
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
@@ -0,0 +1,58 @@
+package com.bounswe.predictionpolls.ui.vote
+
+import androidx.compose.runtime.getValue
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+
+const val POLL_VOTE_ROUTE = "pollVote"
+
+fun NavGraphBuilder.pollVoteScreen(navController: NavController) {
+    composable(POLL_VOTE_ROUTE) {
+        val pollVoteViewModel: PollVoteViewModel = hiltViewModel()
+
+        // Accessing state from ViewModel
+        val state by pollVoteViewModel.state.collectAsStateWithLifecycle()
+
+        // PollVoteScreen Composable
+        PollVoteScreen(
+            state = state,
+            onPointsReservedChanged = { points ->
+                pollVoteViewModel.onPointsReservedChanged(points)
+            },
+            onVotePressed = {
+                // Assuming you have pollId, points, and voteInput available
+                when (state) {
+                    is PollVoteScreenUiState.DiscretePoll -> {
+                        val pollId = (state as PollVoteScreenUiState.DiscretePoll).poll.polId
+                        val points =
+                            (state as PollVoteScreenUiState.DiscretePoll).currentPointsReserved
+                        val voteInput = (state as PollVoteScreenUiState.DiscretePoll).currentVoteId
+                        voteInput?.let {
+                            pollVoteViewModel.onVotePressed(pollId, points, voteInput)
+                        }
+                    }
+
+                    is PollVoteScreenUiState.ContinuousPoll -> {
+                        val pollId = (state as PollVoteScreenUiState.ContinuousPoll).poll.polId
+                        val points =
+                            (state as PollVoteScreenUiState.ContinuousPoll).currentPointsReserved
+                        val voteInput =
+                            (state as PollVoteScreenUiState.ContinuousPoll).currentVoteInput
+                        voteInput?.let {
+                            pollVoteViewModel.onVotePressed(pollId, points, voteInput)
+                        }
+                    }
+
+                    else -> {
+                    }
+                }
+            },
+            onVoteInputChanged = { voteInput ->
+                pollVoteViewModel.onVoteInputChanged(voteInput)
+            },
+        )
+    }
+}
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
index 6bac2f45..8f2872a6 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
@@ -22,6 +22,47 @@ class PollVoteViewModel @Inject constructor(private val votePollUseCase: VotePol
     val state: StateFlow<PollVoteScreenUiState>
         get() = _state.asStateFlow()
 
+    fun onPointsReservedChanged(points: Int) {
+        // Update the state with the new points value
+        _state.update { currentState ->
+            when (currentState) {
+                is PollVoteScreenUiState.DiscretePoll -> currentState.copy(currentPointsReserved = points)
+                is PollVoteScreenUiState.ContinuousPoll -> currentState.copy(currentPointsReserved = points)
+                else -> currentState
+            }
+        }
+    }
+
+
+    fun onVoteInputChanged(voteInput: String) {
+        _state.update { currentState ->
+            when (currentState) {
+                is PollVoteScreenUiState.DiscretePoll -> currentState.copy(currentVoteId = voteInput)
+                is PollVoteScreenUiState.ContinuousPoll -> currentState.copy(currentVoteInput = voteInput)
+                else -> currentState
+            }
+        }
+    }
+
+
+    fun onVotePressed(pollId: String, points: Int, voteInput: String) {
+        when (_state.value) {
+            is PollVoteScreenUiState.DiscretePoll -> {
+                // Assuming voteInput is the id of the selected option in discrete polls
+                voteForDiscretePoll(pollId, points, voteInput)
+            }
+
+            is PollVoteScreenUiState.ContinuousPoll -> {
+                // For continuous polls, voteInput is the input value
+                voteForContinuousPoll(pollId, points, voteInput)
+            }
+
+            else -> {
+                // Handle other states if necessary
+            }
+        }
+    }
+
     fun voteForDiscretePoll(pollId: String, points: Int, voteId: String) = viewModelScope.launch {
         when (val result = votePollUseCase.voteForContinuousPoll(pollId, points, voteId)) {
             is Result.Success -> {

From b18f0d35623964ba4240bc1c43203ddacaecacfd Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Sun, 26 Nov 2023 02:53:03 +0300
Subject: [PATCH 168/246] implement nav graph

---
 .../data/remote/services/PollService.kt       |  7 ++++
 .../data/vote/VotePollRepository.kt           | 15 ++++++++
 .../domain/poll/VotePollRepository.kt         |  2 +-
 .../ui/vote/PollVoteNavGraph.kt               |  6 +++-
 .../ui/vote/PollVoteViewModel.kt              | 35 ++++++++++++++++++-
 5 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
index 205168bc..b5fa221d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/PollService.kt
@@ -1,11 +1,13 @@
 package com.bounswe.predictionpolls.data.remote.services
 
+import com.bounswe.predictionpolls.data.feed.model.PollResponse
 import com.bounswe.predictionpolls.data.remote.model.request.CreateContinuousPollRequest
 import com.bounswe.predictionpolls.data.remote.model.request.CreateDiscretePollRequest
 import com.bounswe.predictionpolls.data.vote.ContinuousPollRequest
 import com.bounswe.predictionpolls.data.vote.DiscreteVotePollRequest
 import com.bounswe.predictionpolls.data.vote.VotePollResponse
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
 
@@ -32,4 +34,9 @@ interface PollService {
         @Body continuousPollRequest: ContinuousPollRequest
     ): VotePollResponse
 
+
+    @GET("/polls/{pollId}")
+    suspend fun getPoll(
+        @Path("pollId") pollId: String
+    ): PollResponse
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
index 80765acd..0040397d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
@@ -2,6 +2,7 @@ package com.bounswe.predictionpolls.data.vote
 
 import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.data.remote.services.PollService
+import com.bounswe.predictionpolls.domain.poll.Poll
 import com.bounswe.predictionpolls.domain.poll.VotePollRepository
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -10,6 +11,20 @@ import javax.inject.Inject
 class VotePollRepositoryImpl @Inject constructor(
     private val votePollApi: PollService
 ) : VotePollRepository {
+
+    override suspend fun fetchPoll(pollId: String): Result<Poll> =
+        withContext(Dispatchers.IO) {
+            try {
+                val result = votePollApi.getPoll(pollId)
+                result.predictionPollsError?.message?.let {
+                    return@withContext Result.Error(Exception(it))
+                }
+                return@withContext Result.Success(result.toPollDomainModel())
+            } catch (e: Exception) {
+                return@withContext Result.Error(e)
+            }
+        }
+
     override suspend fun voteForDiscretePoll(
         pollId: String,
         points: Int,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt
index ecea4cd9..4a2ce8f4 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/poll/VotePollRepository.kt
@@ -6,7 +6,7 @@ interface VotePollRepository {
 
     suspend fun voteForDiscretePoll(pollId: String, points: Int, voteId: String): Result<Unit>
 
-
+    suspend fun fetchPoll(pollId: String): Result<Poll>
     suspend fun voteForContinuousPoll(pollId: String, points: Int, voteInput: String): Result<Unit>
 
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
index 19162e76..011de715 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
@@ -1,5 +1,6 @@
 package com.bounswe.predictionpolls.ui.vote
 
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -12,9 +13,12 @@ const val POLL_VOTE_ROUTE = "pollVote"
 fun NavGraphBuilder.pollVoteScreen(navController: NavController) {
     composable(POLL_VOTE_ROUTE) {
         val pollVoteViewModel: PollVoteViewModel = hiltViewModel()
-
+        val pollId: String = "" // TODO: Fetch this from navcontroller
         // Accessing state from ViewModel
         val state by pollVoteViewModel.state.collectAsStateWithLifecycle()
+        LaunchedEffect(key1 = Unit) {
+            pollVoteViewModel.fetchPoll(pollId)
+        }
 
         // PollVoteScreen Composable
         PollVoteScreen(
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
index 8f2872a6..3b9ae281 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
@@ -3,6 +3,8 @@ package com.bounswe.predictionpolls.ui.vote
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.poll.Poll
+import com.bounswe.predictionpolls.domain.poll.VotePollRepository
 import com.bounswe.predictionpolls.domain.poll.VotePollUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -14,7 +16,9 @@ import javax.inject.Inject
 
 
 @HiltViewModel
-class PollVoteViewModel @Inject constructor(private val votePollUseCase: VotePollUseCase) :
+class PollVoteViewModel @Inject constructor(
+    private val votePollUseCase: VotePollUseCase, private val votePollRepository: VotePollRepository
+) :
     ViewModel() {
 
     private val _state = MutableStateFlow<PollVoteScreenUiState>(PollVoteScreenUiState.Loading)
@@ -22,6 +26,35 @@ class PollVoteViewModel @Inject constructor(private val votePollUseCase: VotePol
     val state: StateFlow<PollVoteScreenUiState>
         get() = _state.asStateFlow()
 
+
+    fun fetchPoll(pollId: String) = viewModelScope.launch {
+        when (val result = votePollRepository.fetchPoll(pollId)) {
+            is Result.Success -> {
+                when (val poll = result.data) {
+                    is Poll.DiscretePoll -> {
+                        _state.update { PollVoteScreenUiState.DiscretePoll(poll, "", 0, null) }
+                    }
+
+                    is Poll.ContinuousPoll -> {
+                        _state.update { PollVoteScreenUiState.ContinuousPoll(poll, "", 0, null) }
+                    }
+
+                    else -> {
+                        // Handle other poll types if necessary
+                    }
+                }
+            }
+
+            is Result.Error -> {
+                _state.update {
+                    PollVoteScreenUiState.Error(
+                        result.exception.message ?: "Unknown error"
+                    )
+                }
+            }
+        }
+    }
+
     fun onPointsReservedChanged(points: Int) {
         // Update the state with the new points value
         _state.update { currentState ->

From 9fa2c93f9b5f511f80461ff0e633fdb5eb6cdd30 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 11:56:02 +0300
Subject: [PATCH 169/246] hotfix addContinuousPoll Rollback

---
 prediction-polls/backend/src/repositories/PollDB.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index b2c7420c..f1770399 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -103,6 +103,7 @@ async function addContinuousPoll(question, username, cont_poll_type, setDueDate,
     const sql_continuous_poll = 'INSERT INTO continuous_polls (id, cont_poll_type) VALUES (?, ?)' 
 
     try {
+        await connection.beginTransaction();
         const [resultSetHeader] = await connection.query(sql_poll, [question, username, 'continuous', false, setDueDate, dueDatePoll, numericFieldValue, selectedTimeUnit]);
         poll_id = resultSetHeader.insertId;
 

From 00841f5d0331ad04d52a56de258726ab88d9ed98 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 12:27:44 +0300
Subject: [PATCH 170/246] remove authorization requirement

---
 prediction-polls/backend/src/routes/PollRouter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 2cd91737..e4326ae1 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -250,7 +250,7 @@ router.get('/', service.getPolls);
  *                     message: Error while accessing the database.
  *                     code: 3004
  */
-router.get('/:pollId', authenticator.authorizeAccessToken, service.getPollWithId);
+router.get('/:pollId', service.getPollWithId);
 
 /**
  * @swagger

From 20ca2687b696fceba4ec721f983f956a1301bc01 Mon Sep 17 00:00:00 2001
From: Ali Nasra <52269552+AliNasra@users.noreply.github.com>
Date: Sun, 26 Nov 2023 13:25:26 +0300
Subject: [PATCH 171/246] Improvements

---
 .../src/Components/PollCard/index.jsx         |  26 ++-
 .../src/Components/PollOption/index.jsx       |   4 +-
 .../frontend/src/Pages/Vote/index.jsx         | 207 ++++++++++++++----
 3 files changed, 181 insertions(+), 56 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index f7421ee8..91c2010b 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -6,8 +6,10 @@ import { ReactComponent as CommentIcon } from "../../Assets/icons/Comment.svg";
 import { ReactComponent as ShareIcon } from "../../Assets/icons/Share.svg";
 import { ReactComponent as ReportIcon } from "../../Assets/icons/Warning.svg";
 import PollOption from "../PollOption";
+import { Input,DatePicker } from 'antd';
 
-function PollCard({ PollData }) {
+
+function PollCard({ PollData ,setAnswer}) {
   const [selectedArray, setSelectedArray] = React.useState(
     !PollData.isCustomPoll ? Array(PollData["options"].length).fill(false) : []
   );
@@ -22,6 +24,7 @@ function PollCard({ PollData }) {
     var newPoll = JSON.parse(JSON.stringify(PollData));
     for (let i = 0; i < PollData["options"].length; i++) {
       if (newList[i] == true) {
+        setAnswer(PollData["options"][i].id);
         newPoll["options"][i]["votes"] = newPoll["options"][i]["votes"] + 1;
         break;
       }
@@ -64,18 +67,27 @@ function PollCard({ PollData }) {
               );
             })}
           </div>
-        ) : (
+        ) :pollData.cont_poll_type == "date"? (
           <div className={styles.customOptionWrapper}>
             <p className={styles.customOptionText}>
-              Enter a {PollData.optionType}
+              Enter a date
             </p>
-            <input
+            <DatePicker
               className={styles.customOption}
               type={PollData.optionType}
-              onClick={() => navigate("/vote")}
-            ></input>
+              onChange={(_, dateString) => setAnswer(dateString)}
+            ></DatePicker>
           </div>
-        )}
+        ):(<div className={styles.customOptionWrapper}>
+          <p className={styles.customOptionText}>
+            Enter a number
+          </p>
+          <Input
+            className={styles.customOption}
+            type={PollData.optionType}
+            onChange={(e) => setAnswer(e.target.value)}
+          ></Input>
+        </div>)}
         <div className={styles.actionButtons}>
           <div className={styles.buttonWrapper}>
             <button className={styles.commentButton}>
diff --git a/prediction-polls/frontend/src/Components/PollOption/index.jsx b/prediction-polls/frontend/src/Components/PollOption/index.jsx
index fd84004a..ff05e6ad 100644
--- a/prediction-polls/frontend/src/Components/PollOption/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollOption/index.jsx
@@ -48,9 +48,9 @@ function PollOption({
         }
         style={{ width: `${widthPercentage}%` }}
       ></div>
-      <div className={styles.textDiv}>{option.title}</div>
+      <div className={styles.textDiv}>{option.choice_text}</div>
       <div className={styles.optionPoints}>
-        <p>{option.votes}</p>
+        <p>{option.voter_count}</p>
       </div>
     </div>
   );
diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index ef4b6d66..e5680199 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -1,71 +1,184 @@
-import React from "react";
 import Menu from "../../Components/Menu";
 import PollCard from "../../Components/PollCard";
 import styles from "./Vote.module.css";
 import pollData from "../../MockData/PollData.json"
 import PointsButton from "../../Components/PointsButton";
 import pointData from "../../MockData/PointList.json"
-import { Button, InputNumber} from 'antd';
-import {useParams} from 'react-router-dom';
+import { Button, Input } from 'antd';
+import { useParams } from 'react-router-dom';
+import { useNavigate } from "react-router-dom";
+import React, { useState, useEffect } from 'react';
+
 
 
 function Vote() {
-  let {id} = useParams();
+  let { id } = useParams();
   let parsedID = parseInt(id);
-  const [polldata, setPolldata] = React.useState(pollData.pollList[parsedID-1]);
-  const [sentence, setSentence] = React.useState((polldata.isCustomPoll == true) ? "Please enter a suitable answer to the poll" : "Choose the option you want to vote for ");
-  const [betPoint, setBetPoint] = React.useState(0);
-  const [message, setMessage] = React.useState("");
-  const [selectedOption, setSelectedOption] = React.useState();
-  
-  const handleVoting = () =>{
-
-  };
   const retrievePoll = async () => {
     try {
       const requestOptions = {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          id: parsedID,
-        })
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+          //'Authorization': `Bearer ${localStorage.getItem("accessToken")}`
+        },
       };
-      const response = await fetch(process.env.REACT_APP_BACKEND_LINK+'/vote', requestOptions);
+      let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/${parsedID}`
+      const response = await fetch(url, requestOptions);
       const data = await response.json();
-    
-    if (response.status === 200 && data.poll ) {
-    } 
+      if (response.status === 200 && data) {
+        if (data.pollType == "discrete") {
+          data.isCustomPoll = false;
+        }
+        else {
+          data.isCustomPoll = true;
+        }
+        data.closingDate = data.closingDate.slice(0, 10);
+        return data;
+      }
+      else {
+        navigate("/feed");
+      }
+    }
+    catch (error) {
+      navigate("/feed");
+    }
+  };
+  const fetchData = async () => {
+    try {
+      const result = await retrievePoll();
+      setPolldata(result);
+      setSentence((result.isCustomPoll) ? "Please enter a suitable answer to the poll" : "Choose the option you want to vote for ");
+    } catch (error) {
+      console.error('Error fetching data:', error);
+    } finally {
+      setLoaded(true);
+    }
+  };
+
+
+  const navigate = useNavigate();
+  const [polldata, setPolldata] = React.useState(null);
+  const [sentence, setSentence] = React.useState(null);
+  const [betPoint, setBetPoint] = React.useState(0);
+  const [message, setMessage] = React.useState("");
+  const [selectedOption, setSelectedOption] = React.useState();
+  const [isLoaded, setLoaded] = React.useState(false);
+  const [answer, setAnswer] = React.useState(null);
+
+  useEffect(() => {
+    fetchData();
+  }, []);
+
+
+  const handleVoting = async () => {
+    try {
+      if (polldata.pollType == "discrete" && /^[0-9]*$/.test(betPoint) == true) {
+        console.log("Hello");
+        const requestOptions = {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`
+          },
+          body: JSON.stringify({
+            choiceId: answer,
+            points: parseInt(betPoint)
+          })
+        };
+        let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/discrete/${parsedID}/vote`
+        const response = await fetch(url, requestOptions);
+        if (response.status === 200) {
+        }
+        else {
+        }
+      }
+      else if (polldata.pollType == "continuous" && /^[0-9]*$/.test(betPoint) == true) {
+        if (polldata.cont_poll_type == "date") {
+          const requestOptions = {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+              'Authorization': `Bearer ${localStorage.getItem("accessToken")}`
+            },
+            body: JSON.stringify({
+              choice: answer,
+              points: parseInt(betPoint)
+            })
+          };
+          let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/continuous/${parsedID}/vote`
+          const response = await fetch(url, requestOptions);
+          if (response.status === 200) {
+
+          }
+          else {
+
+          }
+        }
+        else {
+          if (/^[0-9]*$/.test(answer) == true) {
+            const requestOptions = {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${localStorage.getItem("accessToken")}`
+              },
+              body: JSON.stringify({
+                choice: answer,
+                points: parseInt(betPoint)
+              })
+            };
+            let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/continuous/${parsedID}/vote`
+            const response = await fetch(url, requestOptions);
+            if (response.status === 200) {
+
+            }
+            else {
+
+            }
+          }
+          else{
+            
+          }
+        }
+      }
+      else {
+
+      }
     }
     catch (error) {
+      navigate("/feed");
     }
   };
-  
-  return (
-    <div className={styles.page}>
-      <Menu currentPage="Vote" />
-      <div className={styles.page_row}>
-        <div className={styles.poll}>
-          <PollCard PollData={polldata} />
+
+  if (isLoaded == true) {
+    return (
+      <div className={styles.page}>
+        <Menu currentPage="Vote" />
+        <div className={styles.page_row}>
+          <div className={styles.poll}>
+            <PollCard PollData={polldata} setAnswer={setAnswer} />
+          </div>
+          <div className={styles.choice_column}>
+            <PointsButton points={pointData.points} />
+            <div className={styles.infoText}><div>{sentence}</div>
+              <div className={styles.chooseText}>How many points do you want to place?</div>
+              <div><Input
+                id="bet"
+                className={styles.inputStyle}
+                placeholder=""
+                onChange={(e) => setBetPoint(e.target.value)}
+              /></div>
+              <div className={styles.buttonDivStyle}><Button
+                className={styles.bottonStyle}
+                onClick={handleVoting}
+              >Vote</Button></div>
+              <div className={styles.messageStyle}>{message}</div>
+            </div></div>
         </div>
-        <div className={styles.choice_column}>
-          <PointsButton points={pointData.points} />
-          <div className={styles.infoText}><div>{sentence}</div>
-            <div className={styles.chooseText}>How many points do you want to place?</div>
-            <div><InputNumber
-              id="bet"
-              className={styles.inputStyle}
-              placeholder=""
-              onChange={(e) => setBetPoint(e.target.value)}
-            /></div>
-            <div className={styles.buttonDivStyle}><Button
-              className={styles.bottonStyle}
-              onClick={handleVoting}
-            >Vote</Button></div>
-            <div className={styles.messageStyle}>{message}</div>
-          </div></div>
       </div>
-    </div>
-  );
+    );
+  }
 }
 
 export default Vote;

From 72e8a56cb105bcc52362f039da0e232fa6305b22 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 14:10:15 +0300
Subject: [PATCH 172/246] fix rejectVotes null

---
 prediction-polls/backend/src/services/PollService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index a7f35a30..7e9682a8 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -18,7 +18,7 @@ async function getPolls(req,res){
                 "creatorImage": null,
                 "pollType": pollObject.poll_type,
                 "closingDate": pollObject.closingDate,
-                "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+                "rejectVotes": (pollObject.numericFieldValue && pollObject.selectedTimeUnit) ? `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}` : null,
                 "isOpen": true,
                 "comments": []
             };
@@ -70,7 +70,7 @@ async function getPollWithId(req, res) {
             "creatorImage": null,
             "pollType": pollObject.poll_type,
             "closingDate": pollObject.closingDate,
-            "rejectVotes": `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}`,
+            "rejectVotes": (pollObject.numericFieldValue && pollObject.selectedTimeUnit) ? `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}` : null,
             "isOpen": true,
             "comments": []
         };

From 4177ab7fe93d21eb5deaded61a86a2f3af386d67 Mon Sep 17 00:00:00 2001
From: Ali Nasra <52269552+AliNasra@users.noreply.github.com>
Date: Sun, 26 Nov 2023 15:36:17 +0300
Subject: [PATCH 173/246] Adding UI responses and improving visibility

---
 .../frontend/src/Components/PollCard/index.jsx |  7 +++++--
 .../PollOption/PollOption.module.css           |  7 +++++++
 .../src/Components/PollOption/index.jsx        |  7 +++++--
 .../frontend/src/Pages/Vote/Vote.module.css    |  2 +-
 .../frontend/src/Pages/Vote/index.jsx          | 18 +++++++++---------
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index 91c2010b..ec7d0a02 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -17,7 +17,7 @@ function PollCard({ PollData ,setAnswer}) {
     JSON.parse(JSON.stringify(PollData))
   );
   var totalPoints = !PollData.isCustomPoll
-    ? PollData.options.reduce((acc, curr) => acc + curr.votes, 0)
+    ? PollData.options.reduce((acc, curr) => curr.votes == null? acc :acc + curr.votes, 0)
     : 0;
   const handleSelect = (newList) => {
     setSelectedArray(newList);
@@ -52,7 +52,10 @@ function PollCard({ PollData ,setAnswer}) {
         {!pollData.isCustomPoll ? (
           <div className={styles.optionList}>
             {pollData.options.map((option, index) => {
-              const widthPercentage = (option.votes / totalPoints) * 100;
+              let widthPercentage = 0;
+              if (totalPoints > 0){
+                widthPercentage = (option.votes / totalPoints) * 100;
+              }
               return (
                 <PollOption
                   widthPercentage={widthPercentage}
diff --git a/prediction-polls/frontend/src/Components/PollOption/PollOption.module.css b/prediction-polls/frontend/src/Components/PollOption/PollOption.module.css
index b34e42a9..2190cb1c 100644
--- a/prediction-polls/frontend/src/Components/PollOption/PollOption.module.css
+++ b/prediction-polls/frontend/src/Components/PollOption/PollOption.module.css
@@ -40,6 +40,13 @@
   font-weight: normal;
   z-index: 2;
 }
+.optionPoints_hidden {
+  font-size: 14px;
+  font-weight: normal;
+  z-index: 2;
+  visibility: hidden;
+}
+
 .backgroundDiv {
   position: absolute;
   top: 0;
diff --git a/prediction-polls/frontend/src/Components/PollOption/index.jsx b/prediction-polls/frontend/src/Components/PollOption/index.jsx
index ff05e6ad..4528fd11 100644
--- a/prediction-polls/frontend/src/Components/PollOption/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollOption/index.jsx
@@ -49,9 +49,12 @@ function PollOption({
         style={{ width: `${widthPercentage}%` }}
       ></div>
       <div className={styles.textDiv}>{option.choice_text}</div>
-      <div className={styles.optionPoints}>
+      {option.voter_count == null ? <div className={styles.optionPoints_hidden}>
+        <p>{"1"}</p>
+      </div> : <div className={styles.optionPoints}>
         <p>{option.voter_count}</p>
-      </div>
+      </div>}
+
     </div>
   );
 }
diff --git a/prediction-polls/frontend/src/Pages/Vote/Vote.module.css b/prediction-polls/frontend/src/Pages/Vote/Vote.module.css
index 644411ac..eef0a812 100644
--- a/prediction-polls/frontend/src/Pages/Vote/Vote.module.css
+++ b/prediction-polls/frontend/src/Pages/Vote/Vote.module.css
@@ -66,7 +66,7 @@
 .messageStyle{
     margin-top: 20px;
     justify-content: center;
-    color: var(--warning-600);
+    color: var(--primary-900);
     font-weight: 700;
     font-size: 16px;
 }
diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index e5680199..80eaa7b6 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -1,7 +1,6 @@
 import Menu from "../../Components/Menu";
 import PollCard from "../../Components/PollCard";
 import styles from "./Vote.module.css";
-import pollData from "../../MockData/PollData.json"
 import PointsButton from "../../Components/PointsButton";
 import pointData from "../../MockData/PointList.json"
 import { Button, Input } from 'antd';
@@ -74,7 +73,6 @@ function Vote() {
   const handleVoting = async () => {
     try {
       if (polldata.pollType == "discrete" && /^[0-9]*$/.test(betPoint) == true) {
-        console.log("Hello");
         const requestOptions = {
           method: 'POST',
           headers: {
@@ -89,8 +87,10 @@ function Vote() {
         let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/discrete/${parsedID}/vote`
         const response = await fetch(url, requestOptions);
         if (response.status === 200) {
+          setMessage("Voted successfully!");
         }
         else {
+          setMessage("An unexpected has error occurred!");
         }
       }
       else if (polldata.pollType == "continuous" && /^[0-9]*$/.test(betPoint) == true) {
@@ -109,10 +109,10 @@ function Vote() {
           let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/continuous/${parsedID}/vote`
           const response = await fetch(url, requestOptions);
           if (response.status === 200) {
-
+            setMessage("Voted successfully!");
           }
           else {
-
+            setMessage("An unexpected has error occurred!");
           }
         }
         else {
@@ -131,19 +131,19 @@ function Vote() {
             let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/continuous/${parsedID}/vote`
             const response = await fetch(url, requestOptions);
             if (response.status === 200) {
-
+              setMessage("Voted successfully!");
             }
             else {
-
+              setMessage("An unexpected has error occurred!");
             }
           }
-          else{
-            
+          else {
+            setMessage("The response should be numeric!");
           }
         }
       }
       else {
-
+        setMessage("The bet points should be integer numbers!");
       }
     }
     catch (error) {

From 091d001935f0001bd67b9651c2e94d170051d26d Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 15:38:02 +0300
Subject: [PATCH 174/246] fix login navigation

---
 .../ui/leaderboard/LeaderboardScreenNavigation.kt               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt
index dc17a400..25425dde 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt
@@ -6,7 +6,7 @@ import androidx.navigation.NavOptions
 import androidx.navigation.Navigator
 import androidx.navigation.compose.composable
 
-const val LEADERBOARD_ROUTE = "login"
+const val LEADERBOARD_ROUTE = "LEADERBOARD"
 
 fun NavGraphBuilder.leaderboardScreen(navController: NavController) {
     composable(LEADERBOARD_ROUTE) {

From 3027ae6f6bff447980a9b15169bdb35e419e96bf Mon Sep 17 00:00:00 2001
From: Ali Nasra <52269552+AliNasra@users.noreply.github.com>
Date: Sun, 26 Nov 2023 16:01:26 +0300
Subject: [PATCH 175/246] Handling the case of undefined due dates

---
 prediction-polls/frontend/src/Components/PollCard/index.jsx | 6 +++---
 prediction-polls/frontend/src/Pages/Vote/index.jsx          | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index ec7d0a02..0db10303 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -132,11 +132,11 @@ function PollCard({ PollData ,setAnswer}) {
         </div>
         <div className={styles.textGroup}>
           <p className={styles.textDescription}>Closing In</p>
-          <p className={styles.textDetail}>{PollData.closingDate}</p>
+          <p className={styles.textDetail}>{PollData.closingDate == null? "Indefinite":PollData.closingDate}</p>
         </div>
         <div className={styles.textGroup}>
-          <p className={styles.textDescription}>Reject Votes In</p>
-          <p className={styles.textDetail}>Last {PollData.rejectVotes}</p>
+          <p className={styles.textDescription}>{PollData.closingDate == null?" ":"Reject Votes In"}</p>
+          <p className={styles.textDetail}>{PollData.closingDate == null?" ":"Last"} {PollData.rejectVotes}</p>
         </div>
       </div>
     </div>
diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index 80eaa7b6..d7b3e3b2 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -32,7 +32,9 @@ function Vote() {
         else {
           data.isCustomPoll = true;
         }
-        data.closingDate = data.closingDate.slice(0, 10);
+        if (data.closingDate != null){
+          data.closingDate = data.closingDate.slice(0, 10);
+        }
         return data;
       }
       else {

From 3da32fb688927feac222225cf8a25999932562be Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 16:27:16 +0300
Subject: [PATCH 176/246] implement appbar

---
 .../bounswe/predictionpolls/MainActivity.kt   | 41 +++++++++---
 .../predictionpolls/ui/common/CommonAppbar.kt | 62 +++++++++++++++++++
 .../ui/common/NavigationDrawer.kt             | 10 +--
 .../LeaderboardScreenNavigation.kt            |  2 +-
 .../bounswe/predictionpolls/utils/NavItem.kt  | 18 +++---
 5 files changed, 113 insertions(+), 20 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index a8562404..e6941793 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -3,8 +3,14 @@ package com.bounswe.predictionpolls
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import com.bounswe.predictionpolls.ui.common.CommonAppbar
+import com.bounswe.predictionpolls.ui.common.NavigationDrawer
 import com.bounswe.predictionpolls.ui.create.createPollScreen
 import com.bounswe.predictionpolls.ui.feed.feedScreen
 import com.bounswe.predictionpolls.ui.leaderboard.leaderboardScreen
@@ -14,6 +20,7 @@ import com.bounswe.predictionpolls.ui.main.mainScreen
 import com.bounswe.predictionpolls.ui.profile.profileScreen
 import com.bounswe.predictionpolls.ui.signup.signupScreen
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
+import com.bounswe.predictionpolls.utils.NavItem
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -23,14 +30,32 @@ class MainActivity : ComponentActivity() {
         setContent {
             PredictionPollsTheme {
                 val navController = rememberNavController()
-                NavHost(navController = navController, startDestination = MAIN_ROUTE) {
-                    mainScreen(navController)
-                    loginScreen(navController)
-                    signupScreen(navController)
-                    feedScreen(navController)
-                    leaderboardScreen(navController)
-                    createPollScreen()
-                    profileScreen(navController)
+                val routesWithDrawer = remember { NavItem.entries.map { it.route }.toSet() }
+                val currentBackStack = navController.currentBackStackEntryAsState()
+                val currentRoute = rememberUpdatedState(currentBackStack.value?.destination?.route)
+
+                NavigationDrawer(
+                    selectedRoute = currentRoute.value,
+                    onButtonClick = {
+                        navController.navigate(it.route)
+                    }
+                ) { toggleDrawerState ->
+                    Column {
+                        CommonAppbar(
+                            isVisible = currentRoute.value in routesWithDrawer,
+                            onMenuClick = { toggleDrawerState() },
+                            onNotificationClick = { /*TODO implement notification */ }
+                        )
+                        NavHost(navController = navController, startDestination = MAIN_ROUTE) {
+                            mainScreen(navController)
+                            loginScreen(navController)
+                            signupScreen(navController)
+                            feedScreen(navController)
+                            leaderboardScreen(navController)
+                            createPollScreen()
+                            profileScreen(navController)
+                        }
+                    }
                 }
             }
         }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt
new file mode 100644
index 00000000..d9f3d76c
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt
@@ -0,0 +1,62 @@
+package com.bounswe.predictionpolls.ui.common
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.bounswe.predictionpolls.R
+
+@Composable
+fun CommonAppbar(
+    isVisible: Boolean = true,
+    onMenuClick: () -> Unit = {},
+    onNotificationClick: () -> Unit = {},
+) {
+    if (!isVisible) return
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween
+    ) {
+        IconButton(
+            onClick = {
+                onMenuClick()
+            },
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_hamburger),
+                contentDescription = null,
+                modifier = Modifier.size(40.dp)
+            )
+        }
+        IconButton(
+            onClick = {
+                onNotificationClick()
+            },
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_notification),
+                contentDescription = null,
+                modifier = Modifier.size(40.dp)
+            )
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun CommonAppbarPreview() {
+    CommonAppbar()
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
index 4914ee5b..f9eea829 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
@@ -43,10 +43,14 @@ typealias ToggleDrawerState = () -> Unit
 @Composable
 fun NavigationDrawer(
     modifier: Modifier = Modifier,
-    selectedNavItem: NavItem,
+    selectedRoute: String? = null,
     onButtonClick: (NavItem) -> Unit = {},
     content: @Composable (ToggleDrawerState) -> Unit = {}
 ) {
+    val selectedNavItem = remember(selectedRoute) {
+        NavItem.values().firstOrNull { it.route == selectedRoute }
+    }
+
     val drawerState = remember {
         DrawerState(
             initialValue = DrawerValue.Closed
@@ -170,9 +174,7 @@ fun NavigationDrawerPreview() {
     PredictionPollsTheme(
         darkTheme = false
     ) {
-        NavigationDrawer(
-            selectedNavItem = NavItem.FEED
-        ) {
+        NavigationDrawer {
             Button(onClick = {
                 it()
             }) {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt
index 25425dde..fb09d1f3 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenNavigation.kt
@@ -6,7 +6,7 @@ import androidx.navigation.NavOptions
 import androidx.navigation.Navigator
 import androidx.navigation.compose.composable
 
-const val LEADERBOARD_ROUTE = "LEADERBOARD"
+const val LEADERBOARD_ROUTE = "leaderboard"
 
 fun NavGraphBuilder.leaderboardScreen(navController: NavController) {
     composable(LEADERBOARD_ROUTE) {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
index 78c25992..e3a20856 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
@@ -3,6 +3,10 @@ package com.bounswe.predictionpolls.utils
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.bounswe.predictionpolls.R
+import com.bounswe.predictionpolls.ui.create.CREATE_POLL_ROUTE
+import com.bounswe.predictionpolls.ui.feed.FEED_ROUTE
+import com.bounswe.predictionpolls.ui.leaderboard.LEADERBOARD_ROUTE
+import com.bounswe.predictionpolls.ui.profile.PROFILE_SCREEN_ROUTE
 
 enum class NavItem(
     val route: String,
@@ -10,37 +14,37 @@ enum class NavItem(
     @DrawableRes val iconId: Int
 ) {
     PROFILE(
-        route = "profile",
+        route = PROFILE_SCREEN_ROUTE,
         titleId = R.string.nav_drawer_profile,
         iconId = R.drawable.ic_profile
     ),
     FEED(
-        route = "feed",
+        route = FEED_ROUTE,
         titleId = R.string.nav_drawer_feed,
         iconId = R.drawable.ic_feed
     ),
     VOTE_POLL(
-        route = "vote_poll",
+        route = "vote_poll", // TODO: change this route with the actual route
         titleId = R.string.nav_drawer_vote,
         iconId = R.drawable.ic_vote
     ),
     CREATE_POLL(
-        route = "create_poll",
+        route = CREATE_POLL_ROUTE,
         titleId = R.string.nav_drawer_create,
         iconId = R.drawable.ic_create
     ),
     MODERATION(
-        route = "moderation",
+        route = "moderation", // TODO: change this route with the actual route
         titleId = R.string.nav_drawer_moderation,
         iconId = R.drawable.ic_moderation
     ),
     LEADERBOARD(
-        route = "leaderboard",
+        route = LEADERBOARD_ROUTE,
         titleId = R.string.nav_drawer_leaderboard,
         iconId = R.drawable.ic_leaderboard
     ),
     NOTIFICATIONS(
-        route = "notifications",
+        route = "notifications", // TODO: change this route with the actual route
         titleId = R.string.nav_drawer_notifications,
         iconId = R.drawable.ic_notifications
     ),

From a444bc8b02a2351ac0f3b189c2ada43f55859d8f Mon Sep 17 00:00:00 2001
From: Enes Furkan Arslan <enfurars@gmail.com>
Date: Sun, 26 Nov 2023 16:36:39 +0300
Subject: [PATCH 177/246] Tests for create poll page

I have written tests for functionalities of all parts of the page. They have passed succesfully.
---
 .../frontend/src/Pages/Create/Create.test.js  | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 prediction-polls/frontend/src/Pages/Create/Create.test.js

diff --git a/prediction-polls/frontend/src/Pages/Create/Create.test.js b/prediction-polls/frontend/src/Pages/Create/Create.test.js
new file mode 100644
index 00000000..5fcb8dd8
--- /dev/null
+++ b/prediction-polls/frontend/src/Pages/Create/Create.test.js
@@ -0,0 +1,122 @@
+import React from 'react';
+import { render, fireEvent } from '@testing-library/react';
+import Create from './index.jsx'; 
+import { MemoryRouter } from 'react-router-dom';
+
+describe('Create', () => {
+  test('renders Create component', () => {
+    render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+  });
+
+  test('allows the user to fill the question input', () => {
+    const { getByLabelText } = render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+    const input = getByLabelText('Enter the question title');
+    fireEvent.change(input, { target: { value: 'Test Question' } });
+    expect(input.value).toBe('Test Question');
+  });
+
+  test('allows the user to select multiple choice as poll type', () => {
+    const { getByText } = render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+    const button = getByText('Multiple Choice');
+    fireEvent.click(button);
+    expect(button).toHaveStyle({ backgroundColor: 'var(--secondary-500)' }); 
+  });
+
+  test('allows the user to select customized as poll type', () => {
+    const { getByText } = render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+    const button = getByText('Customized');
+    fireEvent.click(button);
+    expect(button).toHaveStyle({ backgroundColor: 'var(--secondary-500)' }); 
+  });
+
+  test('allows the user to select date when customized is selected', () => { 
+    const { getByText } = render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+    const button = getByText('Customized');
+    fireEvent.click(button);
+    const addButton = getByText('Date'); 
+    fireEvent.click(addButton);
+    expect(addButton).toHaveStyle({ backgroundColor: 'var(--secondary-500)' });  
+  });
+
+  test('allows the user to select numeric when customized is selected', () => { 
+    const { getByText } = render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+    const button = getByText('Customized');
+    fireEvent.click(button);
+    const addButton = getByText('Numeric'); 
+    fireEvent.click(addButton);
+    expect(addButton).toHaveStyle({ backgroundColor: 'var(--secondary-500)' });  
+  });
+
+  test('allows the user to set a due date', () => {
+    const { getByLabelText } = render(
+      <MemoryRouter>
+        <Create />
+      </MemoryRouter>
+    );
+    const checkbox = getByLabelText('Set Due Date');
+    fireEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
+  });
+
+  test('allows the user to add a choice when multiple choice is selected', () => {
+    const { getByText } = render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+    const button = getByText('Multiple Choice');
+    fireEvent.click(button);
+    const addButton = getByText('+ Add');
+    fireEvent.click(addButton);
+    const choiceInput = document.querySelector('.ant-input');
+    expect(choiceInput).toBeInTheDocument();
+  });
+
+  test('allows the user to open distribution visibility', () => {
+    const { getByLabelText, getByText } = render(
+      <MemoryRouter>
+        <Create />
+      </MemoryRouter>
+    );
+    const button = getByText('Multiple Choice');
+    fireEvent.click(button);
+    const checkbox = getByLabelText('Open Distribution Visibility');
+    fireEvent.click(checkbox);
+    expect(checkbox).toBeChecked();
+  });
+
+  test('allows the user to submit poll', () => {
+    const { getByText } = render(
+        <MemoryRouter>
+          <Create />
+        </MemoryRouter>
+      );
+    const button = getByText('Create Poll');
+    fireEvent.click(button);
+    expect(button).toHaveStyle({ backgroundColor: 'var(--secondary-500)' }); 
+  });
+});
\ No newline at end of file

From 2f046c61c2ec14998e0edbf5842cc3a529ea54a2 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 16:40:40 +0300
Subject: [PATCH 178/246] add cd to the app bar

---
 .../bounswe/predictionpolls/ui/common/CommonAppbar.kt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt
index d9f3d76c..6ec172c3 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/CommonAppbar.kt
@@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.bounswe.predictionpolls.R
@@ -26,7 +27,7 @@ fun CommonAppbar(
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(horizontal = 16.dp, vertical = 8.dp),
+            .padding(horizontal = 8.dp, vertical = 8.dp),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
@@ -37,8 +38,8 @@ fun CommonAppbar(
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_hamburger),
-                contentDescription = null,
-                modifier = Modifier.size(40.dp)
+                contentDescription = stringResource(id = R.string.cd_menu),
+                modifier = Modifier.size(32.dp)
             )
         }
         IconButton(
@@ -48,8 +49,8 @@ fun CommonAppbar(
         ) {
             Icon(
                 painter = painterResource(id = R.drawable.ic_notification),
-                contentDescription = null,
-                modifier = Modifier.size(40.dp)
+                contentDescription = stringResource(id = R.string.cd_notification),
+                modifier = Modifier.size(32.dp)
             )
         }
     }

From daffd71dac37b893e5878fff3d6581d3251ded03 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 16:41:01 +0300
Subject: [PATCH 179/246] adjust create poll screen paddings

---
 .../com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt   | 2 +-
 prediction-polls/android/app/src/main/res/values/strings.xml    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
index 61aa4ae5..5b40843e 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
@@ -144,7 +144,7 @@ private fun CreatePollScreenUI(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .padding(top = 24.dp, start = 16.dp, end = 16.dp)
+            .padding(start = 16.dp, end = 16.dp)
             .verticalScroll(scrollState),
         verticalArrangement = Arrangement.spacedBy(24.dp)
     ) {
diff --git a/prediction-polls/android/app/src/main/res/values/strings.xml b/prediction-polls/android/app/src/main/res/values/strings.xml
index 50faf5d9..a2b528de 100644
--- a/prediction-polls/android/app/src/main/res/values/strings.xml
+++ b/prediction-polls/android/app/src/main/res/values/strings.xml
@@ -57,6 +57,8 @@
     <!-- Content Descriptions -->
     <string name="cd_app_title">App Title</string>
     <string name="cd_back">Back Button</string>
+    <string name="cd_menu">Open menu</string>
+    <string name="cd_notification">Open notifications</string>
     <string name="cd_welcome_page_image">Welcome page image</string>
     <string name="cd_nav_item">Navigation drawer item: %1$s</string>
     <string name="cd_poll_profile_picture">Poll Profile Picture</string>

From 139667ac94a75d9fe76381d6580bfc008400cce2 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 17:06:52 +0300
Subject: [PATCH 180/246] add auth button to drawer

---
 .../ui/common/NavigationDrawer.kt             | 77 +++++++++++++++----
 .../bounswe/predictionpolls/utils/NavItem.kt  | 23 ++++--
 .../app/src/main/res/drawable/ic_settings.xml | 20 +++++
 .../app/src/main/res/values/strings.xml       |  3 +
 4 files changed, 103 insertions(+), 20 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/res/drawable/ic_settings.xml

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
index f9eea829..433e51de 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
@@ -5,15 +5,17 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.Divider
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -45,6 +47,8 @@ fun NavigationDrawer(
     modifier: Modifier = Modifier,
     selectedRoute: String? = null,
     onButtonClick: (NavItem) -> Unit = {},
+    isSignedIn: Boolean = true,
+    onAuthButtonClick: () -> Unit = {},
     content: @Composable (ToggleDrawerState) -> Unit = {}
 ) {
     val selectedNavItem = remember(selectedRoute) {
@@ -75,7 +79,9 @@ fun NavigationDrawer(
         scrimColor = Color.Transparent,
         drawerContent = {
             ModalDrawerSheet(
-                modifier = Modifier.width(IntrinsicSize.Max),
+                modifier = Modifier
+                    .width(IntrinsicSize.Max)
+                    .padding(bottom = 8.dp),
                 drawerContainerColor = MaterialTheme.colorScheme.background,
                 drawerContentColor = MaterialTheme.colorScheme.onBackground,
             ) {
@@ -85,16 +91,18 @@ fun NavigationDrawer(
                         .fillMaxWidth(),
                 ) {
                     NavItem.values().forEach { navItem ->
-                        Column {
-                            Divider()
-                            NavDrawerItem(
-                                navItem = navItem,
-                                isSelected = selectedNavItem == navItem,
-                                onButtonClick = onButtonClick
-                            )
-                        }
+                        NavDrawerItem(
+                            navItem = navItem,
+                            isSelected = selectedNavItem == navItem,
+                            onButtonClick = onButtonClick
+                        )
                     }
                 }
+                Spacer(modifier = Modifier.weight(1f))
+                AuthButton(
+                    isSignedIn = isSignedIn,
+                    onAuthButtonClick = onAuthButtonClick
+                )
             }
         },
         content = {
@@ -118,6 +126,49 @@ private fun AppTitle() {
     )
 }
 
+@Composable
+private fun AuthButton(
+    isSignedIn: Boolean,
+    onAuthButtonClick: () -> Unit = {}
+) {
+    val textId = if (isSignedIn) {
+        R.string.nav_drawer_signout
+    } else {
+        R.string.nav_drawer_signin
+    }
+
+    val color = if (isSignedIn) {
+        MaterialTheme.colorScheme.onError
+    } else {
+        MaterialTheme.colorScheme.onPrimary
+    }
+
+    val backgroundColor = if (isSignedIn) {
+        MaterialTheme.colorScheme.error
+    } else {
+        MaterialTheme.colorScheme.primary
+    }
+
+    Button(
+        onClick = {
+            onAuthButtonClick()
+        },
+        shape = RoundedCornerShape(8.dp),
+        colors = ButtonDefaults.buttonColors(
+            containerColor = backgroundColor,
+        ),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+    ) {
+        Text(
+            text = stringResource(id = textId),
+            color = color,
+            style = MaterialTheme.typography.bodyMedium,
+        )
+    }
+}
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun NavDrawerItem(
@@ -142,9 +193,6 @@ private fun NavDrawerItem(
         onClick = {
             onButtonClick(navItem)
         },
-        elevation = CardDefaults.cardElevation(
-            defaultElevation = 1.dp
-        )
     ) {
         Row(
             modifier = Modifier
@@ -162,7 +210,8 @@ private fun NavDrawerItem(
                 ),
             )
             Text(
-                text = stringResource(id = navItem.titleId)
+                text = stringResource(id = navItem.titleId),
+                style = MaterialTheme.typography.bodyMedium,
             )
         }
     }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
index e3a20856..b267e8b1 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
@@ -11,12 +11,14 @@ import com.bounswe.predictionpolls.ui.profile.PROFILE_SCREEN_ROUTE
 enum class NavItem(
     val route: String,
     @StringRes val titleId: Int,
-    @DrawableRes val iconId: Int
+    @DrawableRes val iconId: Int,
+    requiresAuth: Boolean = false,
 ) {
     PROFILE(
         route = PROFILE_SCREEN_ROUTE,
         titleId = R.string.nav_drawer_profile,
-        iconId = R.drawable.ic_profile
+        iconId = R.drawable.ic_profile,
+        requiresAuth = true
     ),
     FEED(
         route = FEED_ROUTE,
@@ -26,17 +28,20 @@ enum class NavItem(
     VOTE_POLL(
         route = "vote_poll", // TODO: change this route with the actual route
         titleId = R.string.nav_drawer_vote,
-        iconId = R.drawable.ic_vote
+        iconId = R.drawable.ic_vote,
+        requiresAuth = true
     ),
     CREATE_POLL(
         route = CREATE_POLL_ROUTE,
         titleId = R.string.nav_drawer_create,
-        iconId = R.drawable.ic_create
+        iconId = R.drawable.ic_create,
+        requiresAuth = true
     ),
     MODERATION(
         route = "moderation", // TODO: change this route with the actual route
         titleId = R.string.nav_drawer_moderation,
-        iconId = R.drawable.ic_moderation
+        iconId = R.drawable.ic_moderation,
+        requiresAuth = true
     ),
     LEADERBOARD(
         route = LEADERBOARD_ROUTE,
@@ -46,6 +51,12 @@ enum class NavItem(
     NOTIFICATIONS(
         route = "notifications", // TODO: change this route with the actual route
         titleId = R.string.nav_drawer_notifications,
-        iconId = R.drawable.ic_notifications
+        iconId = R.drawable.ic_notifications,
+        requiresAuth = true
+    ),
+    SETTINGS(
+        route = "settings", // TODO: change this route with the actual route
+        titleId = R.string.nav_drawer_settings,
+        iconId = R.drawable.ic_settings,
     ),
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/res/drawable/ic_settings.xml b/prediction-polls/android/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 00000000..967e1cd0
--- /dev/null
+++ b/prediction-polls/android/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="50dp"
+    android:height="50dp"
+    android:viewportWidth="50"
+    android:viewportHeight="50">
+  <path
+      android:pathData="M42.396,18.589L41.633,18.165C41.514,18.099 41.456,18.066 41.399,18.032C40.83,17.691 40.35,17.22 40,16.657C39.965,16.6 39.932,16.541 39.864,16.423C39.796,16.306 39.762,16.246 39.73,16.188C39.417,15.601 39.247,14.948 39.237,14.283C39.236,14.217 39.236,14.148 39.238,14.013L39.253,13.127C39.277,11.709 39.289,10.998 39.09,10.36C38.913,9.793 38.617,9.271 38.221,8.828C37.774,8.327 37.156,7.969 35.917,7.256L34.888,6.663C33.653,5.951 33.035,5.595 32.38,5.46C31.8,5.339 31.201,5.345 30.623,5.475C29.971,5.621 29.361,5.986 28.141,6.717L28.135,6.72L27.397,7.161C27.281,7.231 27.222,7.266 27.163,7.299C26.584,7.621 25.936,7.799 25.273,7.821C25.207,7.823 25.139,7.823 25.003,7.823C24.868,7.823 24.797,7.823 24.73,7.821C24.066,7.799 23.417,7.62 22.837,7.296C22.778,7.264 22.72,7.228 22.603,7.158L21.861,6.713C20.634,5.976 20.019,5.607 19.363,5.46C18.783,5.329 18.182,5.326 17.6,5.447C16.942,5.585 16.324,5.943 15.089,6.66L15.083,6.663L14.067,7.253L14.056,7.259C12.831,7.97 12.217,8.326 11.774,8.825C11.381,9.268 11.087,9.789 10.911,10.354C10.712,10.994 10.723,11.706 10.747,13.131L10.762,14.015C10.764,14.149 10.768,14.216 10.767,14.282C10.757,14.948 10.585,15.602 10.27,16.19C10.239,16.248 10.206,16.306 10.139,16.422C10.072,16.538 10.039,16.595 10.004,16.651C9.653,17.218 9.171,17.691 8.599,18.033C8.542,18.066 8.482,18.099 8.365,18.164L7.612,18.581C6.359,19.276 5.732,19.624 5.276,20.118C4.873,20.556 4.568,21.075 4.382,21.64C4.172,22.279 4.172,22.995 4.175,24.428L4.178,25.599C4.181,27.023 4.186,27.734 4.397,28.368C4.583,28.93 4.885,29.446 5.286,29.881C5.74,30.372 6.36,30.718 7.604,31.41L8.35,31.825C8.477,31.896 8.541,31.931 8.602,31.967C9.17,32.309 9.648,32.781 9.996,33.344C10.034,33.405 10.07,33.468 10.142,33.595C10.214,33.719 10.25,33.782 10.283,33.844C10.589,34.423 10.752,35.066 10.764,35.72C10.765,35.79 10.764,35.862 10.761,36.006L10.747,36.855C10.723,38.284 10.712,38.999 10.912,39.64C11.089,40.207 11.385,40.729 11.781,41.172C12.227,41.673 12.847,42.03 14.086,42.744L15.114,43.337C16.349,44.048 16.967,44.404 17.622,44.54C18.202,44.66 18.801,44.655 19.379,44.525C20.033,44.379 20.645,44.012 21.868,43.28L22.605,42.839C22.721,42.769 22.78,42.734 22.839,42.701C23.419,42.379 24.065,42.2 24.728,42.178C24.795,42.176 24.863,42.176 24.999,42.176C25.135,42.176 25.203,42.176 25.27,42.178C25.934,42.2 26.585,42.38 27.165,42.703C27.216,42.732 27.268,42.762 27.358,42.816L28.141,43.287C29.369,44.024 29.982,44.392 30.639,44.539C31.219,44.669 31.82,44.675 32.402,44.553C33.059,44.416 33.679,44.056 34.914,43.34L35.945,42.741C37.17,42.03 37.785,41.673 38.228,41.174C38.621,40.732 38.916,40.211 39.092,39.645C39.289,39.011 39.277,38.304 39.254,36.9L39.238,35.984C39.236,35.85 39.236,35.784 39.237,35.718C39.246,35.052 39.416,34.397 39.73,33.81C39.762,33.751 39.795,33.693 39.862,33.577C39.929,33.461 39.964,33.403 39.999,33.347C40.35,32.781 40.832,32.307 41.405,31.966C41.461,31.932 41.518,31.9 41.633,31.837L41.637,31.835L42.39,31.418C43.643,30.723 44.271,30.375 44.727,29.881C45.13,29.443 45.434,28.925 45.62,28.36C45.829,27.724 45.828,27.012 45.825,25.596L45.822,24.4C45.819,22.976 45.817,22.265 45.606,21.631C45.42,21.069 45.116,20.553 44.715,20.118C44.262,19.627 43.641,19.282 42.399,18.591L42.396,18.589Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#464B4F"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16.667,25C16.667,29.602 20.398,33.333 25.001,33.333C29.603,33.333 33.334,29.602 33.334,25C33.334,20.397 29.603,16.667 25.001,16.667C20.398,16.667 16.667,20.397 16.667,25Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#464B4F"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/prediction-polls/android/app/src/main/res/values/strings.xml b/prediction-polls/android/app/src/main/res/values/strings.xml
index a2b528de..55896f44 100644
--- a/prediction-polls/android/app/src/main/res/values/strings.xml
+++ b/prediction-polls/android/app/src/main/res/values/strings.xml
@@ -9,6 +9,9 @@
     <string name="nav_drawer_moderation">Moderation</string>
     <string name="nav_drawer_leaderboard">Leaderboard</string>
     <string name="nav_drawer_notifications">Notifications</string>
+    <string name="nav_drawer_settings">Settings</string>
+    <string name="nav_drawer_signin">Sign in</string>
+    <string name="nav_drawer_signout">Sign out</string>
 
     <!-- Welcome Page -->
     <string name="welcome_page_title">Welcome To</string>

From d21b25d298626bcdd72a5a916bf9b67ec2d86f24 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 17:29:48 +0300
Subject: [PATCH 181/246] fix auth related logic

---
 .../bounswe/predictionpolls/MainActivity.kt   | 31 ++++++++++++++++++-
 .../data/remote/services/AuthService.kt       |  8 ++---
 .../ui/common/NavigationDrawer.kt             |  3 +-
 .../ui/signup/SignupScreenViewModel.kt        |  2 +-
 .../bounswe/predictionpolls/utils/NavItem.kt  |  2 +-
 .../app/src/main/res/values/strings.xml       |  3 ++
 6 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index e6941793..78ead325 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -1,14 +1,19 @@
 package com.bounswe.predictionpolls
 
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
+import com.bounswe.predictionpolls.data.remote.TokenManager
 import com.bounswe.predictionpolls.ui.common.CommonAppbar
 import com.bounswe.predictionpolls.ui.common.NavigationDrawer
 import com.bounswe.predictionpolls.ui.create.createPollScreen
@@ -17,14 +22,19 @@ import com.bounswe.predictionpolls.ui.leaderboard.leaderboardScreen
 import com.bounswe.predictionpolls.ui.login.loginScreen
 import com.bounswe.predictionpolls.ui.main.MAIN_ROUTE
 import com.bounswe.predictionpolls.ui.main.mainScreen
+import com.bounswe.predictionpolls.ui.main.navigateToMainScreen
 import com.bounswe.predictionpolls.ui.profile.profileScreen
 import com.bounswe.predictionpolls.ui.signup.signupScreen
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 import com.bounswe.predictionpolls.utils.NavItem
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
+    @Inject
+    lateinit var tokenManager: TokenManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
@@ -33,11 +43,30 @@ class MainActivity : ComponentActivity() {
                 val routesWithDrawer = remember { NavItem.entries.map { it.route }.toSet() }
                 val currentBackStack = navController.currentBackStackEntryAsState()
                 val currentRoute = rememberUpdatedState(currentBackStack.value?.destination?.route)
+                val isUserLoggedIn = tokenManager.isLoggedIn.collectAsState(initial = false)
+                val context = LocalContext.current
+                val loginRequiredText = stringResource(R.string.login_required_notification)
+                val logoutSuccessText = stringResource(R.string.logged_out_notification)
 
                 NavigationDrawer(
                     selectedRoute = currentRoute.value,
                     onButtonClick = {
-                        navController.navigate(it.route)
+                        if (it.requiresAuth && !isUserLoggedIn.value) {
+                            Toast.makeText(context, loginRequiredText, Toast.LENGTH_SHORT).show()
+                            navController.navigateToMainScreen()
+                        } else {
+                            navController.navigate(it.route)
+                        }
+                    },
+                    isSignedIn = isUserLoggedIn.value,
+                    onAuthButtonClick = {
+                        if (isUserLoggedIn.value) {
+                            tokenManager.clear()
+                            Toast.makeText(context, logoutSuccessText, Toast.LENGTH_SHORT).show()
+                            navController.navigateToMainScreen()
+                        } else {
+                            navController.navigateToMainScreen()
+                        }
                     }
                 ) { toggleDrawerState ->
                     Column {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/AuthService.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/AuthService.kt
index f97759ac..013324b8 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/AuthService.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/services/AuthService.kt
@@ -11,22 +11,22 @@ import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface AuthService {
-    @POST("/signup")
+    @POST("/auth/signup")
     suspend fun signup(
         @Body signupRequest: SignupRequest
     )
 
-    @POST("/login")
+    @POST("/auth/login")
     suspend fun login(
         @Body loginRequest: LoginRequest
     ): LoginResponse
 
-    @POST("/logout")
+    @POST("/auth/logout")
     suspend fun logout(
         @Body logoutRequest: LogoutRequest
     )
 
-    @POST("/access-token")
+    @POST("/auth/access-token")
     suspend fun refreshAccessToken(
         @Body refreshAccessTokenRequest: RefreshAccessTokenRequest
     ): RefreshAccessTokenResponse
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
index 433e51de..7502459d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/NavigationDrawer.kt
@@ -80,8 +80,7 @@ fun NavigationDrawer(
         drawerContent = {
             ModalDrawerSheet(
                 modifier = Modifier
-                    .width(IntrinsicSize.Max)
-                    .padding(bottom = 8.dp),
+                    .width(IntrinsicSize.Max),
                 drawerContainerColor = MaterialTheme.colorScheme.background,
                 drawerContentColor = MaterialTheme.colorScheme.onBackground,
             ) {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/signup/SignupScreenViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/signup/SignupScreenViewModel.kt
index 2950cb7d..99eeb3be 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/signup/SignupScreenViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/signup/SignupScreenViewModel.kt
@@ -57,7 +57,7 @@ class SignupScreenViewModel @Inject constructor(
             maxRetryCount = 1
         ) {
             val givenBirthday = screenState.birthday
-            val formattedBirthday = "${givenBirthday.substring(0, 2)}/${givenBirthday.substring(2, 4)}/${givenBirthday.substring(4, 8)}"
+            val formattedBirthday = "${givenBirthday.substring(4, 8)}-${givenBirthday.substring(2, 4)}-${givenBirthday.substring(0, 2)}"
 
             authRepository.signup(
                 email = screenState.email,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
index b267e8b1..1e416146 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
@@ -12,7 +12,7 @@ enum class NavItem(
     val route: String,
     @StringRes val titleId: Int,
     @DrawableRes val iconId: Int,
-    requiresAuth: Boolean = false,
+    val requiresAuth: Boolean = false,
 ) {
     PROFILE(
         route = PROFILE_SCREEN_ROUTE,
diff --git a/prediction-polls/android/app/src/main/res/values/strings.xml b/prediction-polls/android/app/src/main/res/values/strings.xml
index 55896f44..ffa7ad76 100644
--- a/prediction-polls/android/app/src/main/res/values/strings.xml
+++ b/prediction-polls/android/app/src/main/res/values/strings.xml
@@ -89,4 +89,7 @@
     <string name="poll_create_screen_choose_continuous_type">Choose customized input type</string>
     <string name="poll_create_screen_distribution_visibility">Open distribution visibility</string>
     <string name="poll_create_action">Create</string>
+
+    <string name="logged_out_notification">You have signed out successfully</string>
+    <string name="login_required_notification">Please sign in to access this page.</string>
 </resources>
\ No newline at end of file

From 973edc89c79444d0d413c9f4286824a2e95afd61 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 18:06:13 +0300
Subject: [PATCH 182/246] fix create poll pages

---
 .../bounswe/predictionpolls/MainActivity.kt   | 21 ++++++++--
 .../request/CreateContinuousPollRequest.kt    |  3 ++
 .../ui/create/CreatePollScreen.kt             | 11 +++++-
 .../ui/create/CreatePollScreenEvent.kt        | 39 ++++++++++++-------
 .../ui/create/CreatePollViewModel.kt          | 15 ++++---
 .../app/src/main/res/values/strings.xml       |  1 +
 6 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index 78ead325..df525c25 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -5,12 +5,15 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
+import androidx.compose.material3.Text
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavOptions
 import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.bounswe.predictionpolls.data.remote.TokenManager
@@ -53,7 +56,9 @@ class MainActivity : ComponentActivity() {
                     onButtonClick = {
                         if (it.requiresAuth && !isUserLoggedIn.value) {
                             Toast.makeText(context, loginRequiredText, Toast.LENGTH_SHORT).show()
-                            navController.navigateToMainScreen()
+                            navController.navigateToMainScreen(
+                                navOptions = NavOptions.Builder().setPopUpTo(MAIN_ROUTE, true).build()
+                            )
                         } else {
                             navController.navigate(it.route)
                         }
@@ -63,9 +68,13 @@ class MainActivity : ComponentActivity() {
                         if (isUserLoggedIn.value) {
                             tokenManager.clear()
                             Toast.makeText(context, logoutSuccessText, Toast.LENGTH_SHORT).show()
-                            navController.navigateToMainScreen()
+                            navController.navigateToMainScreen(
+                                navOptions = NavOptions.Builder().setPopUpTo(MAIN_ROUTE, true).build()
+                            )
                         } else {
-                            navController.navigateToMainScreen()
+                            navController.navigateToMainScreen(
+                                navOptions = NavOptions.Builder().setPopUpTo(MAIN_ROUTE, true).build()
+                            )
                         }
                     }
                 ) { toggleDrawerState ->
@@ -83,6 +92,12 @@ class MainActivity : ComponentActivity() {
                             leaderboardScreen(navController)
                             createPollScreen()
                             profileScreen(navController)
+
+                            // TODO: Remove placeholders
+                            composable("vote_poll"){ Text(text = "Vote Poll Page WIP") }
+                            composable("settings"){ Text(text = "Settings Page WIP") }
+                            composable("notifications"){ Text(text = "Notifications Page WIP") }
+                            composable("moderation"){ Text(text = "Moderation Page WIP") }
                         }
                     }
                 }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
index 1846d2ed..250ed9ff 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/model/request/CreateContinuousPollRequest.kt
@@ -1,5 +1,7 @@
 package com.bounswe.predictionpolls.data.remote.model.request
 
+import com.google.gson.annotations.SerializedName
+
 data class CreateContinuousPollRequest(
     val question: String,
     val openVisibility: Boolean,
@@ -7,6 +9,7 @@ data class CreateContinuousPollRequest(
     val dueDatePoll: String?,
     val numericFieldValue: Int?,
     val selectedTimeUnit: String,
+    @SerializedName("cont_poll_type")
     val pollType: String,
 ) {
     enum class TimeUnit(val value: String) {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
index 5b40843e..306a8832 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreen.kt
@@ -1,5 +1,6 @@
 package com.bounswe.predictionpolls.ui.create
 
+import android.widget.Toast
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -33,6 +34,7 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
@@ -54,6 +56,9 @@ import com.bounswe.predictionpolls.utils.DateTransformation
 fun CreatePollScreen(
     viewModel: CreatePollViewModel = hiltViewModel()
 ) {
+    val successfulCreateText = stringResource(id = R.string.poll_create_successful)
+    val context = LocalContext.current
+
     CreatePollScreenUI(
         question = viewModel.screenState.question,
         onQuestionChanged = { viewModel.onEvent(CreatePollScreenEvent.OnQuestionChanged(it)) },
@@ -101,7 +106,11 @@ fun CreatePollScreen(
                 )
             )
         },
-        onCreatePollClicked = { viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked) },
+        onCreatePollClicked = {
+            viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked {
+                Toast.makeText(context, successfulCreateText, Toast.LENGTH_SHORT).show()
+            })
+        },
         errorId = viewModel.screenState.inputValidationError,
         networkError = viewModel.error,
         onDismissErrorDialog = { viewModel.onEvent(CreatePollScreenEvent.OnErrorDismissed) },
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
index 4e5fa6ea..f35a7da2 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollScreenEvent.kt
@@ -1,18 +1,29 @@
 package com.bounswe.predictionpolls.ui.create
 
 sealed class CreatePollScreenEvent {
-    data class OnQuestionChanged(val question: String): CreatePollScreenEvent()
-    data class OnPollTypeChanged(val pollType: CreatePollScreenState.PollType): CreatePollScreenEvent()
-    data class OnDiscreteOptionChanged(val option: String, val position: Int): CreatePollScreenEvent()
-    data object OnDiscreteOptionAdded: CreatePollScreenEvent()
-    data class OnDiscreteOptionRemoved(val position: Int): CreatePollScreenEvent()
-    data class OnContinuousInputTypeChanged(val inputType: CreatePollScreenState.ContinuousInputType): CreatePollScreenEvent()
-    data class OnDueDateChecked(val isChecked: Boolean): CreatePollScreenEvent()
-    data class OnDueDateChanged(val dueDate: String): CreatePollScreenEvent()
-    data class OnLastAcceptValueChanged(val value: String): CreatePollScreenEvent()
-    data class OnAcceptValueTypeChanged(val type: CreatePollScreenState.AcceptValueType): CreatePollScreenEvent()
-    data class OnDistributionVisibilityChanged(val isChecked: Boolean): CreatePollScreenEvent()
-    data object OnCreatePollClicked: CreatePollScreenEvent()
-    data object OnErrorDismissed: CreatePollScreenEvent()
-    data object ToggleDatePicker: CreatePollScreenEvent()
+    data class OnQuestionChanged(val question: String) : CreatePollScreenEvent()
+    data class OnPollTypeChanged(val pollType: CreatePollScreenState.PollType) :
+        CreatePollScreenEvent()
+
+    data class OnDiscreteOptionChanged(val option: String, val position: Int) :
+        CreatePollScreenEvent()
+
+    data object OnDiscreteOptionAdded : CreatePollScreenEvent()
+    data class OnDiscreteOptionRemoved(val position: Int) : CreatePollScreenEvent()
+    data class OnContinuousInputTypeChanged(val inputType: CreatePollScreenState.ContinuousInputType) :
+        CreatePollScreenEvent()
+
+    data class OnDueDateChecked(val isChecked: Boolean) : CreatePollScreenEvent()
+    data class OnDueDateChanged(val dueDate: String) : CreatePollScreenEvent()
+    data class OnLastAcceptValueChanged(val value: String) : CreatePollScreenEvent()
+    data class OnAcceptValueTypeChanged(val type: CreatePollScreenState.AcceptValueType) :
+        CreatePollScreenEvent()
+
+    data class OnDistributionVisibilityChanged(val isChecked: Boolean) : CreatePollScreenEvent()
+    data class OnCreatePollClicked(
+        val onSuccess: () -> Unit,
+    ) : CreatePollScreenEvent()
+
+    data object OnErrorDismissed : CreatePollScreenEvent()
+    data object ToggleDatePicker : CreatePollScreenEvent()
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
index 5e3777ea..067b77f7 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
@@ -20,7 +20,7 @@ class CreatePollViewModel @Inject constructor(
         screenState = screenState.reduce(event)
         when (event) {
             is CreatePollScreenEvent.OnCreatePollClicked -> {
-                onCreatePoll()
+                onCreatePoll(event.onSuccess)
             }
 
             is CreatePollScreenEvent.OnErrorDismissed -> {
@@ -48,7 +48,7 @@ class CreatePollViewModel @Inject constructor(
         return true
     }
 
-    private fun onCreatePoll() {
+    private fun onCreatePoll(onSuccess: () -> Unit) {
         if (isInputValid().not()) return
 
         val formattedDueDate = if (screenState.isDueDateEnabled) {
@@ -61,7 +61,10 @@ class CreatePollViewModel @Inject constructor(
 
         launchCatching(
             trackJobProgress = true,
-            maxRetryCount = 1
+            maxRetryCount = 1,
+            onSuccess = {
+                onSuccess()
+            }
         ) {
             when (screenState.pollType) {
                 CreatePollScreenState.PollType.DISCRETE -> {
@@ -71,7 +74,8 @@ class CreatePollViewModel @Inject constructor(
                         screenState.isDistributionVisible,
                         screenState.isDueDateEnabled,
                         formattedDueDate,
-                        screenState.lastAcceptValue.filter { it.isDigit() }.toInt(),
+                        screenState.lastAcceptValue.filter { it.isDigit() }
+                            .takeIf { it.isBlank().not() }?.toInt(),
                         screenState.acceptValueType.toDiscreteRequestType().value,
                     )
                 }
@@ -82,7 +86,8 @@ class CreatePollViewModel @Inject constructor(
                         screenState.isDistributionVisible,
                         screenState.isDueDateEnabled,
                         formattedDueDate,
-                        screenState.lastAcceptValue.filter { it.isDigit() }.toInt(),
+                        screenState.lastAcceptValue.filter { it.isDigit() }
+                            .takeIf { it.isBlank().not() }?.toInt(),
                         screenState.acceptValueType.toContinuousRequestType().value,
                         screenState.continuousInputType.toContinuousRequestType().value,
                     )
diff --git a/prediction-polls/android/app/src/main/res/values/strings.xml b/prediction-polls/android/app/src/main/res/values/strings.xml
index ffa7ad76..abcf3afd 100644
--- a/prediction-polls/android/app/src/main/res/values/strings.xml
+++ b/prediction-polls/android/app/src/main/res/values/strings.xml
@@ -89,6 +89,7 @@
     <string name="poll_create_screen_choose_continuous_type">Choose customized input type</string>
     <string name="poll_create_screen_distribution_visibility">Open distribution visibility</string>
     <string name="poll_create_action">Create</string>
+    <string name="poll_create_successful">Poll created successfully</string>
 
     <string name="logged_out_notification">You have signed out successfully</string>
     <string name="login_required_notification">Please sign in to access this page.</string>

From 38fff3b03f484dc5ba27e105d748d51c2babbe1e Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 18:12:37 +0300
Subject: [PATCH 183/246] add dummy data to leaderboard

---
 .../ui/leaderboard/LeaderboardScreen.kt       |  4 +-
 .../ui/leaderboard/LeaderboardScreenState.kt  | 65 +++++++++++++++++--
 .../ui/leaderboard/LeaderboardViewModel.kt    |  2 +-
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreen.kt
index 497ad41c..0124cc1d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreen.kt
@@ -132,8 +132,8 @@ private fun LeaderboardScreenTagSelection(
             ),
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(horizontal = 16.dp)
                 .background(MaterialTheme.colorScheme.primaryContainer)
+                .padding(horizontal = 16.dp)
         ) {
             items.forEach { item ->
                 DropdownMenuItem(
@@ -187,7 +187,7 @@ private fun ColumnScope.Leaderboard(
 @Composable
 private fun LeaderboardRow(
     position: String,
-    image: String,
+    image: String, // TODO: use image
     username: String,
     point: String,
 ) {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenState.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenState.kt
index d92cefd0..1e88b153 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenState.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardScreenState.kt
@@ -9,13 +9,68 @@ data class LeaderboardScreenState(
         val DUMMY_STATE = LeaderboardScreenState(
             tags = listOf("E-sport", "NBA", "Football", "Tennis"),
             selectedTag = "E-sport",
-            leaderboardList = (0..20).reversed().map {
+            leaderboardList = listOf(
                 LeaderboardItem(
-                    username = "user$it",
+                    username = "yigit",
+                    image = "yigit",
+                    score = 420
+                ),
+                LeaderboardItem(
+                    username = "ahmet",
                     image = "",
-                    score = it * 10
-                )
-            }
+                    score = 410
+                ),
+                LeaderboardItem(
+                    username = "ozan",
+                    image = "",
+                    score = 400
+                ),
+                LeaderboardItem(
+                    username = "batuhan",
+                    image = "",
+                    score = 390
+                ),
+                LeaderboardItem(
+                    username = "şefik",
+                    image = "",
+                    score = 380
+                ),
+                LeaderboardItem(
+                    username = "yusuf",
+                    image = "",
+                    score = 370
+                ),
+                LeaderboardItem(
+                    username = "merve",
+                    image = "",
+                    score = 360
+                ),
+                LeaderboardItem(
+                    username = "aslıhan",
+                    image = "",
+                    score = 350
+                ),
+                LeaderboardItem(
+                    username = "mehmet",
+                    image = "",
+                    score = 340
+                ),
+                LeaderboardItem(
+                    username = "ali",
+                    image = "",
+                    score = 330
+                ),
+                LeaderboardItem(
+                    username = "veli",
+                    image = "",
+                    score = 320
+                ),
+                LeaderboardItem(
+                    username = "ayşe",
+                    image = "",
+                    score = 310
+                ),
+            )
         )
     }
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardViewModel.kt
index cfc3bfed..1e2c9820 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/leaderboard/LeaderboardViewModel.kt
@@ -9,7 +9,7 @@ import javax.inject.Inject
 
 @HiltViewModel
 class LeaderboardViewModel @Inject constructor() : BaseViewModel() {
-    var screenState by mutableStateOf(LeaderboardScreenState())
+    var screenState by mutableStateOf(LeaderboardScreenState.DUMMY_STATE)
         private set
 
     fun onEvent(event: LeaderboardScreenEvent){

From 30dc446e74f6d3fd8c3d854b2a23942c2f99fe76 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 18:13:23 +0300
Subject: [PATCH 184/246] add isOpen to polls

---
 prediction-polls/backend/src/schema.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 3e1efd22..a9bb359d 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -30,7 +30,8 @@ CREATE TABLE polls (
     setDueDate BOOLEAN NOT NULL,
     closingDate DATE,
     numericFieldValue INT,
-    selectedTimeUnit ENUM('min', 'h', 'day', 'mth')
+    selectedTimeUnit ENUM('min', 'h', 'day', 'mth'),
+    isOpen BOOLEAN DEFAULT true
 );
 
 CREATE TABLE discrete_polls (

From 5d99dddee76afabf4a4c246e40dee1ae98fece6e Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 18:14:19 +0300
Subject: [PATCH 185/246] add db functions for poll closing

---
 .../backend/src/repositories/PollDB.js        | 81 +++++++++++++++++--
 1 file changed, 76 insertions(+), 5 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index f1770399..b866f5e0 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -153,7 +153,7 @@ async function voteDiscretePoll(pollId, userId, choiceId, pointsSpent){
     const connection = await pool.getConnection();
 
     const deleteExistingSql = "DELETE FROM discrete_polls_selections WHERE poll_id = ? AND user_id = ?"
-    const addVoteSql = "INSERT INTO discrete_polls_selections (poll_id, choice_id, user_id) VALUES (?, ?, ?)"
+    const addVoteSql = "INSERT INTO discrete_polls_selections (poll_id, choice_id, user_id, given_points) VALUES (?, ?, ?, ?)"
     const findPointsSql = 'SELECT * FROM profiles WHERE userId= ?';
     const updatePointSql = 'UPDATE profiles SET points = ? WHERE userId = ?';
 
@@ -161,7 +161,7 @@ async function voteDiscretePoll(pollId, userId, choiceId, pointsSpent){
         await connection.beginTransaction()
 
         deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
-        addResult = await connection.query(addVoteSql, [pollId, choiceId, userId]);
+        addResult = await connection.query(addVoteSql, [pollId, choiceId, userId, pointsSpent]);
         const [rows] = await connection.query(findPointsSql, [userId]);
         const current_points = rows[0].points;
 
@@ -237,21 +237,92 @@ async function getContinuousPollVotes(pollId) {
 }
 
 async function getTagsOfPoll(pollId) {
-    const sql = "SELECT * FROM tags WHERE poll_id = ?";
+    const sql = "SELECT tags.topic FROM tags WHERE poll_id = ?";
 
     try {
         [rows] = await pool.query(sql, [pollId]);
-        return rows;
+        return rows.map(item => item.topic);
     } catch (error) { 
         console.error('getTagsOfPoll(): Database Error');
         throw error;
     }
 }
 
+async function getUntaggedPolls() {
+    const sql = 'SELECT polls.id, polls.question, polls.tagsScanned FROM polls'
+
+    try {
+        [rows] = await pool.query(sql, []);
+        return rows;
+    } catch (error) { 
+        console.error('getUntaggedPolls(): Database Error');
+        throw error;
+    }
+}
+
+async function updateTagsScanned(pollId, tagsScanned) {
+    const sql = 'UPDATE polls SET tagsScanned = ? WHERE id = ?'
+
+    try {
+        [rows] = await pool.query(sql, [tagsScanned, pollId]);
+        return rows;
+    } catch (error) { 
+        console.error('updateTagsScanned(): Database Error');
+        throw error;
+    }
+}
+
+async function addTopic(pollId, topic) {
+    const sql = 'INSERT into tags (topic, poll_id) VALUES (?, ?)'
+
+    try {
+        [rows] = await pool.query(sql, [topic, pollId]);
+        return rows;
+    } catch (error) { 
+        console.error('updateTopic(): Database Error');
+        throw error;
+    }
+}
+
+async function getDiscreteSelectionsWithPollId(pollId) {
+    const sql = "SELECT * FROM discrete_polls_selections WHERE poll_id = ?";
+
+    try {
+        [result] = await pool.query(sql, [pollId]);
+        return result;
+    } catch (error) {
+        console.error('getDiscreteSelectionWithPollId(): Database Error');
+        throw error;
+    }
+}
+
+async function closePoll(pollId, rewards) {
+    const pointUpdateSql = 'UPDATE profiles SET points = points + ? WHERE userId = ?';
+    const closePollSql = 'UPDATE polls SET isOpen = false WHERE id = ?';
 
+    const connection = await pool.getConnection();
 
+    try {
+        await connection.beginTransaction();
+
+        rewards.map(reward => {
+            connection.query(pointUpdateSql, [reward.reward, reward.user_id]);
+        });
+
+        connection.query(closePollSql, [pollId]);
+
+        await connection.commit();
+        return true;
+    } catch (error) {
+        console.error('closePoll(): Database Error');
+        await connection.rollback();
+        throw {error: errorCodes.DATABASE_ERROR};
+    } finally {
+        connection.release();
+    }
+}
 
 module.exports = {getPolls, getPollWithId, getDiscretePollWithId, getContinuousPollWithId, 
     addDiscretePoll,addContinuousPoll, getDiscretePollChoices, getDiscreteVoteCount, voteDiscretePoll, voteContinuousPoll,
-    getContinuousPollVotes,getTagsOfPoll}
+    getContinuousPollVotes,getTagsOfPoll, getUntaggedPolls, updateTagsScanned, addTopic, getDiscreteSelectionsWithPollId, closePoll}
     
\ No newline at end of file

From 4829239766025dce3c098b2c74e34496e37cd848 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 18:15:05 +0300
Subject: [PATCH 186/246] implement closePoll()

---
 .../backend/src/services/PollService.js       | 66 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 7e9682a8..19816a7b 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -19,7 +19,7 @@ async function getPolls(req,res){
                 "pollType": pollObject.poll_type,
                 "closingDate": pollObject.closingDate,
                 "rejectVotes": (pollObject.numericFieldValue && pollObject.selectedTimeUnit) ? `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}` : null,
-                "isOpen": true,
+                "isOpen": pollObject.isOpen ? true : false,
                 "comments": []
             };
 
@@ -71,7 +71,7 @@ async function getPollWithId(req, res) {
             "pollType": pollObject.poll_type,
             "closingDate": pollObject.closingDate,
             "rejectVotes": (pollObject.numericFieldValue && pollObject.selectedTimeUnit) ? `${pollObject.numericFieldValue} ${pollObject.selectedTimeUnit}` : null,
-            "isOpen": true,
+            "isOpen": pollObject.isOpen ? true : false,
             "comments": []
         };
     
@@ -261,4 +261,64 @@ async function voteContinuousPoll(req, res) {
     }
 }
 
-module.exports = {getPolls, getPollWithId, addDiscretePoll, addContinuousPoll, voteDiscretePoll, voteContinuousPoll}
\ No newline at end of file
+async function closePoll(req, res) {
+    try {
+        const pollIdInput = req.params.pollId;
+        const choiceIdInput = req.body.choiceId;
+
+        if (!(/^\d+$/.test(pollIdInput))) {
+            throw {error: {code: 5100, message: "pollId not a number."}};
+        }
+
+        if (!(typeof choiceIdInput === 'number')) {
+            throw {error: {code: 5101, message: "choiceId not a number."}}
+        }
+
+        pollId = parseInt(pollIdInput);
+        choiceId = parseInt(choiceIdInput);
+
+        const rows = await db.getPollWithId(pollId);
+        if (rows.length === 0) {
+            throw errorCodes.NO_SUCH_POLL_ERROR;
+        }
+
+        const pollObject = rows[0];
+
+        if (pollObject.poll_type === 'continuous') {
+            throw {error: {code: 5102, message: "Closing unsupported."}};
+        }
+
+        if (!pollObject.isOpen) {
+            throw {error: {code: 5013, message: "Poll already closed"}};
+        }
+
+        const selections = await db.getDiscreteSelectionsWithPollId(pollId);
+        console.log("selections: ", selections);
+
+        const totalPointsBet = selections.reduce((sum, selection) => sum + selection.given_points, 0);
+        console.log("totalPointsBet: ", totalPointsBet);
+
+        const correctSelections = selections.filter(selection => selection.choice_id === choiceId);
+        console.log("correctSelections: ", correctSelections);
+
+        const totalCorrectBet = correctSelections.reduce((sum, selection) => sum + selection.given_points, 0);
+        console.log("totalCorrectBet: ", totalCorrectBet);
+
+        const rewardPoints = correctSelections.map((selection) => {
+            return {user_id: selection.user_id, reward: Math.floor(totalPointsBet * (selection.given_points / totalCorrectBet))}
+        })
+        console.log("rewardPoints: ", rewardPoints);
+
+        await db.closePoll(pollId, rewardPoints);
+
+        res.status(200).json({success: true});
+    } catch (error) {
+        if (error) {
+            res.status(400).json(error);
+        } else {
+            res.status(500).json({ error: errorCodes.DATABASE_ERROR });
+        }
+    }
+}
+
+module.exports = {getPolls, getPollWithId, addDiscretePoll, addContinuousPoll, voteDiscretePoll, voteContinuousPoll, closePoll}
\ No newline at end of file

From 8827f621f1b54bd105e79c485765b4e85bf2f2b1 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 18:15:24 +0300
Subject: [PATCH 187/246] add new route

---
 prediction-polls/backend/src/routes/PollRouter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index e4326ae1..4dd5c6e4 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -545,5 +545,7 @@ router.post('/discrete/:pollId/vote',authenticator.authorizeAccessToken, service
  */
 router.post('/continuous/:pollId/vote',authenticator.authorizeAccessToken, service.voteContinuousPoll);
 
+router.post('/close/:pollId', authenticator.authorizeAccessToken, service.closePoll);
+
 module.exports = router;
 

From 288544833e98bec721ba78917047acdf0a1b6bbf Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 18:19:00 +0300
Subject: [PATCH 188/246] add small swagger

---
 .../backend/src/routes/PollRouter.js          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/prediction-polls/backend/src/routes/PollRouter.js b/prediction-polls/backend/src/routes/PollRouter.js
index 4dd5c6e4..ffc136de 100644
--- a/prediction-polls/backend/src/routes/PollRouter.js
+++ b/prediction-polls/backend/src/routes/PollRouter.js
@@ -545,6 +545,41 @@ router.post('/discrete/:pollId/vote',authenticator.authorizeAccessToken, service
  */
 router.post('/continuous/:pollId/vote',authenticator.authorizeAccessToken, service.voteContinuousPoll);
 
+/**
+ * @swagger
+ * /polls/close/{pollId}:
+ *   post:
+ *     tags:
+ *       - polls
+ *     description: Close a discrete poll and redistribute its points
+ *     parameters:
+ *       - in: path
+ *         name: pollId
+ *         required: true
+ *         schema:
+ *           type: integer
+ *         description: The ID of the continuous poll to vote on.
+ *     requestBody:
+ *       description: Vote details
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             type: object
+ *             properties:
+ *               choiceId:
+ *                 type: integer
+ *                 example: 1 
+ *     responses:
+ *       200:
+ *         description: Poll closed successfully
+ *       400:
+ *         description: Bad request
+ *       404:
+ *         description: Poll not found
+ *       500:
+ *         description: Internal Server Error
+ */
 router.post('/close/:pollId', authenticator.authorizeAccessToken, service.closePoll);
 
 module.exports = router;

From be8aabefd0a55203eb9fc986d65de725280e39bf Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 18:35:31 +0300
Subject: [PATCH 189/246] add iso 8601 support

---
 prediction-polls/android/app/build.gradle.kts    |  4 +++-
 .../extensions/StringExtensions.kt               | 16 ++++++++++++++++
 .../ui/create/CreatePollViewModel.kt             |  5 ++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/android/app/build.gradle.kts b/prediction-polls/android/app/build.gradle.kts
index b2eb9d36..d263e22a 100644
--- a/prediction-polls/android/app/build.gradle.kts
+++ b/prediction-polls/android/app/build.gradle.kts
@@ -54,6 +54,7 @@ android {
         }
     }
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
@@ -141,5 +142,6 @@ dependencies {
     // Used for creating stable domain classes. Check stability meaning in terms of compose if you do not know what I mean.
     implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.6")
 
-
+    // For date transformation
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt
index de1ce6f8..28770a8f 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt
@@ -2,6 +2,9 @@ package com.bounswe.predictionpolls.extensions
 
 import android.os.Build
 import java.text.SimpleDateFormat
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.util.Locale
 
@@ -41,4 +44,17 @@ fun String.isValidDate(): Boolean {
             false
         }
     }
+}
+
+fun String.toISO8601(): String? {
+    val currentTime = LocalDateTime.now().toLocalTime()
+    val localDate = LocalDateTime.of(
+        this.substring(4, 8).toInt(),
+        this.substring(2, 4).toInt(),
+        this.substring(0, 2).toInt(),
+        currentTime.hour,
+        currentTime.minute
+    )
+    val offsetDate = OffsetDateTime.of(localDate, ZoneOffset.UTC)
+    return offsetDate.format(DateTimeFormatter.ISO_DATE_TIME)
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
index 067b77f7..25abcc5e 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
@@ -6,6 +6,7 @@ import androidx.compose.runtime.setValue
 import com.bounswe.predictionpolls.R
 import com.bounswe.predictionpolls.core.BaseViewModel
 import com.bounswe.predictionpolls.data.remote.repositories.PollRepository
+import com.bounswe.predictionpolls.extensions.toISO8601
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -52,9 +53,7 @@ class CreatePollViewModel @Inject constructor(
         if (isInputValid().not()) return
 
         val formattedDueDate = if (screenState.isDueDateEnabled) {
-            screenState.dueDate.run {
-                "${substring(4, 8)}/${substring(2, 4)}/${substring(0, 2)}"
-            }
+            screenState.dueDate.toISO8601()
         } else {
             null
         }

From ab339f9dcbbbf4edccf0783562e91bb2bd4a0b77 Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Sun, 26 Nov 2023 19:11:26 +0300
Subject: [PATCH 190/246] implement exception handling

---
 .../java/com/bounswe/predictionpolls/MainActivity.kt |  5 ++++-
 .../predictionpolls/ui/vote/PollVoteNavGraph.kt      |  5 ++++-
 .../predictionpolls/ui/vote/PollVoteScreen.kt        | 12 ++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index a8562404..a593a518 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -14,6 +14,8 @@ import com.bounswe.predictionpolls.ui.main.mainScreen
 import com.bounswe.predictionpolls.ui.profile.profileScreen
 import com.bounswe.predictionpolls.ui.signup.signupScreen
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
+import com.bounswe.predictionpolls.ui.vote.POLL_VOTE_ROUTE
+import com.bounswe.predictionpolls.ui.vote.pollVoteScreen
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -23,7 +25,7 @@ class MainActivity : ComponentActivity() {
         setContent {
             PredictionPollsTheme {
                 val navController = rememberNavController()
-                NavHost(navController = navController, startDestination = MAIN_ROUTE) {
+                NavHost(navController = navController, startDestination = POLL_VOTE_ROUTE) {
                     mainScreen(navController)
                     loginScreen(navController)
                     signupScreen(navController)
@@ -31,6 +33,7 @@ class MainActivity : ComponentActivity() {
                     leaderboardScreen(navController)
                     createPollScreen()
                     profileScreen(navController)
+                    pollVoteScreen(navController)
                 }
             }
         }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
index 011de715..4764e63b 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
@@ -13,7 +13,7 @@ const val POLL_VOTE_ROUTE = "pollVote"
 fun NavGraphBuilder.pollVoteScreen(navController: NavController) {
     composable(POLL_VOTE_ROUTE) {
         val pollVoteViewModel: PollVoteViewModel = hiltViewModel()
-        val pollId: String = "" // TODO: Fetch this from navcontroller
+        val pollId = "1" // TODO: Fetch this from navcontroller
         // Accessing state from ViewModel
         val state by pollVoteViewModel.state.collectAsStateWithLifecycle()
         LaunchedEffect(key1 = Unit) {
@@ -57,6 +57,9 @@ fun NavGraphBuilder.pollVoteScreen(navController: NavController) {
             onVoteInputChanged = { voteInput ->
                 pollVoteViewModel.onVoteInputChanged(voteInput)
             },
+            onToastConsumed = {
+                pollVoteViewModel.consumeToastMessage()
+            }
         )
     }
 }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
index 436b7a10..128b53d3 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
@@ -1,13 +1,17 @@
 package com.bounswe.predictionpolls.ui.vote
 
+import android.util.Log
+import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
@@ -18,6 +22,7 @@ fun PollVoteScreen(
     onPointsReservedChanged: (Int) -> Unit,
     onVotePressed: () -> Unit,
     onVoteInputChanged: (String) -> Unit, // either the vote input or the selected option id is passed as a string
+    onToastConsumed: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     when (state) {
@@ -30,6 +35,13 @@ fun PollVoteScreen(
         }
 
         is PollVoteScreenUiState.DiscretePoll -> {
+            val context = LocalContext.current
+            LaunchedEffect(key1 = state.toastMessage) {
+                state.toastMessage?.let {
+                    Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                    onToastConsumed()
+                }
+            }
             PollVote(
                 pollContent = {
                     val poll = state.poll

From 42ed5fc1f378c44196251df984a97b01334b9cce Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Sun, 26 Nov 2023 19:25:20 +0300
Subject: [PATCH 191/246] fix api responsE

---
 .../com/bounswe/predictionpolls/MainActivity.kt    | 11 +----------
 .../data/feed/model/PollResponse.kt                | 14 +++++++-------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index df4750fe..fb2f62d5 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -105,16 +105,7 @@ class MainActivity : ComponentActivity() {
                             composable("moderation") { Text(text = "Moderation Page WIP") }
                         }
                     }
-                    NavHost(navController = navController, startDestination = POLL_VOTE_ROUTE) {
-                        mainScreen(navController)
-                        loginScreen(navController)
-                        signupScreen(navController)
-                        feedScreen(navController)
-                        leaderboardScreen(navController)
-                        createPollScreen()
-                        profileScreen(navController)
-                        pollVoteScreen(navController)
-                    }
+
                 }
             }
         }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
index fdfa30ff..072a5380 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/feed/model/PollResponse.kt
@@ -139,16 +139,16 @@ class PollResponseDeserializer : JsonDeserializer<PollResponse> {
         } catch (e: Exception) {
             null
         }
-        val optionsJson = jsonObject.get("options").asJsonArray
         val options = mutableListOf<Any>()
         if (pollType == "continuous") {
-            options.addAll(
-                context.deserialize<List<String>>(
-                    optionsJson,
-                    object : TypeToken<List<Int>>() {}.type
-                )
-            )
+//            options.addAll(
+//                context.deserialize<List<String>>(
+//                    optionsJson,
+//                    object : TypeToken<List<Int>>() {}.type
+//                )
+//            )
         } else {
+            val optionsJson = jsonObject.get("options").asJsonArray
             options.addAll(
                 context.deserialize<List<PollResponse.Option>>(
                     optionsJson,

From c90a76f4485c30d1be167c1ac11deebd002abcab Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Sun, 26 Nov 2023 19:41:38 +0300
Subject: [PATCH 192/246] fix errors

---
 .../bounswe/predictionpolls/MainActivity.kt   |  3 +-
 .../data/vote/DiscreteVotePollRequest.kt      |  2 +-
 .../data/vote/VotePollRepository.kt           |  4 +-
 .../ui/common/poll/DiscreteVoteOption.kt      |  2 +-
 .../ui/common/poll/PollsComposable.kt         | 10 +++-
 .../predictionpolls/ui/feed/FeedScreen.kt     |  8 +++-
 .../ui/feed/FeedScreenNavigation.kt           |  5 +-
 .../ui/vote/PollVoteNavGraph.kt               | 16 +++++--
 .../predictionpolls/ui/vote/PollVoteScreen.kt | 46 ++++++++++++-------
 .../ui/vote/PollVoteViewModel.kt              |  2 +-
 10 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index fb2f62d5..543f2c19 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -29,7 +29,6 @@ import com.bounswe.predictionpolls.ui.main.navigateToMainScreen
 import com.bounswe.predictionpolls.ui.profile.profileScreen
 import com.bounswe.predictionpolls.ui.signup.signupScreen
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
-import com.bounswe.predictionpolls.ui.vote.POLL_VOTE_ROUTE
 import com.bounswe.predictionpolls.ui.vote.pollVoteScreen
 import com.bounswe.predictionpolls.utils.NavItem
 import dagger.hilt.android.AndroidEntryPoint
@@ -97,9 +96,9 @@ class MainActivity : ComponentActivity() {
                             leaderboardScreen(navController)
                             createPollScreen()
                             profileScreen(navController)
+                            pollVoteScreen(navController)
 
                             // TODO: Remove placeholders
-                            composable("vote_poll") { Text(text = "Vote Poll Page WIP") }
                             composable("settings") { Text(text = "Settings Page WIP") }
                             composable("notifications") { Text(text = "Notifications Page WIP") }
                             composable("moderation") { Text(text = "Moderation Page WIP") }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt
index bfe469a3..3ba70130 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/DiscreteVotePollRequest.kt
@@ -1,6 +1,6 @@
 package com.bounswe.predictionpolls.data.vote
 
-data class DiscreteVotePollRequest(val choiceId: String, val points: String)
+data class DiscreteVotePollRequest(val choiceId: Int, val points: String)
 
 data class ContinuousPollRequest(val choice: String, val points: String)
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
index 0040397d..f9eb9839 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/vote/VotePollRepository.kt
@@ -35,7 +35,7 @@ class VotePollRepositoryImpl @Inject constructor(
                 val result = votePollApi.voteForDiscretePoll(
                     pollId,
                     DiscreteVotePollRequest(
-                        voteId,
+                        voteId.toInt(),
                         points.toString()
                     )
                 )
@@ -58,8 +58,8 @@ class VotePollRepositoryImpl @Inject constructor(
                 val result = votePollApi.voteForContinuousPoll(
                     pollId,
                     ContinuousPollRequest(
+                        voteInput,
                         points.toString(),
-                        voteInput
                     )
                 )
                 if (result.error != null) {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/DiscreteVoteOption.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/DiscreteVoteOption.kt
index bef36d48..0eeaa470 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/DiscreteVoteOption.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/DiscreteVoteOption.kt
@@ -60,7 +60,7 @@ fun DiscreteVoteOption(
             .clip(DiscreteVoteOptionShape)
             .border(
                 2.dp,
-                MaterialTheme.colorScheme.secondary.copy(alpha = if (isSelected) 1f else 0.5f),
+                MaterialTheme.colorScheme.secondary.copy(alpha = if (isSelected) 1f else 0.1f),
                 DiscreteVoteOptionShape
             )
             .background(MaterialTheme.colorScheme.background)
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
index 4154af05..0fb84aa7 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -1,5 +1,6 @@
 package com.bounswe.predictionpolls.ui.common.poll
 
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -15,10 +16,17 @@ import kotlinx.collections.immutable.ImmutableList
  * Displays polls in a lazy list. This composable can be used in profile screen and feed screen where continuous flow of polls are expected.
  */
 @Composable
-fun Polls(polls: ImmutableList<Poll>, modifier: Modifier = Modifier) {
+fun Polls(
+    polls: ImmutableList<Poll>,
+    onPollClicked: (id: String) -> Unit = {},
+    modifier: Modifier = Modifier
+) {
     LazyColumn(modifier = modifier) {
         items(polls) {
             PollComposable(
+                modifier = Modifier.clickable {
+                    onPollClicked(it.polId)
+                },
                 pollCreatorProfilePictureUri = it.creatorProfilePictureUri,
                 pollCreatorName = it.pollCreatorName,
                 tags = it.tags,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
index 2d753429..276de357 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
@@ -19,7 +19,11 @@ import androidx.compose.ui.unit.dp
 import com.bounswe.predictionpolls.ui.common.poll.Polls
 
 @Composable
-fun FeedScreen(feedUiState: FeedUiState, modifier: Modifier = Modifier) {
+fun FeedScreen(
+    feedUiState: FeedUiState,
+    onPollClicked: (pollId: String) -> Unit,
+    modifier: Modifier = Modifier
+) {
     var text by rememberSaveable { mutableStateOf("") } // this might be stored in VM. I am not sure how we will use this parameter so I will store it here for now..
     Column(
         modifier = modifier
@@ -41,7 +45,7 @@ fun FeedScreen(feedUiState: FeedUiState, modifier: Modifier = Modifier) {
             }
 
             is FeedUiState.HasFeed -> {
-                Polls(polls = feedUiState.feed)
+                Polls(polls = feedUiState.feed, onPollClicked = onPollClicked)
             }
 
             is FeedUiState.Error -> {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
index 90f07a74..22dc5a84 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
@@ -9,6 +9,7 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigator
 import androidx.navigation.compose.composable
+import com.bounswe.predictionpolls.ui.vote.navigateToPollVoteScreen
 
 const val FEED_ROUTE = "feed"
 
@@ -21,7 +22,9 @@ fun NavGraphBuilder.feedScreen(navController: NavController) {
                 feedViewModel.fetchFeed(0)
         }
         val feedUiState by feedViewModel.feedUiState.collectAsStateWithLifecycle()
-        FeedScreen(feedUiState)
+        FeedScreen(feedUiState, onPollClicked = {
+            navController.navigateToPollVoteScreen(it)
+        })
     }
 }
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
index 4764e63b..6f756691 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteNavGraph.kt
@@ -6,15 +6,20 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavType
 import androidx.navigation.compose.composable
+import androidx.navigation.navArgument
 
-const val POLL_VOTE_ROUTE = "pollVote"
+const val POLL_VOTE_ROUTE = "pollVote/{pollId}"
 
 fun NavGraphBuilder.pollVoteScreen(navController: NavController) {
-    composable(POLL_VOTE_ROUTE) {
+    composable(
+        POLL_VOTE_ROUTE, arguments = listOf(navArgument("pollId") { type = NavType.StringType })
+    ) {
         val pollVoteViewModel: PollVoteViewModel = hiltViewModel()
-        val pollId = "1" // TODO: Fetch this from navcontroller
         // Accessing state from ViewModel
+        val pollId = it.arguments?.getString("pollId") ?: "" // Default value as fallback
+
         val state by pollVoteViewModel.state.collectAsStateWithLifecycle()
         LaunchedEffect(key1 = Unit) {
             pollVoteViewModel.fetchPoll(pollId)
@@ -63,3 +68,8 @@ fun NavGraphBuilder.pollVoteScreen(navController: NavController) {
         )
     }
 }
+
+
+fun NavController.navigateToPollVoteScreen(pollId: String) {
+    this.navigate("pollVote/$pollId")
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
index 128b53d3..61d87297 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteScreen.kt
@@ -61,7 +61,6 @@ fun PollVoteScreen(
                                     voteCount = discreteOption.voteCount,
                                     fillPercentage = discreteOption.voteCount / sumOfTotalVotes.toFloat(),
                                     isSelected = discreteOption.id == state.currentVoteId,
-                                    optionPrefix = (10 + index).toChar().toString() + ") ",
                                     modifier = Modifier.clickable {
                                         onVoteInputChanged(discreteOption.id)
                                     }
@@ -83,23 +82,38 @@ fun PollVoteScreen(
 
         is PollVoteScreenUiState.ContinuousPoll -> {
             val poll = state.poll
-            PollComposable(
-                pollCreatorProfilePictureUri = poll.creatorProfilePictureUri,
-                pollCreatorName = poll.pollCreatorName,
-                tags = poll.tags,
-                pollQuestionTitle = poll.pollQuestionTitle,
-                optionsContent = {
-                    ContinuousVoteOption(
-                        title = "Enter your vote",
-                        vote = state.currentVoteInput ?: "",
-                        isVotingEnabled = true,
-                        voteType = poll.inputType,
-                        onVoteInputChanged = onVoteInputChanged
+            val context = LocalContext.current
+            LaunchedEffect(key1 = state.toastMessage) {
+                state.toastMessage?.let {
+                    Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+                    onToastConsumed()
+                }
+            }
+            PollVote(
+                pollContent = {
+                    PollComposable(
+                        pollCreatorProfilePictureUri = poll.creatorProfilePictureUri,
+                        pollCreatorName = poll.pollCreatorName,
+                        tags = poll.tags,
+                        pollQuestionTitle = poll.pollQuestionTitle,
+                        optionsContent = {
+                            ContinuousVoteOption(
+                                title = "Enter your vote",
+                                vote = state.currentVoteInput ?: "",
+                                isVotingEnabled = true,
+                                voteType = poll.inputType,
+                                onVoteInputChanged = onVoteInputChanged
+                            )
+                        },
+                        dueDate = poll.dueDate ?: "",
+                        rejectionText = poll.rejectionText ?: "",
+                        commentCount = 0
                     )
                 },
-                dueDate = poll.dueDate ?: "",
-                rejectionText = poll.rejectionText ?: "",
-                commentCount = 0
+                currentPointsReserved = state.currentPointsReserved,
+                onPointsReservedChanged = onPointsReservedChanged,
+                onVotePressed = onVotePressed,
+                modifier = modifier
             )
 
         }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
index 3b9ae281..54f130c9 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVoteViewModel.kt
@@ -97,7 +97,7 @@ class PollVoteViewModel @Inject constructor(
     }
 
     fun voteForDiscretePoll(pollId: String, points: Int, voteId: String) = viewModelScope.launch {
-        when (val result = votePollUseCase.voteForContinuousPoll(pollId, points, voteId)) {
+        when (val result = votePollUseCase.voteForDiscretePoll(pollId, points, voteId)) {
             is Result.Success -> {
                 _state.update { (it as PollVoteScreenUiState.DiscretePoll).copy(toastMessage = "Successfully voted") }
             }

From 7592fe84c7a3829f77e848b5fd0a0e19f44206de Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 23:50:46 +0300
Subject: [PATCH 193/246] add simple unit test for 404

---
 .../backend/tests/PollService.test.js         | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 prediction-polls/backend/tests/PollService.test.js

diff --git a/prediction-polls/backend/tests/PollService.test.js b/prediction-polls/backend/tests/PollService.test.js
new file mode 100644
index 00000000..87d15dad
--- /dev/null
+++ b/prediction-polls/backend/tests/PollService.test.js
@@ -0,0 +1,25 @@
+const { getPollWithId } = require('../src/services/PollService.js');
+const db = require('../src/repositories/PollDB.js');
+const errorCodes = require("../src/errorCodes.js")
+
+jest.mock('../src/repositories/PollDB');
+
+describe('getPollWithId', () => {
+  test('returns a 404 response for non-existing poll', async () => {
+    const req = { params: { pollId: 'nonexistentId' } };
+    const res = {
+      status: jest.fn().mockReturnThis(),
+      json: jest.fn(),
+    };
+
+    db.getPollWithId.mockResolvedValue([]);
+
+    await getPollWithId(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({
+      code: errorCodes.NO_SUCH_POLL_ERROR.code,
+      message: errorCodes.NO_SUCH_POLL_ERROR.message,
+    });
+  });
+});
\ No newline at end of file

From 70c24bc36bc09542b21685a6899d14721c0b5ecc Mon Sep 17 00:00:00 2001
From: Ahmet Emre Safak <aemresafak@gmail.com>
Date: Sun, 26 Nov 2023 19:52:59 +0300
Subject: [PATCH 194/246] create tests

---
 .../predictionpolls/ui/profile/ProfileCard.kt |  4 +-
 .../predictionpolls/GetFeedUseCaseTest.kt     | 48 +++++++++++++++++++
 .../predictionpolls/GetProfileUseCaseTest.kt  | 36 ++++++++++++++
 .../repo/FakeFeedRepository.kt                | 29 +++++++++++
 .../repo/FakeProfileRepository.kt             | 33 +++++++++++++
 5 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetFeedUseCaseTest.kt
 create mode 100644 prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetProfileUseCaseTest.kt
 create mode 100644 prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeFeedRepository.kt
 create mode 100644 prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeProfileRepository.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
index 098c40db..4d876e05 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileCard.kt
@@ -183,7 +183,7 @@ private fun CoverPhoto(imageUri: String?, modifier: Modifier) {
         model = imageUri,
         contentDescription = "User Badge",
         modifier = modifier,
-        contentScale = ContentScale.Crop,
+        contentScale = if (imageUri == null) ContentScale.Fit else ContentScale.Crop,
         alignment = Alignment.Center,
         error = painterResource(id = R.drawable.ic_warning),
     )
@@ -254,7 +254,7 @@ private fun ProfilePicture(imageUri: String?, modifier: Modifier = Modifier) {
 @Composable
 private fun UserDescription(description: String?, modifier: Modifier = Modifier) {
     Text(
-        text = description?:"", modifier = modifier,
+        text = description ?: "", modifier = modifier,
         maxLines = 5,
         overflow = TextOverflow.Ellipsis,
         color = MaterialTheme.colorScheme.scrim,
diff --git a/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetFeedUseCaseTest.kt b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetFeedUseCaseTest.kt
new file mode 100644
index 00000000..317e6264
--- /dev/null
+++ b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetFeedUseCaseTest.kt
@@ -0,0 +1,48 @@
+package com.bounswe.predictionpolls
+
+import com.bounswe.predictionpolls.domain.feed.GetFeedUseCase
+import com.bounswe.predictionpolls.repo.FakeFeedRepository
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+
+class GetFeedUseCaseTest {
+
+    private lateinit var fakeFeedRepository: FakeFeedRepository
+    private lateinit var getFeedUseCase: GetFeedUseCase
+
+    @Before
+    fun setUp() {
+        fakeFeedRepository = FakeFeedRepository()
+        getFeedUseCase = GetFeedUseCase(fakeFeedRepository)
+    }
+
+    @Test
+    fun `invoke returns success with correct data`() = runBlockingTest {
+        val result = getFeedUseCase.invoke(1)
+        assertTrue(result is com.bounswe.predictionpolls.common.Result.Success)
+        assertNotNull((result as com.bounswe.predictionpolls.common.Result.Success).data)
+        // Further assertions can be added to check the data content
+    }
+
+
+    @Test
+    fun `invoke returns success with correct data on page 2`() = runBlockingTest {
+        val result = getFeedUseCase.invoke(2)
+        assertTrue(result is com.bounswe.predictionpolls.common.Result.Success)
+        assertNotNull((result as com.bounswe.predictionpolls.common.Result.Success).data)
+        // Further assertions can be added to check the data content
+    }
+
+    @Test
+    fun `invoke returns success with correct data on page 0`() = runBlockingTest {
+        val result = getFeedUseCase.invoke(0)
+        assertTrue(result is com.bounswe.predictionpolls.common.Result.Success)
+        assertNotNull((result as com.bounswe.predictionpolls.common.Result.Success).data)
+        // Further assertions can be added to check the data content
+    }
+
+
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetProfileUseCaseTest.kt b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetProfileUseCaseTest.kt
new file mode 100644
index 00000000..5720145d
--- /dev/null
+++ b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/GetProfileUseCaseTest.kt
@@ -0,0 +1,36 @@
+package com.bounswe.predictionpolls
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.profile.GetProfileInfoUseCase
+import com.bounswe.predictionpolls.repo.FakeProfileInfoRepository
+import kotlinx.coroutines.test.runBlockingTest
+import org.junit.Before
+import org.junit.Test
+import org.junit.Assert.*
+
+class GetProfileInfoUseCaseTest {
+
+    private lateinit var fakeProfileInfoRepository: FakeProfileInfoRepository
+    private lateinit var getProfileInfoUseCase: GetProfileInfoUseCase
+
+    @Before
+    fun setUp() {
+        fakeProfileInfoRepository = FakeProfileInfoRepository()
+        getProfileInfoUseCase = GetProfileInfoUseCase(fakeProfileInfoRepository)
+    }
+
+    @Test
+    fun `invoke returns success with correct data`() = runBlockingTest {
+        val result = getProfileInfoUseCase("testUser")
+        assertTrue(result is Result.Success)
+        assertEquals("testUser", (result as Result.Success).data.username)
+    }
+
+    @Test
+    fun `invoke returns error on repository failure`() = runBlockingTest {
+        fakeProfileInfoRepository.setReturnError(true)
+
+        val result = getProfileInfoUseCase("testUser")
+        assertTrue(result is Result.Error)
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeFeedRepository.kt b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeFeedRepository.kt
new file mode 100644
index 00000000..f108c78c
--- /dev/null
+++ b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeFeedRepository.kt
@@ -0,0 +1,29 @@
+package com.bounswe.predictionpolls.repo
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.feed.FeedRepository
+import com.bounswe.predictionpolls.domain.poll.Poll
+import kotlinx.collections.immutable.persistentListOf
+
+class FakeFeedRepository : FeedRepository {
+    // Test data
+    private val polls = listOf(
+        Poll.DiscretePoll(
+            polId = "1",
+            creatorProfilePictureUri = null,
+            dueDate = "2023-12-31",
+            pollCreatorName = "Test User",
+            pollQuestionTitle = "Sample Poll 1",
+            rejectionText = null,
+            commentCount = 5,
+            tags = listOf("test", "sample"),
+            options = persistentListOf() // Add your options here
+        ),
+        // Add more Poll objects as needed for testing
+    )
+
+    override suspend fun getPolls(page: Int): Result<List<Poll>> {
+        // Return the test data, simulating a successful response
+        return Result.Success(polls)
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeProfileRepository.kt b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeProfileRepository.kt
new file mode 100644
index 00000000..7930f612
--- /dev/null
+++ b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakeProfileRepository.kt
@@ -0,0 +1,33 @@
+package com.bounswe.predictionpolls.repo
+
+
+import com.bounswe.predictionpolls.common.Result
+import com.bounswe.predictionpolls.domain.profile.ProfileInfo
+import com.bounswe.predictionpolls.domain.profile.ProfileInfoRepository
+import kotlinx.collections.immutable.persistentListOf
+
+class FakeProfileInfoRepository : ProfileInfoRepository {
+
+    private var shouldReturnError = false
+
+    fun setReturnError(value: Boolean) {
+        shouldReturnError = value
+    }
+
+    override suspend fun getProfileInfo(username: String): Result<ProfileInfo> {
+        return if (!shouldReturnError) {
+            Result.Success(
+                ProfileInfo(
+                    username = username,
+                    userFullName = "Test User",
+                    coverPhotoUri = "http://example.com/cover.jpg",
+                    profilePictureUri = "http://example.com/profile.jpg",
+                    userDescription = "This is a test user.",
+                    badgeUris = persistentListOf("http://example.com/badge1.jpg")
+                )
+            )
+        } else {
+            Result.Error(Exception("Fake error"))
+        }
+    }
+}

From 305e916e07deff8c52dcee2c022a3ac0516aa84d Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 20:29:33 +0300
Subject: [PATCH 195/246] remove vote page from drawer

---
 .../main/java/com/bounswe/predictionpolls/utils/NavItem.kt  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
index 1e416146..5741e651 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/utils/NavItem.kt
@@ -25,12 +25,6 @@ enum class NavItem(
         titleId = R.string.nav_drawer_feed,
         iconId = R.drawable.ic_feed
     ),
-    VOTE_POLL(
-        route = "vote_poll", // TODO: change this route with the actual route
-        titleId = R.string.nav_drawer_vote,
-        iconId = R.drawable.ic_vote,
-        requiresAuth = true
-    ),
     CREATE_POLL(
         route = CREATE_POLL_ROUTE,
         titleId = R.string.nav_drawer_create,

From f068ca7f855123989ee62f7a3d102b7f13fd2583 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 20:29:41 +0300
Subject: [PATCH 196/246] fix drawer tests

---
 .../predictionpolls/ui/common/NavigationDrawerTest.kt        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/prediction-polls/android/app/src/androidTest/java/com/bounswe/predictionpolls/ui/common/NavigationDrawerTest.kt b/prediction-polls/android/app/src/androidTest/java/com/bounswe/predictionpolls/ui/common/NavigationDrawerTest.kt
index e41197bc..f44506e9 100644
--- a/prediction-polls/android/app/src/androidTest/java/com/bounswe/predictionpolls/ui/common/NavigationDrawerTest.kt
+++ b/prediction-polls/android/app/src/androidTest/java/com/bounswe/predictionpolls/ui/common/NavigationDrawerTest.kt
@@ -24,9 +24,7 @@ class NavigationDrawerTest {
 
         composeTestRule.setContent {
             titles = titleIds.map { stringResource(id = it) }
-            NavigationDrawer(
-                selectedNavItem = NavItem.FEED
-            ) {
+            NavigationDrawer() {
                 Button(
                     onClick = {
                         it()
@@ -56,7 +54,6 @@ class NavigationDrawerTest {
         composeTestRule.setContent {
             clickedTitle = stringResource(id = NavItem.PROFILE.titleId)
             NavigationDrawer(
-                selectedNavItem = selectedNavItem,
                 onButtonClick = {
                     selectedNavItem = it
                 }

From 0d30a68e886d4256428460773ca1432b671d6935 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 20:29:53 +0300
Subject: [PATCH 197/246] get username with id with findUser

---
 prediction-polls/backend/src/services/PollService.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 7e9682a8..9f43fa06 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -115,7 +115,8 @@ async function addDiscretePoll(req, res) {
         const numericFieldValue = req.body.numericFieldValue;
         const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
         const selectedTimeUnit = req.body.selectedTimeUnit;
-        const username = req.user.name;
+        const findUserResult = await findUser({userId: req.user.id});
+        const username = findUserResult.username;
 
         const result = await db.addDiscretePoll(
             question,
@@ -172,7 +173,8 @@ async function addContinuousPoll(req, res) {
         const numericFieldValue = req.body.numericFieldValue;
         const dueDatePoll = setDueDate ? new Date(req.body.dueDatePoll).toISOString().split('T')[0] : null;
         const selectedTimeUnit = req.body.selectedTimeUnit;
-        const username = req.user.name;
+        const findUserResult = await findUser({userId: req.user.id});
+        const username = findUserResult.username;
 
         const result = await db.addContinuousPoll(
             question,

From a6e2177581537df5e2500e93c7e379cec9880b11 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 20:38:41 +0300
Subject: [PATCH 198/246] fix poll dates

---
 .../bounswe/predictionpolls/extensions/StringExtensions.kt | 7 +++++++
 .../predictionpolls/ui/common/poll/PollsComposable.kt      | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt
index 28770a8f..ad3c4f51 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/extensions/StringExtensions.kt
@@ -57,4 +57,11 @@ fun String.toISO8601(): String? {
     )
     val offsetDate = OffsetDateTime.of(localDate, ZoneOffset.UTC)
     return offsetDate.format(DateTimeFormatter.ISO_DATE_TIME)
+}
+
+fun String.fromISO8601(): String {
+    val offsetDate = OffsetDateTime.parse(this, DateTimeFormatter.ISO_DATE_TIME)
+    offsetDate.apply {
+        return "${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')} ${dayOfMonth}/${monthValue}/${year}"
+    }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
index 0fb84aa7..edc0a908 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -9,6 +9,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.bounswe.predictionpolls.domain.poll.Poll
 import com.bounswe.predictionpolls.domain.poll.PollOption
+import com.bounswe.predictionpolls.extensions.fromISO8601
 import kotlinx.collections.immutable.ImmutableList
 
 
@@ -48,7 +49,7 @@ fun Polls(
                         }
                     }
                 },
-                dueDate = it.dueDate ?: "",
+                dueDate = it.dueDate?.fromISO8601() ?: "",
                 rejectionText = it.rejectionText ?: "",
                 commentCount = it.commentCount
             )

From 868c198ef5d8abfff1ea8be98ca431872ab2fe9c Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Sun, 26 Nov 2023 20:57:22 +0300
Subject: [PATCH 199/246] add tag functionality

---
 prediction-polls/backend/package.json         |   1 +
 prediction-polls/backend/src/app.js           |   1 +
 .../backend/src/repositories/PollDB.js        |  39 ++++-
 .../backend/src/routines/tagRoutine.js        |  72 +++++++++
 .../backend/src/routines/topics.json          | 151 ++++++++++++++++++
 prediction-polls/backend/src/schema.sql       |   3 +-
 6 files changed, 263 insertions(+), 4 deletions(-)
 create mode 100644 prediction-polls/backend/src/routines/tagRoutine.js
 create mode 100644 prediction-polls/backend/src/routines/topics.json

diff --git a/prediction-polls/backend/package.json b/prediction-polls/backend/package.json
index cfab128d..8b5c09f1 100644
--- a/prediction-polls/backend/package.json
+++ b/prediction-polls/backend/package.json
@@ -23,6 +23,7 @@
     "jsonwebtoken": "^9.0.2",
     "multer": "^1.4.5-lts.1",
     "mysql2": "^3.6.2",
+    "node-cron": "^3.0.3",
     "nodemailer": "^6.9.7",
     "querystring": "^0.2.1",
     "swagger-jsdoc": "^6.2.8",
diff --git a/prediction-polls/backend/src/app.js b/prediction-polls/backend/src/app.js
index f18f0e8d..c95e41ed 100644
--- a/prediction-polls/backend/src/app.js
+++ b/prediction-polls/backend/src/app.js
@@ -2,6 +2,7 @@ const express = require('express');
 const authRouter = require('./routes/AuthorizationRouter.js'); 
 const pollRouter = require('./routes/PollRouter.js');
 const profileRouter = require('./routes/ProfileRouter.js');
+const tagRoutine = require('./routines/tagRoutine.js');
 
 const cors = require("cors");
 
diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index f1770399..9d39d3c1 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -237,21 +237,54 @@ async function getContinuousPollVotes(pollId) {
 }
 
 async function getTagsOfPoll(pollId) {
-    const sql = "SELECT * FROM tags WHERE poll_id = ?";
+    const sql = "SELECT tags.topic FROM tags WHERE poll_id = ?";
 
     try {
         [rows] = await pool.query(sql, [pollId]);
-        return rows;
+        return rows.map(item => item.topic);
     } catch (error) { 
         console.error('getTagsOfPoll(): Database Error');
         throw error;
     }
 }
 
+async function getUntaggedPolls() {
+    const sql = 'SELECT polls.id, polls.question, polls.tagsScanned FROM polls'
+
+    try {
+        [rows] = await pool.query(sql, []);
+        return rows;
+    } catch (error) { 
+        console.error('getUntaggedPolls(): Database Error');
+        throw error;
+    }
+}
+
+async function updateTagsScanned(pollId, tagsScanned) {
+    const sql = 'UPDATE polls SET tagsScanned = ? WHERE id = ?'
+
+    try {
+        [rows] = await pool.query(sql, [tagsScanned, pollId]);
+        return rows;
+    } catch (error) { 
+        console.error('updateTagsScanned(): Database Error');
+        throw error;
+    }
+}
 
+async function addTopic(pollId, topic) {
+    const sql = 'INSERT into tags (topic, poll_id) VALUES (?, ?)'
 
+    try {
+        [rows] = await pool.query(sql, [topic, pollId]);
+        return rows;
+    } catch (error) { 
+        console.error('updateTopic(): Database Error');
+        throw error;
+    }
+}
 
 module.exports = {getPolls, getPollWithId, getDiscretePollWithId, getContinuousPollWithId, 
     addDiscretePoll,addContinuousPoll, getDiscretePollChoices, getDiscreteVoteCount, voteDiscretePoll, voteContinuousPoll,
-    getContinuousPollVotes,getTagsOfPoll}
+    getContinuousPollVotes,getTagsOfPoll, getUntaggedPolls, updateTagsScanned, addTopic}
     
\ No newline at end of file
diff --git a/prediction-polls/backend/src/routines/tagRoutine.js b/prediction-polls/backend/src/routines/tagRoutine.js
new file mode 100644
index 00000000..2652f016
--- /dev/null
+++ b/prediction-polls/backend/src/routines/tagRoutine.js
@@ -0,0 +1,72 @@
+const cron = require('node-cron');
+const axios = require('axios');
+const topics = require('./topics.json');
+const {getUntaggedPolls, updateTagsScanned, addTopic} = require('../repositories/PollDB');
+require('dotenv').config();
+
+const scoreThreshold = 0.85;
+
+async function tagRoutine() {
+  const doTag = process.env.DO_TAG === 'true';
+
+  console.log('tagRoutine Running');
+
+  if (!doTag) {
+    console.log('DO_TAG is set to false. tagRoutine will do nothing.');
+    return;
+  }
+
+  const apiUrl = process.env.TAG_API_URL;
+
+  if (!apiUrl) {
+    console.error('TAG_API_URL is not defined in the environment variables.');
+    return;
+  }
+
+  const untaggedPolls = await getUntaggedPolls();
+
+  const filteredPolls = untaggedPolls.filter(poll => poll.tagsScanned >= 0 && poll.tagsScanned < topics.topics.length);
+  if (filteredPolls.length === 0) {
+    console.log("No polls to tag.");
+    return;
+  }
+  console.log(filteredPolls);
+  const randomPoll = filteredPolls[Math.floor(Math.random() * filteredPolls.length)];
+  console.log(randomPoll);
+  const pollId = randomPoll.id;
+  const pollQuestion = randomPoll.question;
+  const tagsScanned = randomPoll.tagsScanned;
+
+  const batchSize = 10; // the api accepts at most 10 candidate_labels
+  const topicsBatch = topics.topics.slice(tagsScanned, tagsScanned + batchSize);
+  const additionalScans = topicsBatch.length;
+
+  const candidateLabels = topicsBatch.map(topic => topic.name).join(', ');
+
+  axios.post(apiUrl, {
+    // inputs: "What will be the result of the Besiktas vs. Fenerbahce football match at 9.12.2023?",
+    inputs: pollQuestion,
+    parameters: {
+      candidate_labels: candidateLabels,
+      multi_label: true
+    }
+  })
+  .then(response => {
+    const filteredLabels = response.data.labels.filter((label, index) => response.data.scores[index] > scoreThreshold);
+
+    updateTagsScanned(pollId, tagsScanned + additionalScans)
+    if (filteredLabels.length > 0) {
+      addTopic(pollId, filteredLabels[0])
+    }
+
+  })
+  .catch(error => {
+
+    console.error('Error:', error.message);
+  });
+}
+
+// Schedule the routine to run every 30 seconds
+cron.schedule('*/30 * * * * *', tagRoutine);
+
+module.exports = tagRoutine;
diff --git a/prediction-polls/backend/src/routines/topics.json b/prediction-polls/backend/src/routines/topics.json
new file mode 100644
index 00000000..811effe9
--- /dev/null
+++ b/prediction-polls/backend/src/routines/topics.json
@@ -0,0 +1,151 @@
+{
+  "topics": [
+    {
+      "name": "Weather",
+      "subtopics": []
+    },
+    {
+      "name": "Politics",
+      "subtopics": [
+        "International relations",
+        "Political ideologies",
+        "Political philosophy",
+        "Political systems",
+        "Government policies",
+        "Political economy",
+        "Political history",
+        "Geopolitics",
+        "Political activism"
+      ]
+    },
+    {
+      "name": "Health",
+      "subtopics": [
+        "Nutrition and diet",
+        "Mental health",
+        "Physical fitness",
+        "Chronic diseases",
+        "Healthcare systems",
+        "Public health",
+        "Alternative medicine",
+        "Health education",
+        "Healthcare technology"
+      ]
+    },
+    {
+      "name": "Technology",
+      "subtopics": [
+        "Artificial intelligence",
+        "Blockchain technology",
+        "Virtual reality",
+        "Augmented reality",
+        "Cybersecurity",
+        "Internet of Things (IoT)",
+        "Machine learning",
+        "Robotics",
+        "Quantum computing"
+      ]
+    },
+    {
+      "name": "Science",
+      "subtopics": [
+        "Physics",
+        "Chemistry",
+        "Biology",
+        "Astronomy",
+        "Earth science",
+        "Environmental science",
+        "Psychology",
+        "Neuroscience",
+        "Scientific research methods"
+      ]
+    },
+    {
+      "name": "Nature",
+      "subtopics": [
+        "Zoology",
+        "Animal",
+        "Endangered species",
+        "Wildlife conservation",
+        "Veterinary medicine",
+        "Animal welfare",
+        "Ethology",
+        "Pets and domestication"
+      ]
+    },
+    {
+      "name": "Lifestyle",
+      "subtopics": [
+        "Fashion and style",
+        "Travel and leisure",
+        "Home decor",
+        "Personal development",
+        "Beauty and skincare",
+        "Hobbies and crafts",
+        "Food and cooking",
+        "Relationships and dating",
+        "Parenting"
+      ]
+    },
+    {
+      "name": "Art",
+      "subtopics": [
+        "Visual arts",
+        "Performing arts",
+        "Literature and writing",
+        "Film and cinema",
+        "Photography",
+        "Art history",
+        "Digital art",
+        "Contemporary art"
+      ]
+    },
+    {
+      "name": "Environment",
+      "subtopics": [
+        "Climate change",
+        "Conservation efforts",
+        "Renewable energy",
+        "Biodiversity",
+        "Pollution control",
+        "Sustainable living",
+        "Environmental policies",
+        "Ecotourism",
+        "Environmental activism"
+      ]
+    },
+    {
+      "name": "Education",
+      "subtopics": [
+        "Online education platforms",
+        "Educational technology",
+        "Pedagogy",
+        "Learning strategies",
+        "Special education",
+        "Vocational training",
+        "Higher education trends",
+        "Education policies",
+        "Lifelong learning"
+      ]
+    },
+    {
+      "name": "Sports",
+      "subtopics": [
+        "Football",
+        "Basketball",
+        "Baseball",
+        "Tennis",
+        "Athletics",
+        "Esports",
+        "Extreme sports",
+        "Sports analytics",
+        "Sports psychology"
+      ]
+    },
+    {
+      "name": "Entertainment",
+      "subtopics": [
+      ]
+    }
+  ]
+}
diff --git a/prediction-polls/backend/src/schema.sql b/prediction-polls/backend/src/schema.sql
index 3e1efd22..1379b7c9 100644
--- a/prediction-polls/backend/src/schema.sql
+++ b/prediction-polls/backend/src/schema.sql
@@ -30,7 +30,8 @@ CREATE TABLE polls (
     setDueDate BOOLEAN NOT NULL,
     closingDate DATE,
     numericFieldValue INT,
-    selectedTimeUnit ENUM('min', 'h', 'day', 'mth')
+    selectedTimeUnit ENUM('min', 'h', 'day', 'mth'),
+    tagsScanned INT DEFAULT 0
 );
 
 CREATE TABLE discrete_polls (

From 27cce08e84fc9b14a5cbf3557747208802318f44 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 20 Nov 2023 23:50:46 +0300
Subject: [PATCH 200/246] add simple unit test for 404

---
 .../backend/tests/PollService.test.js         | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 prediction-polls/backend/tests/PollService.test.js

diff --git a/prediction-polls/backend/tests/PollService.test.js b/prediction-polls/backend/tests/PollService.test.js
new file mode 100644
index 00000000..87d15dad
--- /dev/null
+++ b/prediction-polls/backend/tests/PollService.test.js
@@ -0,0 +1,25 @@
+const { getPollWithId } = require('../src/services/PollService.js');
+const db = require('../src/repositories/PollDB.js');
+const errorCodes = require("../src/errorCodes.js")
+
+jest.mock('../src/repositories/PollDB');
+
+describe('getPollWithId', () => {
+  test('returns a 404 response for non-existing poll', async () => {
+    const req = { params: { pollId: 'nonexistentId' } };
+    const res = {
+      status: jest.fn().mockReturnThis(),
+      json: jest.fn(),
+    };
+
+    db.getPollWithId.mockResolvedValue([]);
+
+    await getPollWithId(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({
+      code: errorCodes.NO_SUCH_POLL_ERROR.code,
+      message: errorCodes.NO_SUCH_POLL_ERROR.message,
+    });
+  });
+});
\ No newline at end of file

From e0935f0972b68d1bc18f87070828c6bb1d494a56 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 21:51:06 +0300
Subject: [PATCH 201/246] improve feed ui

---
 .../ui/common/poll/PollComposable.kt          | 50 ++++++++++---------
 .../ui/common/poll/PollCreatorProfile.kt      |  5 +-
 .../ui/common/poll/PollsComposable.kt         | 22 ++++----
 .../predictionpolls/ui/feed/FeedScreen.kt     |  7 ++-
 .../predictionpolls/ui/feed/FeedSearchBar.kt  |  1 -
 5 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
index cf1ea17d..4a831752 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollComposable.kt
@@ -48,49 +48,54 @@ fun PollComposable(
 ) {
     Box(
         modifier = modifier
-            .shadow(4.dp, RoundedCornerShape(12.dp))
+            .shadow(
+                6.dp,
+                RoundedCornerShape(12.dp),
+                ambientColor = MaterialTheme.colorScheme.primary,
+                spotColor = MaterialTheme.colorScheme.primary
+            )
             .background(Color.White, RoundedCornerShape(12.dp))
-            .padding(16.dp)
+            .padding(horizontal = 16.dp, vertical = 8.dp)
             .wrapContentSize()
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
-                .wrapContentHeight()
+                .wrapContentHeight(),
+            verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
             PollCreatorProfile(
                 imageUri = pollCreatorProfilePictureUri,
                 userName = pollCreatorName,
                 modifier = Modifier.align(Alignment.End)
             )
-            Spacer(modifier = Modifier.height(8.dp))
-            PollTagsContent(tags)
+            if (tags.isNotEmpty()) PollTagsContent(tags)
             PollQuestionTitle(pollQuestionTitle = pollQuestionTitle)
             optionsContent()
-            Box(
+            Row(
                 modifier = Modifier
                     .fillMaxWidth()
                     .wrapContentHeight()
-                    .padding(top = 48.dp)
-                    .padding(horizontal = 48.dp)
+                    .padding(vertical = 8.dp),
+                horizontalArrangement = Arrangement.SpaceAround
             ) {
-                DueDateComposable(
-                    dueDate = dueDate,
-                    modifier = Modifier.align(Alignment.CenterStart)
-                )
-                RejectionDateComposable(
-                    rejectionText = rejectionText,
-                    modifier = Modifier.align(Alignment.CenterEnd)
-                )
+                if (dueDate.isNotEmpty()){
+                    DueDateComposable(
+                        dueDate = dueDate
+                    )
+                }
+                if (rejectionText.isNotEmpty()){
+                    RejectionDateComposable(
+                        rejectionText = rejectionText
+                    )
+                }
             }
             Row(
                 modifier = Modifier
-                    .padding(horizontal = 48.dp)
-
                     .fillMaxWidth()
                     .wrapContentHeight()
-                    .padding(top = 48.dp),
-                horizontalArrangement = Arrangement.SpaceBetween
+                    .padding(vertical = 8.dp),
+                horizontalArrangement = Arrangement.SpaceAround
             ) {
                 Column {
                     PollIcon(
@@ -131,7 +136,7 @@ private fun PollIcon(@DrawableRes id: Int, modifier: Modifier = Modifier) {
         painter = painterResource(id = id),
         contentDescription = null,
         modifier = modifier
-            .padding(16.dp)
+            .padding(12.dp)
             .size(32.dp)
     )
 
@@ -170,7 +175,7 @@ private fun RejectionDateComposable(rejectionText: String, modifier: Modifier =
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(
-            text = "Closing in",
+            text = "Reject votes in",
             fontFamily = MontserratFontFamily,
             color = MaterialTheme.colorScheme.scrim,
             fontWeight = FontWeight.Bold,
@@ -210,7 +215,6 @@ private fun PollQuestionTitle(pollQuestionTitle: String, modifier: Modifier = Mo
         color = MaterialTheme.colorScheme.scrim,
         fontWeight = FontWeight.Bold,
         modifier = modifier
-            .padding(vertical = 32.dp)
             .fillMaxWidth()
             .wrapContentHeight(),
         textAlign = TextAlign.Start,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt
index 5cb64f5e..9ecb9907 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollCreatorProfile.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import com.bounswe.predictionpolls.R
@@ -33,10 +34,10 @@ fun PollCreatorProfile(imageUri: String?, userName: String, modifier: Modifier =
             text = userName,
             fontFamily = MontserratFontFamily,
             color = MaterialTheme.colorScheme.scrim,
-            fontWeight = FontWeight.Bold
+            fontWeight = FontWeight.Bold,
+            fontSize = 12.sp,
         )
     }
-
 }
 
 
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
index edc0a908..f2ea96a1 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/common/poll/PollsComposable.kt
@@ -1,12 +1,14 @@
 package com.bounswe.predictionpolls.ui.common.poll
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import com.bounswe.predictionpolls.domain.poll.Poll
 import com.bounswe.predictionpolls.domain.poll.PollOption
 import com.bounswe.predictionpolls.extensions.fromISO8601
@@ -22,7 +24,10 @@ fun Polls(
     onPollClicked: (id: String) -> Unit = {},
     modifier: Modifier = Modifier
 ) {
-    LazyColumn(modifier = modifier) {
+    LazyColumn(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
         items(polls) {
             PollComposable(
                 modifier = Modifier.clickable {
@@ -34,15 +39,7 @@ fun Polls(
                 pollQuestionTitle = it.pollQuestionTitle,
                 optionsContent = {
                     when (it) {
-                        is Poll.ContinuousPoll -> {
-                            ContinuousVoteOption(
-                                title = "Enter your vote",
-                                vote = "",
-                                isVotingEnabled = false,
-                                voteType = it.inputType,
-                                onVoteInputChanged = {}
-                            )
-                        }
+                        is Poll.ContinuousPoll -> {}
 
                         is Poll.DiscretePoll -> {
                             ReadOnlyDiscretePollOptions(it.options)
@@ -69,7 +66,10 @@ fun ReadOnlyDiscretePollOptions(
         } else sum
     }
 
-    Column(modifier) {
+    Column(
+        modifier,
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
         options.forEach {
             DiscreteVoteOption(
                 optionName = it.text,
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
index 276de357..3d18ebdb 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreen.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.CircularProgressIndicator
@@ -30,7 +31,11 @@ fun FeedScreen(
             .fillMaxSize()
             .padding(16.dp)
     ) {
-        FeedSearchBar(text = text, onTextChanged = { text = it })
+        FeedSearchBar(
+            modifier = Modifier.fillMaxWidth(),
+            text = text,
+            onTextChanged = { text = it }
+        )
         Spacer(modifier = Modifier.height(16.dp))
         when (feedUiState) {
             is FeedUiState.Loading -> {
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedSearchBar.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedSearchBar.kt
index 6c2a72d3..8d507eea 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedSearchBar.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedSearchBar.kt
@@ -30,7 +30,6 @@ fun FeedSearchBar(
 }
 
 // create a preview for above composable
-
 @Preview
 @Composable
 fun FeedSearchBarPreview() {

From c4b5ef78e85b1196959cddb3e58b7ee62c19b987 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 21:58:05 +0300
Subject: [PATCH 202/246] fix auth interceptor

---
 .../predictionpolls/data/remote/interceptors/AuthInterceptor.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/interceptors/AuthInterceptor.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/interceptors/AuthInterceptor.kt
index 88e32e21..5f9ca508 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/interceptors/AuthInterceptor.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/interceptors/AuthInterceptor.kt
@@ -21,6 +21,8 @@ class AuthInterceptor @Inject constructor(
 
         var response = chain.proceed(request)
         if (response.code == 401) {
+            response.close()
+
             refreshAccessToken()?.let { newAccessToken ->
                 tokenManager.accessToken = newAccessToken
                 request = addAuthHeader(request, newAccessToken)

From 57abda7b1e954d2cb994b21ad7476d29521938e9 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 22:03:36 +0300
Subject: [PATCH 203/246] fix vote screen navigation

---
 .../com/bounswe/predictionpolls/MainActivity.kt   |  2 +-
 .../ui/feed/FeedScreenNavigation.kt               | 12 ++++++++++--
 .../bounswe/predictionpolls/ui/vote/PollVote.kt   | 15 ++++++++++++---
 .../android/app/src/main/res/values/strings.xml   |  2 +-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
index 543f2c19..c12f76cd 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/MainActivity.kt
@@ -92,7 +92,7 @@ class MainActivity : ComponentActivity() {
                             mainScreen(navController)
                             loginScreen(navController)
                             signupScreen(navController)
-                            feedScreen(navController)
+                            feedScreen(navController, isUserLoggedIn.value)
                             leaderboardScreen(navController)
                             createPollScreen()
                             profileScreen(navController)
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
index 22dc5a84..d5ad3882 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/feed/FeedScreenNavigation.kt
@@ -9,11 +9,13 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.Navigator
 import androidx.navigation.compose.composable
+import com.bounswe.predictionpolls.ui.main.MAIN_ROUTE
+import com.bounswe.predictionpolls.ui.main.navigateToMainScreen
 import com.bounswe.predictionpolls.ui.vote.navigateToPollVoteScreen
 
 const val FEED_ROUTE = "feed"
 
-fun NavGraphBuilder.feedScreen(navController: NavController) {
+fun NavGraphBuilder.feedScreen(navController: NavController, isUserLoggedIn: Boolean) {
     composable(FEED_ROUTE) {
         val feedViewModel: FeedViewModel = hiltViewModel()
         LaunchedEffect(Unit) {
@@ -23,7 +25,13 @@ fun NavGraphBuilder.feedScreen(navController: NavController) {
         }
         val feedUiState by feedViewModel.feedUiState.collectAsStateWithLifecycle()
         FeedScreen(feedUiState, onPollClicked = {
-            navController.navigateToPollVoteScreen(it)
+            if (isUserLoggedIn) {
+                navController.navigateToPollVoteScreen(it)
+            } else {
+                navController.navigateToMainScreen(
+                    navOptions = NavOptions.Builder().setPopUpTo(MAIN_ROUTE, true).build()
+                )
+            }
         })
     }
 }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt
index f6f49dc9..e6113c85 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/vote/PollVote.kt
@@ -2,13 +2,16 @@ package com.bounswe.predictionpolls.ui.vote
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -40,11 +43,17 @@ fun PollVote(
     onVotePressed: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(horizontal = 16.dp, vertical = 8.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
         pollContent()
         Text(
             text = stringResource(id = R.string.vote_screen_text),
-            fontSize = 20.sp,
+            fontSize = 16.sp,
             fontFamily = MontserratFontFamily,
             fontWeight = FontWeight.Medium,
             textAlign = TextAlign.Center,
@@ -115,7 +124,7 @@ private fun PollVotePreview() {
                 pollCreatorName = "Zehra Eser",
                 tags = listOf("Basketball", "Cleveland Cavaliers", "Lebron James"),
                 pollQuestionTitle = "Who is the best basketball player of all time?",
-                optionsContent = {  },
+                optionsContent = { },
                 dueDate = "",
                 rejectionText = "Last 5 days",
                 commentCount = 145
diff --git a/prediction-polls/android/app/src/main/res/values/strings.xml b/prediction-polls/android/app/src/main/res/values/strings.xml
index abcf3afd..20f5d97e 100644
--- a/prediction-polls/android/app/src/main/res/values/strings.xml
+++ b/prediction-polls/android/app/src/main/res/values/strings.xml
@@ -68,7 +68,7 @@
 
     <string name="date_picker_ok">Tamam</string>
     <string name="date_picker_cancel">İptal</string>
-    <string name="vote_screen_text">Choose one of the options you want to vote for</string>
+    <string name="vote_screen_text">Choose one of the options you want</string>
     <string name="vote_screen_vote_button_text">Vote</string>
     <string name="poll_vote_input_title">Vote points</string>
 

From 91db4fcd2d1a10132d693587c0e0a9342dc56334 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 22:16:45 +0300
Subject: [PATCH 204/246] improve profile navigation

---
 .../data/profile/ProfileApi.kt                |  3 +++
 .../profile/ProfileInfoRemoteDataSource.kt    |  1 +
 .../ProfileInfoRemoteDataSourceImpl.kt        | 12 +++++++++-
 .../data/profile/ProfileInfoRepositoryImpl.kt | 24 +++++++++++++++++++
 .../predictionpolls/di/ProfileModule.kt       |  2 +-
 .../profile/GetCurrentUserProfileUseCase.kt   | 13 ++++++++++
 .../domain/profile/ProfileInfoRepository.kt   |  2 +-
 .../ui/profile/ProfileScreen.kt               | 23 ++++++++----------
 .../ui/profile/ProfileScreenNavigation.kt     |  6 ++---
 .../ui/profile/ProfileScreenViewModel.kt      | 10 ++++----
 10 files changed, 71 insertions(+), 25 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetCurrentUserProfileUseCase.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
index 05dd036f..b412cb11 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileApi.kt
@@ -8,4 +8,7 @@ interface ProfileApi {
 
     @GET("profiles")
     suspend fun fetchProfileInfo(@Query("username") username: String): ProfileInfoResponse
+
+    @GET("profiles/myProfile")
+    suspend fun fetchCurrentUserProfileInfo(): ProfileInfoResponse
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
index d09331a2..e68380b8 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSource.kt
@@ -6,4 +6,5 @@ import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
 interface ProfileInfoRemoteDataSource {
 
     suspend fun fetchProfileInfo(username: String): Result<ProfileInfoResponse>
+    suspend fun fetchCurrentUserProfileInfo(): Result<ProfileInfoResponse>
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
index a6ff9d11..303d61b3 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRemoteDataSourceImpl.kt
@@ -2,9 +2,9 @@ package com.bounswe.predictionpolls.data.profile
 
 import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.data.profile.model.ProfileInfoResponse
+import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import javax.inject.Inject
 
 class ProfileInfoRemoteDataSourceImpl @Inject constructor(
     private val profileApi: ProfileApi
@@ -18,4 +18,14 @@ class ProfileInfoRemoteDataSourceImpl @Inject constructor(
                 Result.Error(e)
             }
         }
+
+    override suspend fun fetchCurrentUserProfileInfo(): Result<ProfileInfoResponse> =
+        withContext(Dispatchers.IO) {
+            try {
+                val response = profileApi.fetchCurrentUserProfileInfo()
+                Result.Success(response)
+            } catch (e: Exception) {
+                Result.Error(e)
+            }
+        }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRepositoryImpl.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRepositoryImpl.kt
index 4df38551..66d55a08 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRepositoryImpl.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/profile/ProfileInfoRepositoryImpl.kt
@@ -31,4 +31,28 @@ class ProfileInfoRepositoryImpl @Inject constructor(
             }
         }
     }
+
+    override suspend fun getCurrentUserProfileInfo(): Result<ProfileInfo> {
+        profileInfoRemoteDataSource.fetchCurrentUserProfileInfo().let { result ->
+            return when (result) {
+                is Result.Success -> {
+                    val profileInfo = result.data.toProfileInfo()
+                    if (profileInfo != null) {
+                        Result.Success(profileInfo)
+                    } else {
+                        Result.Error(
+                            Exception(
+                                result.data.predictionPollsError?.message
+                                    ?: "ProfileInfoResponse is not valid"
+                            )
+                        )
+                    }
+                }
+
+                is Result.Error -> {
+                    Result.Error(result.exception)
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt
index a6859268..c817aa76 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/ProfileModule.kt
@@ -27,7 +27,7 @@ abstract class ProfileModule {
 
     companion object {
         @Provides
-        fun provideProfileApi(@UnauthenticatedRetrofit unauthenticatedRetrofit: Retrofit): ProfileApi =
+        fun provideProfileApi(@AuthenticatedRetrofit unauthenticatedRetrofit: Retrofit): ProfileApi =
             unauthenticatedRetrofit.create(ProfileApi::class.java)
 
     }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetCurrentUserProfileUseCase.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetCurrentUserProfileUseCase.kt
new file mode 100644
index 00000000..916cc70e
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/GetCurrentUserProfileUseCase.kt
@@ -0,0 +1,13 @@
+package com.bounswe.predictionpolls.domain.profile
+
+import com.bounswe.predictionpolls.common.Result
+import javax.inject.Inject
+
+class GetCurrentUserProfileUseCase @Inject constructor(
+    private val profileInfoRepository: ProfileInfoRepository
+) {
+
+    suspend operator fun invoke(): Result<ProfileInfo> =
+        profileInfoRepository.getCurrentUserProfileInfo()
+
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
index a4bdcf54..4f9e178d 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/domain/profile/ProfileInfoRepository.kt
@@ -4,5 +4,5 @@ import com.bounswe.predictionpolls.common.Result
 
 interface ProfileInfoRepository {
     suspend fun getProfileInfo(username: String): Result<ProfileInfo>
-
+    suspend fun getCurrentUserProfileInfo(): Result<ProfileInfo>
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
index b0cec400..1ddd00ad 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreen.kt
@@ -1,6 +1,7 @@
 package com.bounswe.predictionpolls.ui.profile
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -14,10 +15,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.bounswe.predictionpolls.domain.poll.Poll
-import com.bounswe.predictionpolls.ui.common.poll.ContinuousVoteOption
-import com.bounswe.predictionpolls.ui.common.poll.ReadOnlyDiscretePollOptions
+import com.bounswe.predictionpolls.extensions.fromISO8601
 import com.bounswe.predictionpolls.ui.common.poll.DiscreteVoteOption
 import com.bounswe.predictionpolls.ui.common.poll.PollComposable
+import com.bounswe.predictionpolls.ui.common.poll.ReadOnlyDiscretePollOptions
 import com.bounswe.predictionpolls.ui.theme.PredictionPollsTheme
 
 
@@ -73,22 +74,14 @@ fun ProfileScreen(profileScreenUiState: ProfileScreenUiState, modifier: Modifier
                             pollQuestionTitle = it.pollQuestionTitle,
                             optionsContent = {
                                 when (it) {
-                                    is Poll.ContinuousPoll -> {
-                                        ContinuousVoteOption(
-                                            title = "Enter your vote",
-                                            vote = "",
-                                            isVotingEnabled = false,
-                                            voteType = it.inputType,
-                                            onVoteInputChanged = {}
-                                        )
-                                    }
+                                    is Poll.ContinuousPoll -> {}
 
                                     is Poll.DiscretePoll -> {
                                         ReadOnlyDiscretePollOptions(it.options)
                                     }
                                 }
                             },
-                            dueDate = it.dueDate ?: "",
+                            dueDate = it.dueDate?.fromISO8601() ?: "",
                             rejectionText = it.rejectionText ?: "",
                             commentCount = it.commentCount
                         )
@@ -116,7 +109,11 @@ private fun InternalProfileScreen(
     polls: LazyListScope.() -> Unit,
     modifier: Modifier = Modifier
 ) {
-    LazyColumn(modifier = modifier.background(MaterialTheme.colorScheme.surface)) {
+    LazyColumn(
+        modifier = modifier
+            .background(MaterialTheme.colorScheme.surface),
+        verticalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
 
         item {
             profileInformation()
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
index 332604d6..c7f256c9 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenNavigation.kt
@@ -14,16 +14,14 @@ const val PROFILE_SCREEN_ROUTE = "profile"
 
 fun NavGraphBuilder.profileScreen(navController: NavController) {
     composable(PROFILE_SCREEN_ROUTE) {
-
-        val username = "ahmetknk" // TODO: fetch this from navController arguments
-
+        //TODO: I have replaced index navigation. It should be implemented
         val profileViewModel: ProfileScreenViewModel = hiltViewModel()
         LaunchedEffect(key1 = Unit) {
             if (
                 profileViewModel.profileScreenUiState.value is ProfileScreenUiState.Loading ||
                 profileViewModel.profileScreenUiState.value is ProfileScreenUiState.Error
             ) {
-                profileViewModel.fetchProfileInfo(username)
+                profileViewModel.fetchProfileInfo()
                 profileViewModel.fetchFeed(0)
             }
         }
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
index afaccaaa..da7507a0 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/profile/ProfileScreenViewModel.kt
@@ -5,9 +5,10 @@ import androidx.lifecycle.viewModelScope
 import com.bounswe.predictionpolls.common.Result
 import com.bounswe.predictionpolls.domain.feed.GetFeedUseCase
 import com.bounswe.predictionpolls.domain.poll.Poll
-import com.bounswe.predictionpolls.domain.profile.GetProfileInfoUseCase
+import com.bounswe.predictionpolls.domain.profile.GetCurrentUserProfileUseCase
 import com.bounswe.predictionpolls.domain.profile.ProfileInfo
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -16,7 +17,6 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 private data class ProfileScreenViewModelState(
     val profileInfo: ProfileInfo? = null,
@@ -44,7 +44,7 @@ private data class ProfileScreenViewModelState(
 
 @HiltViewModel
 class ProfileScreenViewModel @Inject constructor(
-    private val getProfileInfoUseCase: GetProfileInfoUseCase,
+    private val getProfileInfoUseCase: GetCurrentUserProfileUseCase,
     private val getFeedUseCase: GetFeedUseCase
 ) : ViewModel() {
 
@@ -57,9 +57,9 @@ class ProfileScreenViewModel @Inject constructor(
             .stateIn(viewModelScope, SharingStarted.Eagerly, ProfileScreenUiState.Loading)
 
 
-    fun fetchProfileInfo(username: String) = viewModelScope.launch {
+    fun fetchProfileInfo() = viewModelScope.launch {
         _profileScreenUiState.update { it.copy(isLoading = true) }
-        when (val result = getProfileInfoUseCase(username)) {
+        when (val result = getProfileInfoUseCase()) {
             is Result.Success -> {
                 _profileScreenUiState.update {
                     it.copy(

From 7c45a17f29615373155222bb6f5272a9384bbc76 Mon Sep 17 00:00:00 2001
From: YigitSekerci <yigitsekerci6174@gmail.com>
Date: Sun, 26 Nov 2023 22:59:55 +0300
Subject: [PATCH 205/246] add extra tests for create poll

---
 .../remote/repositories/PollRepository.kt     |  14 +-
 .../repositories/PollRepositoryInterface.kt   |  29 +++
 .../predictionpolls/di/RepositoryModule.kt    |   3 +-
 .../ui/create/CreatePollViewModel.kt          |   4 +-
 .../repo/FakePollRepository.kt                |  29 +++
 .../ui/create/CreatePollViewModelTest.kt      | 193 ++++++++++++++++++
 6 files changed, 262 insertions(+), 10 deletions(-)
 create mode 100644 prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepositoryInterface.kt
 create mode 100644 prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakePollRepository.kt
 create mode 100644 prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModelTest.kt

diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
index 702c4a4a..e0811009 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepository.kt
@@ -7,13 +7,13 @@ import com.bounswe.predictionpolls.data.remote.services.PollService
 
 class PollRepository(
     private val pollService: PollService
-): BaseRepository()  {
-    suspend fun createContinuousPoll(
+): BaseRepository(), PollRepositoryInterface  {
+    override suspend fun createContinuousPoll(
         question: String,
         openVisibility: Boolean,
         setDueDate: Boolean,
-        dueDatePoll: String? = null,
-        numericFieldValue: Int? = null,
+        dueDatePoll: String?,
+        numericFieldValue: Int?,
         selectedTimeUnit: String,
         pollType: String,
     ){
@@ -31,13 +31,13 @@ class PollRepository(
         }
     }
 
-    suspend fun createDiscretePoll(
+    override suspend fun createDiscretePoll(
         question: String,
         choices: List<String>,
         openVisibility: Boolean,
         setDueDate: Boolean,
-        dueDatePoll: String? = null,
-        numericFieldValue: Int? = null,
+        dueDatePoll: String?,
+        numericFieldValue: Int?,
         selectedTimeUnit: String
     ){
         val request = CreateDiscretePollRequest(
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepositoryInterface.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepositoryInterface.kt
new file mode 100644
index 00000000..657c7ffc
--- /dev/null
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/data/remote/repositories/PollRepositoryInterface.kt
@@ -0,0 +1,29 @@
+package com.bounswe.predictionpolls.data.remote.repositories
+
+interface PollRepositoryInterface {
+    /**
+     * Creates a continuous poll and returns the result.
+     */
+    suspend fun createContinuousPoll(
+        question: String,
+        openVisibility: Boolean,
+        setDueDate: Boolean,
+        dueDatePoll: String? = null,
+        numericFieldValue: Int? = null,
+        selectedTimeUnit: String,
+        pollType: String,
+    )
+
+    /**
+     * Creates a discrete poll and returns the result.
+     */
+    suspend fun createDiscretePoll(
+        question: String,
+        choices: List<String>,
+        openVisibility: Boolean,
+        setDueDate: Boolean,
+        dueDatePoll: String? = null,
+        numericFieldValue: Int? = null,
+        selectedTimeUnit: String
+    )
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt
index 01f7d655..40e8050f 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/di/RepositoryModule.kt
@@ -3,6 +3,7 @@ package com.bounswe.predictionpolls.di
 import com.bounswe.predictionpolls.data.remote.TokenManager
 import com.bounswe.predictionpolls.data.remote.repositories.AuthRepository
 import com.bounswe.predictionpolls.data.remote.repositories.PollRepository
+import com.bounswe.predictionpolls.data.remote.repositories.PollRepositoryInterface
 import com.bounswe.predictionpolls.data.remote.services.AuthService
 import com.bounswe.predictionpolls.data.remote.services.PollService
 import dagger.Module
@@ -27,7 +28,7 @@ object RepositoryModule {
     @Singleton
     fun providePollRepository(
         pollService: PollService,
-    ): PollRepository {
+    ): PollRepositoryInterface {
         return PollRepository(pollService)
     }
 }
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
index 25abcc5e..3968468c 100644
--- a/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
+++ b/prediction-polls/android/app/src/main/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModel.kt
@@ -5,14 +5,14 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import com.bounswe.predictionpolls.R
 import com.bounswe.predictionpolls.core.BaseViewModel
-import com.bounswe.predictionpolls.data.remote.repositories.PollRepository
+import com.bounswe.predictionpolls.data.remote.repositories.PollRepositoryInterface
 import com.bounswe.predictionpolls.extensions.toISO8601
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class CreatePollViewModel @Inject constructor(
-    private val pollRepository: PollRepository
+    private val pollRepository: PollRepositoryInterface
 ) : BaseViewModel() {
     var screenState by mutableStateOf(CreatePollScreenState())
         private set
diff --git a/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakePollRepository.kt b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakePollRepository.kt
new file mode 100644
index 00000000..fc5b533a
--- /dev/null
+++ b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/repo/FakePollRepository.kt
@@ -0,0 +1,29 @@
+package com.bounswe.predictionpolls.repo
+
+import com.bounswe.predictionpolls.data.remote.repositories.PollRepositoryInterface
+
+class FakePollRepository: PollRepositoryInterface {
+    override suspend fun createContinuousPoll(
+        question: String,
+        openVisibility: Boolean,
+        setDueDate: Boolean,
+        dueDatePoll: String?,
+        numericFieldValue: Int?,
+        selectedTimeUnit: String,
+        pollType: String
+    ) {
+        // Do nothing
+    }
+
+    override suspend fun createDiscretePoll(
+        question: String,
+        choices: List<String>,
+        openVisibility: Boolean,
+        setDueDate: Boolean,
+        dueDatePoll: String?,
+        numericFieldValue: Int?,
+        selectedTimeUnit: String
+    ) {
+        // Do nothing
+    }
+}
\ No newline at end of file
diff --git a/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModelTest.kt b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModelTest.kt
new file mode 100644
index 00000000..6ef0e350
--- /dev/null
+++ b/prediction-polls/android/app/src/test/java/com/bounswe/predictionpolls/ui/create/CreatePollViewModelTest.kt
@@ -0,0 +1,193 @@
+package com.bounswe.predictionpolls.ui.create
+
+import com.bounswe.predictionpolls.data.remote.repositories.PollRepositoryInterface
+import com.bounswe.predictionpolls.repo.FakePollRepository
+import org.junit.Before
+import org.junit.Test
+
+class CreatePollViewModelTest {
+    private lateinit var pollRepository: PollRepositoryInterface
+    private lateinit var viewModel: CreatePollViewModel
+
+    @Before
+    fun setup() {
+        pollRepository = FakePollRepository()
+        viewModel = CreatePollViewModel(pollRepository)
+    }
+
+    @Test
+    fun `test On Create poll click event with no form data`() {
+        var isTriggered = false
+        viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked{
+            isTriggered = true
+        })
+
+        assert(isTriggered.not())
+        assert(viewModel.screenState.inputValidationError != null)
+    }
+
+    @Test
+    fun `test on question changed`() {
+        val question = "What is your favorite color?"
+        viewModel.onEvent(CreatePollScreenEvent.OnQuestionChanged(question))
+
+        assert(viewModel.screenState.question == question)
+    }
+
+    @Test
+    fun `test on poll type changed`() {
+        val pollType = CreatePollScreenState.PollType.DISCRETE
+        viewModel.onEvent(CreatePollScreenEvent.OnPollTypeChanged(pollType))
+
+        assert(viewModel.screenState.pollType == pollType)
+    }
+
+    @Test
+    fun `test on discrete option changed`() {
+        val option = "Red"
+        val position = 0
+        viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionAdded)
+        viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionChanged(option, position))
+
+        assert(viewModel.screenState.discreteOptions[position] == option)
+    }
+
+    @Test
+    fun `test on discrete option added`() {
+        viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionAdded)
+        assert(viewModel.screenState.discreteOptions.size == 3)
+    }
+
+    @Test
+    fun `test on discrete option removed`() {
+        val option = "Red"
+        viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionAdded)
+        viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionRemoved(0))
+
+        assert(viewModel.screenState.discreteOptions.contains(option).not())
+    }
+
+    @Test
+    fun `test on continuous input type changed`() {
+        val inputType = CreatePollScreenState.ContinuousInputType.NUMERIC
+        viewModel.onEvent(CreatePollScreenEvent.OnContinuousInputTypeChanged(inputType))
+
+        assert(viewModel.screenState.continuousInputType == inputType)
+    }
+
+    @Test
+    fun `test on due date checked`() {
+        val isChecked = true
+        viewModel.onEvent(CreatePollScreenEvent.OnDueDateChecked(isChecked))
+
+        assert(viewModel.screenState.isDueDateEnabled == isChecked)
+    }
+
+    @Test
+    fun `test on due date changed`() {
+        val dueDate = "2021-05-01"
+        viewModel.onEvent(CreatePollScreenEvent.OnDueDateChanged(dueDate))
+
+        assert(viewModel.screenState.dueDate == dueDate)
+    }
+
+    @Test
+    fun `test on last accept value changed`() {
+        val value = "10"
+        viewModel.onEvent(CreatePollScreenEvent.OnLastAcceptValueChanged(value))
+
+        assert(viewModel.screenState.lastAcceptValue == value)
+    }
+
+    @Test
+    fun `test on accept value type changed`() {
+        val type = CreatePollScreenState.AcceptValueType.DAY
+        viewModel.onEvent(CreatePollScreenEvent.OnAcceptValueTypeChanged(type))
+
+        assert(viewModel.screenState.acceptValueType == type)
+    }
+
+    @Test
+    fun `test on distribution visibility changed`() {
+        val isChecked = true
+        viewModel.onEvent(CreatePollScreenEvent.OnDistributionVisibilityChanged(isChecked))
+
+        assert(viewModel.screenState.isDistributionVisible == isChecked)
+    }
+
+    @Test
+    fun `test on error dismissed`() {
+        viewModel.onEvent(CreatePollScreenEvent.OnErrorDismissed)
+
+        assert(viewModel.screenState.inputValidationError == null)
+    }
+
+    @Test
+    fun `test toggle date picker`() {
+        viewModel.onEvent(CreatePollScreenEvent.ToggleDatePicker)
+        assert(viewModel.screenState.isDatePickerVisible)
+    }
+
+    @Test
+    fun `test on create poll clicked with discrete form data`() {
+        val onSuccess = {}
+        val question = "What is your favorite color?"
+        val pollType = CreatePollScreenState.PollType.DISCRETE
+        val option = "Red"
+        val position = 0
+        viewModel.onEvent(CreatePollScreenEvent.OnQuestionChanged(question))
+        viewModel.onEvent(CreatePollScreenEvent.OnPollTypeChanged(pollType))
+        viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionAdded)
+        viewModel.onEvent(CreatePollScreenEvent.OnDiscreteOptionChanged(option, position))
+        viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked(onSuccess))
+
+        assert(viewModel.screenState.inputValidationError != null)
+    }
+
+    @Test
+    fun `test on create poll clicked with continuous form data`() {
+        val onSuccess = {}
+        val question = "What is your favorite color?"
+        val pollType = CreatePollScreenState.PollType.CONTINUOUS
+        val inputType = CreatePollScreenState.ContinuousInputType.NUMERIC
+        val isChecked = true
+        val dueDate = "2021-05-01"
+        val value = "10"
+        val type = CreatePollScreenState.AcceptValueType.DAY
+        val isDistributionVisible = true
+        viewModel.onEvent(CreatePollScreenEvent.OnQuestionChanged(question))
+        viewModel.onEvent(CreatePollScreenEvent.OnPollTypeChanged(pollType))
+        viewModel.onEvent(CreatePollScreenEvent.OnContinuousInputTypeChanged(inputType))
+        viewModel.onEvent(CreatePollScreenEvent.OnDueDateChecked(isChecked))
+        viewModel.onEvent(CreatePollScreenEvent.OnDueDateChanged(dueDate))
+        viewModel.onEvent(CreatePollScreenEvent.OnLastAcceptValueChanged(value))
+        viewModel.onEvent(CreatePollScreenEvent.OnAcceptValueTypeChanged(type))
+        viewModel.onEvent(CreatePollScreenEvent.OnDistributionVisibilityChanged(isDistributionVisible))
+        viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked(onSuccess))
+
+        assert(viewModel.screenState.inputValidationError != null)
+    }
+
+
+    @Test
+    fun `test on create poll clicked with continuous form data with no last accept value`() {
+        val onSuccess = {}
+        val question = "What is your favorite color?"
+        val pollType = CreatePollScreenState.PollType.CONTINUOUS
+        val inputType = CreatePollScreenState.ContinuousInputType.NUMERIC
+        val isChecked = true
+        val dueDate = "2021-05-01"
+        val type = CreatePollScreenState.AcceptValueType.DAY
+        val isDistributionVisible = true
+        viewModel.onEvent(CreatePollScreenEvent.OnQuestionChanged(question))
+        viewModel.onEvent(CreatePollScreenEvent.OnPollTypeChanged(pollType))
+        viewModel.onEvent(CreatePollScreenEvent.OnContinuousInputTypeChanged(inputType))
+        viewModel.onEvent(CreatePollScreenEvent.OnDueDateChecked(isChecked))
+        viewModel.onEvent(CreatePollScreenEvent.OnDueDateChanged(dueDate))
+        viewModel.onEvent(CreatePollScreenEvent.OnAcceptValueTypeChanged(type))
+        viewModel.onEvent(CreatePollScreenEvent.OnDistributionVisibilityChanged(isDistributionVisible))
+        viewModel.onEvent(CreatePollScreenEvent.OnCreatePollClicked(onSuccess))
+
+        assert(viewModel.screenState.inputValidationError != null)
+    }
+}
\ No newline at end of file

From 498ff7107407df22334ebe3ce69d11a15a84486f Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 00:38:52 +0300
Subject: [PATCH 206/246] implement poll service tests

---
 .../backend/tests/PollService.test.js         | 430 +++++++++++++++++-
 1 file changed, 418 insertions(+), 12 deletions(-)

diff --git a/prediction-polls/backend/tests/PollService.test.js b/prediction-polls/backend/tests/PollService.test.js
index 87d15dad..10e7669d 100644
--- a/prediction-polls/backend/tests/PollService.test.js
+++ b/prediction-polls/backend/tests/PollService.test.js
@@ -1,25 +1,431 @@
-const { getPollWithId } = require('../src/services/PollService.js');
-const db = require('../src/repositories/PollDB.js');
-const errorCodes = require("../src/errorCodes.js")
 
-jest.mock('../src/repositories/PollDB');
+const {addDiscretePoll, addContinuousPoll, voteDiscretePoll, voteContinuousPoll, getPolls, getPollWithId} = require('../src/services/PollService');
+const db = require('../src/repositories/PollDB');
+const {findUser} = require('../src/repositories/AuthorizationDB');
+const errorCodes = require('../src/errorCodes');
 
-describe('getPollWithId', () => {
-  test('returns a 404 response for non-existing poll', async () => {
-    const req = { params: { pollId: 'nonexistentId' } };
-    const res = {
+jest.mock('../src/repositories/PollDB', () => ({
+  addDiscretePoll: jest.fn().mockResolvedValue(1),
+  addContinuousPoll: jest.fn().mockResolvedValue(1),
+  getContinuousPollWithId: jest.fn().mockResolvedValue([ { id: 2, cont_poll_type: 'numeric' } ]),
+  getContinuousPollVotes: jest.fn().mockResolvedValue([]),
+  voteDiscretePoll: jest.fn().mockResolvedValue(0),
+  voteContinuousPoll: jest.fn().mockResolvedValue(0),
+  getTagsOfPoll: jest.fn().mockResolvedValue([]),
+  choicesWithVoteCount: jest.fn().mockResolvedValue(0),
+  getDiscreteVoteCount: jest.fn().mockResolvedValue(0),
+  getDiscretePollChoices: jest.fn().mockResolvedValue([
+    { id: 1, choice_text: 'Trump', poll_id: 1 },
+    { id: 2, choice_text: 'Biden', poll_id: 1 }
+  ]),
+  getPolls: jest.fn().mockResolvedValue([
+    {
+      id: 1,
+      question: 'Who will win the 2024 Election to become President?',
+      username: 'sefik2',
+      poll_type: 'discrete',
+      openVisibility: 1,
+      setDueDate: 1,
+      closingDate: '2023-12-29T21:00:00.000Z',
+      numericFieldValue: 2,
+      selectedTimeUnit: 'min'
+    },
+    {
+      id: 2,
+      question: 'Question 2?',
+      username: 'sefik2',
+      poll_type: 'continuous',
+      openVisibility: 0,
+      setDueDate: 1,
+      closingDate: '2023-11-20T21:00:00.000Z',
+      numericFieldValue: 5,
+      selectedTimeUnit: 'min'
+    }
+  ]),
+  getPollWithId: jest.fn().mockResolvedValue([
+    {
+      id: 1,
+      question: 'Who will win the 2024 Election to become President?',
+      username: 'sefik2',
+      poll_type: 'discrete',
+      openVisibility: 1,
+      setDueDate: 1,
+      closingDate: '2023-12-29T21:00:00.000Z',
+      numericFieldValue: 2,
+      selectedTimeUnit: 'min'
+    }
+  ])
+}));
+
+jest.mock('../src/repositories/AuthorizationDB', () => ({
+  findUser: jest.fn().mockResolvedValue({ username: 'mocked-username' }),
+}));
+
+describe('addDiscretePoll()', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {
+      body: {
+        question: "Who will win the 2024 Election to become President?",
+        choices: [
+          "Trump",
+          "Biden"
+        ],
+        openVisibility: true,
+        setDueDate: true,
+        dueDatePoll: "2023-12-30T11:39:00+03:00",
+        numericFieldValue: 2,
+        selectedTimeUnit: "min"
+      },
+      user: {
+        id: 1,
+      },
+    }
+    res = {
+      json: jest.fn(),
       status: jest.fn().mockReturnThis(),
+    };
+  })
+
+  it('should return success and newPollId on successful addition', async () => {
+    const insertId = 1;
+    db.addDiscretePoll.mockResolvedValueOnce(insertId);
+    await addDiscretePoll(req, res);
+
+    expect(res.status).not.toHaveBeenCalled();
+    expect(res.json).toHaveBeenCalledWith({
+      success: true,
+      newPollId: insertId,
+    });
+  });
+
+  it('return error when addDiscretePoll throws database Error', async () => {
+    db.addDiscretePoll.mockRejectedValueOnce({error: errorCodes.DATABASE_ERROR});
+    await addDiscretePoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(500);
+    expect(res.json).toHaveBeenCalledWith({error: errorCodes.DATABASE_ERROR});
+  });
+
+  it('returns 400 when passed in empty body', async () => {
+    req.body = {};
+    await addDiscretePoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(400);
+    expect(res.json).toHaveBeenCalledWith({ error: errorCodes.BAD_DISCRETE_POLL_REQUEST_ERROR });
+  });
+});
+
+describe('addContinuousPoll()', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {
+      body: {
+        question: "Question 2?",
+        "setDueDate": true,
+        "dueDatePoll": "2023-11-21T11:39:00+03:00",
+        "numericFieldValue": 5,
+        "selectedTimeUnit": "min",
+        "cont_poll_type": "numeric"
+      },
+      user: {
+        id: 1,
+      },
+    }
+    res = {
       json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
     };
+  })
 
-    db.getPollWithId.mockResolvedValue([]);
+  it('should return success and newPollId on successful addition', async () => {
+    const insertId = 1;
+    db.addContinuousPoll.mockResolvedValueOnce(insertId);
+    await addContinuousPoll(req, res);
 
-    await getPollWithId(req, res);
+    expect(res.status).not.toHaveBeenCalled();
+    expect(res.json).toHaveBeenCalledWith({
+      success: true,
+      newPollId: insertId,
+    });
+  });
+
+  it('return error when addDiscretePoll throws database Error', async () => {
+    db.addContinuousPoll.mockRejectedValueOnce({error: errorCodes.DATABASE_ERROR});
+    await addContinuousPoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(500);
+    expect(res.json).toHaveBeenCalledWith({error: errorCodes.DATABASE_ERROR});
+  });
+
+  it('returns 400 when passed in empty body', async () => {
+    req.body = {};
+    await addContinuousPoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(400);
+    expect(res.json).toHaveBeenCalledWith({ error: errorCodes.BAD_CONT_POLL_REQUEST_ERROR });
+  });
+
+});
+
+describe('voteDiscretePoll()', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {
+      params: {
+        pollId: 1
+      },
+      user: {
+        id: 1
+      },
+      body: {
+        choiceId: 1,
+        points: 50
+      }
+    }
+    res = {
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
+    };
+  })
+
+  it('should return success on successful voting', async () => {
+    const choices = [{id: 1}, {id: 2}, {id: 3}];
+    db.getDiscretePollChoices.mockResolvedValueOnce(choices);
+    await voteDiscretePoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({ message: "Vote Successful" });
+  });
+
+  it('should return 404 on choice not found', async () => {
+    const choices = [{id: 2}, {id: 3}];
+    db.getDiscretePollChoices.mockResolvedValueOnce(choices);
+    await voteDiscretePoll(req, res);
 
     expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({error: errorCodes.CHOICE_DOES_NOT_EXIST_ERROR});
+  });
+
+  it('should return 404 on negative points passed', async () => {
+    const choices = [{id: 1}, {id: 2}, {id: 3}];
+    req.body.points = -1;
+    await voteDiscretePoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({error: errorCodes.USER_MUST_GIVE_POINTS_ERROR});
+  });
+
+  it('should return 404 on no points passed', async () => {
+    const choices = [{id: 1}, {id: 2}, {id: 3}];
+    req.body.points = null;
+    await voteDiscretePoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({ error: errorCodes.USER_MUST_GIVE_POINTS_ERROR });
+  });
+});
+
+describe('voteContinuousPoll()', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {
+      params: {
+        pollId: 1
+      },
+      user: {
+        id: 1
+      },
+      body: {
+        choice: 1,
+        points: 50
+      }
+    }
+    res = {
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
+    };
+  })
+
+  it('should return 200 on successful voting on discrete polls', async () => {
+    db.getContinuousPollWithId.mockResolvedValueOnce([{
+      cont_poll_type: 'numeric'
+    }]);
+    await voteContinuousPoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({ message: "Vote Successful" });
+  });
+
+  it('should return 200 on successful voting on continuous polls', async () => {
+    db.getContinuousPollWithId.mockResolvedValueOnce([{
+      cont_poll_type: 'date'
+    }]);
+    await voteContinuousPoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(200);
+    expect(res.json).toHaveBeenCalledWith({ message: "Vote Successful" });
+  });
+
+  it('should return 404 on giving negative points', async () => {
+    req.body.points = -1
+    await voteContinuousPoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({ error: errorCodes.USER_MUST_GIVE_POINTS_ERROR });
+  });
+
+  it('should return 404 on no points passed', async () => {
+    req.body.points = null;
+    await voteContinuousPoll(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({ error: errorCodes.USER_MUST_GIVE_POINTS_ERROR });
+  });
+});
+
+describe('getPolls()', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {};
+    res = {
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
+    };
+  })
+
+  it('should return pollObjects on successful get request', async () => {
+    // db.getContinuousPollWithId.mockResolvedValueOnce([ { id: 2, cont_poll_type: 'numeric' } ])
+    await getPolls(req, res);
+
+    expect(res.status).not.toHaveBeenCalled();
+    expect(res.json).toHaveBeenCalledWith(
+      [
+        {
+            id: 1,
+            question: "Who will win the 2024 Election to become President?",
+            tags: [],
+            creatorName: "sefik2",
+            creatorUsername: "sefik2",
+            creatorImage: null,
+            pollType: "discrete",
+            closingDate: "2023-12-29T21:00:00.000Z",
+            rejectVotes: "2 min",
+            isOpen: true,
+            comments: [],
+            options: [
+                {
+                    id: 1,
+                    choice_text: "Trump",
+                    poll_id: 1,
+                    voter_count: 0
+                },
+                {
+                    id: 2,
+                    choice_text: "Biden",
+                    poll_id: 1,
+                    voter_count: 0
+                }
+            ]
+        },
+        {
+            id: 2,
+            question: "Question 2?",
+            tags: [],
+            creatorName: "sefik2",
+            creatorUsername: "sefik2",
+            creatorImage: null,
+            pollType: "continuous",
+            closingDate: "2023-11-20T21:00:00.000Z",
+            rejectVotes: "5 min",
+            isOpen: true,
+            comments: [],
+            cont_poll_type: "numeric"
+        }
+    ]);
+  });
+});
+
+describe('getPollWithId()', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {params: {pollId: 1}};
+    res = {
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
+    };
+  })
+
+  it('should return pollObjects on successful get request for discretePoll', async () => {
+    await getPollWithId(req, res);
+
+    expect(res.status).not.toHaveBeenCalled();
+    expect(res.json).toHaveBeenCalledWith({
+      id: 1,
+      question: "Who will win the 2024 Election to become President?",
+      tags: [],
+      creatorName: "sefik2",
+      creatorUsername: "sefik2",
+      creatorImage: null,
+      pollType: "discrete",
+      closingDate: "2023-12-29T21:00:00.000Z",
+      rejectVotes: "2 min",
+      isOpen: true,
+      comments: [],
+      options: [
+          {
+              id: 1,
+              choice_text: "Trump",
+              poll_id: 1,
+              voter_count: 0
+          },
+          {
+              id: 2,
+              choice_text: "Biden",
+              poll_id: 1,
+              voter_count: 0
+          }
+      ]
+    });
+  });
+
+  it('should return correct pollObjects on successful get request for a continuous poll', async () => {
+    req.params.pollId = 2;
+    db.getPollWithId.mockResolvedValue([
+      {
+        id: 2,
+        question: 'Question 2?',
+        username: 'sefik2',
+        poll_type: 'continuous',
+        openVisibility: 0,
+        setDueDate: 1,
+        closingDate: '2023-11-20T21:00:00.000Z',
+        numericFieldValue: 5,
+        selectedTimeUnit: 'min'
+      }
+    ])
+    await getPollWithId(req, res);
+
+    expect(res.status).not.toHaveBeenCalled();
     expect(res.json).toHaveBeenCalledWith({
-      code: errorCodes.NO_SUCH_POLL_ERROR.code,
-      message: errorCodes.NO_SUCH_POLL_ERROR.message,
+        id: 2,
+        question: "Question 2?",
+        tags: [],
+        creatorName: "sefik2",
+        creatorUsername: "sefik2",
+        creatorImage: null,
+        pollType: "continuous",
+        closingDate: "2023-11-20T21:00:00.000Z",
+        rejectVotes: "5 min",
+        isOpen: true,
+        comments: [],
+        cont_poll_type: "numeric"
     });
   });
 });
\ No newline at end of file

From 90f6232dabcf618e24c60a7e4cd0b7fced6b0db4 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 14:00:28 +0300
Subject: [PATCH 207/246] remove console.logs

---
 prediction-polls/backend/src/services/PollService.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/prediction-polls/backend/src/services/PollService.js b/prediction-polls/backend/src/services/PollService.js
index 19816a7b..ef75098d 100644
--- a/prediction-polls/backend/src/services/PollService.js
+++ b/prediction-polls/backend/src/services/PollService.js
@@ -293,21 +293,13 @@ async function closePoll(req, res) {
         }
 
         const selections = await db.getDiscreteSelectionsWithPollId(pollId);
-        console.log("selections: ", selections);
-
         const totalPointsBet = selections.reduce((sum, selection) => sum + selection.given_points, 0);
-        console.log("totalPointsBet: ", totalPointsBet);
-
         const correctSelections = selections.filter(selection => selection.choice_id === choiceId);
-        console.log("correctSelections: ", correctSelections);
-
         const totalCorrectBet = correctSelections.reduce((sum, selection) => sum + selection.given_points, 0);
-        console.log("totalCorrectBet: ", totalCorrectBet);
 
         const rewardPoints = correctSelections.map((selection) => {
             return {user_id: selection.user_id, reward: Math.floor(totalPointsBet * (selection.given_points / totalCorrectBet))}
         })
-        console.log("rewardPoints: ", rewardPoints);
 
         await db.closePoll(pollId, rewardPoints);
 

From ba76bab8ed5cbad7993ed144656cbe451bfc20d1 Mon Sep 17 00:00:00 2001
From: Ali Nasra <52269552+AliNasra@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:15:47 +0300
Subject: [PATCH 208/246] Writing the test

---
 .../frontend/src/Pages/Vote/Vote.test.js      | 92 +++++++++++++++++++
 .../frontend/src/Pages/Vote/index.jsx         | 13 +--
 2 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 prediction-polls/frontend/src/Pages/Vote/Vote.test.js

diff --git a/prediction-polls/frontend/src/Pages/Vote/Vote.test.js b/prediction-polls/frontend/src/Pages/Vote/Vote.test.js
new file mode 100644
index 00000000..1b242f84
--- /dev/null
+++ b/prediction-polls/frontend/src/Pages/Vote/Vote.test.js
@@ -0,0 +1,92 @@
+import React from 'react';
+import ReactDom from 'react-dom';
+import { render, fireEvent, screen, act, waitFor } from '@testing-library/react';
+import Vote from './index.jsx';
+import { BrowserRouter, MemoryRouter, Route, Routes } from 'react-router-dom';
+
+describe('Vote', () => {
+    test('renders the vote page with the poll whose ID is 1', async () => {
+        const pollID = 1;
+        const route = `/vote/${pollID}`;
+        render(
+            <MemoryRouter initialEntries={[route]}>
+                <Routes>
+                    <Route path="/vote/:id" element={<Vote />} />
+                </Routes>
+            </MemoryRouter>
+        );
+        await waitFor(() => {
+            expect(screen.getByText('How many points do you want to place?')).toBeInTheDocument();
+        });
+
+    });
+    test('Check if the discrete poll with the ID 4 is rendered correctly', async () => {
+        const pollID = 4;
+        const route = `/vote/${pollID}`;
+        render(
+            <MemoryRouter initialEntries={[route]}>
+                <Routes>
+                    <Route path="/vote/:id" element={<Vote />} />
+                </Routes>
+            </MemoryRouter>
+        );
+        await waitFor(() => {
+            expect(screen.getByText('Choose the option you want to vote for')).toBeInTheDocument();
+        });
+
+    });
+    test('Check if the continuous poll with the ID 5 is rendered correctly', async () => {
+        const pollID = 5;
+        const route = `/vote/${pollID}`;
+        render(
+            <MemoryRouter initialEntries={[route]}>
+                <Routes>
+                    <Route path="/vote/:id" element={<Vote />} />
+                </Routes>
+            </MemoryRouter>
+        );
+        await waitFor(() => {
+            expect(screen.getByText('Please enter a suitable answer to the poll')).toBeInTheDocument();
+        });
+
+    });
+    test('Check if the betting mechanism rejects non-numeric bet points', async () => {
+        const pollID = 5;
+        const route = `/vote/${pollID}`;
+        render(
+            <MemoryRouter initialEntries={[route]}>
+                <Routes>
+                    <Route path="/vote/:id" element={<Vote />} />
+                </Routes>
+            </MemoryRouter>
+        );
+        await waitFor(() => {
+            const inputElement = document.getElementById('bet');
+            const buttonElement = document.getElementById('submitButton');
+            fireEvent.change(inputElement, { target: { value: 'AER34' } });
+            fireEvent.click(buttonElement);
+            expect(screen.getByText('The bet points should be integer numbers!')).toBeInTheDocument();
+        });
+
+    });
+    test('Check if you can vote without any input', async () => {
+        const pollID = 5;
+        const route = `/vote/${pollID}`;
+        render(
+            <MemoryRouter initialEntries={[route]}>
+                <Routes>
+                    <Route path="/vote/:id" element={<Vote />} />
+                </Routes>
+            </MemoryRouter>
+        );
+        await waitFor(() => {
+            const inputElement = document.getElementById('bet');
+            const buttonElement = document.getElementById('submitButton');
+            fireEvent.change(inputElement, { target: { value: '100' } });
+            fireEvent.click(buttonElement);
+            expect(screen.getByText('The response should be numeric!')).toBeInTheDocument();
+        });
+
+    });
+});
+
diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index d7b3e3b2..7b977f7a 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -32,7 +32,7 @@ function Vote() {
         else {
           data.isCustomPoll = true;
         }
-        if (data.closingDate != null){
+        if (data.closingDate != null) {
           data.closingDate = data.closingDate.slice(0, 10);
         }
         return data;
@@ -49,7 +49,7 @@ function Vote() {
     try {
       const result = await retrievePoll();
       setPolldata(result);
-      setSentence((result.isCustomPoll) ? "Please enter a suitable answer to the poll" : "Choose the option you want to vote for ");
+      setSentence((result.isCustomPoll) ? "Please enter a suitable answer to the poll" : "Choose the option you want to vote for");
     } catch (error) {
       console.error('Error fetching data:', error);
     } finally {
@@ -92,7 +92,7 @@ function Vote() {
           setMessage("Voted successfully!");
         }
         else {
-          setMessage("An unexpected has error occurred!");
+          setMessage("An error has occurred!");
         }
       }
       else if (polldata.pollType == "continuous" && /^[0-9]*$/.test(betPoint) == true) {
@@ -114,7 +114,7 @@ function Vote() {
             setMessage("Voted successfully!");
           }
           else {
-            setMessage("An unexpected has error occurred!");
+            setMessage("An error has occurred!");
           }
         }
         else {
@@ -136,7 +136,7 @@ function Vote() {
               setMessage("Voted successfully!");
             }
             else {
-              setMessage("An unexpected has error occurred!");
+              setMessage("An error has occurred!");
             }
           }
           else {
@@ -164,7 +164,7 @@ function Vote() {
           <div className={styles.choice_column}>
             <PointsButton points={pointData.points} />
             <div className={styles.infoText}><div>{sentence}</div>
-              <div className={styles.chooseText}>How many points do you want to place?</div>
+              <div id="statement" className={styles.chooseText}>How many points do you want to place?</div>
               <div><Input
                 id="bet"
                 className={styles.inputStyle}
@@ -172,6 +172,7 @@ function Vote() {
                 onChange={(e) => setBetPoint(e.target.value)}
               /></div>
               <div className={styles.buttonDivStyle}><Button
+                id="submitButton"
                 className={styles.bottonStyle}
                 onClick={handleVoting}
               >Vote</Button></div>

From 31ac59201d41fedc05c6cc788d5f5b16858c3a56 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 14:21:40 +0300
Subject: [PATCH 209/246] implement change vote

---
 .../backend/src/repositories/PollDB.js        | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index b866f5e0..4bf159e2 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -152,32 +152,39 @@ async function getDiscreteVoteCount(choiceid) {
 async function voteDiscretePoll(pollId, userId, choiceId, pointsSpent){
     const connection = await pool.getConnection();
 
-    const deleteExistingSql = "DELETE FROM discrete_polls_selections WHERE poll_id = ? AND user_id = ?"
-    const addVoteSql = "INSERT INTO discrete_polls_selections (poll_id, choice_id, user_id, given_points) VALUES (?, ?, ?, ?)"
+    const oldSelectionPointsSql = "SELECT * FROM discrete_polls_selections WHERE poll_id = ? AND user_id = ?";
+    const deleteExistingSql = "DELETE FROM discrete_polls_selections WHERE poll_id = ? AND user_id = ?";
+    const addVoteSql = "INSERT INTO discrete_polls_selections (poll_id, choice_id, user_id, given_points) VALUES (?, ?, ?, ?)";
     const findPointsSql = 'SELECT * FROM profiles WHERE userId= ?';
     const updatePointSql = 'UPDATE profiles SET points = ? WHERE userId = ?';
 
     try {
         await connection.beginTransaction()
 
-        deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
-        addResult = await connection.query(addVoteSql, [pollId, choiceId, userId, pointsSpent]);
         const [rows] = await connection.query(findPointsSql, [userId]);
         const current_points = rows[0].points;
 
-        if(current_points - pointsSpent < 0){
+        const [oldSelection] = await connection.query(oldSelectionPointsSql, [pollId, userId]);
+
+        const deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
+        const addResult = await connection.query(addVoteSql, [pollId, choiceId, userId, pointsSpent]);
+
+        const oldPoint = (oldSelection.length != 0 ? oldSelection[0].given_points : 0);
+
+        const newPoints = current_points - pointsSpent + oldPoint;
+        if(newPoints < 0){
             connection.rollback()
             throw {error: errorCodes.INSUFFICIENT_POINTS_ERROR};
         }
 
-        const [resultSetHeader] = await connection.query(updatePointSql, [current_points - pointsSpent, userId]);
+        const [resultSetHeader] = await connection.query(updatePointSql, [newPoints, userId]);
         
         connection.commit();
         return {status:"success"};
 
     } catch (error) { 
         await connection.rollback();
-        console.error('voteDiscretePoll(): Database Error');
+        console.error('voteDiscretePoll(): Database Error: ', error);
         throw error;
     } finally {
         connection.release();
@@ -188,31 +195,38 @@ async function voteDiscretePoll(pollId, userId, choiceId, pointsSpent){
 async function voteContinuousPoll(pollId, userId, choice, contPollType, pointsSpent){
     const connection = await pool.getConnection();
 
-    const deleteExistingSql = "DELETE FROM continuous_poll_selections WHERE poll_id = ? AND user_id = ?"
-    const addVoteSql = "INSERT INTO continuous_poll_selections (poll_id, user_id, float_value, date_value) VALUES (?, ?, ?, ?)"
+    const oldSelectionPointsSql = "SELECT * FROM continuous_poll_selections WHERE poll_id = ? AND user_id = ?";
+    const deleteExistingSql = "DELETE FROM continuous_poll_selections WHERE poll_id = ? AND user_id = ?";
+    const addVoteSql = "INSERT INTO continuous_poll_selections (poll_id, user_id, float_value, date_value, given_points) VALUES (?, ?, ?, ?, ?)";
     const findPointsSql = 'SELECT points FROM profiles WHERE userId= ?';
     const updatePointSql = 'UPDATE profiles SET points = ? WHERE userId = ?';
 
     try {
         await connection.beginTransaction()
 
+        const [rows] = await connection.query(findPointsSql, [userId]);
+        const current_points = rows[0].points;
+
+        const [oldSelection] = await connection.query(oldSelectionPointsSql, [pollId, userId]);
+
         deleteResult = await connection.query(deleteExistingSql, [pollId, userId]);
         if (contPollType === "numeric") {
-            addResult = await connection.query(addVoteSql, [pollId, userId, choice, null]);
+            addResult = await connection.query(addVoteSql, [pollId, userId, choice, null, pointsSpent]);
         } else if (contPollType === "date") {
-            addResult = await connection.query(addVoteSql, [pollId, userId, null, choice]);
+            addResult = await connection.query(addVoteSql, [pollId, userId, null, choice, pointsSpent]);
         } else {
-            await connection.rollback();
+            throw {error: errorCodes.NO_SUCH_POLL_ERROR};
         }
-        const [rows] = await connection.query(findPointsSql, [userId]);
-        const current_points = rows[0].points;
 
-        if(current_points - pointsSpent < 0){
+        const oldPoint = (oldSelection.length != 0 ? oldSelection[0].given_points : 0);
+        const newPoints = current_points - pointsSpent + oldPoint;
+
+        if(newPoints < 0){
             connection.rollback()
             throw {error: errorCodes.INSUFFICIENT_POINTS_ERROR};
         }
 
-        const [resultSetHeader] = await connection.query(updatePointSql, [current_points - pointsSpent, userId]);
+        const [resultSetHeader] = await connection.query(updatePointSql, [newPoints, userId]);
         connection.commit();
     } catch (error) { 
         await connection.rollback();

From 80fd18d906f2cea9e91fbabf11766f1c8254f10e Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:25:54 +0300
Subject: [PATCH 210/246] Change endpoint of myprofile to profiles/me

---
 prediction-polls/backend/src/routes/ProfileRouter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 4ce646bc..9d45f74d 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -93,7 +93,7 @@ router.get('/', service.getProfile);
 
 /**
  * @swagger
- * /profiles/myProfile:
+ * /profiles/me:
  *   get:
  *     tags:
  *       - profiles
@@ -129,7 +129,7 @@ router.get('/', service.getProfile);
  *                     code: 3000,
  *                     message: Profile not found,
  */
-router.get('/myProfile',authenticator.authorizeAccessToken ,service.getMyProfile);
+router.get('/me',authenticator.authorizeAccessToken ,service.getMyProfile);
 
 /**
  * @swagger

From 192e6c0a4d100013031cf0c845b27d23f83b1d34 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:26:20 +0300
Subject: [PATCH 211/246] Add porfile functionlity to myProfile

---
 .../backend/src/services/ProfileService.js    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index a86d9e7c..4e83ec12 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -103,6 +103,14 @@ async function getProfileWithProfileId(req,res){
             throw error
         }
 
+        if(profile.profile_picture){
+            const image_result = await getImagefromS3(profile.profile_picture);
+            if(image_result.error){
+                throw image_result.error;
+            }
+            profile.profile_picture = image_result.signedUrl;
+        }
+
         const {badges,error:badge_error} = await db.getBadges(result.id);
         if(badge_error){
             throw badge_error;
@@ -127,6 +135,22 @@ async function getMyProfile(req,res){
         if(error){
             throw error;
         }
+
+        if(profile.profile_picture){
+            const image_result = await getImagefromS3(profile.profile_picture);
+            if(image_result.error){
+                throw image_result.error;
+            }
+            profile.profile_picture = image_result.signedUrl;
+        }
+
+        const {badges,error:badge_error} = await db.getBadges(result.id);
+        if(badge_error){
+            throw badge_error;
+        }
+        profile.badges = badges;
+
+
         return res.status(200).json(profile);
         
     }catch(error){

From b312de16ec8f5f7adb8e18b9a1927f90ad7dfbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:28:04 +0300
Subject: [PATCH 212/246] updated logout request

---
 prediction-polls/frontend/src/api/requests/logout.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/frontend/src/api/requests/logout.jsx b/prediction-polls/frontend/src/api/requests/logout.jsx
index ef4cc5ff..943f7ff8 100644
--- a/prediction-polls/frontend/src/api/requests/logout.jsx
+++ b/prediction-polls/frontend/src/api/requests/logout.jsx
@@ -3,7 +3,7 @@ const baseUrl = process.env.REACT_APP_BACKEND_LINK; // Replace with your actual
 
 async function logout(refreshToken) {
   try {
-    const response = await fetch(`${baseUrl}/logout`, {
+    const response = await fetch(`${baseUrl}/auth/logout`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ refreshToken }),
@@ -13,6 +13,7 @@ async function logout(refreshToken) {
       // Clear access token and refresh token from local storage (or wherever you've stored them)
       localStorage.removeItem('accessToken');
       localStorage.removeItem('refreshToken');
+      localStorage.removeItem('username');
       return true;
     } else {
       return false;

From 2d522e245f255956da4b1c7eefa695c27ac036b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:28:28 +0300
Subject: [PATCH 213/246] added edit and get profile requests

---
 prediction-polls/frontend/package-lock.json   | 36 +++++++++++++++----
 prediction-polls/frontend/package.json        |  1 +
 .../frontend/src/api/requests/editProfile.jsx | 30 ++++++++++++++++
 .../frontend/src/api/requests/profile.jsx     | 25 +++++++++++++
 .../frontend/src/api/requests/profileMe.jsx   | 25 +++++++++++++
 .../src/api/requests/uploadProfilePhoto.jsx   | 33 +++++++++++++++++
 6 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 prediction-polls/frontend/src/api/requests/editProfile.jsx
 create mode 100644 prediction-polls/frontend/src/api/requests/profile.jsx
 create mode 100644 prediction-polls/frontend/src/api/requests/profileMe.jsx
 create mode 100644 prediction-polls/frontend/src/api/requests/uploadProfilePhoto.jsx

diff --git a/prediction-polls/frontend/package-lock.json b/prediction-polls/frontend/package-lock.json
index c80f46f3..8be481c1 100644
--- a/prediction-polls/frontend/package-lock.json
+++ b/prediction-polls/frontend/package-lock.json
@@ -12,6 +12,7 @@
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
         "antd": "^5.10.0",
+        "form-data": "^4.0.0",
         "history": "^5.3.0",
         "jest-matchmedia-mock": "^1.1.0",
         "moment": "^2.29.4",
@@ -8819,9 +8820,9 @@
       }
     },
     "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -12286,6 +12287,19 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/jsdom/node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/jsdom/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -25186,9 +25200,9 @@
       }
     },
     "form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -27648,6 +27662,16 @@
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
           "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
         },
+        "form-data": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+          "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
diff --git a/prediction-polls/frontend/package.json b/prediction-polls/frontend/package.json
index 8c5a251b..08bad541 100644
--- a/prediction-polls/frontend/package.json
+++ b/prediction-polls/frontend/package.json
@@ -7,6 +7,7 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "antd": "^5.10.0",
+    "form-data": "^4.0.0",
     "history": "^5.3.0",
     "jest-matchmedia-mock": "^1.1.0",
     "moment": "^2.29.4",
diff --git a/prediction-polls/frontend/src/api/requests/editProfile.jsx b/prediction-polls/frontend/src/api/requests/editProfile.jsx
new file mode 100644
index 00000000..a29b6fe7
--- /dev/null
+++ b/prediction-polls/frontend/src/api/requests/editProfile.jsx
@@ -0,0 +1,30 @@
+const baseUrl = process.env.REACT_APP_BACKEND_LINK;
+
+const updateProfile = async (userData) => {
+    
+    const accessToken = localStorage.getItem("accessToken"); 
+  
+    try {
+      const response = await fetch(`${baseUrl}/profiles`, {
+        method: "PATCH", 
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${accessToken}`, 
+        },
+        body: JSON.stringify(userData)
+      });
+  
+      if (response.ok) {
+        const data = await response.json();
+        return data;
+      } else {
+        console.error("Error in updateProfile:", response.statusText);
+        return null;
+      }
+    } catch (error) {
+      console.error("Network error:", error);
+      return false;
+    }
+  };
+  
+export default updateProfile;
\ No newline at end of file
diff --git a/prediction-polls/frontend/src/api/requests/profile.jsx b/prediction-polls/frontend/src/api/requests/profile.jsx
new file mode 100644
index 00000000..c1ba138e
--- /dev/null
+++ b/prediction-polls/frontend/src/api/requests/profile.jsx
@@ -0,0 +1,25 @@
+const baseUrl = process.env.REACT_APP_BACKEND_LINK; // Replace with your actual base URL
+
+async function getProfile(profileId) {
+  const accessToken = localStorage.getItem("accessToken");
+  try {
+    const response = await fetch(`${baseUrl}/profiles/?username=${profileId}`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+
+    if (response.ok) {
+      const data = await response.json();
+      return data;
+    } else {
+      return null;
+    }
+  } catch (error) {
+    return false;
+  }
+}
+
+export default getProfile;
diff --git a/prediction-polls/frontend/src/api/requests/profileMe.jsx b/prediction-polls/frontend/src/api/requests/profileMe.jsx
new file mode 100644
index 00000000..8433fa48
--- /dev/null
+++ b/prediction-polls/frontend/src/api/requests/profileMe.jsx
@@ -0,0 +1,25 @@
+const baseUrl = process.env.REACT_APP_BACKEND_LINK; // Replace with your actual base URL
+
+async function getProfileMe() {
+    const accessToken = localStorage.getItem("accessToken");
+  try {
+    const response = await fetch(`${baseUrl}/profiles/myProfile`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+
+    if (response.ok) {
+      const data = await response.json();
+      return data;
+    } else {
+      return null;
+    }
+  } catch (error) {
+    return false;
+  }
+}
+
+export default getProfileMe;
diff --git a/prediction-polls/frontend/src/api/requests/uploadProfilePhoto.jsx b/prediction-polls/frontend/src/api/requests/uploadProfilePhoto.jsx
new file mode 100644
index 00000000..32831607
--- /dev/null
+++ b/prediction-polls/frontend/src/api/requests/uploadProfilePhoto.jsx
@@ -0,0 +1,33 @@
+
+
+const baseUrl = process.env.REACT_APP_BACKEND_LINK;
+
+async function uploadProfilePhoto(file, caption) {
+  const accessToken = localStorage.getItem("accessToken");
+  const formData = new FormData();
+  formData.append("image", file);
+  formData.append("caption", caption);
+
+  try {
+    const response = await fetch(`${baseUrl}/profiles/profilePhoto`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+      body: formData
+    });
+
+    if (response.ok) {
+      const data = await response.json();
+      return data;
+    } else {
+      console.error("Error uploading profile photo:", response.statusText);
+      return null;
+    }
+  } catch (error) {
+    console.error("Network error:", error);
+    return false;
+  }
+}
+
+export default uploadProfilePhoto;

From ab6b7e92bf87db58b50d00aa2ca12a0d51c0aff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:29:09 +0300
Subject: [PATCH 214/246] implemented profile backend integration

---
 .../frontend/src/Components/Sidebar/index.jsx |  3 +-
 .../frontend/src/Pages/Auth/SignIn/index.jsx  |  1 +
 .../src/Pages/Profile/Profile.module.css      | 18 +++++
 .../frontend/src/Pages/Profile/index.jsx      | 69 ++++++++++++++-----
 4 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/Sidebar/index.jsx b/prediction-polls/frontend/src/Components/Sidebar/index.jsx
index 9579b2b8..74f770db 100644
--- a/prediction-polls/frontend/src/Components/Sidebar/index.jsx
+++ b/prediction-polls/frontend/src/Components/Sidebar/index.jsx
@@ -13,8 +13,9 @@ import { useNavigate } from "react-router-dom";
 import  logout  from "../../api/requests/logout.jsx";
 
 
+const username = localStorage.getItem("username")
 const menuData = [
-  { key: "Profile", Icon: ProfileIcon, to:"profile/can.gezer" },
+  { key: "Profile", Icon: ProfileIcon, to:`profile/${username}` },
   { key: "Feed", Icon: FeedIcon, to:"feed" },
   { key: "Vote", Icon: VoteIcon, to:"vote" },
   { key: "Create", Icon: CreateIcon , to:"create"},
diff --git a/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx b/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
index 959998e1..9bdd6226 100644
--- a/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
@@ -36,6 +36,7 @@ function SignIn() {
     if (response.status === 201 && data.accessToken && data.refreshToken) {
       localStorage.setItem('accessToken', data.accessToken); 
       localStorage.setItem('refreshToken', data.refreshToken);
+      localStorage.setItem('username', username);
       navigate("/feed");
     } 
 
diff --git a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
index 02ab2976..0ed78481 100644
--- a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
+++ b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
@@ -31,6 +31,7 @@
   width: 100%;
   height: 200px;
   position: relative;
+  background-image: linear-gradient(to right, #2c3e50, #4ca1af);
 }
 
 .thumbnail {
@@ -48,6 +49,21 @@
   left: 50px;
   bottom: -75px;
 }
+
+.profileImagePlaceholder {
+  width: 150px;
+  height: 150px;
+  object-fit: cover;
+  border-radius: 100px;
+  position: absolute;
+  left: 50px;
+  bottom: -75px;
+  background-color: var(--neutral-100);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .info {
   display: flex;
   width: 100%;
@@ -59,6 +75,8 @@
   display: flex;
   flex-direction: row;
   justify-content: space-between;
+  padding-top: 10px;
+  padding-bottom: 10px;
   
 }
 .name {
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index 64a7cabb..262467a7 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -7,13 +7,41 @@ import pollData from "../../MockData/PollData.json";
 import PollCard from "../../Components/PollCard";
 import { useNavigate } from "react-router-dom";
 import PointsButton from "../../Components/PointsButton";
-import pointData from "../../MockData/PointList.json"
+import pointData from "../../MockData/PointList.json";
 import { useParams } from "react-router-dom";
+import getProfileMe from "../../api/requests/profileMe.jsx";
+import getProfile from "../../api/requests/profile.jsx";
+import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
 
 function Profile() {
   const { username } = useParams();
+  const [userData, setUserData] = React.useState({});
+
+  const userMeUsername = localStorage.getItem("username");
+
+  React.useEffect(() => {
+    const fetchData = async () => {
+      try {
+        if (username === userMeUsername) {
+          const response = await getProfileMe();
+          if (response) {
+            setUserData(response);
+          }
+        } else {
+          const response = await getProfile(username);
+          if (response) {
+            setUserData(response);
+          }
+        }
+      } catch (error) {
+        console.error("Error fetching profile data:", error);
+      }
+    };
+
+    fetchData();
+  }, [username, userMeUsername]);
+
 
-  const userData = Users.userList.filter((user) => user.username === username)[0];
   const navigate = useNavigate();
   return (
     <div className={styles.page}>
@@ -21,32 +49,35 @@ function Profile() {
       <div className={styles.profileInfo}>
         <div className={styles.card}>
           <div className={styles.thumbnailImage}>
-            <img
-              src={userData.thumbnailImage}
-              className={styles.thumbnail}
-              alt="thumbnail"
-            />
-            <img
+            {userData.profileImage == null ? 
+            <div 
+              className={styles.profileImagePlaceholder} > <ProfileIcon/></div> : 
+              <img
               src={userData.image}
               alt="profileImage"
               className={styles.profileImage}
             ></img>
+            }
+            
           </div>
           <div className={styles.info}>
             <div className={styles.nameAndButton}>
               <div className={styles.name}>
-                <p className={styles.nameUsernameText}>
-                  {userData.username}
-                </p>
-                <p className={styles.nameUsernameText}>
-                  {userData.name}
-                </p>
+                <p className={styles.nameUsernameText}>{userData.username}</p>
               </div>
               <div className={styles.buttonContainer}>
-                <button className={styles.button} onClick={() => navigate(`/editProfile/${userData.username}`)}>
-                  {userData.username === "can.gezer" ? <><EditIcon />
-                  <p className={styles.buttonText}>Edit Profile</p></> : <p className={styles.buttonText}>Follow</p>}
-                  
+                <button
+                  className={styles.button}
+                  onClick={() => navigate(`/editProfile/${userData.username}`)}
+                >
+                  {userData.username === userMeUsername ? (
+                    <>
+                      <EditIcon />
+                      <p className={styles.buttonText}>Edit Profile</p>
+                    </>
+                  ) : (
+                    <p className={styles.buttonText}>Follow</p>
+                  )}
                 </button>
               </div>
             </div>
@@ -74,7 +105,7 @@ function Profile() {
           <PollCard PollData={poll} key={index} />
         ))}
       </div>
-      <PointsButton points={pointData.points}/>
+      <PointsButton points={pointData.points} />
     </div>
   );
 }

From e61e0b78afd392225d552a62e350b49b812f979c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:29:27 +0300
Subject: [PATCH 215/246] implemented edit profile backend integration

---
 .../Pages/EditProfile/EditProfile.module.css  |  12 ++
 .../frontend/src/Pages/EditProfile/index.jsx  | 165 ++++++++++++++----
 2 files changed, 146 insertions(+), 31 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
index 55badc17..d42686c1 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
+++ b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
@@ -25,6 +25,18 @@
   border-radius: 100px;
   justify-self: center;
   box-shadow: 2px 4px 8px var(--neutral-shadow);
+  cursor:pointer;
+}
+.profileImagePlaceholder {
+  width: 150px;
+  height: 150px;
+  object-fit: cover;
+  border-radius: 100px;
+  background-color: var(--neutral-100);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor:pointer;
 }
 
 .formInputStyle {
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index a3efe69a..70d97960 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -3,33 +3,106 @@ import Menu from "../../Components/Menu";
 import styles from "./EditProfile.module.css";
 import { useParams } from "react-router-dom";
 import Users from "../../MockData/Users.json";
-import {
-  Button,
-  Input,
-  Form,
-  DatePicker,
-  Checkbox,
-  Typography,
-  Divider,
-} from "antd";
+import { Button, Input, Form, DatePicker, Checkbox } from "antd";
 import PointsButton from "../../Components/PointsButton";
 import pointData from "../../MockData/PointList.json";
 import moment from "moment";
+import getProfileMe from "../../api/requests/profileMe.jsx";
+import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
+import uploadProfilePhoto from "../../api/requests/uploadProfilePhoto.jsx";
+import updateProfile from "../../api/requests/editProfile.jsx";
 
 function EditProfile() {
   const { username } = useParams();
   const [form] = Form.useForm();
+  const [initialValues, setInitialValues] = React.useState({
+    username: "",
+    // fullname: userData.name,
+    about: "",
+    birthday: "",
+    isHidden: null,
+  });
+  const [file, setFile] = React.useState(null);
+  const [caption, setCaption] = React.useState("");
+  const fileInputRef = React.useRef(null);
+  const [selectedFile, setSelectedFile] = React.useState(null);
 
+  const [userData, setUserData] = React.useState({});
 
-  const userData = Users.userList.filter(
-    (user) => user.username === username
-  )[0];
+  React.useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const response = await getProfileMe();
+        if (response) {
+          setUserData(response);
+          const newInitialValues = {
+            username: response.username,
+            // fullname: response.name,
+            about: response.biography,
+            birthday: response.birthday ? moment(response.birthday) : null,
+            isHidden: response.isHidden ,
+          };
+          setInitialValues(newInitialValues);
+          form.setFieldsValue(newInitialValues);
+        }
+      } catch (error) {
+        console.error("Error fetching profile data:", error);
+      }
+    };
 
-  const initialValues = {
-    username: userData.username,
-    fullname: userData.name,
-    about: userData.about,
-    birthday: userData.birthday ? moment(userData.birthday) : null, 
+    fetchData();
+  }, [username]);
+
+
+  const submitImage = async () => {
+    const result = await uploadProfilePhoto(file, caption);
+    if (result) {
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+  const handleEditProfile = async () => {
+    const formUserData = form.getFieldsValue();
+    const profileUpdateResult = await updateProfile({
+      userId: userData.id,
+      username: formUserData.username,
+      email: userData.email,
+      profile_picture: userData.profileImage,
+      biography: formUserData.about,
+      birthday: formUserData.birthday ? formUserData.birthday.format("YYYY-MM-DD") : null,
+      isHidden: formUserData.isHidden,
+    });
+  
+    if (profileUpdateResult) {
+      
+      if (file) {
+        const imageUploadResult = await submitImage(file);
+        if (!imageUploadResult) {
+          console.error("Error uploading the profile image.");
+          
+        }
+      }
+      
+     // window.location.reload();
+    } else {
+      console.error("Error updating the profile.");
+    }
+  };
+
+ 
+
+  const handleFileInputChange = (event) => {
+    const file = event.target.files[0];
+    if (file) {
+      setSelectedFile(URL.createObjectURL(file)); 
+      setFile(file); 
+    }
+  };
+
+  const handlePlaceholderClick = () => {
+    fileInputRef.current.click(); 
   };
 
   return (
@@ -45,42 +118,71 @@ function EditProfile() {
           initialValues={initialValues}
         >
           <Form.Item className={styles.profileImageWrapperStyle}>
-            <img
-              src={userData.image}
-              alt="profileImage"
-              className={styles.profileImage}
-            ></img>
+            <div
+              className={styles.profileImageContainer}
+              onClick={handlePlaceholderClick}
+            >
+              {selectedFile || userData.profileImage ? (
+                <img
+                  src={selectedFile || userData.profileImage}
+                  alt="Profile"
+                  className={styles.profileImage}
+                />
+              ) : (<div className={styles.profileImagePlaceholder}>
+                <ProfileIcon /> </div>
+              )}
+            </div>
+            <input
+              type="file"
+              ref={fileInputRef}
+              onChange={handleFileInputChange}
+              accept="image/*"
+              style={{ display: "none" }} 
+            />
           </Form.Item>
-          <Form.Item label={<label className={styles.formLabel}>USERNAME</label> }name="username" className={styles.formItem}>
+          <Form.Item
+            label={<label className={styles.formLabel}>USERNAME</label>}
+            name="username"
+            className={styles.formItem}
+          >
             <Input
               type="text"
               className={styles.formInputStyle}
               placeholder="username"
             />
           </Form.Item>
-          <Form.Item label={<label className={styles.formLabel}>FULL NAME</label>} name="fullname" className={styles.formItem}>
+          {/* <Form.Item label={<label className={styles.formLabel}>FULL NAME</label>} name="fullname" className={styles.formItem}>
             <Input
               type="text"
               className={styles.formInputStyle}
               placeholder="Full Name"
             />
-          </Form.Item>
-          <Form.Item label={<label className={styles.formLabel}>ABOUT</label>} name="about" className={styles.formItem}>
+          </Form.Item> */}
+          <Form.Item
+            label={<label className={styles.formLabel}>ABOUT</label>}
+            name="about"
+            className={styles.formItem}
+          >
             <Input
               className={styles.formInputStyle}
               type="text"
               placeholder="about"
             />
           </Form.Item>
-          <Form.Item>
+          {/*<Form.Item>
             <p>COVER IMAGE</p>
             <img
               src={userData.thumbnailImage}
               alt="thumbnailImage"
               className={styles.thumbnailImage}
             ></img>
-          </Form.Item>
-          <Form.Item label={<label className={styles.formLabel}>BIRTHDAY</label>} name="birthday" htmlFor="birthday" className={styles.formItem}>
+          </Form.Item> */}
+          <Form.Item
+            label={<label className={styles.formLabel}>BIRTHDAY</label>}
+            name="birthday"
+            htmlFor="birthday"
+            className={styles.formItem}
+          >
             <div className={styles.birthdayWrapperStyle}>
               <DatePicker
                 id="birthday"
@@ -88,15 +190,16 @@ function EditProfile() {
                 placeholder="01.01.2000"
                 format="YYYY-MM-DD"
               />
-              <Checkbox>Show in profile</Checkbox>
+              <Checkbox id="isHidden">Show in profile</Checkbox>
             </div>
           </Form.Item>
-          <Form.Item className={styles.buttonContainer} >
+          <Form.Item className={styles.buttonContainer}>
             <div className={styles.buttonWrapper}>
               <Button
                 type="primary"
                 htmlType="submit"
                 className={styles.formButtonStyle}
+                onClick={handleEditProfile}
               >
                 Save Changes
               </Button>

From 31b3b53852e99df88aba57fc6871b532c16d2982 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 14:39:47 +0300
Subject: [PATCH 216/246] Prevent voting a closed poll

---
 prediction-polls/backend/src/repositories/PollDB.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 4bf159e2..47a84da2 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -161,6 +161,12 @@ async function voteDiscretePoll(pollId, userId, choiceId, pointsSpent){
     try {
         await connection.beginTransaction()
 
+        const pollObject = await getPollWithId(pollId);
+
+        if (pollObject[0].isOpen == 0) {
+            throw { error: errorCodes.DATABASE_ERROR };
+        }
+
         const [rows] = await connection.query(findPointsSql, [userId]);
         const current_points = rows[0].points;
 
@@ -204,6 +210,12 @@ async function voteContinuousPoll(pollId, userId, choice, contPollType, pointsSp
     try {
         await connection.beginTransaction()
 
+        const pollObject = await getPollWithId(pollId);
+
+        if (pollObject[0].isOpen == 0) {
+            throw { error: errorCodes.DATABASE_ERROR };
+        }
+
         const [rows] = await connection.query(findPointsSql, [userId]);
         const current_points = rows[0].points;
 

From 196c51594819eca4929ef9366db38c7af173b62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:44:59 +0300
Subject: [PATCH 217/246] made profile page responsive

---
 .../src/Pages/Profile/Profile.module.css      | 258 +++++++++++-------
 .../frontend/src/Pages/Profile/index.jsx      |   5 +-
 2 files changed, 163 insertions(+), 100 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
index 0ed78481..2119d184 100644
--- a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
+++ b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
@@ -3,10 +3,19 @@
   background-color: var(--neutral-white);
   width: 100%;
 }
-@media (max-width: 640px) {
+@media (max-width: 768px) {
   .page {
     flex-direction: column;
   }
+  .profileInfo {
+    width: 100%;
+  }
+}
+
+@media (min-width: 768px) {
+  .profileInfo {
+    width: 60%;
+  }
 }
 
 .card {
@@ -23,7 +32,6 @@
   display: flex;
   flex-direction: column;
   padding-left: 20px;
-  width: 60%;
   margin-top: 30px;
 }
 .thumbnailImage {
@@ -32,6 +40,7 @@
   height: 200px;
   position: relative;
   background-image: linear-gradient(to right, #2c3e50, #4ca1af);
+  border-radius: 8px 8px 0px 0px;
 }
 
 .thumbnail {
@@ -40,30 +49,69 @@
   border-radius: 8px 8px 0px 0px;
   object-fit: cover;
 }
-.profileImage {
-  width: 150px;
-  height: 150px;
-  object-fit: cover;
-  border-radius: 100px;
-  position: absolute;
-  left: 50px;
-  bottom: -75px;
+
+@media (max-width: 768px) {
+  .thumbnailImage {
+    height: 150px;
+  }
+}
+@media (max-width: 768px) {
+  .profileImage {
+    width: 100px;
+    height: 100px;
+    object-fit: cover;
+    border-radius: 100px;
+    position: absolute;
+    left: 20px;
+    bottom: -50px;
+  }
+}
+@media (min-width: 768px) {
+  .profileImage {
+    width: 150px;
+    height: 150px;
+    object-fit: cover;
+    border-radius: 100px;
+    position: absolute;
+    left: 50px;
+    bottom: -75px;
+  }
 }
 
-.profileImagePlaceholder {
-  width: 150px;
-  height: 150px;
-  object-fit: cover;
-  border-radius: 100px;
-  position: absolute;
-  left: 50px;
-  bottom: -75px;
-  background-color: var(--neutral-100);
-  display: flex;
-  align-items: center;
-  justify-content: center;
+@media (max-width: 768px) {
+  .profileImagePlaceholder{
+    width: 100px;
+    height: 100px;
+    object-fit: cover;
+    border-radius: 100px;
+    position: absolute;
+    left: 20px;
+    bottom: -50px;
+    background-color: var(--neutral-100);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+@media (min-width: 768px) {
+  .profileImagePlaceholder {
+    width: 150px;
+    height: 150px;
+    object-fit: cover;
+    border-radius: 100px;
+    position: absolute;
+    left: 50px;
+    bottom: -75px;
+    background-color: var(--neutral-100);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
 }
 
+
+
+
 .info {
   display: flex;
   width: 100%;
@@ -77,7 +125,6 @@
   justify-content: space-between;
   padding-top: 10px;
   padding-bottom: 10px;
-  
 }
 .name {
   display: flex;
@@ -85,9 +132,15 @@
   justify-content: start;
   align-items: start;
   margin-left: 230px;
-  gap:10px;
+  padding-right: 10px;
   padding-top: 20px;
-  
+
+}
+
+@media (max-width: 768px) {
+  .name {
+    margin-left: 140px;
+  }
 }
 .button {
   background-color: var(--primary-500);
@@ -103,8 +156,8 @@
   cursor: pointer;
   font-size: 20px;
 }
-.buttonText{
-    margin: 0px;
+.buttonText {
+  margin: 0px;
 }
 .buttonContainer {
   display: flex;
@@ -112,82 +165,91 @@
   align-items: center;
   padding-right: 10px;
 }
-.aboutContainer{
-    display: flex;
-    flex-direction: column;
-    padding: 0px 10px;
-    padding-left: 50px;
-    padding-top: 10px;
-    gap:10
-}
-.aboutTitle{
-    font-weight: 700;
-    color: var(--neutral-black);
-    line-height: 24px;
-    font-size: 24px;
-    margin: 0px 0px;
-}
-.aboutText{
-    color:var(--neutral-black);
-    margin: 0px;
-    font-size: 20px;
+.aboutContainer {
+  display: flex;
+  flex-direction: column;
+  padding: 0px 10px;
+  padding-left: 50px;
+  padding-top: 10px;
+  gap: 10;
+}
+.aboutTitle {
+  font-weight: 700;
+  color: var(--neutral-black);
+  line-height: 24px;
+  font-size: 24px;
+  margin: 0px 0px;
+}
+.aboutText {
+  color: var(--neutral-black);
+  margin: 0px;
+  font-size: 20px;
 }
 
-.nameUsernameText{
-    font-weight: 700;
-    color: var(--neutral-black);
-    line-height: 24px;
-    font-size: 24px;
-    margin: 0px 0px;
+.nameUsernameText {
+  font-weight: 700;
+  color: var(--neutral-black);
+  line-height: 24px;
+  font-size: 24px;
+  margin: 0px 0px;
+}
+.badgesContainer {
+  display: flex;
+  flex-direction: row;
+  justify-content: start;
+  align-items: center;
+  gap: 10px;
+  padding-left: 50px;
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
 
+.badge {
+  width: 85px;
+  height: 85px;
+  border-radius: 100%;
+  background-color: gold;
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  box-sizing: border-box;
+  overflow-wrap: anywhere;
+  padding: 4px;
+  text-align: center;
+  vertical-align: middle;
+  position: relative;
 }
-.badgesContainer{
-    display: flex;
-    flex-direction: row;
-    justify-content: start;
-    align-items: center;
-    gap: 10px;
-    padding-left: 50px;
-    padding-top: 10px;
-    padding-bottom: 10px;
+.badge::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 85px;
+  height: 85px;
+  background-color: var(--neutral-white);
+  opacity: 0.2;
+  border-radius: 100%;
+  pointer-events: none;
+}
+.badgeText {
+  font-weight: 700;
+  color: var(--neutral-black);
+  line-height: 14px;
+  font-size: 14px;
+  margin: 0px 0px;
+  z-index: 1;
 }
 
-.badge{
-    width: 85px;
-    height: 85px;
-    border-radius: 100%;
-    background-color: gold;
-    justify-content: center;
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-    gap:5px;
-    box-sizing: border-box;
-    overflow-wrap:anywhere;
-    padding: 4px;
-    text-align: center;
-    vertical-align: middle;
-    position: relative;
+@media (max-width: 768px) {
+  .pointButton {
+    display: none;
+  }
+}
 
+@media (min-width: 768px) {
+  .pointButton {
+    display: block;
+  }
 }
-.badge::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 85px;
-    height: 85px;
-    background-color: var(--neutral-white);
-    opacity: 0.2; 
-    border-radius: 100%; 
-    pointer-events: none; 
-}
-.badgeText{
-    font-weight: 700;
-    color: var(--neutral-black);
-    line-height: 14px;
-    font-size: 14px;
-    margin: 0px 0px;
-    z-index: 1;
-    
-}
\ No newline at end of file
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index 262467a7..e6cff919 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -83,7 +83,7 @@ function Profile() {
             </div>
             <div className={styles.aboutContainer}>
               <p className={styles.aboutTitle}>About</p>
-              <p className={styles.aboutText}>{userData.about}</p>
+              <p className={styles.aboutText}>{userData.biography}</p>
             </div>
             <div className={styles.badgesContainer}>
               <div className={styles.badge}>
@@ -105,7 +105,8 @@ function Profile() {
           <PollCard PollData={poll} key={index} />
         ))}
       </div>
-      <PointsButton points={pointData.points} />
+      <div className={styles.pointButton}>
+      <PointsButton points={pointData.points} /></div>
     </div>
   );
 }

From 0262ab4a87b82ab74ad7e91600eaad19de9fa72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 14:58:06 +0300
Subject: [PATCH 218/246] updated photo upload

---
 .../frontend/src/Pages/EditProfile/index.jsx           | 10 +++++++---
 prediction-polls/frontend/src/Pages/Profile/index.jsx  |  4 ++--
 .../frontend/src/api/requests/profileMe.jsx            |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index 70d97960..c5c07324 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -11,6 +11,7 @@ import getProfileMe from "../../api/requests/profileMe.jsx";
 import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
 import uploadProfilePhoto from "../../api/requests/uploadProfilePhoto.jsx";
 import updateProfile from "../../api/requests/editProfile.jsx";
+import { useNavigate } from "react-router-dom";
 
 function EditProfile() {
   const { username } = useParams();
@@ -28,6 +29,7 @@ function EditProfile() {
   const [selectedFile, setSelectedFile] = React.useState(null);
 
   const [userData, setUserData] = React.useState({});
+  const navigate = useNavigate();
 
   React.useEffect(() => {
     const fetchData = async () => {
@@ -85,7 +87,7 @@ function EditProfile() {
         }
       }
       
-     // window.location.reload();
+     navigate(`/profile/${formUserData.username}`);
     } else {
       console.error("Error updating the profile.");
     }
@@ -122,9 +124,9 @@ function EditProfile() {
               className={styles.profileImageContainer}
               onClick={handlePlaceholderClick}
             >
-              {selectedFile || userData.profileImage ? (
+              {selectedFile || userData.profile_picture ? (
                 <img
-                  src={selectedFile || userData.profileImage}
+                  src={selectedFile || userData.profile_picture}
                   alt="Profile"
                   className={styles.profileImage}
                 />
@@ -140,6 +142,7 @@ function EditProfile() {
               style={{ display: "none" }} 
             />
           </Form.Item>
+          
           <Form.Item
             label={<label className={styles.formLabel}>USERNAME</label>}
             name="username"
@@ -149,6 +152,7 @@ function EditProfile() {
               type="text"
               className={styles.formInputStyle}
               placeholder="username"
+              disabled
             />
           </Form.Item>
           {/* <Form.Item label={<label className={styles.formLabel}>FULL NAME</label>} name="fullname" className={styles.formItem}>
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index e6cff919..f157ebf5 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -49,11 +49,11 @@ function Profile() {
       <div className={styles.profileInfo}>
         <div className={styles.card}>
           <div className={styles.thumbnailImage}>
-            {userData.profileImage == null ? 
+            {userData.profile_picture == null ? 
             <div 
               className={styles.profileImagePlaceholder} > <ProfileIcon/></div> : 
               <img
-              src={userData.image}
+              src={userData.profile_picture}
               alt="profileImage"
               className={styles.profileImage}
             ></img>
diff --git a/prediction-polls/frontend/src/api/requests/profileMe.jsx b/prediction-polls/frontend/src/api/requests/profileMe.jsx
index 8433fa48..054c7fb7 100644
--- a/prediction-polls/frontend/src/api/requests/profileMe.jsx
+++ b/prediction-polls/frontend/src/api/requests/profileMe.jsx
@@ -3,7 +3,7 @@ const baseUrl = process.env.REACT_APP_BACKEND_LINK; // Replace with your actual
 async function getProfileMe() {
     const accessToken = localStorage.getItem("accessToken");
   try {
-    const response = await fetch(`${baseUrl}/profiles/myProfile`, {
+    const response = await fetch(`${baseUrl}/profiles/me`, {
       method: "GET",
       headers: {
         "Content-Type": "application/json",

From 3ca2c739e5f704aac63764362bce74ab9b217261 Mon Sep 17 00:00:00 2001
From: kutaysaran <74209499+kutaysaran@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:01:28 +0300
Subject: [PATCH 219/246] Poll backend connection

I have connected frontend with backend to retrieve polls data .
---
 .../Components/PollCard/PollCard.module.css   |  1 +
 .../src/Components/PollCard/index.jsx         |  4 +-
 .../frontend/src/Pages/Feed/index.jsx         | 79 ++++++++++++++++---
 3 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css b/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
index 9362480a..bed8b007 100644
--- a/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
+++ b/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
@@ -10,6 +10,7 @@
   gap: 20px;
   background-color: var(--neutral-pollCard);
   margin-bottom: 20px;
+  cursor: pointer;
 }
 .question {
   display: flex;
diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index 0db10303..c28b209e 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -9,7 +9,7 @@ import PollOption from "../PollOption";
 import { Input,DatePicker } from 'antd';
 
 
-function PollCard({ PollData ,setAnswer}) {
+function PollCard({ PollData ,setAnswer, onClick}) {
   const [selectedArray, setSelectedArray] = React.useState(
     !PollData.isCustomPoll ? Array(PollData["options"].length).fill(false) : []
   );
@@ -37,7 +37,7 @@ function PollCard({ PollData ,setAnswer}) {
   const navigate = useNavigate();
 
   return (
-    <div className={styles.card}>
+    <div className={styles.card} onClick={onClick}>
       <div className={styles.question}>
         <div className={styles.tags}>
           {pollData.tags.map((tag, index) => (
diff --git a/prediction-polls/frontend/src/Pages/Feed/index.jsx b/prediction-polls/frontend/src/Pages/Feed/index.jsx
index 046b7a54..ed22c487 100644
--- a/prediction-polls/frontend/src/Pages/Feed/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Feed/index.jsx
@@ -1,14 +1,64 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import Menu from "../../Components/Menu";
 import styles from "./Feed.module.css";
-import pollData from "../../MockData/PollData.json"
 import PollCard from "../../Components/PollCard";
 import PointsButton from "../../Components/PointsButton";
 import pointData from "../../MockData/PointList.json";
-import SearchBar from "../../Components/SearchBar"
+import SearchBar from "../../Components/SearchBar";
+import { useNavigate } from "react-router-dom";
 
 function Feed() {
+  const [pollData, setPollData] = useState({ pollList: [] });
   const [filteredPolls, setFilteredPolls] = useState(pollData.pollList);
+  const url = process.env.REACT_APP_BACKEND_LINK; 
+  const navigate = useNavigate();
+
+  useEffect(() => {
+  const fetchData = async () => {
+    try {
+      const response = await fetch(url + "/polls", {  
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${localStorage.getItem("accessToken")}`,  
+        },
+      });
+
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
+
+      const contentType = response.headers.get('content-type');
+      if (!contentType || !contentType.includes('application/json')) {
+        throw new TypeError('Received non-JSON response from server');
+      }
+
+      const data = await response.json();
+
+      // Modify each poll in the data array
+      const modifiedData = data.map(poll => {
+        if (poll.pollType === "discrete") {
+          return { ...poll, isCustomPoll: false };
+        } else {
+          return { ...poll, isCustomPoll: true };
+        }
+      });
+
+      setPollData({ pollList: modifiedData });
+      setFilteredPolls(modifiedData);
+
+    } catch (error) {
+      console.error('Error fetching polls:', error);
+    }
+  };
+
+
+  fetchData();
+}, []);
+
+  const handlePollClick = async (pollId) => {
+    navigate("/vote/" + pollId)
+  };
 
   const handleSearch = (searchText) => {
     if (!searchText.trim()) {
@@ -31,14 +81,21 @@ function Feed() {
 
   return (
     <div className={styles.page}>
-      <Menu currentPage="Feed" />   
-      <div className = {styles.pollList}>  
-       <SearchBar onSearch={handleSearch} />
-       {filteredPolls.map((poll) => (
-          <PollCard PollData={poll} key={poll.id} />
-        ))}</div>
-     <div className={styles.pointsButton}>
-      <PointsButton points={pointData.points}/></div> 
+      <Menu currentPage="Feed" />
+      <div className={styles.pollList}>
+        <SearchBar onSearch={handleSearch} />
+        {filteredPolls.map((poll) => (
+          <PollCard
+            className={styles.pollCard}
+            PollData={poll}
+            key={poll.id} 
+            onClick={() => handlePollClick(poll.id)}
+          />
+        ))}
+      </div>
+      <div className={styles.pointsButton}>
+        <PointsButton points={pointData.points} />
+      </div>
     </div>
   );
 }

From 1ebc0c3072df101a42bf855436ecb0b59c3f0084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:06:15 +0300
Subject: [PATCH 220/246] updated my profile url

---
 prediction-polls/frontend/src/api/requests/profileMe.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/frontend/src/api/requests/profileMe.jsx b/prediction-polls/frontend/src/api/requests/profileMe.jsx
index 054c7fb7..8433fa48 100644
--- a/prediction-polls/frontend/src/api/requests/profileMe.jsx
+++ b/prediction-polls/frontend/src/api/requests/profileMe.jsx
@@ -3,7 +3,7 @@ const baseUrl = process.env.REACT_APP_BACKEND_LINK; // Replace with your actual
 async function getProfileMe() {
     const accessToken = localStorage.getItem("accessToken");
   try {
-    const response = await fetch(`${baseUrl}/profiles/me`, {
+    const response = await fetch(`${baseUrl}/profiles/myProfile`, {
       method: "GET",
       headers: {
         "Content-Type": "application/json",

From 9c23cf67a6ac99b1d0aabc12a4825d4c6e65e8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:29:25 +0300
Subject: [PATCH 221/246] added badge component and updated sidebar navigation

---
 .../src/Components/Badge/Badge.module.css     | 48 ++++++++++++++
 .../frontend/src/Components/Badge/index.jsx   | 24 +++++++
 .../frontend/src/Components/Sidebar/index.jsx |  7 ++-
 .../Pages/EditProfile/EditProfile.module.css  | 39 ------------
 .../frontend/src/Pages/EditProfile/index.jsx  | 63 ++++++++-----------
 .../src/Pages/Profile/Profile.module.css      | 40 +-----------
 .../frontend/src/Pages/Profile/index.jsx      | 20 +++---
 7 files changed, 111 insertions(+), 130 deletions(-)
 create mode 100644 prediction-polls/frontend/src/Components/Badge/Badge.module.css
 create mode 100644 prediction-polls/frontend/src/Components/Badge/index.jsx

diff --git a/prediction-polls/frontend/src/Components/Badge/Badge.module.css b/prediction-polls/frontend/src/Components/Badge/Badge.module.css
new file mode 100644
index 00000000..0b3e7ccf
--- /dev/null
+++ b/prediction-polls/frontend/src/Components/Badge/Badge.module.css
@@ -0,0 +1,48 @@
+.badge {
+    width: 85px;
+    height: 85px;
+    border-radius: 100%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+    box-sizing: border-box;
+    overflow-wrap: anywhere;
+    padding: 4px;
+    text-align: center;
+    vertical-align: middle;
+    position: relative;
+  }
+  .badge::after {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 85px;
+    height: 85px;
+    background-color: var(--neutral-white);
+    opacity: 0.2;
+    border-radius: 100%;
+    pointer-events: none;
+  }
+  .badgeText {
+    font-weight: 700;
+    color: var(--neutral-black);
+    line-height: 14px;
+    font-size: 14px;
+    margin: 0px 0px;
+    z-index: 1;
+  }
+
+  .silver {
+    background-color: silver;
+  }
+  
+  .bronze {
+    background-color: #cd7f32; /* Bronze color */
+  }
+
+  .gold {
+    background-color: gold;
+  }
\ No newline at end of file
diff --git a/prediction-polls/frontend/src/Components/Badge/index.jsx b/prediction-polls/frontend/src/Components/Badge/index.jsx
new file mode 100644
index 00000000..f2df8bf4
--- /dev/null
+++ b/prediction-polls/frontend/src/Components/Badge/index.jsx
@@ -0,0 +1,24 @@
+import React from "react";
+import styles from "./Badge.module.css";
+
+function Badge({ number, text }) {
+  let badgeClass = styles.badge;
+  
+  if (number === 1) {
+    badgeClass = `${styles.badge} ${styles.gold}`;
+  }
+  else if (number === 2) {
+    badgeClass = `${styles.badge} ${styles.silver}`;
+  } else if (number === 3) {
+    badgeClass = `${styles.badge} ${styles.bronze}`;
+  }
+  
+  return (
+    <div className={badgeClass}>
+      <p className={styles.badgeText}>{number}</p>
+      <p className={styles.badgeText}>{text}</p>
+    </div>
+  );
+}
+
+export default Badge;
diff --git a/prediction-polls/frontend/src/Components/Sidebar/index.jsx b/prediction-polls/frontend/src/Components/Sidebar/index.jsx
index 74f770db..4361ea5a 100644
--- a/prediction-polls/frontend/src/Components/Sidebar/index.jsx
+++ b/prediction-polls/frontend/src/Components/Sidebar/index.jsx
@@ -11,6 +11,7 @@ import { ReactComponent as Logo } from "../../Assets/Logo.svg";
 import styles from "./Sidebar.module.css";
 import { useNavigate } from "react-router-dom";
 import  logout  from "../../api/requests/logout.jsx";
+import { Link } from 'react-router-dom';
 
 
 const username = localStorage.getItem("username")
@@ -37,18 +38,18 @@ const SidebarMenuItem = ({
 
   const isSelected = currentPage === pageKey;
   return (
-    <div
+    <Link
       key={pageKey}
       className={`${styles.menuItem} ${
         isSelected ? styles.selectedMenuItem : ""
       }`}
-      onClick={() => navigate(to)}
+      to={to}
     >
       {Icon && (
         <Icon width={40} height={40} />
       )}
       <p className={styles.etxt}>{label || pageKey}</p>
-    </div>
+    </Link>
   );
 };
 
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
index d42686c1..320396d0 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
+++ b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
@@ -98,45 +98,6 @@ border-radius: 10px;
     padding-bottom: 10px;
 }
 
-.badge{
-    width: 85px;
-    height: 85px;
-    border-radius: 100%;
-    background-color: gold;
-    justify-content: center;
-    align-items: center;
-    display: flex;
-    flex-direction: column;
-    gap:5px;
-    box-sizing: border-box;
-    overflow-wrap:anywhere;
-    padding: 4px;
-    text-align: center;
-    vertical-align: middle;
-    position: relative;
-
-}
-.badge::after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 85px;
-    height: 85px;
-    background-color: var(--neutral-white);
-    opacity: 0.2; 
-    border-radius: 100%; 
-    pointer-events: none; 
-}
-.badgeText{
-    font-weight: 700;
-    color: var(--neutral-black);
-    line-height: 14px;
-    font-size: 14px;
-    margin: 0px 0px;
-    z-index: 1;
-    
-}
 .badgeCheckbox{
     display: flex;
     flex-direction: row;
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index c5c07324..65a0f72a 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -12,6 +12,7 @@ import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
 import uploadProfilePhoto from "../../api/requests/uploadProfilePhoto.jsx";
 import updateProfile from "../../api/requests/editProfile.jsx";
 import { useNavigate } from "react-router-dom";
+import Badge from "../../Components/Badge/index.jsx";
 
 function EditProfile() {
   const { username } = useParams();
@@ -42,7 +43,7 @@ function EditProfile() {
             // fullname: response.name,
             about: response.biography,
             birthday: response.birthday ? moment(response.birthday) : null,
-            isHidden: response.isHidden ,
+            isHidden: response.isHidden,
           };
           setInitialValues(newInitialValues);
           form.setFieldsValue(newInitialValues);
@@ -55,7 +56,6 @@ function EditProfile() {
     fetchData();
   }, [username]);
 
-
   const submitImage = async () => {
     const result = await uploadProfilePhoto(file, caption);
     if (result) {
@@ -73,38 +73,36 @@ function EditProfile() {
       email: userData.email,
       profile_picture: userData.profileImage,
       biography: formUserData.about,
-      birthday: formUserData.birthday ? formUserData.birthday.format("YYYY-MM-DD") : null,
+      birthday: formUserData.birthday
+        ? formUserData.birthday.format("YYYY-MM-DD")
+        : null,
       isHidden: formUserData.isHidden,
     });
-  
+
     if (profileUpdateResult) {
-      
       if (file) {
         const imageUploadResult = await submitImage(file);
         if (!imageUploadResult) {
           console.error("Error uploading the profile image.");
-          
         }
       }
-      
-     navigate(`/profile/${formUserData.username}`);
+
+      navigate(`/profile/${formUserData.username}`);
     } else {
       console.error("Error updating the profile.");
     }
   };
 
- 
-
   const handleFileInputChange = (event) => {
     const file = event.target.files[0];
     if (file) {
-      setSelectedFile(URL.createObjectURL(file)); 
-      setFile(file); 
+      setSelectedFile(URL.createObjectURL(file));
+      setFile(file);
     }
   };
 
   const handlePlaceholderClick = () => {
-    fileInputRef.current.click(); 
+    fileInputRef.current.click();
   };
 
   return (
@@ -130,8 +128,10 @@ function EditProfile() {
                   alt="Profile"
                   className={styles.profileImage}
                 />
-              ) : (<div className={styles.profileImagePlaceholder}>
-                <ProfileIcon /> </div>
+              ) : (
+                <div className={styles.profileImagePlaceholder}>
+                  <ProfileIcon />{" "}
+                </div>
               )}
             </div>
             <input
@@ -139,10 +139,10 @@ function EditProfile() {
               ref={fileInputRef}
               onChange={handleFileInputChange}
               accept="image/*"
-              style={{ display: "none" }} 
+              style={{ display: "none" }}
             />
           </Form.Item>
-          
+
           <Form.Item
             label={<label className={styles.formLabel}>USERNAME</label>}
             name="username"
@@ -216,27 +216,14 @@ function EditProfile() {
         <p className={styles.badgesText}>Badges</p>
         <p>(You can choose at most 3)</p>
         <div className={styles.badgesContainer}>
-          <div className={styles.badgeCheckbox}>
-            <Checkbox />
-            <div className={styles.badge}>
-              <p className={styles.badgeText}>1</p>
-              <p className={styles.badgeText}>Basketball</p>
-            </div>
-          </div>
-          <div className={styles.badgeCheckbox}>
-            <Checkbox />
-            <div className={styles.badge}>
-              <p className={styles.badgeText}>1</p>
-              <p className={styles.badgeText}>Politics</p>
-            </div>
-          </div>
-          <div className={styles.badgeCheckbox}>
-            <Checkbox />
-            <div className={styles.badge}>
-              <p className={styles.badgeText}>1</p>
-              <p className={styles.badgeText}>Football</p>
-            </div>
-          </div>
+          {userData.badges &&
+            userData.badges.length > 0 ?
+            userData.badges.map((badge, index) => (
+              <div className={styles.badgeCheckbox}>
+                <Checkbox />
+                <Badge number={badge.rank} text={badge.topic} key={index} />
+              </div>
+            )) : <p>No badges yet.</p>}
         </div>
       </div>
     </div>
diff --git a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
index 2119d184..5e28be9c 100644
--- a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
+++ b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
@@ -170,7 +170,7 @@
   flex-direction: column;
   padding: 0px 10px;
   padding-left: 50px;
-  padding-top: 10px;
+  padding-top: 20px;
   gap: 10;
 }
 .aboutTitle {
@@ -204,43 +204,7 @@
   padding-bottom: 10px;
 }
 
-.badge {
-  width: 85px;
-  height: 85px;
-  border-radius: 100%;
-  background-color: gold;
-  justify-content: center;
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-  gap: 5px;
-  box-sizing: border-box;
-  overflow-wrap: anywhere;
-  padding: 4px;
-  text-align: center;
-  vertical-align: middle;
-  position: relative;
-}
-.badge::after {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 85px;
-  height: 85px;
-  background-color: var(--neutral-white);
-  opacity: 0.2;
-  border-radius: 100%;
-  pointer-events: none;
-}
-.badgeText {
-  font-weight: 700;
-  color: var(--neutral-black);
-  line-height: 14px;
-  font-size: 14px;
-  margin: 0px 0px;
-  z-index: 1;
-}
+
 
 @media (max-width: 768px) {
   .pointButton {
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index f157ebf5..4526957f 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -12,6 +12,7 @@ import { useParams } from "react-router-dom";
 import getProfileMe from "../../api/requests/profileMe.jsx";
 import getProfile from "../../api/requests/profile.jsx";
 import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
+import Badge from "../../Components/Badge/index.jsx";
 
 function Profile() {
   const { username } = useParams();
@@ -86,18 +87,13 @@ function Profile() {
               <p className={styles.aboutText}>{userData.biography}</p>
             </div>
             <div className={styles.badgesContainer}>
-              <div className={styles.badge}>
-                <p className={styles.badgeText}>1</p>
-                <p className={styles.badgeText}>Basketball</p>
-              </div>
-              <div className={styles.badge}>
-                <p className={styles.badgeText}>1</p>
-                <p className={styles.badgeText}>Politics</p>
-              </div>
-              <div className={styles.badge}>
-                <p className={styles.badgeText}>1</p>
-                <p className={styles.badgeText}>Football</p>
-              </div>
+              {userData.badges && userData.badges.length > 0 && (
+                userData.badges.map((badge, index) => (
+
+                  <Badge number={badge.rank} text={badge.topic} key={index} />
+                ))
+              )}
+
             </div>
           </div>
         </div>

From c101302a2bb65f9ecc0b74401ca9c34772bd5e06 Mon Sep 17 00:00:00 2001
From: kutaysaran <74209499+kutaysaran@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:37:47 +0300
Subject: [PATCH 222/246] Reversed data

---
 prediction-polls/frontend/src/Pages/Feed/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Feed/index.jsx b/prediction-polls/frontend/src/Pages/Feed/index.jsx
index ed22c487..08b36ca8 100644
--- a/prediction-polls/frontend/src/Pages/Feed/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Feed/index.jsx
@@ -43,9 +43,9 @@ function Feed() {
           return { ...poll, isCustomPoll: true };
         }
       });
-
-      setPollData({ pollList: modifiedData });
-      setFilteredPolls(modifiedData);
+      const reversedData = [...modifiedData].reverse();
+      setPollData({ pollList: reversedData });
+      setFilteredPolls(reversedData);
 
     } catch (error) {
       console.error('Error fetching polls:', error);

From 9cb6d62c730fd55ae85dd86f284ea64d0e4e9561 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 15:43:49 +0300
Subject: [PATCH 223/246] Update endpoint

---
 prediction-polls/backend/src/routes/ProfileRouter.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 9d45f74d..4ce646bc 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -93,7 +93,7 @@ router.get('/', service.getProfile);
 
 /**
  * @swagger
- * /profiles/me:
+ * /profiles/myProfile:
  *   get:
  *     tags:
  *       - profiles
@@ -129,7 +129,7 @@ router.get('/', service.getProfile);
  *                     code: 3000,
  *                     message: Profile not found,
  */
-router.get('/me',authenticator.authorizeAccessToken ,service.getMyProfile);
+router.get('/myProfile',authenticator.authorizeAccessToken ,service.getMyProfile);
 
 /**
  * @swagger

From 5d92f62fbb53153f35bf01d4ffab180e10077405 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:07:55 +0300
Subject: [PATCH 224/246] Update swagger

---
 prediction-polls/backend/src/routes/ProfileRouter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/prediction-polls/backend/src/routes/ProfileRouter.js b/prediction-polls/backend/src/routes/ProfileRouter.js
index 4ce646bc..dda8b23f 100644
--- a/prediction-polls/backend/src/routes/ProfileRouter.js
+++ b/prediction-polls/backend/src/routes/ProfileRouter.js
@@ -22,6 +22,8 @@ const upload = multer({ storage: storage })
  *           type: string
  *         profile_picture:
  *           type: string
+ *         points:
+ *           type: integer
  *         biography:
  *           type: string
  *         birthday:

From 71cfb41155221943830fad3794bc9aeab3a255bb Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 16:41:03 +0300
Subject: [PATCH 225/246] fix pollService tests with new commits

---
 prediction-polls/backend/tests/PollService.test.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/backend/tests/PollService.test.js b/prediction-polls/backend/tests/PollService.test.js
index 10e7669d..3be72a5e 100644
--- a/prediction-polls/backend/tests/PollService.test.js
+++ b/prediction-polls/backend/tests/PollService.test.js
@@ -28,7 +28,8 @@ jest.mock('../src/repositories/PollDB', () => ({
       setDueDate: 1,
       closingDate: '2023-12-29T21:00:00.000Z',
       numericFieldValue: 2,
-      selectedTimeUnit: 'min'
+      selectedTimeUnit: 'min',
+      isOpen: true
     },
     {
       id: 2,
@@ -39,7 +40,8 @@ jest.mock('../src/repositories/PollDB', () => ({
       setDueDate: 1,
       closingDate: '2023-11-20T21:00:00.000Z',
       numericFieldValue: 5,
-      selectedTimeUnit: 'min'
+      selectedTimeUnit: 'min',
+      isOpen: true
     }
   ]),
   getPollWithId: jest.fn().mockResolvedValue([
@@ -52,7 +54,8 @@ jest.mock('../src/repositories/PollDB', () => ({
       setDueDate: 1,
       closingDate: '2023-12-29T21:00:00.000Z',
       numericFieldValue: 2,
-      selectedTimeUnit: 'min'
+      selectedTimeUnit: 'min',
+      isOpen: true
     }
   ])
 }));
@@ -344,6 +347,7 @@ describe('getPolls()', () => {
             closingDate: "2023-11-20T21:00:00.000Z",
             rejectVotes: "5 min",
             isOpen: true,
+            options: [],
             comments: [],
             cont_poll_type: "numeric"
         }
@@ -407,7 +411,8 @@ describe('getPollWithId()', () => {
         setDueDate: 1,
         closingDate: '2023-11-20T21:00:00.000Z',
         numericFieldValue: 5,
-        selectedTimeUnit: 'min'
+        selectedTimeUnit: 'min',
+        isOpen: true
       }
     ])
     await getPollWithId(req, res);

From 94a3299928bff5f5a2f1f6c31278ee8c55f1781c Mon Sep 17 00:00:00 2001
From: Ali Nasra <52269552+AliNasra@users.noreply.github.com>
Date: Mon, 27 Nov 2023 16:54:34 +0300
Subject: [PATCH 226/246] Adapting the isOpen feature to the polling mechanism

---
 .../frontend/src/Pages/Vote/index.jsx         | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index 7b977f7a..45bad69b 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -74,29 +74,10 @@ function Vote() {
 
   const handleVoting = async () => {
     try {
-      if (polldata.pollType == "discrete" && /^[0-9]*$/.test(betPoint) == true) {
-        const requestOptions = {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'Authorization': `Bearer ${localStorage.getItem("accessToken")}`
-          },
-          body: JSON.stringify({
-            choiceId: answer,
-            points: parseInt(betPoint)
-          })
-        };
-        let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/discrete/${parsedID}/vote`
-        const response = await fetch(url, requestOptions);
-        if (response.status === 200) {
-          setMessage("Voted successfully!");
-        }
-        else {
-          setMessage("An error has occurred!");
-        }
-      }
-      else if (polldata.pollType == "continuous" && /^[0-9]*$/.test(betPoint) == true) {
-        if (polldata.cont_poll_type == "date") {
+      console.log("isOpen");
+      console.log(polldata.isOpen);
+      if (polldata.isOpen == true) {
+        if (polldata.pollType == "discrete" && /^[0-9]*$/.test(betPoint) == true) {
           const requestOptions = {
             method: 'POST',
             headers: {
@@ -104,11 +85,11 @@ function Vote() {
               'Authorization': `Bearer ${localStorage.getItem("accessToken")}`
             },
             body: JSON.stringify({
-              choice: answer,
+              choiceId: answer,
               points: parseInt(betPoint)
             })
           };
-          let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/continuous/${parsedID}/vote`
+          let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/discrete/${parsedID}/vote`
           const response = await fetch(url, requestOptions);
           if (response.status === 200) {
             setMessage("Voted successfully!");
@@ -117,8 +98,8 @@ function Vote() {
             setMessage("An error has occurred!");
           }
         }
-        else {
-          if (/^[0-9]*$/.test(answer) == true) {
+        else if (polldata.pollType == "continuous" && /^[0-9]*$/.test(betPoint) == true) {
+          if (polldata.cont_poll_type == "date") {
             const requestOptions = {
               method: 'POST',
               headers: {
@@ -140,12 +121,38 @@ function Vote() {
             }
           }
           else {
-            setMessage("The response should be numeric!");
+            if (/^[0-9]*$/.test(answer) == true) {
+              const requestOptions = {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                  'Authorization': `Bearer ${localStorage.getItem("accessToken")}`
+                },
+                body: JSON.stringify({
+                  choice: answer,
+                  points: parseInt(betPoint)
+                })
+              };
+              let url = `${process.env.REACT_APP_BACKEND_LINK}/polls/continuous/${parsedID}/vote`
+              const response = await fetch(url, requestOptions);
+              if (response.status === 200) {
+                setMessage("Voted successfully!");
+              }
+              else {
+                setMessage("An error has occurred!");
+              }
+            }
+            else {
+              setMessage("The response should be numeric!");
+            }
           }
         }
+        else {
+          setMessage("The bet points should be integer numbers!");
+        }
       }
       else {
-        setMessage("The bet points should be integer numbers!");
+        setMessage("The poll isn't open for voting!");
       }
     }
     catch (error) {

From 7023db19b7786238da0ed06b167d039257744e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:51:09 +0300
Subject: [PATCH 227/246] updated points button

---
 .../src/Components/PointsButton/index.jsx     | 12 +++----
 .../frontend/src/Pages/Create/index.jsx       | 12 +++++--
 .../frontend/src/Pages/EditProfile/index.jsx  |  2 +-
 .../frontend/src/Pages/Feed/index.jsx         | 11 ++++++-
 .../frontend/src/Pages/Leaderboard/index.jsx  |  2 +-
 .../frontend/src/Pages/Profile/index.jsx      | 32 +++++++++----------
 .../frontend/src/Pages/Vote/index.jsx         | 11 ++++++-
 7 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PointsButton/index.jsx b/prediction-polls/frontend/src/Components/PointsButton/index.jsx
index b6737371..c0447da0 100644
--- a/prediction-polls/frontend/src/Components/PointsButton/index.jsx
+++ b/prediction-polls/frontend/src/Components/PointsButton/index.jsx
@@ -3,21 +3,21 @@ import styles from "./PointsButton.module.css";
 import { ReactComponent as ArrowDown } from "../../Assets/icons/ArrowDown.svg";
 import { ReactComponent as ArrowUp } from "../../Assets/icons/ArrowUp.svg";
 
-function PointsButton({ points }) {
+function PointsButton({ point }) {
   const [isOpen, setIsOpen] = useState(false);
 
-  const GPValue = points.find((point) => "GP" in point).GP; 
+  //const GPValue = points.find((point) => "GP" in point).GP; 
 
   return (
     <div className={styles.pointsContainer}>
       <button
-        onClick={() => setIsOpen(!isOpen)}
+        //onClick={() => setIsOpen(!isOpen)}
         className={styles.pointsButton}
       >
-        {GPValue} GP <span>{isOpen ? <ArrowUp className={styles.iconStyle}/> : <ArrowDown className={styles.iconStyle}/>}</span>
+        {point} GP {/*<span> {isOpen ? <ArrowUp className={styles.iconStyle}/> : <ArrowDown className={styles.iconStyle}/>}</span> */}
       </button>
       {isOpen && (
-        <div className={styles.pointsList}>
+        {/*<div className={styles.pointsList}>
           {points.slice(1).map((point, index) => {
             const [category, value] = Object.entries(point)[0]; 
             return (
@@ -26,7 +26,7 @@ function PointsButton({ points }) {
               </div>
             );
           })}
-        </div>
+        </div>*/}
       )}
     </div>
   );
diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index 8053246b..1c22c19b 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import Menu from '../../Components/Menu'
 import styles from './Create.module.css'
 import { useState } from 'react';
@@ -6,6 +6,7 @@ import { Button, Input, DatePicker, Checkbox, Select } from 'antd';
 import { useNavigate } from 'react-router-dom';
 import pointData from "../../MockData/PointList.json"
 import PointsButton from "../../Components/PointsButton"; 
+import getProfileMe from '../../api/requests/profileMe';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -21,9 +22,16 @@ function Create() {
   const [numericFieldValue, setNumericFieldValue] = useState('');
   const [selectedTimeUnit, setSelectedTimeUnit] = useState('min');
   const [openVisibility, setOpenVisibility] = useState(false); 
+  const [userData, setUserData] =  useState({})
   const url = process.env.REACT_APP_BACKEND_LINK; 
   const navigate = useNavigate()
 
+  useEffect( () => {
+     const data = getProfileMe();
+      data.then((result) => {
+        setUserData(result);
+      });
+  },[])
 
   const choices = additionalChoices.filter(choice => choice.trim() !== '')
   const isSubmitDisabled = question.trim() === '' || 
@@ -400,7 +408,7 @@ function Create() {
             Create Poll
           </Button>
         </div>
-        <PointsButton points={pointData.points}/> 
+        <PointsButton point={userData.points}/> 
       </div>
     </div>
   );
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index 65a0f72a..2d687aca 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -212,7 +212,7 @@ function EditProfile() {
         </Form>
       </div>
       <div className={styles.pointCol}>
-        <PointsButton points={pointData.points} />
+      <PointsButton point={userData.points}/> 
         <p className={styles.badgesText}>Badges</p>
         <p>(You can choose at most 3)</p>
         <div className={styles.badgesContainer}>
diff --git a/prediction-polls/frontend/src/Pages/Feed/index.jsx b/prediction-polls/frontend/src/Pages/Feed/index.jsx
index 046b7a54..c0a895dd 100644
--- a/prediction-polls/frontend/src/Pages/Feed/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Feed/index.jsx
@@ -6,9 +6,18 @@ import PollCard from "../../Components/PollCard";
 import PointsButton from "../../Components/PointsButton";
 import pointData from "../../MockData/PointList.json";
 import SearchBar from "../../Components/SearchBar"
+import getProfileMe from "../../api/requests/profileMe.jsx";
 
 function Feed() {
   const [filteredPolls, setFilteredPolls] = useState(pollData.pollList);
+  const [userData, setUserData] =  useState({})
+
+  React.useEffect( () => {
+    const data = getProfileMe();
+     data.then((result) => {
+       setUserData(result);
+     });
+ },[])
 
   const handleSearch = (searchText) => {
     if (!searchText.trim()) {
@@ -38,7 +47,7 @@ function Feed() {
           <PollCard PollData={poll} key={poll.id} />
         ))}</div>
      <div className={styles.pointsButton}>
-      <PointsButton points={pointData.points}/></div> 
+     <PointsButton point={userData.points}/> </div> 
     </div>
   );
 }
diff --git a/prediction-polls/frontend/src/Pages/Leaderboard/index.jsx b/prediction-polls/frontend/src/Pages/Leaderboard/index.jsx
index fc5bad0a..20caaa2c 100644
--- a/prediction-polls/frontend/src/Pages/Leaderboard/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Leaderboard/index.jsx
@@ -53,7 +53,7 @@ function Leaderboard() {
           },
         ]}
       />
-      <PointsButton points={pointData.points} />
+      {/*<PointsButton points={pointData.points} />*/}
       <div className={styles.listContainer}>
         <div className={styles.listHeader}>
           <div className={styles.rankHeader}>#</div>
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index 4526957f..adc7d8ba 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -42,7 +42,6 @@ function Profile() {
     fetchData();
   }, [username, userMeUsername]);
 
-
   const navigate = useNavigate();
   return (
     <div className={styles.page}>
@@ -50,16 +49,18 @@ function Profile() {
       <div className={styles.profileInfo}>
         <div className={styles.card}>
           <div className={styles.thumbnailImage}>
-            {userData.profile_picture == null ? 
-            <div 
-              className={styles.profileImagePlaceholder} > <ProfileIcon/></div> : 
+            {userData.profile_picture == null ? (
+              <div className={styles.profileImagePlaceholder}>
+                {" "}
+                <ProfileIcon />
+              </div>
+            ) : (
               <img
-              src={userData.profile_picture}
-              alt="profileImage"
-              className={styles.profileImage}
-            ></img>
-            }
-            
+                src={userData.profile_picture}
+                alt="profileImage"
+                className={styles.profileImage}
+              ></img>
+            )}
           </div>
           <div className={styles.info}>
             <div className={styles.nameAndButton}>
@@ -87,13 +88,11 @@ function Profile() {
               <p className={styles.aboutText}>{userData.biography}</p>
             </div>
             <div className={styles.badgesContainer}>
-              {userData.badges && userData.badges.length > 0 && (
+              {userData.badges &&
+                userData.badges.length > 0 &&
                 userData.badges.map((badge, index) => (
-
                   <Badge number={badge.rank} text={badge.topic} key={index} />
-                ))
-              )}
-
+                ))}
             </div>
           </div>
         </div>
@@ -102,7 +101,8 @@ function Profile() {
         ))}
       </div>
       <div className={styles.pointButton}>
-      <PointsButton points={pointData.points} /></div>
+        <PointsButton point={userData.points} />{" "}
+      </div>
     </div>
   );
 }
diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index d7b3e3b2..b1518dfd 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -7,12 +7,21 @@ import { Button, Input } from 'antd';
 import { useParams } from 'react-router-dom';
 import { useNavigate } from "react-router-dom";
 import React, { useState, useEffect } from 'react';
+import getProfileMe from "../../api/requests/profileMe.jsx";
 
 
 
 function Vote() {
   let { id } = useParams();
   let parsedID = parseInt(id);
+  const [userData, setUserData] =  useState({})
+
+  React.useEffect( () => {
+    const data = getProfileMe();
+     data.then((result) => {
+       setUserData(result);
+     });
+ },[])
   const retrievePoll = async () => {
     try {
       const requestOptions = {
@@ -162,7 +171,7 @@ function Vote() {
             <PollCard PollData={polldata} setAnswer={setAnswer} />
           </div>
           <div className={styles.choice_column}>
-            <PointsButton points={pointData.points} />
+          <PointsButton point={userData.points}/> 
             <div className={styles.infoText}><div>{sentence}</div>
               <div className={styles.chooseText}>How many points do you want to place?</div>
               <div><Input

From 3103ba913013bd2f86ef6953b2fb5b79f0b3e9ae Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 17:54:44 +0300
Subject: [PATCH 228/246] trim the tag of whitespaces

---
 prediction-polls/backend/src/repositories/PollDB.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prediction-polls/backend/src/repositories/PollDB.js b/prediction-polls/backend/src/repositories/PollDB.js
index 9d39d3c1..a1b58d21 100644
--- a/prediction-polls/backend/src/repositories/PollDB.js
+++ b/prediction-polls/backend/src/repositories/PollDB.js
@@ -241,7 +241,7 @@ async function getTagsOfPoll(pollId) {
 
     try {
         [rows] = await pool.query(sql, [pollId]);
-        return rows.map(item => item.topic);
+        return rows.map(item => item.topic.trim());
     } catch (error) { 
         console.error('getTagsOfPoll(): Database Error');
         throw error;

From fb1e2eaaa4c6d369aa0e9568f8fad54116edc392 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 17:54:56 +0300
Subject: [PATCH 229/246] add all related tags

---
 prediction-polls/backend/src/routines/tagRoutine.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/prediction-polls/backend/src/routines/tagRoutine.js b/prediction-polls/backend/src/routines/tagRoutine.js
index 2652f016..dedf1451 100644
--- a/prediction-polls/backend/src/routines/tagRoutine.js
+++ b/prediction-polls/backend/src/routines/tagRoutine.js
@@ -55,10 +55,9 @@ async function tagRoutine() {
     const filteredLabels = response.data.labels.filter((label, index) => response.data.scores[index] > scoreThreshold);
 
     updateTagsScanned(pollId, tagsScanned + additionalScans)
-    if (filteredLabels.length > 0) {
-      addTopic(pollId, filteredLabels[0])
-    }
-
+    filteredLabels.map((label) => {
+      addTopic(pollId, label)
+    });
   })
   .catch(error => {
 

From ccc0f3a6601a3f0d48e44da74e688c12e3203295 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 17:56:47 +0300
Subject: [PATCH 230/246] remove unnecessary logs

---
 prediction-polls/backend/src/routines/tagRoutine.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/prediction-polls/backend/src/routines/tagRoutine.js b/prediction-polls/backend/src/routines/tagRoutine.js
index dedf1451..cc674eb9 100644
--- a/prediction-polls/backend/src/routines/tagRoutine.js
+++ b/prediction-polls/backend/src/routines/tagRoutine.js
@@ -30,9 +30,7 @@ async function tagRoutine() {
     console.log("No polls to tag.");
     return;
   }
-  console.log(filteredPolls);
   const randomPoll = filteredPolls[Math.floor(Math.random() * filteredPolls.length)];
-  console.log(randomPoll);
   const pollId = randomPoll.id;
   const pollQuestion = randomPoll.question;
   const tagsScanned = randomPoll.tagsScanned;

From a20722a8e14959682380bf474693fc777f820f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:10:07 +0300
Subject: [PATCH 231/246] updated Profile poll list and poll card click

---
 .../src/Components/PollCard/index.jsx         | 69 ++++++++++++-------
 .../frontend/src/Pages/Feed/index.jsx         |  5 +-
 .../frontend/src/Pages/Profile/index.jsx      | 51 +++++++++++++-
 3 files changed, 95 insertions(+), 30 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index c28b209e..0ccb27e5 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -6,18 +6,35 @@ import { ReactComponent as CommentIcon } from "../../Assets/icons/Comment.svg";
 import { ReactComponent as ShareIcon } from "../../Assets/icons/Share.svg";
 import { ReactComponent as ReportIcon } from "../../Assets/icons/Warning.svg";
 import PollOption from "../PollOption";
-import { Input,DatePicker } from 'antd';
+import { Input, DatePicker } from "antd";
+import { useLocation } from "react-router-dom";
 
-
-function PollCard({ PollData ,setAnswer, onClick}) {
+function PollCard({ PollData, setAnswer, onClick }) {
   const [selectedArray, setSelectedArray] = React.useState(
     !PollData.isCustomPoll ? Array(PollData["options"].length).fill(false) : []
   );
   const [pollData, setPollData] = React.useState(
     JSON.parse(JSON.stringify(PollData))
   );
+  const navigate = useNavigate();
+  const location = useLocation();
+  const [isVotePath, setIsVotePath] = React.useState(
+    /^\/vote\//.test(location.pathname)
+  );
+
+  React.useEffect(() => {
+    setIsVotePath(/^\/vote\//.test(location.pathname));
+  }, [location.pathname]);
+
+  const clickHandle = () => {
+    navigate("/vote/" + PollData.id);
+  };
+
   var totalPoints = !PollData.isCustomPoll
-    ? PollData.options.reduce((acc, curr) => curr.votes == null? acc :acc + curr.votes, 0)
+    ? PollData.options.reduce(
+        (acc, curr) => (curr.votes == null ? acc : acc + curr.votes),
+        0
+      )
     : 0;
   const handleSelect = (newList) => {
     setSelectedArray(newList);
@@ -34,7 +51,6 @@ function PollCard({ PollData ,setAnswer, onClick}) {
       ? PollData.options.reduce((acc, curr) => acc + curr.votes, 0)
       : 0;
   };
-  const navigate = useNavigate();
 
   return (
     <div className={styles.card} onClick={onClick}>
@@ -53,7 +69,7 @@ function PollCard({ PollData ,setAnswer, onClick}) {
           <div className={styles.optionList}>
             {pollData.options.map((option, index) => {
               let widthPercentage = 0;
-              if (totalPoints > 0){
+              if (totalPoints > 0) {
                 widthPercentage = (option.votes / totalPoints) * 100;
               }
               return (
@@ -70,27 +86,27 @@ function PollCard({ PollData ,setAnswer, onClick}) {
               );
             })}
           </div>
-        ) :pollData.cont_poll_type == "date"? (
+        ) : pollData.cont_poll_type == "date" ? (
           <div className={styles.customOptionWrapper}>
-            <p className={styles.customOptionText}>
-              Enter a date
-            </p>
+            <p className={styles.customOptionText}>Enter a date</p>
             <DatePicker
               className={styles.customOption}
               type={PollData.optionType}
               onChange={(_, dateString) => setAnswer(dateString)}
+              onClick={() => !isVotePath && clickHandle()}
             ></DatePicker>
           </div>
-        ):(<div className={styles.customOptionWrapper}>
-          <p className={styles.customOptionText}>
-            Enter a number
-          </p>
-          <Input
-            className={styles.customOption}
-            type={PollData.optionType}
-            onChange={(e) => setAnswer(e.target.value)}
-          ></Input>
-        </div>)}
+        ) : (
+          <div className={styles.customOptionWrapper}>
+            <p className={styles.customOptionText}>Enter a number</p>
+            <Input
+              className={styles.customOption}
+              type={PollData.optionType}
+              onChange={(e) => setAnswer(e.target.value)}
+              onClick={() => !isVotePath && clickHandle()}
+            ></Input>
+          </div>
+        )}
         <div className={styles.actionButtons}>
           <div className={styles.buttonWrapper}>
             <button className={styles.commentButton}>
@@ -112,7 +128,6 @@ function PollCard({ PollData ,setAnswer, onClick}) {
             <button className={styles.reportButton}>
               <ReportIcon />
               <p className={styles.buttonText}>Report</p>
-              
             </button>
           </div>
         </div>
@@ -132,11 +147,17 @@ function PollCard({ PollData ,setAnswer, onClick}) {
         </div>
         <div className={styles.textGroup}>
           <p className={styles.textDescription}>Closing In</p>
-          <p className={styles.textDetail}>{PollData.closingDate == null? "Indefinite":PollData.closingDate}</p>
+          <p className={styles.textDetail}>
+            {PollData.closingDate == null ? "Indefinite" : PollData.closingDate}
+          </p>
         </div>
         <div className={styles.textGroup}>
-          <p className={styles.textDescription}>{PollData.closingDate == null?" ":"Reject Votes In"}</p>
-          <p className={styles.textDetail}>{PollData.closingDate == null?" ":"Last"} {PollData.rejectVotes}</p>
+          <p className={styles.textDescription}>
+            {PollData.closingDate == null ? " " : "Reject Votes In"}
+          </p>
+          <p className={styles.textDetail}>
+            {PollData.closingDate == null ? " " : "Last"} {PollData.rejectVotes}
+          </p>
         </div>
       </div>
     </div>
diff --git a/prediction-polls/frontend/src/Pages/Feed/index.jsx b/prediction-polls/frontend/src/Pages/Feed/index.jsx
index 5f3feadf..d9fb8cd2 100644
--- a/prediction-polls/frontend/src/Pages/Feed/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Feed/index.jsx
@@ -63,9 +63,7 @@ function Feed() {
     fetchData();
   }, []);
 
-  const handlePollClick = async (pollId) => {
-    navigate("/vote/" + pollId);
-  };
+
 
   const handleSearch = (searchText) => {
     if (!searchText.trim()) {
@@ -104,7 +102,6 @@ function Feed() {
             className={styles.pollCard}
             PollData={poll}
             key={poll.id}
-            onClick={() => handlePollClick(poll.id)}
           />
         ))}
       </div>
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index adc7d8ba..88595300 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -3,7 +3,7 @@ import Menu from "../../Components/Menu";
 import styles from "./Profile.module.css";
 import Users from "../../MockData/Users.json";
 import EditIcon from "../../Assets/icons/EditIcon.jsx";
-import pollData from "../../MockData/PollData.json";
+
 import PollCard from "../../Components/PollCard";
 import { useNavigate } from "react-router-dom";
 import PointsButton from "../../Components/PointsButton";
@@ -16,7 +16,50 @@ import Badge from "../../Components/Badge/index.jsx";
 
 function Profile() {
   const { username } = useParams();
+  const [pollData, setPollData] = React.useState({ pollList: [] });
   const [userData, setUserData] = React.useState({});
+  React.useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const response = await fetch(
+          process.env.REACT_APP_BACKEND_LINK + "/polls",
+          {
+            method: "GET",
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${localStorage.getItem("accessToken")}`,
+            },
+          }
+        );
+
+        if (!response.ok) {
+          throw new Error(`HTTP error! status: ${response.status}`);
+        }
+
+        const contentType = response.headers.get("content-type");
+        if (!contentType || !contentType.includes("application/json")) {
+          throw new TypeError("Received non-JSON response from server");
+        }
+
+        const data = await response.json();
+
+        // Modify each poll in the data array
+        const modifiedData = data.map((poll) => {
+          if (poll.pollType === "discrete") {
+            return { ...poll, isCustomPoll: false };
+          } else {
+            return { ...poll, isCustomPoll: true };
+          }
+        });
+        const reversedData = [...modifiedData].reverse();
+        setPollData({ pollList: reversedData });
+      } catch (error) {
+        console.error("Error fetching polls:", error);
+      }
+    };
+
+    fetchData();
+  }, []);
 
   const userMeUsername = localStorage.getItem("username");
 
@@ -97,7 +140,11 @@ function Profile() {
           </div>
         </div>
         {pollData.pollList.map((poll, index) => (
-          <PollCard PollData={poll} key={index} />
+          <PollCard
+            className={styles.pollCard}
+            PollData={poll}
+            key={poll.id}
+          />
         ))}
       </div>
       <div className={styles.pointButton}>

From 8381b8b1e2ec8e899224a1ac2d9afa4f2707cf05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:20:27 +0300
Subject: [PATCH 232/246] Created profile page test

---
 .../src/Pages/Profile/Profile.test.js         | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 prediction-polls/frontend/src/Pages/Profile/Profile.test.js

diff --git a/prediction-polls/frontend/src/Pages/Profile/Profile.test.js b/prediction-polls/frontend/src/Pages/Profile/Profile.test.js
new file mode 100644
index 00000000..adcfe994
--- /dev/null
+++ b/prediction-polls/frontend/src/Pages/Profile/Profile.test.js
@@ -0,0 +1,146 @@
+import React from "react";
+import {
+  render,
+  screen,
+  waitFor,
+  fireEvent,
+  act,
+} from "@testing-library/react";
+import "@testing-library/jest-dom";
+import Profile from "./index.jsx";
+import getProfileMe from "../../api/requests/profileMe.jsx";
+import getProfile from "../../api/requests/profile.jsx";
+import * as reactRouterDom from "react-router-dom";
+import { MemoryRouter } from "react-router-dom";
+
+// Mocking modules and data
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useParams: jest.fn(),
+  useNavigate: jest.fn(),
+}));
+
+jest.mock("../../api/requests/profileMe.jsx");
+jest.mock("../../api/requests/profile.jsx");
+
+const mockProfileMeResponse = {
+  id: 6,
+  userId: 6,
+  username: "sell",
+  email: "selin2001a@gmail.com",
+  profile_picture: "profile_pic_url",
+  points: 10000,
+  biography: "selin",
+  birthday: null,
+  isHidden: null,
+  badges: [],
+};
+const mockProfileResponse = {
+  id: 4,
+  userId: 4,
+  username: "otheruser",
+  email: "a@b.com",
+  profile_picture: null,
+  points: 10000,
+  biography: null,
+  birthday: null,
+  isHidden: null,
+  badges: [],
+};
+const mockNavigate = jest.fn();
+
+describe("Profile Component", () => {
+  beforeEach(() => {
+    reactRouterDom.useParams.mockReturnValue({ username: "sell" });
+    reactRouterDom.useNavigate.mockReturnValue(mockNavigate);
+    getProfileMe.mockResolvedValue(mockProfileMeResponse);
+    getProfile.mockResolvedValue(mockProfileResponse);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    localStorage.clear();
+  });
+
+  test("renders Profile component for the logged-in user", async () => {
+    localStorage.setItem("username", "sell");
+    render(
+      <MemoryRouter>
+        <Profile />
+      </MemoryRouter>
+    );
+
+    await waitFor(async () => {
+      expect(
+        await screen.getByText(mockProfileMeResponse.username)
+      ).toBeDefined();
+    });
+
+    expect(getProfileMe).toHaveBeenCalled();
+    // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
+    // Check for Edit Profile button
+    const editButton = await screen.getByText("Edit Profile");
+    expect(editButton).toBeInTheDocument();
+  });
+
+  test("renders Profile component for a different user", async () => {
+    localStorage.setItem("username", "sell");
+    reactRouterDom.useParams.mockReturnValue({ username: "otheruser" });
+
+    render(
+      <MemoryRouter>
+        <Profile />
+      </MemoryRouter>
+    );
+
+    expect(getProfile).toHaveBeenCalled();
+
+    // Check if Follow button is rendered for a different user
+    await waitFor(() => {
+      expect(screen.getByText("Follow")).toBeInTheDocument();
+    });
+  });
+
+  test("navigates to edit profile page on clicking Edit Profile", async () => {
+    localStorage.setItem("username", "sell");
+    render(
+      <MemoryRouter>
+        <Profile />
+      </MemoryRouter>
+    );
+
+    await waitFor(async () => expect(await screen.getByText("Edit Profile")).toBeInTheDocument());
+
+    await act(async () => {
+      const editButton = await screen.getByText("Edit Profile");
+      await editButton.click();
+    });
+
+    await waitFor(() => {
+      expect(mockNavigate).toHaveBeenCalledWith(
+        `/editProfile/${mockProfileMeResponse.username}`
+      );
+    });
+  });
+
+  test("renders profile picture when available", async () => {
+    localStorage.setItem("username", "sell");
+    getProfileMe.mockResolvedValue({
+      ...mockProfileMeResponse,
+      profile_picture: "profile_pic_url",
+    });
+
+    render(
+      <MemoryRouter>
+        <Profile />
+      </MemoryRouter>
+    );
+
+    await waitFor(() => {
+      const profileImage = screen.getByAltText("profileImage");
+      expect(profileImage).toBeInTheDocument();
+      // eslint-disable-next-line testing-library/no-wait-for-multiple-assertions
+      expect(profileImage.src).toBe("http://localhost/profile_pic_url");
+    });
+  });
+});
\ No newline at end of file

From 88fd4a4a1eec03b6fd37ca3727924977d632ccca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:37:55 +0300
Subject: [PATCH 233/246] added profile Image Placeholder

---
 .../src/Components/PollCard/PollCard.module.css  | 16 +++++++++++++++-
 .../frontend/src/Components/PollCard/index.jsx   | 15 ++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css b/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
index bed8b007..86f1b7ef 100644
--- a/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
+++ b/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
@@ -10,7 +10,6 @@
   gap: 20px;
   background-color: var(--neutral-pollCard);
   margin-bottom: 20px;
-  cursor: pointer;
 }
 .question {
   display: flex;
@@ -31,6 +30,7 @@
   align-items: center;
   gap: 5px;
   cursor: pointer;
+  justify-content: flex-end;
 }
 .creatorImage {
   width: 35px;
@@ -38,6 +38,18 @@
   border-radius: 100px;
   cursor: pointer;
 }
+
+.creatorImagePlaceholder {
+  width: 35px;
+  height: 35px;
+  border-radius: 100px;
+  cursor: pointer;
+  background-color: var(--neutral-100);
+  justify-content: center;
+  align-items: center;
+  display: flex;
+}
+
 .creatorName {
   font-size: 16px;
   font-weight: 700;
@@ -159,6 +171,8 @@
   font-size: 20px;
   background-color: var(--neutral-pollCard);
   color: var(--neutral-black);
+  cursor: pointer!important;
+
 
 }
 
diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index 0ccb27e5..ddea5a92 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -8,6 +8,7 @@ import { ReactComponent as ReportIcon } from "../../Assets/icons/Warning.svg";
 import PollOption from "../PollOption";
 import { Input, DatePicker } from "antd";
 import { useLocation } from "react-router-dom";
+import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
 
 function PollCard({ PollData, setAnswer, onClick }) {
   const [selectedArray, setSelectedArray] = React.useState(
@@ -135,11 +136,15 @@ function PollCard({ PollData, setAnswer, onClick }) {
       <div className={styles.info}>
         <div className={styles.creator}>
           <a href={`/profile/${PollData.creatorUsername}`}>
-            <img
-              src={PollData.creatorImage}
-              alt="user"
-              className={styles.creatorImage}
-            />
+            {PollData.creatorImage == null ? (
+              <div className={styles.creatorImagePlaceholder} ><ProfileIcon width={20} height={20}/></div>
+            ) : (
+              <img
+                src={PollData.creatorImage}
+                alt="user"
+                className={styles.creatorImage}
+              />
+            )}
           </a>
           <a href={`/profile/${PollData.creatorUsername}`}>
             <div className={styles.creatorName}>{PollData.creatorName}</div>

From 973f35f65d55f336fd8977b46c10150f1e3f6d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:44:23 +0300
Subject: [PATCH 234/246] updated poll card user image

---
 .../frontend/src/Components/PollCard/index.jsx  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/index.jsx b/prediction-polls/frontend/src/Components/PollCard/index.jsx
index ddea5a92..d6efd15c 100644
--- a/prediction-polls/frontend/src/Components/PollCard/index.jsx
+++ b/prediction-polls/frontend/src/Components/PollCard/index.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import styles from "./PollCard.module.css";
 import PollTag from "../PollTag";
 import { useNavigate } from "react-router-dom";
@@ -9,6 +9,7 @@ import PollOption from "../PollOption";
 import { Input, DatePicker } from "antd";
 import { useLocation } from "react-router-dom";
 import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
+import getProfile from "../../api/requests/profile.jsx";
 
 function PollCard({ PollData, setAnswer, onClick }) {
   const [selectedArray, setSelectedArray] = React.useState(
@@ -17,12 +18,22 @@ function PollCard({ PollData, setAnswer, onClick }) {
   const [pollData, setPollData] = React.useState(
     JSON.parse(JSON.stringify(PollData))
   );
+  const [userData, setUserData] = React.useState({});
   const navigate = useNavigate();
   const location = useLocation();
   const [isVotePath, setIsVotePath] = React.useState(
     /^\/vote\//.test(location.pathname)
   );
 
+  
+  useEffect(() => {
+    const data = getProfile(PollData.creatorUsername);
+    data.then((result) => {
+      setUserData(result);
+    });
+  }, []);
+
+
   React.useEffect(() => {
     setIsVotePath(/^\/vote\//.test(location.pathname));
   }, [location.pathname]);
@@ -136,11 +147,11 @@ function PollCard({ PollData, setAnswer, onClick }) {
       <div className={styles.info}>
         <div className={styles.creator}>
           <a href={`/profile/${PollData.creatorUsername}`}>
-            {PollData.creatorImage == null ? (
+            {userData?.profile_picture == null ? (
               <div className={styles.creatorImagePlaceholder} ><ProfileIcon width={20} height={20}/></div>
             ) : (
               <img
-                src={PollData.creatorImage}
+                src={userData.profile_picture}
                 alt="user"
                 className={styles.creatorImage}
               />

From f93b65b1d26942e26c80fc42fcc4e822be21a0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:47:05 +0300
Subject: [PATCH 235/246] added edit profile page test

---
 .../src/Pages/EditProfile/EditProfile.test.js | 146 ++++++++++++++++++
 .../frontend/src/Pages/EditProfile/index.jsx  |   1 +
 2 files changed, 147 insertions(+)
 create mode 100644 prediction-polls/frontend/src/Pages/EditProfile/EditProfile.test.js

diff --git a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.test.js b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.test.js
new file mode 100644
index 00000000..0240528c
--- /dev/null
+++ b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.test.js
@@ -0,0 +1,146 @@
+import "@testing-library/jest-dom";
+import {
+  render,
+  waitFor,
+  screen,
+  fireEvent,
+  act,
+} from "@testing-library/react";
+import EditProfile from "./index";
+import getProfileMe from "../../api/requests/profileMe";
+import updateProfile from "../../api/requests/editProfile";
+import uploadProfilePhoto from "../../api/requests/uploadProfilePhoto";
+import { MemoryRouter, createMemoryHistory } from "react-router-dom";
+import * as reactRouterDom from "react-router-dom";
+
+// Mocking modules and data
+jest.mock("react-router-dom", () => ({
+  ...jest.requireActual("react-router-dom"),
+  useParams: jest.fn(),
+  useNavigate: jest.fn(),
+}));
+// Mocking API calls
+jest.mock("../../api/requests/profileMe");
+jest.mock("../../api/requests/uploadProfilePhoto");
+jest.mock("../../api/requests/editProfile");
+const mockNavigate = jest.fn();
+
+jest.mock(window.matchMedia);
+
+global.URL.createObjectURL = jest.fn();
+
+const mockProfileMeResponse = {
+  id: 6,
+  userId: 6,
+  username: "sell",
+  email: "selin2001a@gmail.com",
+  profile_picture: "profile_pic_url",
+  points: 10000,
+  biography: "selin",
+  birthday: null,
+  isHidden: null,
+  badges: [],
+};
+
+describe("EditProfile Component", () => {
+  beforeEach(() => {
+    global.window.matchMedia = jest.fn().mockImplementation((query) => ({
+      matches: false,
+      media: query,
+      onchange: null,
+      addListener: jest.fn(), // Deprecated
+      removeListener: jest.fn(), // Deprecated
+      addEventListener: jest.fn(),
+      removeEventListener: jest.fn(),
+      dispatchEvent: jest.fn(),
+    }));
+    reactRouterDom.useParams.mockReturnValue({ username: "sell" });
+    reactRouterDom.useNavigate.mockReturnValue(mockNavigate);
+    getProfileMe.mockResolvedValue(mockProfileMeResponse);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    localStorage.clear();
+  });
+
+  it("renders correctly and makes an API call to fetch user data", async () => {
+    getProfileMe.mockResolvedValue(mockProfileMeResponse);
+
+    render(
+      <MemoryRouter>
+        <EditProfile />
+      </MemoryRouter>
+    );
+
+    await waitFor(async () => {
+      expect(screen.getByPlaceholderText("username")).toHaveValue(
+        mockProfileMeResponse.username
+      );
+    });
+  });
+
+  it("handles image upload", async () => {
+    global.URL.createObjectURL.mockReturnValue("tst_img.png");
+    render(
+      <MemoryRouter>
+        <EditProfile />
+      </MemoryRouter>
+    );
+
+    const file = new File(["blablabla"], "tst_img.png", { type: "image/png" });
+    const input = screen.getByTestId("fileInput");
+    fireEvent.change(input, { target: { files: [file] } });
+
+    await waitFor(() => {
+      expect(screen.getByAltText("Profile").src).toContain("tst_img.png");
+    });
+  });
+
+  it("navigates to profile page after successful update", async () => {
+    getProfileMe.mockResolvedValue(mockProfileMeResponse);
+    uploadProfilePhoto.mockResolvedValue({ success: true });
+    updateProfile.mockResolvedValue({ success: true });
+
+    render(
+      <MemoryRouter>
+        <EditProfile />
+      </MemoryRouter>
+    );
+
+    await waitFor(async () => {
+      expect(getProfileMe).toHaveBeenCalled();
+    });
+
+    const submitButton = screen.getByText("Save Changes");
+    fireEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(mockNavigate).toHaveBeenCalledWith("/profile/sell");
+    });
+  });
+  // Add more tests for form interaction, image upload, navigation, etc.
+  it("submits form and calls update API", async () => {
+    updateProfile.mockResolvedValue({ success: true });
+
+    render(
+      <MemoryRouter>
+        <EditProfile />
+      </MemoryRouter>
+    );
+
+    const aboutInput = screen.getByPlaceholderText("about");
+    fireEvent.change(aboutInput, { target: { value: "New bio" } });
+
+    const submitButton = screen.getByText("Save Changes");
+    fireEvent.click(submitButton);
+
+    await waitFor(() => {
+      expect(updateProfile).toHaveBeenCalledWith(
+        expect.objectContaining({
+          biography: "New bio",
+        })
+      );
+    });
+  });
+});
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index 2d687aca..1feacec8 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -136,6 +136,7 @@ function EditProfile() {
             </div>
             <input
               type="file"
+              data-testid="fileInput"
               ref={fileInputRef}
               onChange={handleFileInputChange}
               accept="image/*"

From 443e9fd3e2435c2345dbc93f3e22fbadeb329031 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:55:55 +0300
Subject: [PATCH 236/246] Update ProfileService.js

---
 .../backend/src/services/ProfileService.js    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/backend/src/services/ProfileService.js b/prediction-polls/backend/src/services/ProfileService.js
index a86d9e7c..7f6bf104 100644
--- a/prediction-polls/backend/src/services/ProfileService.js
+++ b/prediction-polls/backend/src/services/ProfileService.js
@@ -68,7 +68,7 @@ async function getProfile(req,res){
         if(result.error){
             throw result.error;
         }
-    
+        
         const {profile,error} = await db.getProfileWithUserId(result.id);
         if(error){
             throw error;
@@ -103,7 +103,15 @@ async function getProfileWithProfileId(req,res){
             throw error
         }
 
-        const {badges,error:badge_error} = await db.getBadges(result.id);
+        if(profile.profile_picture){
+            const image_result = await getImagefromS3(profile.profile_picture);
+            if(image_result.error){
+                throw image_result.error;
+            }
+            profile.profile_picture = image_result.signedUrl;
+        }
+
+        const {badges,error:badge_error} = await db.getBadges(profile.userId);
         if(badge_error){
             throw badge_error;
         }
@@ -127,6 +135,22 @@ async function getMyProfile(req,res){
         if(error){
             throw error;
         }
+
+        if(profile.profile_picture){
+            const image_result = await getImagefromS3(profile.profile_picture);
+            if(image_result.error){
+                throw image_result.error;
+            }
+            profile.profile_picture = image_result.signedUrl;
+        }
+
+        const {badges,error:badge_error} = await db.getBadges(result.id);
+        if(badge_error){
+            throw badge_error;
+        }
+        profile.badges = badges;
+
+
         return res.status(200).json(profile);
         
     }catch(error){

From ccdfd85d3d33603afa2c218bbdfa5b9f1dc0c5e9 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:56:18 +0300
Subject: [PATCH 237/246] Write new tests for profile endpoints

---
 .../backend/tests/ProfileService.test.js      | 342 +++++++++++-------
 1 file changed, 218 insertions(+), 124 deletions(-)

diff --git a/prediction-polls/backend/tests/ProfileService.test.js b/prediction-polls/backend/tests/ProfileService.test.js
index c734e545..b883d03f 100644
--- a/prediction-polls/backend/tests/ProfileService.test.js
+++ b/prediction-polls/backend/tests/ProfileService.test.js
@@ -1,128 +1,222 @@
-const service = require('../src/services/ProfileService.js');
-const db = require('../src/repositories/ProfileDB.js');
-const authDb = require('../src/repositories/AuthorizationDB.js');
-
-// Mock the ProfileDB module
-jest.mock('../src/repositories/ProfileDB.js', () => ({
-    findUser: jest.fn(),
-    getProfileWithUserId: jest.fn(),
-    getProfileWithProfileId: jest.fn(),
-    addProfile: jest.fn(),
-    updateProfile: jest.fn(),
-}));
-
-// Mock the AuthorizationDB module
-jest.mock('../src/repositories/AuthorizationDB.js', () => ({
-    findUser: jest.fn(),
-}));
-
-test('test if getProfile returns profile data', async () => {
-    // Set up mock behavior for findUser and getProfileWithUserId
-    const userId = 2;
-    const username = 'testUsername';
-    const email = 'test@mail.com';
-    const password = "testPassword.";
-
-    const profile = { id: 2,username,email,biograhpy:"Biograhpy"};
-
-    authDb.findUser.mockResolvedValue({ id: userId, username, email, password });
-    db.getProfileWithUserId.mockResolvedValue({ profile: profile});
-
-    const req = { query: { userId, username, email } };
-    const res = {
-        status: jest.fn(() => res),
+const {
+    getProfile,
+    getProfileWithProfileId,
+    getMyProfile,
+    updateProfile,
+    uploadImagetoS3
+  } = require('../src/services/ProfileService');
+  const db = require('../src/repositories/ProfileDB');
+  const authDb = require('../src/repositories/AuthorizationDB');
+  const aws = require('aws-sdk');
+  
+  jest.mock('aws-sdk');
+  jest.mock('../src/repositories/ProfileDB');
+  jest.mock('../src/repositories/AuthorizationDB');
+  
+  describe('getProfile()', () => {
+    let req, res;
+  
+    beforeEach(() => {
+      req = {
+        query: { userId: 1, username: 'testUser', email: 'test@example.com' },
+      };
+      res = {
         json: jest.fn(),
-    };
-
-    await service.getProfile(req, res);
-
-    // Assert that the correct functions were called and with the correct arguments
-    expect(authDb.findUser).toHaveBeenCalledWith({ userId, username, email });
-    expect(db.getProfileWithUserId).toHaveBeenCalledWith(userId);
-
-    // Assert that the response was sent with the correct data
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith(profile);
-});
-
-test('test if getProfileWithProfileId returns profile data', async () => {
-    // Set up mock behavior for getProfileWithProfileId
-    const profileId = 1;
-
-    const profile = { id: 2,username:"testUsername",email:"email@test.com",biograhpy:"Biograhpy"};
-
-    db.getProfileWithProfileId.mockResolvedValue({ profile: profile});
-
-    const req = { params: { profileId } };
-    const res = {
-        status: jest.fn(() => res),
+        status: jest.fn().mockReturnThis(),
+      };
+    });
+  
+    it('should return user profile with badges', async () => {
+      const profileResult = {
+        profile: {
+          id: 2,
+          userId: 1,
+          username: 'testUser',
+          email: 'test@example.com',
+          profile_picture: null,
+          badges: ['Badge1', 'Badge2'],
+        },
+      };
+  
+      db.getProfileWithUserId.mockResolvedValueOnce(profileResult);
+      authDb.findUser.mockResolvedValueOnce({ id: 1, username: 'testUser', email: 'test@example.com' });
+      db.getBadges.mockResolvedValueOnce({badges:[{topic:"basketball",userRank:1}]})
+
+      await getProfile(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(200);
+      expect(res.json).toHaveBeenCalledWith(profileResult.profile);
+    });
+  
+    it('should handle errors and return 400 status', async () => {
+      const errorMessage = 'Error fetching profile';
+  
+      db.getProfileWithUserId.mockResolvedValueOnce({ error: errorMessage });
+      authDb.findUser.mockResolvedValueOnce({ id: 1, username: 'testUser', email: 'test@example.com' });
+      db.getBadges.mockResolvedValueOnce({badges:[{topic:"basketball",userRank:1}]})
+  
+      await getProfile(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(400);
+      expect(res.json).toHaveBeenCalledWith({ error: errorMessage });
+    });
+  });
+
+
+  describe('getProfileWithProfileId()', () => {
+    let req, res;
+  
+    beforeEach(() => {
+      req = {
+        params: { profileId: 2 },
+      };
+      res = {
         json: jest.fn(),
-    };
-
-    await service.getProfileWithProfileId(req, res);
-
-    // Assert that the correct function was called and with the correct arguments
-    expect(db.getProfileWithProfileId).toHaveBeenCalledWith(profileId);
-
-    // Assert that the response was sent with the correct data
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith(profile);
-});
-
-test('test if addProfile returns added profile data', async () => {
-    // Set up mock behavior for findUser, addProfile, and getProfileWithUserId
-    const userId = 2;
-    const username = 'testUsername';
-    const email = 'test@mail.com';
-
-    const profile = { userId,username,email,biography:"Biography"};
-
-    authDb.findUser.mockResolvedValue({ userId, username, email });
-    db.addProfile.mockResolvedValue({ profileId: 5 });
-    db.getProfileWithUserId.mockResolvedValue({ profile: profile});
-
-    const req = { body: { userId, username, email, biography:"Biography" } };
-    const res = {
-        status: jest.fn(() => res),
+        status: jest.fn().mockReturnThis(),
+      };
+    });
+  
+    it('should return user profile with badges', async () => {
+        const profileResult = {
+            profile: {
+              id: 2,
+              userId: 1,
+              username: 'testUser',
+              email: 'test@example.com',
+              profile_picture: null,
+              badges: ['Badge1', 'Badge2'],
+            },
+        };
+  
+      db.getProfileWithProfileId.mockResolvedValueOnce(profileResult);
+      db.getBadges.mockResolvedValueOnce({badges:[{topic:"basketball",userRank:1}]})
+  
+      await getProfileWithProfileId(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(200);
+      expect(res.json).toHaveBeenCalledWith(profileResult.profile);
+    });
+  
+    it('should handle errors and return 400 status', async () => {
+      const errorMessage = 'Error fetching profile';
+  
+      db.getProfileWithProfileId.mockResolvedValueOnce({ error: errorMessage });
+      db.getBadges.mockResolvedValueOnce({badges:[{topic:"basketball",userRank:1}]})
+  
+      await getProfileWithProfileId(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(400);
+      expect(res.json).toHaveBeenCalledWith({ error: errorMessage });
+    });
+  });
+
+  
+  describe('getMyProfile()', () => {
+    let req, res;
+  
+    beforeEach(() => {
+      req = {
+        user: { id: 1 },
+      };
+      res = {
         json: jest.fn(),
-    };
-
-    await service.addProfile(req, res);
-
-    // Assert that the correct functions were called and with the correct arguments
-    expect(authDb.findUser).toHaveBeenCalledWith({ userId, username, email });
-    expect(db.addProfile).toHaveBeenCalledWith({ userId, username, email, biography:"Biography","isHidden": undefined, "profile_picture": undefined, "userId": undefined });
-    expect(db.getProfileWithUserId).toHaveBeenCalledWith(userId);
-
-    // Assert that the response was sent with the correct data
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith({ userId, username, email, biography:"Biography","isHidden": undefined, "profile_picture": undefined, "userId": undefined });
-});
-
-test('test if updateProfile returns updated profile data', async () => {
-    // Set up mock behavior for findUser, updateProfile, and getProfileWithUserId
-    const userId = 'testUserId';
-    const username = 'testUsername';
-    const email = 'test@mail.com';
-
-    authDb.findUser.mockResolvedValue({ id: userId, username, email });
-    db.updateProfile.mockResolvedValue({ status: 'updated', error: undefined });
-    db.getProfileWithUserId.mockResolvedValue({ profile: { /* updated profile data */ }, user_error: undefined });
-
-    const req = { body: { userId, username, email, /* updated profile data */ } };
-    const res = {
-        status: jest.fn(() => res),
+        status: jest.fn().mockReturnThis(),
+      };
+    });
+  
+    it('should return user profile with badges', async () => {
+        const profileResult = {
+            profile: {
+                id: 2,
+                userId: 1,
+                username: 'testUser',
+                email: 'test@example.com',
+                profile_picture: null,
+                badges: ['Badge1', 'Badge2'],
+            },
+        };
+  
+      db.getProfileWithUserId.mockResolvedValueOnce(profileResult);
+      authDb.findUser.mockResolvedValueOnce({ id: 1, username: 'testUser', email: 'test@example.com' });
+      db.getBadges.mockResolvedValueOnce({badges:[{topic:"basketball",userRank:1}]})
+  
+      await getMyProfile(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(200);
+      expect(res.json).toHaveBeenCalledWith(profileResult.profile);
+    });
+  
+    it('should handle errors and return 400 status', async () => {
+      const errorMessage = 'Error fetching profile';
+  
+      db.getProfileWithUserId.mockResolvedValueOnce({ error: errorMessage });
+      authDb.findUser.mockResolvedValueOnce({ id: 1, username: 'testUser', email: 'test@example.com' });
+      db.getBadges.mockResolvedValueOnce({badges:[{topic:"basketball",userRank:1}]})
+  
+      await getMyProfile(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(400);
+      expect(res.json).toHaveBeenCalledWith({ error: errorMessage });
+    });
+  });
+
+
+  describe('updateProfile()', () => {
+    let req, res;
+  
+    beforeEach(() => {
+      req = {
+        body: {
+          userId: 1,
+          username: 'testUser',
+          email: 'test@example.com',
+          biography: 'New biography',
+          birthday: null,
+          isHidden: true,
+        },
+      };
+      res = {
         json: jest.fn(),
-    };
-
-    await service.updateProfile(req, res);
-
-    // Assert that the correct functions were called and with the correct arguments
-    expect(authDb.findUser).toHaveBeenCalledWith({ userId, username, email });
-    expect(db.updateProfile).toHaveBeenCalledWith({ userId, /* updated profile data */ });
-    expect(db.getProfileWithUserId).toHaveBeenCalledWith(userId);
-
-    // Assert that the response was sent with the correct data
-    expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith({ /* updated profile data */ });
-});
\ No newline at end of file
+        status: jest.fn().mockReturnThis(),
+      };
+    });
+  
+    it('should update user profile and return the updated profile', async () => {
+      const updatedProfileResult = {
+        profile: {
+          userId: 1,
+          username: 'testUser',
+          email: 'test@example.com',
+          profile_picture: null,
+          biography: 'New biography',
+          birthday: null,
+          isHidden: true,
+        },
+      };
+  
+      db.updateProfile.mockResolvedValueOnce({ status: 'Updated successfully' });
+      db.getProfileWithUserId.mockResolvedValueOnce(updatedProfileResult);
+      authDb.findUser.mockResolvedValueOnce({ id: 1, username: 'testUser', email: 'test@example.com' });
+  
+      await updateProfile(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(200);
+      expect(res.json).toHaveBeenCalledWith(updatedProfileResult.profile);
+    });
+  
+    it('should handle errors and return 400 status', async () => {
+      const errorMessage = 'Error updating profile';
+  
+      db.updateProfile.mockResolvedValueOnce({ error: errorMessage });
+      authDb.findUser.mockResolvedValueOnce({ id: 1, username: 'testUser', email: 'test@example.com' });
+  
+      await updateProfile(req, res);
+  
+      expect(res.status).toHaveBeenCalledWith(400);
+      expect(res.json).toHaveBeenCalledWith({ error: errorMessage });
+    });
+  });
+  
+  
+  // Add similar test cases for other functions (getProfileWithProfileId, getMyProfile, updateProfile, uploadImagetoS3)
+  
\ No newline at end of file

From b7c4ebb42a34e4b75a9fc7ab061f36546f40d0c3 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 19:22:49 +0300
Subject: [PATCH 238/246] Add apiToken to api requests

---
 prediction-polls/backend/src/routines/tagRoutine.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/prediction-polls/backend/src/routines/tagRoutine.js b/prediction-polls/backend/src/routines/tagRoutine.js
index cc674eb9..bca2ec16 100644
--- a/prediction-polls/backend/src/routines/tagRoutine.js
+++ b/prediction-polls/backend/src/routines/tagRoutine.js
@@ -17,6 +17,7 @@ async function tagRoutine() {
   }
 
   const apiUrl = process.env.TAG_API_URL;
+  const apiToken = process.env.TAG_API_TOKEN;
 
   if (!apiUrl) {
     console.error('TAG_API_URL is not defined in the environment variables.');
@@ -48,6 +49,11 @@ async function tagRoutine() {
       candidate_labels: candidateLabels,
       multi_label: true
     }
+  }, {
+    headers: {
+      'Content-Type': 'application/json',
+      'Authorization': `Bearer ${apiToken}`
+    }
   })
   .then(response => {
     const filteredLabels = response.data.labels.filter((label, index) => response.data.scores[index] > scoreThreshold);

From 04cce95b9579684f82e56427ea0740b75b0686ac Mon Sep 17 00:00:00 2001
From: Ali Nasra <52269552+AliNasra@users.noreply.github.com>
Date: Mon, 27 Nov 2023 19:28:52 +0300
Subject: [PATCH 239/246] Adjusting dates

---
 prediction-polls/frontend/src/Pages/EditProfile/index.jsx | 2 +-
 prediction-polls/frontend/src/Pages/Feed/index.jsx        | 3 +++
 prediction-polls/frontend/src/Pages/Profile/index.jsx     | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index 1feacec8..e5f337a4 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -74,7 +74,7 @@ function EditProfile() {
       profile_picture: userData.profileImage,
       biography: formUserData.about,
       birthday: formUserData.birthday
-        ? formUserData.birthday.format("YYYY-MM-DD")
+        ? formUserData.birthday
         : null,
       isHidden: formUserData.isHidden,
     });
diff --git a/prediction-polls/frontend/src/Pages/Feed/index.jsx b/prediction-polls/frontend/src/Pages/Feed/index.jsx
index d9fb8cd2..19c17189 100644
--- a/prediction-polls/frontend/src/Pages/Feed/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Feed/index.jsx
@@ -46,6 +46,9 @@ function Feed() {
 
         // Modify each poll in the data array
         const modifiedData = data.map((poll) => {
+          if (poll.closingDate != null) {
+            poll.closingDate = poll.closingDate.slice(0, 10);
+          }
           if (poll.pollType === "discrete") {
             return { ...poll, isCustomPoll: false };
           } else {
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index 88595300..f0f7d6f3 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -45,6 +45,9 @@ function Profile() {
 
         // Modify each poll in the data array
         const modifiedData = data.map((poll) => {
+          if (poll.closingDate != null) {
+            poll.closingDate = poll.closingDate.slice(0, 10);
+          }
           if (poll.pollType === "discrete") {
             return { ...poll, isCustomPoll: false };
           } else {

From 877ce1f4b00a7d6ef1ad281ed1659a48019d290f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 19:38:27 +0300
Subject: [PATCH 240/246] fixed edit profile button

---
 .../frontend/src/Pages/Profile/index.jsx      | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index f0f7d6f3..4d0ed5b9 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -114,19 +114,23 @@ function Profile() {
                 <p className={styles.nameUsernameText}>{userData.username}</p>
               </div>
               <div className={styles.buttonContainer}>
-                <button
-                  className={styles.button}
-                  onClick={() => navigate(`/editProfile/${userData.username}`)}
-                >
-                  {userData.username === userMeUsername ? (
-                    <>
+                {userData.username === userMeUsername ? (
+                  <>
+                    <button
+                      className={styles.button}
+                      onClick={() =>
+                        navigate(`/editProfile/${userData.username}`)
+                      }
+                    >
                       <EditIcon />
                       <p className={styles.buttonText}>Edit Profile</p>
-                    </>
-                  ) : (
+                    </button>
+                  </>
+                ) : (
+                  <button className={styles.button}>
                     <p className={styles.buttonText}>Follow</p>
-                  )}
-                </button>
+                  </button>
+                )}
               </div>
             </div>
             <div className={styles.aboutContainer}>
@@ -143,11 +147,7 @@ function Profile() {
           </div>
         </div>
         {pollData.pollList.map((poll, index) => (
-          <PollCard
-            className={styles.pollCard}
-            PollData={poll}
-            key={poll.id}
-          />
+          <PollCard className={styles.pollCard} PollData={poll} key={poll.id} />
         ))}
       </div>
       <div className={styles.pointButton}>

From bd45ff213c41766240baebb9df6d107ece327904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 20:09:35 +0300
Subject: [PATCH 241/246] fixed navigation error and point error

---
 .../Components/PollCard/PollCard.module.css   |  4 +-
 .../frontend/src/Components/Sidebar/index.jsx | 50 ++++++++++---------
 .../frontend/src/Pages/Create/index.jsx       |  2 +-
 .../Pages/EditProfile/EditProfile.module.css  |  2 +-
 .../frontend/src/Pages/EditProfile/index.jsx  |  2 +-
 .../frontend/src/Pages/Feed/index.jsx         |  2 +-
 .../src/Pages/Profile/Profile.module.css      |  6 +--
 .../frontend/src/Pages/Profile/index.jsx      | 12 ++++-
 .../frontend/src/Pages/Vote/index.jsx         |  2 +-
 9 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css b/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
index 86f1b7ef..5cb93904 100644
--- a/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
+++ b/prediction-polls/frontend/src/Components/PollCard/PollCard.module.css
@@ -62,7 +62,7 @@
   justify-content: space-between;
   width: 100%;
   gap: 3%;
-  align-items: start;
+  align-items: flex-start;
 }
 .question {
   font-size: 20px;
@@ -130,7 +130,7 @@
   flex-direction: column;
   gap: 3px;
   align-items: center;
-  justify-content: start;
+  justify-content: flex-start;
 }
 
 .commentCount {
diff --git a/prediction-polls/frontend/src/Components/Sidebar/index.jsx b/prediction-polls/frontend/src/Components/Sidebar/index.jsx
index 4361ea5a..97dc89f3 100644
--- a/prediction-polls/frontend/src/Components/Sidebar/index.jsx
+++ b/prediction-polls/frontend/src/Components/Sidebar/index.jsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import ProfileIcon from "../../Assets/icons/ProfileIcon.jsx";
 import FeedIcon from "../../Assets/icons/FeedIcon.jsx";
 import VoteIcon from "../../Assets/icons/VoteIcon.jsx";
@@ -10,21 +10,8 @@ import SettingsIcon from "../../Assets/icons/SettingsIcon.jsx";
 import { ReactComponent as Logo } from "../../Assets/Logo.svg";
 import styles from "./Sidebar.module.css";
 import { useNavigate } from "react-router-dom";
-import  logout  from "../../api/requests/logout.jsx";
-import { Link } from 'react-router-dom';
-
-
-const username = localStorage.getItem("username")
-const menuData = [
-  { key: "Profile", Icon: ProfileIcon, to:`profile/${username}` },
-  { key: "Feed", Icon: FeedIcon, to:"feed" },
-  { key: "Vote", Icon: VoteIcon, to:"vote" },
-  { key: "Create", Icon: CreateIcon , to:"create"},
-  { key: "Moderation", Icon: ModerationIcon , to:"moderation"},
-  { key: "Leaderboard", Icon: LeaderboardIcon, to:"leaderboard" },
-  { key: "Notifications", Icon: NotificationsIcon, to:"notifications" },
-  { key: "Settings", Icon: SettingsIcon, to:"settings" },
-];
+import logout from "../../api/requests/logout.jsx";
+import { Link } from "react-router-dom";
 
 const SidebarMenuItem = ({
   currentPage,
@@ -34,8 +21,6 @@ const SidebarMenuItem = ({
   navigate,
   to,
 }) => {
-  
-
   const isSelected = currentPage === pageKey;
   return (
     <Link
@@ -45,9 +30,7 @@ const SidebarMenuItem = ({
       }`}
       to={to}
     >
-      {Icon && (
-        <Icon width={40} height={40} />
-      )}
+      {Icon && <Icon width={40} height={40} />}
       <p className={styles.etxt}>{label || pageKey}</p>
     </Link>
   );
@@ -55,9 +38,28 @@ const SidebarMenuItem = ({
 
 const Sidebar = ({ currentPage, handlePageChange }) => {
   const navigate = useNavigate();
+  const [username, setUsername] = React.useState(
+    localStorage.getItem("username")
+  );
+
+  useEffect(() => {
+    const username = localStorage.getItem("username");
+    setUsername(username);
+  }, []);
+
+  const menuData = [
+    { key: "Profile", Icon: ProfileIcon, to: `profile/${username}` },
+    { key: "Feed", Icon: FeedIcon, to: "feed" },
+    { key: "Vote", Icon: VoteIcon, to: "vote" },
+    { key: "Create", Icon: CreateIcon, to: "create" },
+    { key: "Moderation", Icon: ModerationIcon, to: "moderation" },
+    { key: "Leaderboard", Icon: LeaderboardIcon, to: "leaderboard" },
+    { key: "Notifications", Icon: NotificationsIcon, to: "notifications" },
+    { key: "Settings", Icon: SettingsIcon, to: "settings" },
+  ];
 
   const handleLogout = async () => {
-    const refreshToken = localStorage.getItem('refreshToken'); 
+    const refreshToken = localStorage.getItem("refreshToken");
     const isLoggedOut = await logout(refreshToken);
     if (isLoggedOut) {
       navigate("/auth/sign-in");
@@ -77,7 +79,9 @@ const Sidebar = ({ currentPage, handlePageChange }) => {
           to={`/${item.to}`}
         />
       ))}
-      <button className={styles.logoutButton} onClick={handleLogout}>LOGOUT </button>
+      <button className={styles.logoutButton} onClick={handleLogout}>
+        LOGOUT{" "}
+      </button>
     </div>
   );
 };
diff --git a/prediction-polls/frontend/src/Pages/Create/index.jsx b/prediction-polls/frontend/src/Pages/Create/index.jsx
index 1c22c19b..75dc6b9e 100644
--- a/prediction-polls/frontend/src/Pages/Create/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Create/index.jsx
@@ -408,7 +408,7 @@ function Create() {
             Create Poll
           </Button>
         </div>
-        <PointsButton point={userData.points}/> 
+        <PointsButton point={userData?.points ?? 0} />
       </div>
     </div>
   );
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
index 320396d0..78fb9f05 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
+++ b/prediction-polls/frontend/src/Pages/EditProfile/EditProfile.module.css
@@ -84,7 +84,7 @@ border-radius: 10px;
     display: flex;
     flex-direction: column;
     align-items: center;
-    justify-content: start;
+    justify-content: flex-start;
     width: 20%;
     padding-top: 100px;
 
diff --git a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
index e5f337a4..5199cf72 100644
--- a/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/EditProfile/index.jsx
@@ -213,7 +213,7 @@ function EditProfile() {
         </Form>
       </div>
       <div className={styles.pointCol}>
-      <PointsButton point={userData.points}/> 
+      <PointsButton point={userData?.points ?? 0}/> 
         <p className={styles.badgesText}>Badges</p>
         <p>(You can choose at most 3)</p>
         <div className={styles.badgesContainer}>
diff --git a/prediction-polls/frontend/src/Pages/Feed/index.jsx b/prediction-polls/frontend/src/Pages/Feed/index.jsx
index 19c17189..8081d81c 100644
--- a/prediction-polls/frontend/src/Pages/Feed/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Feed/index.jsx
@@ -109,7 +109,7 @@ function Feed() {
         ))}
       </div>
       <div className={styles.pointsButton}>
-        <PointsButton point={userData.points} />
+        <PointsButton point={userData?.points ?? 0} />
       </div>
     </div>
   );
diff --git a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
index 5e28be9c..a8f1e0b7 100644
--- a/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
+++ b/prediction-polls/frontend/src/Pages/Profile/Profile.module.css
@@ -129,8 +129,8 @@
 .name {
   display: flex;
   flex-direction: column;
-  justify-content: start;
-  align-items: start;
+  justify-content: flex-start;
+  align-items: flex-start;
   margin-left: 230px;
   padding-right: 10px;
   padding-top: 20px;
@@ -196,7 +196,7 @@
 .badgesContainer {
   display: flex;
   flex-direction: row;
-  justify-content: start;
+  justify-content: flex-start;
   align-items: center;
   gap: 10px;
   padding-left: 50px;
diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index 4d0ed5b9..7bf80164 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -134,6 +134,16 @@ function Profile() {
               </div>
             </div>
             <div className={styles.aboutContainer}>
+              {userData.isHidden == false ? (
+                userData.birthday ? (
+                  <>
+                    {" "}
+                    <p className={styles.aboutTitle}>Birthday</p>
+                    <p className={styles.aboutText}>{userData.birthday}</p>
+                  </>
+                ) : null
+              ) : null}
+
               <p className={styles.aboutTitle}>About</p>
               <p className={styles.aboutText}>{userData.biography}</p>
             </div>
@@ -151,7 +161,7 @@ function Profile() {
         ))}
       </div>
       <div className={styles.pointButton}>
-        <PointsButton point={userData.points} />{" "}
+        <PointsButton point={userData?.points ?? 0} />{" "}
       </div>
     </div>
   );
diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index 3c47e3d0..37092696 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -171,7 +171,7 @@ function Vote() {
             <PollCard PollData={polldata} setAnswer={setAnswer} />
           </div>
           <div className={styles.choice_column}>
-          <PointsButton point={userData.points}/> 
+          <PointsButton point={userData?.points ?? 0}/> 
             <div className={styles.infoText}><div>{sentence}</div>
               <div id="statement" className={styles.chooseText}>How many points do you want to place?</div>
               <div><Input

From fa145f2bc7249c70c09f245f3ca5b9945d61fcb0 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 20:23:24 +0300
Subject: [PATCH 242/246] Add unit tests

---
 .../tests/AuthorizationService.test.js        | 347 ++++++++----------
 1 file changed, 163 insertions(+), 184 deletions(-)

diff --git a/prediction-polls/backend/tests/AuthorizationService.test.js b/prediction-polls/backend/tests/AuthorizationService.test.js
index 72c2eff8..fc5d8b0c 100644
--- a/prediction-polls/backend/tests/AuthorizationService.test.js
+++ b/prediction-polls/backend/tests/AuthorizationService.test.js
@@ -1,228 +1,207 @@
-
-const service = require('../src/services/AuthorizationService.js');
-const db = require('../src/repositories/AuthorizationDB.js');
+const {
+  signup,
+  createAccessTokenFromRefreshToken,
+  logIn,
+  logOut,
+  authorizeAccessToken,
+  generateAccessToken,
+  generateRefreshToken,
+} = require('../src/services/AuthorizationService');
+const authDb = require('../src/repositories/AuthorizationDB');
+const profileDb = require('../src/repositories/ProfileDB');
 const jwt = require('jsonwebtoken');
-
-require('dotenv').config();
-
-// Mock the database functions
-jest.mock('../src/repositories/AuthorizationDB.js', () => ({
-    addRefreshToken: jest.fn(),
-    checkRefreshToken: jest.fn(),
-    deleteRefreshToken: jest.fn(),
-    checkCredentials: jest.fn().mockImplementation(async (username, password) => {
-      return true; // Customize this based on your test scenarios
-    }),
-    addUser: jest.fn().mockImplementation(async (username, password,email,birthday) => {
-      return {"success":true,"error":undefined};
-    })
-}));
-
-// Mock the jwt.verify function
-jest.mock('jsonwebtoken', () => ({
-    verify: jest.fn((token, secret, callback) => {
-      if (token === 'validRefreshToken') {
-        callback(null, { name: 'testUser' });
-      } else {
-        callback(new Error('Invalid token'));
-      }
-    }),
-    sign: jest.fn(),
-  }));
-
-jwt.sign.mockReturnValue('mockToken');
-
-test('test if logIn returns accessToken and refreshToken', async () => {
-    // Set up mock behavior for checkCredentials
-    const username = 'testUsername';
-    const password = 'asdadasd';
-    db.checkCredentials = jest.fn().mockResolvedValue(true);
-
-    const req = { body: { username, password } };
-    const res = {
-        status: jest.fn(() => res),
-        json: jest.fn(),
-        send: jest.fn(),
+const errorCodes = require('../src/errorCodes');
+
+jest.mock('../src/repositories/AuthorizationDB');
+jest.mock('../src/repositories/ProfileDB');
+jest.mock('jsonwebtoken');
+
+describe('signup()', () => {
+  let req, res;
+
+  beforeEach(() => {
+    req = {
+      body: {
+        username: 'testUser',
+        password: 'TestPassword1.',
+        email: 'test@example.com',
+        birthday: '1990-01-01',
+      },
     };
+    res = {
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
+    };
+  });
 
-    await service.logIn(req, res);
+  it('should successfully sign up a new user', async () => {
+    authDb.isUsernameOrEmailInUse.mockResolvedValueOnce({
+      usernameInUse: false,
+      emailInUse: false,
+    });
+    authDb.addUser.mockResolvedValueOnce({ userId: 1 });
+    profileDb.addProfile.mockResolvedValueOnce({profileId:1})
 
-    // Assert that the correct functions were called and with the correct arguments
-    expect(db.checkCredentials).toHaveBeenCalledWith(username, password);
-    expect(db.addRefreshToken).toHaveBeenCalledWith(expect.any(String));
+    await signup(req, res);
 
-    // Assert that the response was sent with the correct data
     expect(res.status).toHaveBeenCalledWith(201);
-    expect(res.json).toHaveBeenCalledWith({
-        accessToken: expect.any(String),
-        refreshToken: expect.any(String),
-    });
-});
+    expect(res.json).toHaveBeenCalledWith({ status: 'success' });
+  });
 
+});
 
-test('test if signup returns registration successful response ', async () => {
-    // Set up mock behavior for checkCredentials
-    const username = 'testUsername';
-    const password = 'asdadasd';
-    const email= 'test@mail.com';
-    const birthday = '2004-10-8';
+describe('createAccessTokenFromRefreshToken()', () => {
+  let req, res;
 
-    const req = { body: { username, password, email, birthday } };
-    const res = {
-        status: jest.fn(() => res),
-        send: jest.fn(),
+  beforeEach(() => {
+    req = {
+      body: {
+        refreshToken: 'testRefreshToken',
+      },
     };
+    res = {
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
+    };
+  });
 
-    await service.signup(req, res);
+  it('should create access token from refresh token', async () => {
+    jwt.verify.mockImplementationOnce((token, secret, callback) => {
+      callback(null, { name: 'testUser', id: 1 });
+    });
+    jwt.sign.mockReturnValueOnce('testAccessToken');
 
-    // Assert that the correct functions were called and with the correct arguments
-    expect(db.addUser).toHaveBeenCalledWith(username, password, email, birthday);
+    await createAccessTokenFromRefreshToken(req, res);
 
-    // Assert that the response was sent with the correct data
     expect(res.status).toHaveBeenCalledWith(201);
-});
-
-test('test if createAccessTokenFromRefreshToken returns accessToken', async () => {
-  const req = { body: { refreshToken: 'validRefreshToken' } };
-  const res = {
-    status: jest.fn(() => res),
-    json: jest.fn(),
-    send: jest.fn(),
-  };
-
-  await service.createAccessTokenFromRefreshToken(req, res);
-
-  // Assert that the correct functions were called and with the correct arguments
-  expect(jwt.verify).toHaveBeenCalledWith(
-    'validRefreshToken',
-    process.env.REFRESH_TOKEN_SECRET,
-    expect.any(Function)
-  );
-
-  // Assert that the response was sent with the correct data
-  expect(res.status).toHaveBeenCalledWith(201);
-  expect(res.json).toHaveBeenCalledWith({
-    accessToken: expect.any(String),
+    expect(res.json).toHaveBeenCalledWith({ accessToken: 'testAccessToken' });
   });
+
 });
 
-test('test if logout returns refresh token deleted', async () => {
-    // Set up mock behavior for checkCredentials
-    const refreshToken = 'refreshToken';
+describe('logIn()', () => {
+  let req, res;
 
-    const req = { body: {refreshToken } };
-    const res = {
-        status: jest.fn(() => res),
-        send: jest.fn(),
+  beforeEach(() => {
+    req = {
+      body: {
+        username: 'testUser',
+        password: 'testPassword',
+      },
+    };
+    res = {
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
     };
+  });
 
-    db.deleteRefreshToken = jest.fn().mockResolvedValue(true);
+  it('should successfully log in a user', async () => {
+    authDb.checkCredentials.mockResolvedValueOnce([{ id: 1 }]);
 
-    await service.logOut(req, res);
+    jwt.sign.mockReturnValueOnce('testAccessToken');
+    jwt.sign.mockReturnValueOnce('testRefreshToken');
 
-    expect(db.deleteRefreshToken).toHaveBeenCalledWith(expect.any(String));
+    await logIn(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(201);
+    expect(res.json).toHaveBeenCalledWith({
+      accessToken: 'testAccessToken',
+      refreshToken: 'testRefreshToken',
+    });
+  });
 
-    // Assert that the response was sent with the correct data
-    expect(res.status).toHaveBeenCalledWith(204);
 });
 
-test('test if authorizeAccessToken returns refresh token deleted', async () => {
-    // Set up mock behavior for checkCredentials
-    const refreshToken = 'refreshToken';
+describe('logOut()', () => {
+  let req, res;
 
-    const req = { body: {refreshToken } };
-    const res = {
-        status: jest.fn(() => res),
-        send: jest.fn(),
+  beforeEach(() => {
+    req = {
+      body: {
+        refreshToken: 'testRefreshToken',
+      },
     };
+    res = {
+      send: jest.fn(),
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
+    };
+  });
 
-    db.deleteRefreshToken = jest.fn().mockResolvedValue(true);
-
-    await service.logOut(req, res);
+  it('should log out a user by deleting the refresh token', async () => {
+    authDb.deleteRefreshToken.mockResolvedValueOnce(true);
 
-    expect(db.deleteRefreshToken).toHaveBeenCalledWith(expect.any(String));
+    await logOut(req, res);
 
-    // Assert that the response was sent with the correct data
     expect(res.status).toHaveBeenCalledWith(204);
-});
+    expect(res.send).toHaveBeenCalledWith('Token deleted successfully');
+  });
+
+  it('should handle invalid refresh token during logout', async () => {
+    authDb.deleteRefreshToken.mockResolvedValueOnce(false);
 
-test('test if authorizeAccessToken authorizes correctly', async () => {
-    // Set up mock behavior for jwt.verify
-    jwt.verify.mockImplementation((token, secret, callback) => {
-      if (token === 'validAccessToken') {
-        callback(null, { name: 'testUser' });
-      } else {
-        callback(new Error('Invalid token'));
-      }
+    await logOut(req, res);
+
+    expect(res.status).toHaveBeenCalledWith(404);
+    expect(res.json).toHaveBeenCalledWith({
+      error: errorCodes.REFRESH_TOKEN_INVALID_ERROR,
     });
-  
-    const req = { headers: { authorization: 'Bearer validAccessToken' } };
-    const res = {
-      sendStatus: jest.fn(),
-      status: jest.fn(() => res),
+  });
+
+});
+
+describe('authorizeAccessToken()', () => {
+  let req, res, next;
+
+  beforeEach(() => {
+    req = {
+      headers: {
+        authorization: 'Bearer testAccessToken',
+      },
+    };
+    res = {
       send: jest.fn(),
+      json: jest.fn(),
+      status: jest.fn().mockReturnThis(),
     };
-    const next = jest.fn();
-  
-    await service.authorizeAccessToken(req, res, next);
-  
-    // Assert that the correct functions were called and with the correct arguments
-    expect(jwt.verify).toHaveBeenCalledWith(
-      'validAccessToken',
-      process.env.ACCESS_TOKEN_SECRET,
-      expect.any(Function)
-    );
-  
-    // Assert that req.user was set
-    expect(req.user).toEqual({ name: 'testUser' });
-  
-    // Assert that next was called
+    next = jest.fn();
+  });
+
+  it('should authorize access with a valid access token', () => {
+    jwt.verify.mockImplementationOnce((token, secret, callback) => {
+      callback(null, { name: 'testUser', id: 1 });
+    });
+
+    authorizeAccessToken(req, res, next);
+
     expect(next).toHaveBeenCalled();
+    expect(req.user).toEqual({ name: 'testUser', id: 1 });
   });
-  
-  test('test if authorizeAccessToken handles missing token', async () => {
-    const req = { headers: {} };
-    const res = {
-      sendStatus: jest.fn(),
-    };
-    const next = jest.fn();
-  
-    await service.authorizeAccessToken(req, res, next);
-  
-    // Assert that sendStatus was called with status 400
-    expect(res.sendStatus).toHaveBeenCalledWith(400);
-  
-    // Assert that next was not called
+
+  it('should handle missing access token during authorization', () => {
+    req.headers.authorization = undefined;
+
+    authorizeAccessToken(req, res, next);
+
+    expect(res.status).toHaveBeenCalledWith(400);
+    expect(res.json).toHaveBeenCalledWith({
+      error: errorCodes.ACCESS_TOKEN_NEEDED_ERROR,
+    });
     expect(next).not.toHaveBeenCalled();
   });
-  
-  test('test if authorizeAccessToken handles invalid token', async () => {
-    // Set up mock behavior for jwt.verify
-    jwt.verify.mockImplementation((token, secret, callback) => {
+
+  it('should handle invalid access token during authorization', () => {
+    jwt.verify.mockImplementationOnce((token, secret, callback) => {
       callback(new Error('Invalid token'));
     });
-  
-    const req = { headers: { authorization: 'Bearer invalidAccessToken' } };
-    const res = {
-      status: jest.fn(() => res),
-      send: jest.fn(),
-    };
-    const next = jest.fn();
-  
-    await service.authorizeAccessToken(req, res, next);
-  
-    // Assert that the correct functions were called and with the correct arguments
-    expect(jwt.verify).toHaveBeenCalledWith(
-      'invalidAccessToken',
-      process.env.ACCESS_TOKEN_SECRET,
-      expect.any(Function)
-    );
-  
-    // Assert that res.status and res.send were called with the correct messages
+
+    authorizeAccessToken(req, res, next);
+
     expect(res.status).toHaveBeenCalledWith(401);
-    expect(res.send).toHaveBeenCalledWith('The access token is invalid');
-  
-    // Assert that next was not called
+    expect(res.json).toHaveBeenCalledWith({
+      error: errorCodes.ACCESS_TOKEN_INVALID_ERROR,
+    });
     expect(next).not.toHaveBeenCalled();
   });
-  
+
+});
\ No newline at end of file

From f7eaad8ef894cd1cb518260694a97886d1eabe29 Mon Sep 17 00:00:00 2001
From: EmreBatuhan <93476131+EmreBatuhan@users.noreply.github.com>
Date: Mon, 27 Nov 2023 20:23:29 +0300
Subject: [PATCH 243/246] Update AuthorizationService.js

---
 .../src/services/AuthorizationService.js       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/prediction-polls/backend/src/services/AuthorizationService.js b/prediction-polls/backend/src/services/AuthorizationService.js
index 4c5bb063..869460e4 100644
--- a/prediction-polls/backend/src/services/AuthorizationService.js
+++ b/prediction-polls/backend/src/services/AuthorizationService.js
@@ -20,7 +20,7 @@ async function signup(req, res) {
 
   // Birthday validation
   if (birthday && !isValidBirthday(birthday)) {
-      return res.status(400).send({error:errorCodes.INVALID_DATE});
+      return res.status(400).json({error:errorCodes.INVALID_DATE});
 
   }
 
@@ -32,33 +32,33 @@ async function signup(req, res) {
   }
 
   if (usernameInUse) {
-      return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
+      return res.status(400).json({error:errorCodes.USERNAME_ALREADY_EXISTS});
   }
 
   if (emailInUse) {
-      return res.status(400).send({error:errorCodes.USERNAME_ALREADY_EXISTS});
+      return res.status(400).json({error:errorCodes.USERNAME_ALREADY_EXISTS});
   }
 
   // Validate password
   if (!isValidPassword(password)) {
-      return res.status(400).send({error:errorCodes.INVALID_PASSWORD});
+      return res.status(400).json({error:errorCodes.INVALID_PASSWORD});
   }
   // Attempt to add user
   const { userId, error: addUserError } = await db.addUser(username, password, email, birthday);
   if (error) {
-    return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
+    return res.status(400).json({error:errorCodes.REGISTRATION_FAILED});
   }
 
   const result = await profileDb.addProfile(userId,username,email);
   if(!result.profileId){
-    return res.status(400).send({error:errorCodes.REGISTRATION_FAILED});
+    return res.status(400).json({error:errorCodes.REGISTRATION_FAILED});
   }
 
   const verificationToken = generateVerificationToken();
   await db.saveEmailVerificationToken(userId, verificationToken);
   await sendVerificationEmail(email, verificationToken);
 
-  res.status(201).send({status:"success"});
+  res.status(201).json({status:"success"});
   
 }
 
@@ -76,7 +76,7 @@ async function sendVerificationEmail(email, token) {
   try {
       await transporter.sendMail(mailOptions);
   } catch (error) {
-      res.status(500).send({error:errorCodes.INTERNAL_SERVER_ERROR})
+      return {error:errorCodes.INTERNAL_SERVER_ERROR};
   }
 }
 const crypto = require('crypto');
@@ -137,7 +137,7 @@ async function logIn(req,res){
       const accesToken = generateAccessToken(user);
       const refreshToken = generateRefreshToken(user);
       await db.addRefreshToken(refreshToken);
-      res.status(201).json({accessToken: accesToken, refreshToken: refreshToken})
+      return res.status(201).json({accessToken: accesToken, refreshToken: refreshToken})
 
     } catch (error) {
         return res.status(401).json({ error: errorCodes.USER_NOT_FOUND });

From 7fddf3c61a21b1e87e2a2f081f9f80a4c6f458ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 20:31:09 +0300
Subject: [PATCH 244/246] updated case sensitivity error

---
 prediction-polls/frontend/src/Pages/Profile/index.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Profile/index.jsx b/prediction-polls/frontend/src/Pages/Profile/index.jsx
index 7bf80164..34cdfc8e 100644
--- a/prediction-polls/frontend/src/Pages/Profile/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Profile/index.jsx
@@ -69,7 +69,7 @@ function Profile() {
   React.useEffect(() => {
     const fetchData = async () => {
       try {
-        if (username === userMeUsername) {
+        if (username?.toLowerCase() === userMeUsername?.toLowerCase()) {
           const response = await getProfileMe();
           if (response) {
             setUserData(response);
@@ -114,7 +114,7 @@ function Profile() {
                 <p className={styles.nameUsernameText}>{userData.username}</p>
               </div>
               <div className={styles.buttonContainer}>
-                {userData.username === userMeUsername ? (
+                {userData.username?.toLowerCase() === userMeUsername?.toLowerCase() ? (
                   <>
                     <button
                       className={styles.button}

From c5ae3d38efc7b37eff33a95ed0a82cd3ded9a3e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Selin=20I=C5=9F=C4=B1k?=
 <56879777+selinisik@users.noreply.github.com>
Date: Mon, 27 Nov 2023 21:05:29 +0300
Subject: [PATCH 245/246] added reload to vote page

---
 prediction-polls/frontend/src/Pages/Vote/index.jsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/prediction-polls/frontend/src/Pages/Vote/index.jsx b/prediction-polls/frontend/src/Pages/Vote/index.jsx
index 35872488..e837368a 100644
--- a/prediction-polls/frontend/src/Pages/Vote/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Vote/index.jsx
@@ -14,7 +14,8 @@ import getProfileMe from "../../api/requests/profileMe.jsx";
 function Vote() {
   let { id } = useParams();
   let parsedID = parseInt(id);
-  const [userData, setUserData] =  useState({})
+  const [userData, setUserData] =  useState({});
+
 
   React.useEffect( () => {
     const data = getProfileMe();
@@ -102,6 +103,9 @@ function Vote() {
           const response = await fetch(url, requestOptions);
           if (response.status === 200) {
             setMessage("Voted successfully!");
+            setTimeout(() => {
+              window.location.replace("/feed")
+            }, 700);
           }
           else {
             setMessage("An error has occurred!");
@@ -146,6 +150,9 @@ function Vote() {
               const response = await fetch(url, requestOptions);
               if (response.status === 200) {
                 setMessage("Voted successfully!");
+                setTimeout(() => {
+                  window.location.replace("/feed")
+                }, 700);
               }
               else {
                 setMessage("An error has occurred!");

From 18851ab8c588066c89b1ed05068926b7488eb190 Mon Sep 17 00:00:00 2001
From: Sefik-Palazoglu <sefik.palazoglu.s@gmail.com>
Date: Mon, 27 Nov 2023 21:08:38 +0300
Subject: [PATCH 246/246] change topics

---
 .../backend/src/routines/topics.json          | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/prediction-polls/backend/src/routines/topics.json b/prediction-polls/backend/src/routines/topics.json
index 811effe9..018a94d5 100644
--- a/prediction-polls/backend/src/routines/topics.json
+++ b/prediction-polls/backend/src/routines/topics.json
@@ -4,6 +4,23 @@
       "name": "Weather",
       "subtopics": []
     },
+    {
+      "name": "Sports",
+      "subtopics": [
+        "Football",
+        "Basketball",
+        "Baseball",
+        "Tennis",
+        "Athletics",
+        "Esports",
+        "Extreme sports",
+        "Sports analytics",
+        "Sports psychology"
+      ]
+    },
+    {
+      "name": "Economy"
+    },
     {
       "name": "Politics",
       "subtopics": [
@@ -61,7 +78,7 @@
       ]
     },
     {
-      "name": "Nature",
+      "name": "Disaster",
       "subtopics": [
         "Zoology",
         "Animal",
@@ -128,20 +145,6 @@
         "Lifelong learning"
       ]
     },
-    {
-      "name": "Sports",
-      "subtopics": [
-        "Football",
-        "Basketball",
-        "Baseball",
-        "Tennis",
-        "Athletics",
-        "Esports",
-        "Extreme sports",
-        "Sports analytics",
-        "Sports psychology"
-      ]
-    },
     {
       "name": "Entertainment",
       "subtopics": [