fix errors

Author: qdriven

Makefile

@@ -7,7 +7,7 @@ PATH:=$(LOCAL_BIN):$(PATH)
 .PHONY: build-fluent
 build-fluent:
 	# @go build -ldflags "-X main.version=$(shell git describe --abbrev=0 --tags)" -o fluent
-	go build cmd/fluent.go
+	go build app/fluentcli/fluent.go
 
 
 PHONY: test
@@ -16,7 +16,11 @@ test: ## run go tests
 
 PHONY: PB
 PB: ## build pocket-base
+<<<<<<< HEAD
 	go build app/pb/pbserver.go
+=======
+	go build app/pb/pbapp.go
+>>>>>>> 5abef92 (refine codes)
 
 integration-test: ### run integration-test
 	go clean -testcache && go test -v ./integration-test/...
@@ -25,7 +29,11 @@ integration-test: ### run integration-test
 
 .PHONY: build-cli
 build-cli:
-	go build cmd/fluent.go
+	go build app/fluentcli/fluent.go
+
+.PHONY: build-pb
+build-pb:
+	go build app/pb/pbapp.go
 
 .PHONY: build-pb
 build-pb:

app/desktop/app.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"context"
+	"fmt"
+)
+
+// App struct
+type App struct {
+	ctx context.Context
+}
+
+// NewApp creates a new App application struct
+func NewApp() *App {
+	return &App{}
+}
+
+// startup is called when the app starts. The context is saved
+// so we can call the runtime methods
+func (a *App) startup(ctx context.Context) {
+	a.ctx = ctx
+}
+
+// Greet returns a greeting for the given name
+func (a *App) Greet(name string) string {
+	return fmt.Sprintf("Hello %s, It's show time!", name)
+}

cmd/actions/awesome.go renamed to app/fluentcli/actions/awesome.go

@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/fluent-qa/qgops/internal/utils/jsonutil"
-	_ "github.com/fluent-qa/qgops/internal/utils/qhttp"
+	"github.com/fluent-qa/qgops/pkg/utils/jsonutil"
+	_ "github.com/fluent-qa/qgops/pkg/utils/qhttp"
 	"github.com/imroc/req/v3"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"

cmd/actions/awesome.json renamed to app/fluentcli/actions/awesome.json

@@ -1,7 +1,7 @@
 package actions
 
 import (
-	"github.com/fluent-qa/qgops/internal/utils/shell"
+	"github.com/fluent-qa/qgops/pkg/utils/shell"
 	"github.com/spf13/cobra"
 	"path"
 	"strings"

cmd/actions/awesome_test.go renamed to app/fluentcli/actions/awesome_test.go

@@ -1,8 +1,8 @@
 package actions
 
 import (
-	"github.com/fluent-qa/qgops/internal/utils"
-	"github.com/fluent-qa/qgops/internal/utils/shell"
+	"github.com/fluent-qa/qgops/pkg/utils"
+	"github.com/fluent-qa/qgops/pkg/utils/shell"
 	_ "log/slog"
 
 	"github.com/spf13/cobra"
@@ -29,7 +29,7 @@ func init() {
 	IssueCmd.Flags().StringVarP(&issueTitle, "title", "t", "", "Title of the issue")
 	IssueCmd.Flags().StringVarP(&issueBody, "body", "b", "", "Body of the issue")
 	IssueCmd.Flags().StringVarP(&issueDoc, "doc", "d", "", "Body do of the issue")
-	IssueCmd.MarkFlagRequired("title")
+	_ = IssueCmd.MarkFlagRequired("title")
 	//IssueCmd.MarkFlagRequired("body")
 }
 

cmd/actions/base.go renamed to app/fluentcli/actions/base.go

@@ -1,7 +1,7 @@
 package actions
 
 import (
-	"github.com/fluent-qa/qgops/internal/utils/shell"
+	"github.com/fluent-qa/qgops/pkg/utils/shell"
 	"github.com/spf13/cobra"
 	_ "log/slog"
 	"path"

cmd/actions/constants.go renamed to app/fluentcli/actions/constants.go

@@ -6,7 +6,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/fluent-qa/qgops/internal/utils/shell"
+	"github.com/fluent-qa/qgops/pkg/utils/shell"
 )
 
 func TestCreateStartProject(t *testing.T) {

cmd/actions/issue.go renamed to app/fluentcli/actions/issue.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/fluent-qa/qgops/cmd/actions"
-	"github.com/fluent-qa/qgops/cmd/base"
+	"github.com/fluent-qa/qgops/app/fluentcli/actions"
+	"github.com/fluent-qa/qgops/app/fluentcli/base"
 )
 
 func init() {