resolving conflicts

backend/api/blogs/blog.go

@@ -2,21 +2,32 @@ package blogs
 
 import (
 	"context"
+<<<<<<< HEAD
 	"fmt"
+=======
+>>>>>>> dev/cedric
 	"net/http"
 
-	core "fr.latosa-escrima/api/core"
+	core "fr.latosa-escrima/core"
+	"fr.latosa-escrima/core/models"
 )
 
+<<<<<<< HEAD
+func HandleGetBlogs(w http.ResponseWriter, r *http.Request) {
+	var blog []models.Blog
+	count, err := core.DB.NewSelect().
+		Model(&blog).
+=======
 func HandleBlog(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
 	blog_uuid := r.PathValue("uuid")
 
-	var blog core.Blog
+	var blog models.Blog
 	_, err := core.DB.NewSelect().
 		Model(&blog).
 		Where("blog_id = ?", blog_uuid).
+>>>>>>> dev/cedric
 		Relation("Author").
 		ScanAndCount(context.Background())
 	if err != nil {
@@ -29,11 +40,17 @@ func HandleBlog(w http.ResponseWriter, r *http.Request) {
 
 	core.JSONSuccess{
 		Status:  core.Success,
+<<<<<<< HEAD
+		Message: fmt.Sprintf("%d blogs objects sent", count),
+=======
 		Message: "Status OK",
+>>>>>>> dev/cedric
 		Data:    blog,
 	}.Respond(w, http.StatusOK)
 	return
 }
+<<<<<<< HEAD
+<<<<<<<< HEAD:backend/api/blogs/blog.go
 
 func HandleBlogs(w http.ResponseWriter, r *http.Request) {	
 	var blog []core.Blog	
@@ -56,3 +73,7 @@ func HandleBlogs(w http.ResponseWriter, r *http.Request) {
 	}.Respond(w, http.StatusOK)
 	return 
 }
+========
+>>>>>>>> dev/cedric:backend/api/blogs/blogs.go
+=======
+>>>>>>> dev/cedric

backend/api/blogs/delete.go

@@ -1,4 +1,5 @@
 package blogs
+<<<<<<< HEAD
 
 import (
 	"context"
@@ -30,3 +31,5 @@ func HandleDelete(w http.ResponseWriter, r *http.Request) {
 		Message: "Blog deleted.",
 	}.Respond(w, http.StatusOK)
 }
+=======
+>>>>>>> dev/cedric

backend/api/blogs/new.go

@@ -3,9 +3,11 @@ package blogs
 import (
 	"context"
 	"encoding/json"
-	"net/http"
 	"io"
-	core "fr.latosa-escrima/api/core"
+	"net/http"
+
+	core "fr.latosa-escrima/core"
+	"fr.latosa-escrima/core/models"
 )
 
 func HandleNew(w http.ResponseWriter, r *http.Request) {
@@ -17,7 +19,7 @@ func HandleNew(w http.ResponseWriter, r *http.Request) {
 		}.Respond(w, http.StatusNoContent)
 		return
 	}
-	var blog core.Blog
+	var blog models.Blog
 	if err := json.NewDecoder(r.Body).Decode(&blog); err != nil {
 		core.JSONError{
 			Status:  core.Error,