From 32322f02b23fb196a818fb978e8adc5130e1979b Mon Sep 17 00:00:00 2001
From: Barold <the.axe.dude@gmail.com>
Date: Mon, 24 Feb 2020 20:50:35 +0200
Subject: [PATCH] Restructure code

---
 Grabazine.go                                  | 12 +++++-------
 src/LibraryDto/LibraryDto.go => LibraryDto.go |  8 ++++----
 src/LoginDto/LoginDto.go => LoginDto.go       |  8 ++++----
 3 files changed, 13 insertions(+), 15 deletions(-)
 rename src/LibraryDto/LibraryDto.go => LibraryDto.go (63%)
 rename src/LoginDto/LoginDto.go => LoginDto.go (73%)

diff --git a/Grabazine.go b/Grabazine.go
index 42cc10a..23305d4 100644
--- a/Grabazine.go
+++ b/Grabazine.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"./src/LibraryDto"
-	"./src/LoginDto"
 	"bytes"
 	"encoding/json"
 	"flag"
@@ -104,7 +102,7 @@ func main() {
 	fmt.Println("Terminating the application...")
 }
 
-func GetPages(userToken LoginDto.Response, issue LibraryDto.Data) Response {
+func GetPages(userToken LoginResponse, issue LibraryData) Response {
 
 	client := &http.Client{
 	}
@@ -140,7 +138,7 @@ func GetInitialToken() (token string, err error) {
 	return string(found[2]), nil
 }
 
-func GetLoginToken(initialToken string, username string, password string) LoginDto.Response{
+func GetLoginToken(initialToken string, username string, password string) LoginResponse{
 	client := &http.Client{
 	}
 
@@ -153,7 +151,7 @@ func GetLoginToken(initialToken string, username string, password string) LoginD
 	resp, _ := client.Do(req)
 	data, _ := ioutil.ReadAll(resp.Body)
 
-	responseType := LoginDto.Response{}
+	responseType := LoginResponse{}
 
 	_ = json.Unmarshal([]byte(data), &responseType)
 
@@ -161,7 +159,7 @@ func GetLoginToken(initialToken string, username string, password string) LoginD
 
 }
 
-func GetLibrary(userToken LoginDto.Response) LibraryDto.Response{
+func GetLibrary(userToken LoginResponse) LibraryResponse{
 	client := &http.Client{
 	}
 
@@ -173,7 +171,7 @@ func GetLibrary(userToken LoginDto.Response) LibraryDto.Response{
 	resp, _ := client.Do(req)
 	data, _ := ioutil.ReadAll(resp.Body)
 
-	responseType := LibraryDto.Response{}
+	responseType := LibraryResponse{}
 
 	_ = json.Unmarshal(data, &responseType)
 
diff --git a/src/LibraryDto/LibraryDto.go b/LibraryDto.go
similarity index 63%
rename from src/LibraryDto/LibraryDto.go
rename to LibraryDto.go
index b8d4745..3da7663 100644
--- a/src/LibraryDto/LibraryDto.go
+++ b/LibraryDto.go
@@ -1,11 +1,11 @@
-package LibraryDto
+package main
 
-type Response struct {
+type LibraryResponse struct {
 	Status bool   `json:"status"`
-	Data  []Data `json:"data"`
+	Data  []LibraryData `json:"data"`
 }
 
-type Data struct {
+type LibraryData struct {
 	Id int `json:"id"`
 	Name string `json:"name"`
 	Publication Publication `json:"publication"`
diff --git a/src/LoginDto/LoginDto.go b/LoginDto.go
similarity index 73%
rename from src/LoginDto/LoginDto.go
rename to LoginDto.go
index faacc62..3bf9527 100644
--- a/src/LoginDto/LoginDto.go
+++ b/LoginDto.go
@@ -1,11 +1,11 @@
-package LoginDto
+package main
 
-type Response struct {
+type LoginResponse struct {
 	Status bool   `json:"status"`
-	Data  Data `json:"data"`
+	Data  LoginData `json:"data"`
 }
 
-type Data struct {
+type LoginData struct {
 	User User `json:"user"`
 	Token Token `json:"token"`
 	RefreshToken string `json:"refreshToken"`