chore: mv internal/model => config/model

soulteary · Jan 5, 2024 · f1f6806 · f1f6806
1 parent bead3a8
commit f1f6806
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 26 deletions.
diff --git a/cmd/daemon.go b/cmd/daemon.go
@@ -13,9 +13,9 @@ import (
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-gonic/gin"
 
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareState "github.com/soulteary/flare/config/state"
 	FlareLogger "github.com/soulteary/flare/internal/logger"
-	FlareModel "github.com/soulteary/flare/internal/model"
 
 	FlareAuth "github.com/soulteary/flare/internal/auth"
 	FlareAssets "github.com/soulteary/flare/internal/resources/assets"

diff --git a/cmd/flags.go b/cmd/flags.go
@@ -14,8 +14,8 @@ import (
 	"gopkg.in/ini.v1"
 
 	FlareData "github.com/soulteary/flare/config/data"
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareLogger "github.com/soulteary/flare/internal/logger"
-	FlareModel "github.com/soulteary/flare/internal/model"
 )
 
 func ParseEnvVars() (stor FlareModel.Flags) {

diff --git a/cmd/flags_test.go b/cmd/flags_test.go
@@ -8,7 +8,7 @@ import (
 
 	env "github.com/caarlos0/env/v6"
 	FlareCMD "github.com/soulteary/flare/cmd"
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 	"github.com/soulteary/flare/internal/version"
 	flags "github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"

diff --git a/config/data/bookmark.go b/config/data/bookmark.go
@@ -7,7 +7,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 func initBookmarks(filePath string, isFavorite bool) (result FlareModel.Bookmarks, err error) {

diff --git a/config/data/config.go b/config/data/config.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"log"
 
-	FlareModel "github.com/soulteary/flare/internal/model"
-
 	"gopkg.in/yaml.v2"
+
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 func initAppConfig(filePath string) (result FlareModel.Application, err error) {

diff --git a/config/data/editor.go b/config/data/editor.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/jszwec/csvutil"
 
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 // TODO Removed after private link feature support

diff --git a/config/data/editor_test.go b/config/data/editor_test.go
@@ -3,7 +3,7 @@ package FlareData
 import (
 	"testing"
 
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 func TestGetBookmarksDataAsJSON(t *testing.T) {

diff --git a/config/data/settings.go b/config/data/settings.go
@@ -1,7 +1,7 @@
 package FlareData
 
 import (
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 func GetThemeName() string {

diff --git a/config/data/settings_test.go b/config/data/settings_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 func TestGetAndSetThemeName(t *testing.T) {

diff --git a/internal/model/application.go → config/model/application.go b/internal/model/application.go → config/model/application.go
@@ -1,4 +1,4 @@
-package model
+package FlareModel
 
 // Application Data Model
 type Application struct {

diff --git a/internal/model/bookmark.go → config/model/bookmark.go b/internal/model/bookmark.go → config/model/bookmark.go
@@ -1,4 +1,4 @@
-package model
+package FlareModel
 
 // Generic Bookmark Data Model
 type Bookmark struct {

diff --git a/internal/model/cmd.go → config/model/cmd.go b/internal/model/cmd.go → config/model/cmd.go
@@ -1,4 +1,4 @@
-package model
+package FlareModel
 
 // Application Flags Data Model
 type Flags struct {

diff --git a/internal/model/doc.go → config/model/doc.go b/internal/model/doc.go → config/model/doc.go
@@ -3,4 +3,4 @@ Flare
 
 Define all program data models
 */
-package model
+package FlareModel
diff --git a/internal/model/route.go → config/model/route.go b/internal/model/route.go → config/model/route.go
@@ -1,4 +1,4 @@
-package model
+package FlareModel
 
 // Page Data Model
 type Page struct {

diff --git a/internal/model/theme.go → config/model/theme.go b/internal/model/theme.go → config/model/theme.go
@@ -1,4 +1,4 @@
-package model
+package FlareModel
 
 // Theme color Data Model
 type Palette struct {

diff --git a/internal/model/weather.go → config/model/weather.go b/internal/model/weather.go → config/model/weather.go
@@ -1,4 +1,4 @@
-package model
+package FlareModel
 
 // Weather Data Model
 type Weather struct {

diff --git a/config/state/cmd.go b/config/state/cmd.go
@@ -1,7 +1,7 @@
 package FlareState
 
 import (
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 var AppFlags FlareModel.Flags

diff --git a/config/state/router.go b/config/state/router.go
@@ -1,7 +1,7 @@
 package FlareState
 
 import (
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 func getRegularPages() FlareModel.RouteMaps {

diff --git a/config/state/theme.go b/config/state/theme.go
@@ -6,7 +6,7 @@ import (
 	"html/template"
 
 	FlareData "github.com/soulteary/flare/config/data"
-	FlareModel "github.com/soulteary/flare/internal/model"
+	FlareModel "github.com/soulteary/flare/config/model"
 )
 
 // 程序运行默认使用内置的主题配色

diff --git a/internal/pages/home/application.go b/internal/pages/home/application.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	FlareData "github.com/soulteary/flare/config/data"
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareState "github.com/soulteary/flare/config/state"
-	FlareModel "github.com/soulteary/flare/internal/model"
 	FlareMDI "github.com/soulteary/flare/internal/resources/mdi"
 )
 

diff --git a/internal/pages/home/bookmark.go b/internal/pages/home/bookmark.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	FlareData "github.com/soulteary/flare/config/data"
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareState "github.com/soulteary/flare/config/state"
-	FlareModel "github.com/soulteary/flare/internal/model"
 	FlareMDI "github.com/soulteary/flare/internal/resources/mdi"
 )
 

diff --git a/internal/pages/home/help.go b/internal/pages/home/help.go
@@ -3,8 +3,8 @@ package home
 import (
 	"html/template"
 
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareState "github.com/soulteary/flare/config/state"
-	FlareModel "github.com/soulteary/flare/internal/model"
 	FlareMDI "github.com/soulteary/flare/internal/resources/mdi"
 )
 

diff --git a/internal/pages/home/home.go b/internal/pages/home/home.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gin-gonic/gin"
 
 	FlareData "github.com/soulteary/flare/config/data"
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareState "github.com/soulteary/flare/config/state"
 	FlareAuth "github.com/soulteary/flare/internal/auth"
-	FlareModel "github.com/soulteary/flare/internal/model"
 	FlareWeather "github.com/soulteary/flare/internal/settings/weather"
 	weather "github.com/soulteary/funny-china-weather"
 )

diff --git a/internal/settings/appearance/appearance.go b/internal/settings/appearance/appearance.go
@@ -8,9 +8,9 @@ import (
 	"github.com/gin-gonic/gin"
 
 	FlareData "github.com/soulteary/flare/config/data"
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareState "github.com/soulteary/flare/config/state"
 	FlareAuth "github.com/soulteary/flare/internal/auth"
-	FlareModel "github.com/soulteary/flare/internal/model"
 )
 
 func RegisterRouting(router *gin.Engine) {

diff --git a/internal/settings/weather/weather.go b/internal/settings/weather/weather.go
@@ -8,9 +8,9 @@ import (
 	"github.com/gin-gonic/gin"
 
 	FlareData "github.com/soulteary/flare/config/data"
+	FlareModel "github.com/soulteary/flare/config/model"
 	FlareState "github.com/soulteary/flare/config/state"
 	FlareAuth "github.com/soulteary/flare/internal/auth"
-	FlareModel "github.com/soulteary/flare/internal/model"
 	weather "github.com/soulteary/funny-china-weather"
 )