From 6b42a5ecf0ccaa110fb85356c13f1f8e3eac0b5e Mon Sep 17 00:00:00 2001
From: Karan Sharma <hello@mrkaran.dev>
Date: Fri, 25 Jun 2021 19:02:00 +0530
Subject: [PATCH] chore: Restructure package directories

---
 .goreleaser.yml                      | 4 ++--
 Makefile                             | 4 ++--
 cmd/{doggo => }/api/api.go           | 0
 cmd/{doggo => }/api/assets/main.js   | 0
 cmd/{doggo => }/api/assets/style.css | 0
 cmd/{doggo => }/api/config.go        | 0
 cmd/{doggo => }/api/handlers.go      | 0
 cmd/{doggo => }/api/index.html       | 0
 cmd/doggo/{cli => }/cli.go           | 0
 cmd/doggo/{cli => }/help.go          | 0
 cmd/doggo/{cli => }/parse.go         | 0
 11 files changed, 4 insertions(+), 4 deletions(-)
 rename cmd/{doggo => }/api/api.go (100%)
 rename cmd/{doggo => }/api/assets/main.js (100%)
 rename cmd/{doggo => }/api/assets/style.css (100%)
 rename cmd/{doggo => }/api/config.go (100%)
 rename cmd/{doggo => }/api/handlers.go (100%)
 rename cmd/{doggo => }/api/index.html (100%)
 rename cmd/doggo/{cli => }/cli.go (100%)
 rename cmd/doggo/{cli => }/help.go (100%)
 rename cmd/doggo/{cli => }/parse.go (100%)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 0352f99..9005d09 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -17,7 +17,7 @@ builds:
       - 7
     ldflags:
       - -s -w -X "main.buildVersion={{ .Tag }} ({{ .ShortCommit }} {{ .Date }})"
-    dir: ./cmd/doggo/cli/
+    dir: ./cmd/doggo/
 
   - binary: doggo-api.bin
     id: api
@@ -33,7 +33,7 @@ builds:
       - 7
     ldflags:
       - -s -w -X "main.buildVersion={{ .Tag }} ({{ .ShortCommit }} {{ .Date }})"
-    dir: ./cmd/doggo/api/
+    dir: ./cmd/api/
 
 archives:
   - format: tar.gz
diff --git a/Makefile b/Makefile
index 27f3cac..fb8eb83 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,11 @@ VERSION := ${HASH}
 
 .PHONY: build-cli
 build-cli:
-	go build -o ${CLI_BIN} -ldflags="-X 'main.buildVersion=${VERSION}' -X 'main.buildDate=${BUILD_DATE}'" ./cmd/doggo/cli/
+	go build -o ${CLI_BIN} -ldflags="-X 'main.buildVersion=${VERSION}' -X 'main.buildDate=${BUILD_DATE}'" ./cmd/doggo/
 
 .PHONY: build-api
 build-api:
-	go build -o ${API_BIN} -ldflags="-X 'main.buildVersion=${VERSION}' -X 'main.buildDate=${BUILD_DATE}'" ./cmd/doggo/api/
+	go build -o ${API_BIN} -ldflags="-X 'main.buildVersion=${VERSION}' -X 'main.buildDate=${BUILD_DATE}'" ./cmd/api/
 
 .PHONY: build
 build: build-api build-cli
diff --git a/cmd/doggo/api/api.go b/cmd/api/api.go
similarity index 100%
rename from cmd/doggo/api/api.go
rename to cmd/api/api.go
diff --git a/cmd/doggo/api/assets/main.js b/cmd/api/assets/main.js
similarity index 100%
rename from cmd/doggo/api/assets/main.js
rename to cmd/api/assets/main.js
diff --git a/cmd/doggo/api/assets/style.css b/cmd/api/assets/style.css
similarity index 100%
rename from cmd/doggo/api/assets/style.css
rename to cmd/api/assets/style.css
diff --git a/cmd/doggo/api/config.go b/cmd/api/config.go
similarity index 100%
rename from cmd/doggo/api/config.go
rename to cmd/api/config.go
diff --git a/cmd/doggo/api/handlers.go b/cmd/api/handlers.go
similarity index 100%
rename from cmd/doggo/api/handlers.go
rename to cmd/api/handlers.go
diff --git a/cmd/doggo/api/index.html b/cmd/api/index.html
similarity index 100%
rename from cmd/doggo/api/index.html
rename to cmd/api/index.html
diff --git a/cmd/doggo/cli/cli.go b/cmd/doggo/cli.go
similarity index 100%
rename from cmd/doggo/cli/cli.go
rename to cmd/doggo/cli.go
diff --git a/cmd/doggo/cli/help.go b/cmd/doggo/help.go
similarity index 100%
rename from cmd/doggo/cli/help.go
rename to cmd/doggo/help.go
diff --git a/cmd/doggo/cli/parse.go b/cmd/doggo/parse.go
similarity index 100%
rename from cmd/doggo/cli/parse.go
rename to cmd/doggo/parse.go