From 52c0f11dc1562ac1f8c1b33d5ed77371dbd27fc2 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Sat, 5 Nov 2022 21:42:03 +0100 Subject: Dodati modeli za post u clientu. --- .../brzodolokacije/Fragments/FragmentLogin.kt | 2 -- .../brzodolokacije/Fragments/FragmentRegister.kt | 4 ---- .../example/brzodolokacije/Interfaces/IAuthApi.kt | 28 ---------------------- .../brzodolokacije/Interfaces/IBackendApi.kt | 27 +++++++++++++++++++++ .../java/com/example/brzodolokacije/Models/File.kt | 6 ----- .../java/com/example/brzodolokacije/Models/Post.kt | 23 ++++++++++++++++-- .../com/example/brzodolokacije/Models/PostImage.kt | 6 +++++ .../brzodolokacije/Services/RetrofitHelper.kt | 16 ++++++------- 8 files changed, 61 insertions(+), 51 deletions(-) delete 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/Interfaces/IBackendApi.kt delete mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/File.kt create mode 100644 Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/PostImage.kt (limited to 'Client') 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 b68a04f..9092700 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 @@ -12,13 +12,11 @@ import android.widget.EditText import android.widget.TextView import android.widget.Toast -import com.example.brzodolokacije.Activities.ActivityLoginRegister import com.example.brzodolokacije.Activities.NavigationActivity import com.example.brzodolokacije.Activities.ActivityForgottenPassword -import com.example.brzodolokacije.Interfaces.IAuthApi import com.example.brzodolokacije.Models.Auth.Login import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.RetrofitHelper 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 cce3d04..e166d38 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 @@ -1,9 +1,7 @@ package com.example.brzodolokacije.Fragments -import android.graphics.BitmapFactory import android.graphics.Color import android.os.Bundle -import android.util.Base64 import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View @@ -11,14 +9,12 @@ import android.view.ViewGroup import android.widget.Button import android.widget.EditText import android.widget.Toast -import com.example.brzodolokacije.Interfaces.IAuthApi import com.example.brzodolokacije.Models.Auth.Register import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.RetrofitHelper import okhttp3.ResponseBody import retrofit2.Call import retrofit2.Response -import javax.security.auth.callback.Callback class FragmentRegister : Fragment() { // TODO: Rename and change types of parameters 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 deleted file mode 100644 index 25f18a3..0000000 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IAuthApi.kt +++ /dev/null @@ -1,28 +0,0 @@ -package com.example.brzodolokacije.Interfaces - -import com.example.brzodolokacije.Models.Auth.JustMail -import com.example.brzodolokacije.Models.Auth.Login -import com.example.brzodolokacije.Models.Auth.Register -import com.example.brzodolokacije.Models.Auth.ResetPass -import com.example.brzodolokacije.Models.Post -import okhttp3.ResponseBody -import retrofit2.Call -import retrofit2.http.Body -import retrofit2.http.Header -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 - @POST("/api/auth/refreshJwt") - fun refreshJwt(@Header("Authorization") authHeader:String): Call - @POST("/api/auth/forgotpass") - fun forgotpass(@Body obj:JustMail):Call - @POST("/api/auth/resetpass") - fun resetpass(@Body obj:ResetPass):Call - - //@POST("putanja") - //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call -} \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt new file mode 100644 index 0000000..0bbf72e --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Interfaces/IBackendApi.kt @@ -0,0 +1,27 @@ +package com.example.brzodolokacije.Interfaces + +import com.example.brzodolokacije.Models.Auth.JustMail +import com.example.brzodolokacije.Models.Auth.Login +import com.example.brzodolokacije.Models.Auth.Register +import com.example.brzodolokacije.Models.Auth.ResetPass +import okhttp3.ResponseBody +import retrofit2.Call +import retrofit2.http.Body +import retrofit2.http.Header +import retrofit2.http.POST + +interface IBackendApi { + @POST("/api/auth/login") + fun login(@Body obj:Login): Call + @POST("/api/auth/register") + fun register(@Body obj:Register):Call + @POST("/api/auth/refreshJwt") + fun refreshJwt(@Header("Authorization") authHeader:String): Call + @POST("/api/auth/forgotpass") + fun forgotpass(@Body obj:JustMail):Call + @POST("/api/auth/resetpass") + fun resetpass(@Body obj:ResetPass):Call + + //@POST("putanja") + //fun add(@Body obj:Post,@Header("Authorization") authHeader:String):Call +} \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/File.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/File.kt deleted file mode 100644 index 030f658..0000000 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/File.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.brzodolokacije.Models - -data class File ( - var _id:String, - var path:String - ) \ No newline at end of file diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt index 3fa1f70..2ac2619 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/Post.kt @@ -1,7 +1,7 @@ package com.example.brzodolokacije.Models +import okhttp3.MultipartBody import java.time.LocalDateTime -import java.util.* data class Post ( var _id:String, @@ -12,10 +12,29 @@ data class Post ( var reports:List, var ratings:List, var comments:List, - var images:List + var images:List ) +data class PostSend( + var _id:String, + var locationId:String, + var description:String, + var images: List + +) +data class PostPreview( + var _id:String, + var ownerId:String, + var location:Location, + var description:String, + var views:Int, + var ratings:Float, + var comments:List, + var images:List +) + + data class Comment ( var userId:String, diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/PostImage.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/PostImage.kt new file mode 100644 index 0000000..d024272 --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Models/PostImage.kt @@ -0,0 +1,6 @@ +package com.example.brzodolokacije.Models + +data class PostImage ( + var _id:String, + var path:String + ) \ No newline at end of file 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 5f7e8d3..afe93c9 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,9 +1,7 @@ package com.example.brzodolokacije.Services -import com.example.brzodolokacije.Interfaces.IAuthApi +import com.example.brzodolokacije.Interfaces.IBackendApi import com.google.gson.GsonBuilder -import okhttp3.OkHttpClient -import okhttp3.Request import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory @@ -11,21 +9,21 @@ import retrofit2.converter.gson.GsonConverterFactory object RetrofitHelper { val baseUrl="http://10.0.2.2:5279" - private var retrofit_noauth: IAuthApi? = null - private var retrofit_auth: IAuthApi? = null + private var retrofit_noauth: IBackendApi? = null + private var retrofit_auth: IBackendApi? = null - fun getInstance():IAuthApi{ + fun getInstance():IBackendApi{ if(retrofit_noauth==null) retrofit_noauth= createInstance() - return retrofit_noauth as IAuthApi + return retrofit_noauth as IBackendApi } - private fun createInstance():IAuthApi{ + private fun createInstance():IBackendApi{ val gson = GsonBuilder() .setLenient() .create() return Retrofit.Builder().baseUrl(baseUrl) .addConverterFactory(GsonConverterFactory.create(gson)) - .build().create(IAuthApi::class.java) + .build().create(IBackendApi::class.java) } } -- cgit v1.2.3