Alondras branch

app/src/main/java/com/ottogo/weekly/api/WeeklyApiService.kt

@@ -27,6 +27,8 @@ private val retrofit = Retrofit.Builder()
 interface WeeklyApiService {
     @POST("api/account/login/")
     suspend fun login(@Body body: Map<String, String>)
+    @POST("api/account/create/")
+    suspend fun signup(@Body body: Map<String, String>) : Map<String, String>
 
 }
 

app/src/main/java/com/ottogo/weekly/ui/components/Message.kt

@@ -19,7 +19,7 @@ import androidx.navigation.NavController
 
 
 @Composable
-fun Message(navController: NavController, message: String) {
+fun Message(message: String) {
 
 
 

app/src/main/java/com/ottogo/weekly/ui/login/LandingPage.kt

@@ -1,43 +1,75 @@
 package com.ottogo.weekly.ui.login
 
+import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
+import android.widget.TextView
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.background
+import androidx.compose.foundation.horizontalScroll
+import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.focusModifier
+import androidx.compose.ui.text.font.FontFamily
+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 androidx.navigation.NavController
 import com.ottogo.weekly.api.WeeklyApi
 import com.ottogo.weekly.ui.components.CustomButton
+import com.ottogo.weekly.ui.theme.nunitoFamily
 import kotlinx.coroutines.runBlocking
+import java.time.format.TextStyle
 
 @Composable
 fun LandingPage(navController: NavController) {
 
 
+    Column(modifier = Modifier.padding(24.dp)){
 
-    Column(){
+        displayTitle("Weekly")
+        displayGreeting("Make your best memories")
 
-        CustomButton(buttonText = "Sign up"){
-            runBlocking {
-                navController.navigate("signupBirthdayPage")
 
+
+            Spacer(modifier = Modifier.padding(187.dp))
+            CustomButton(buttonText = "Sign up") {
+                runBlocking {
+                    navController.navigate("signupBirthdayPage")
+                }
+                Modifier.height(48.dp)
             }
-        }
-        CustomButton(buttonText = "Login"){
-            runBlocking {
-                navController.navigate("loginPage")
 
+            Spacer(modifier = Modifier.height(15.dp))
+            CustomButton(buttonText = "Login") {
+                runBlocking {
+                    navController.navigate("loginPage")
+                }
             }
         }
-    }
-}
+}
+
+@Composable
+fun displayTitle(appName: String) {
+    Spacer(modifier = Modifier.height(65.dp))
+    Text(text = appName,
+        fontSize = 48.sp,
+        fontWeight = FontWeight(700),
+        fontFamily = nunitoFamily
+    )
+}
+@Composable
+fun displayGreeting(greeting: String) {
+    Spacer(modifier = Modifier.height(17.dp))
+    Text(text = greeting,
+        fontSize = 24.sp,
+        fontWeight = FontWeight(700),
+        fontFamily = nunitoFamily)
+}

app/src/main/java/com/ottogo/weekly/ui/login/SignupBirthdayPage.kt

@@ -7,6 +7,7 @@ import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
@@ -16,6 +17,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.ottogo.weekly.ui.components.CustomButton
+import kotlinx.coroutines.runBlocking
 
 /*
 *
@@ -33,7 +36,13 @@ fun SignupBirthdayPage(navController: NavController) {
 
 
     Column(){
-
+    Text(text ="birthday page")
+        CustomButton(buttonText = "Sign up") {
+            runBlocking {
+                navController.navigate("signupPage/{dob}")
+            }
+            Modifier.width(27.dp)
+        }
 
     }
 }