From ddafb7132710fa8ec0684179249027f4fbef833f Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Fri, 28 Oct 2022 13:17:55 +0200 Subject: Dodati dependencies za retrofit. Napravljeni modeli za user, login, register. Dodat interface za komunikaciju sa back-om. --- Client/BrzoDoLokacije/app/build.gradle | 4 ++++ .../com/example/brzodolokacije/Interfaces/IAuthApi.kt | 15 +++++++++++++++ .../java/com/example/brzodolokacije/Models/Auth/Login.kt | 6 ++++++ .../com/example/brzodolokacije/Models/Auth/Register.kt | 8 ++++++++ .../main/java/com/example/brzodolokacije/Models/User.kt | 15 +++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Login.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Register.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle index 42206c7..e000050 100644 --- a/Client/BrzoDoLokacije/app/build.gradle +++ b/Client/BrzoDoLokacije/app/build.gradle @@ -45,4 +45,8 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + //Retrofit + implementation 'com.squareup.retrofit2:retrofit:2.7.2' + implementation 'com.squareup.retrofit2:converter-gson:2.7.2' } \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt new file mode 100644 index 0000000..6ff3899 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt @@ -0,0 +1,15 @@ +package com.example.brzodolokacije.Interfaces + +import com.example.brzodolokacije.Models.Auth.Login +import com.example.brzodolokacije.Models.Auth.Register +import retrofit2.Call +import retrofit2.Response +import retrofit2.http.Body +import retrofit2.http.POST + +interface IAuthApi { + @POST("/api/auth/login") + fun login(@Body obj:Login): Call + @POST("/api/auth/register") + fun register(@Body obj:Register):Call +} \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Login.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Login.kt new file mode 100644 index 0000000..136b8dd --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Login.kt @@ -0,0 +1,6 @@ +package com.example.brzodolokacije.Models.Auth + +data class Login( + var email:String, + var password:String +) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Register.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Register.kt new file mode 100644 index 0000000..bcb0d2b --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Auth/Register.kt @@ -0,0 +1,8 @@ +package com.example.brzodolokacije.Models.Auth + +data class Register( + var name:String, + var username:String, + var email:String, + var password:String +) diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt new file mode 100644 index 0000000..151c14c --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/User.kt @@ -0,0 +1,15 @@ +package com.example.brzodolokacije.Models + +import java.util.Date + +data class User ( + var _id:String, + var name:String, + var username:String, + var email:String, + var emailToken:String, + var verified:Boolean, + var password:String, + var creationDate:Date + +) \ No newline at end of file -- cgit v1.2.3 From 304ac1495c26af85c7cce10d219d1ba7c43e3d30 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Fri, 28 Oct 2022 13:26:43 +0200 Subject: Napravljen helper za retrofit. --- .../com/example/brzodolokacije/Services/RetrofitHelper.kt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt 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 new file mode 100644 index 0000000..5721816 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt @@ -0,0 +1,15 @@ +package com.example.brzodolokacije.Services + +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +object RetrofitHelper { + val baseUrl="http://10.0.2.2:5279" + fun getInstance():Retrofit{ + return Retrofit.Builder().baseUrl(baseUrl) + .addConverterFactory(GsonConverterFactory.create()) + .build() + } +} +//Usage +//Api = RetrofitHelper.getInstance().create(class) \ No newline at end of file -- cgit v1.2.3