feat(layout): 修改layout

Author: shenchenyang

Makefile

@@ -3,11 +3,20 @@ GOBUILD=$(GOCMD) build
 GOCLEAN=$(GOCMD) clean
 BASEPATH := $(shell pwd)
 BUILDDIR=$(BASEPATH)/dist/bin
-MAIN= $(BASEPATH)/main.go
+UIDIR=$(BASEPATH)/ui
+TERMINALDIR=$(BASEPATH)/terminal
+
+MAIN= $(BASEPATH)/cmd/server/main.go
 
 APP_NAME=ekko
 
 GOPROXY="https://goproxy.cn,direct"
 
-build_darwin:
+build_web:
+	cd $(UIDIR) && npm install && npm run-script build
+	cd $(TERMINALDIR) && npm install && npm run-script build
+
+
+build_bin_darwin: build_web
+	cd $(BASEPATH)
 	GOOS=darwin GOARCH=amd64  $(GOBUILD) -o $(BUILDDIR)/darwin/amd64/$(APP_NAME) $(MAIN)

api/.gitkeep

@@ -1,8 +1,9 @@
-package cmd
+package main
 
 import (
-	"github.com/KubeOperator/ekko/pkg/route"
-	"github.com/KubeOperator/ekko/pkg/server"
+	"embed"
+	"github.com/KubeOperator/ekko/internal/route"
+	"github.com/KubeOperator/ekko/internal/server"
 	"github.com/spf13/cobra"
 )
 
@@ -12,6 +13,12 @@ var (
 	serverBindPort int
 )
 
+//go:embed web/terminal
+var embedWebTerminal embed.FS
+
+//go:embed web/dashboard
+var embedWebDashboard embed.FS
+
 func init() {
 	RootCmd.Flags().StringVar(&serverBindHost, "server-bind-host", "", "ekko bind address")
 	RootCmd.Flags().IntVar(&serverBindPort, "server-bind-port", 0, "ekko bind port")
@@ -22,6 +29,14 @@ var RootCmd = &cobra.Command{
 	Use:   "ekko",
 	Short: "A dashboard for kubernetes",
 	RunE: func(cmd *cobra.Command, args []string) error {
+		server.EmbedWebDashboard = embedWebDashboard
+		server.EmbedWebTerminal = embedWebTerminal
 		return server.Listen(route.InitRoute)
 	},
 }
+
+func main() {
+	if err := RootCmd.Execute(); err != nil {
+		panic(err)
+	}
+}

build/.gitkeep

@@ -1,7 +1,7 @@
 package session
 
 import (
-	"github.com/KubeOperator/ekko/pkg/service/v1/user"
+	"github.com/KubeOperator/ekko/internal/service/v1/user"
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/context"
 )

cmd/params/rules.go

@@ -1,7 +1,7 @@
 package v1
 
 import (
-	"github.com/KubeOperator/ekko/pkg/api/v1/session"
+	"github.com/KubeOperator/ekko/internal/api/v1/session"
 	"github.com/kataras/iris/v12"
 )
 

cmd/params/validator.go

@@ -3,13 +3,12 @@ package config
 import (
 	"encoding/json"
 	"fmt"
-	v1 "github.com/KubeOperator/ekko/pkg/model/v1"
-	"github.com/KubeOperator/ekko/pkg/model/v1/config"
+	v1 "github.com/KubeOperator/ekko/internal/model/v1"
+	"github.com/KubeOperator/ekko/internal/model/v1/config"
 	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/spf13/viper"
 )
 
-const configErr = "can not parse config file , %s"
 const configNotFoundSkipErr = "config file not found in %s, skip"
 const configReadErr = "can not read config file %s ,%s"
 const configMergeErr = "can not merge config file, %s"

cmd/root.go renamed to cmd/server/main.go

@@ -1,6 +1,6 @@
 package config
 
-import v1 "github.com/KubeOperator/ekko/pkg/model/v1"
+import v1 "github.com/KubeOperator/ekko/internal/model/v1"
 
 type Config struct {
 	v1.BaseModel

example/app_example.yml renamed to conf/app_example.yml

@@ -1,6 +1,6 @@
 package user
 
-import v1 "github.com/KubeOperator/ekko/pkg/model/v1"
+import v1 "github.com/KubeOperator/ekko/internal/model/v1"
 
 type User struct {
 	v1.BaseModel `storm:"inline"`

pkg/api/v1/session/session.go renamed to internal/api/v1/session/session.go

@@ -1,7 +1,7 @@
 package route
 
 import (
-	v1 "github.com/KubeOperator/ekko/pkg/api/v1"
+	v1 "github.com/KubeOperator/ekko/internal/api/v1"
 	"github.com/kataras/iris/v12"
 )
 

pkg/api/v1/v1.go renamed to internal/api/v1/v1.go

@@ -1,7 +1,7 @@
 package terminal
 
 import (
-	shell "github.com/KubeOperator/ekko/pkg/terminal"
+	shell "github.com/KubeOperator/ekko/internal/terminal"
 	"github.com/kataras/iris/v12"
 )
 

pkg/config/config.go renamed to internal/config/config.go

@@ -1,7 +1,7 @@
 package ws
 
 import (
-	shell "github.com/KubeOperator/ekko/pkg/terminal"
+	shell "github.com/KubeOperator/ekko/internal/terminal"
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/context"
 )

pkg/model/v1/base.go renamed to internal/model/v1/base.go

@@ -3,8 +3,8 @@ package server
 import (
 	"embed"
 	"fmt"
-	"github.com/KubeOperator/ekko/pkg/config"
-	v1Config "github.com/KubeOperator/ekko/pkg/model/v1/config"
+	"github.com/KubeOperator/ekko/internal/config"
+	v1Config "github.com/KubeOperator/ekko/internal/model/v1/config"
 	"github.com/asdine/storm/v3"
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/sessions"

pkg/model/v1/config/config.go renamed to internal/model/v1/config/config.go

@@ -1,8 +1,8 @@
 package user
 
 import (
-	"github.com/KubeOperator/ekko/pkg/model/v1/user"
-	"github.com/KubeOperator/ekko/pkg/server"
+	"github.com/KubeOperator/ekko/internal/model/v1/user"
+	"github.com/KubeOperator/ekko/internal/server"
 )
 
 type Service interface {

pkg/model/v1/user/user.go renamed to internal/model/v1/user/user.go

@@ -2,7 +2,7 @@ package user
 
 import (
 	"fmt"
-	"github.com/KubeOperator/ekko/pkg/model/v1/user"
+	"github.com/KubeOperator/ekko/internal/model/v1/user"
 	"github.com/asdine/storm/v3"
 	"testing"
 )

pkg/route/proxy/kubernetes.go renamed to internal/route/proxy/kubernetes.go

@@ -20,7 +20,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "../web/terminal",
+            "outputPath": "../cmd/server/web/terminal",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",