diff options
5 files changed, 12 insertions, 22 deletions
diff --git a/Backend/Api/Api/Controllers/AuthController.cs b/Backend/Api/Api/Controllers/AuthController.cs index 6727125..5973c8c 100644 --- a/Backend/Api/Api/Controllers/AuthController.cs +++ b/Backend/Api/Api/Controllers/AuthController.cs @@ -22,7 +22,7 @@ namespace Api.Controllers novi.password = creds.password; novi.username = creds.username; novi.name = creds.name; - novi.creationDate = DateTime.Now; + novi.creationDate = DateTime.Now.ToUniversalTime(); novi._id = ""; int ret= await _userService.createUser(novi); @@ -42,9 +42,9 @@ namespace Api.Controllers var jwt= await _userService.Login(creds); if (jwt != null) { - return Ok(new { token = jwt }); + return Ok(jwt); } - return BadRequest(); + return BadRequest("Pogresno uneti podaci"); } } } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt index ab6794c..3bc62bd 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentLogin.kt @@ -29,10 +29,6 @@ class FragmentLogin : Fragment() { private lateinit var emailString:String - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - } override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -52,7 +48,6 @@ class FragmentLogin : Fragment() { login.setOnClickListener{ emailString=email.text.toString().trim() passwordString=password.text.toString().trim() - //prazan unos? if(emailString.isEmpty()) { @@ -81,9 +76,7 @@ class FragmentLogin : Fragment() { SharedPreferencesHelper.addValue("jwt",token,activity!!) }else{ if(response.errorBody()!=null) - Toast.makeText( - activity, response.errorBody()!!.string(), Toast.LENGTH_LONG - ).show(); + Toast.makeText(activity, response.errorBody()!!.string(), Toast.LENGTH_LONG).show(); } @@ -91,16 +84,11 @@ class FragmentLogin : Fragment() { override fun onFailure(call: Call<String?>, t: Throwable) { Toast.makeText( - activity, "Greska, pokusajte ponovo.", Toast.LENGTH_LONG + activity, t.toString(), Toast.LENGTH_LONG ).show(); } }) - Toast.makeText( - activity, "Korisnik sa unetim podacima nije pronađen. " + "\n" + - "Proverite podatke i pokušajte ponovo", Toast.LENGTH_LONG - ).show(); - } } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt index 4843675..f6300b8 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentRegister.kt @@ -92,9 +92,7 @@ class FragmentRegister : Fragment() { //TODO(navigate to login) }else{ if(response.errorBody()!=null) - Toast.makeText( - activity, response.errorBody()!!.string(), Toast.LENGTH_LONG - ).show(); + Toast.makeText(activity, response.errorBody()!!.string(), Toast.LENGTH_LONG).show() } diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt index 5721816..cc7eb56 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt @@ -1,13 +1,18 @@ package com.example.brzodolokacije.Services +import com.google.gson.GsonBuilder import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory + object RetrofitHelper { val baseUrl="http://10.0.2.2:5279" fun getInstance():Retrofit{ + val gson = GsonBuilder() + .setLenient() + .create() return Retrofit.Builder().baseUrl(baseUrl) - .addConverterFactory(GsonConverterFactory.create()) + .addConverterFactory(GsonConverterFactory.create(gson)) .build() } } diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml index 50d903b..ac526e0 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_login_register.xml @@ -9,7 +9,6 @@ android:foregroundTint="#5E010F13" android:foregroundTintMode="add" tools:context=".Activities.ActivityLoginRegister"> - <Button android:id="@+id/btnFragmentActivityLRLogin" android:layout_width="wrap_content" |