Develop (#277)

* updated openweather api version * technical debt * added iframe dashboard component * updated pachka plugin
e154 · Jun 12, 2024 · a0740f9 · a0740f9
1 parent f76ad70
commit a0740f9
Show file tree

Hide file tree

Showing 117 changed files with 876 additions and 1,949 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21.0
+          go-version: 1.22.0
 
       - name: Set up Node
         uses: actions/setup-node@v2

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21.0
+          go-version: 1.22.0
 
       - name: Install linter
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.21.0
+          go-version: 1.22.0
 
       - name: Set up Node
         uses: actions/setup-node@v2

diff --git a/api/api.go b/api/api.go
@@ -32,13 +32,13 @@ import (
 	"github.com/labstack/echo/v4/middleware"
 	"go.uber.org/atomic"
 
+	"github.com/e154/bus"
 	"github.com/e154/smart-home/adaptors"
 	"github.com/e154/smart-home/api/controllers"
 	"github.com/e154/smart-home/api/stub"
 	publicAssets "github.com/e154/smart-home/build"
 	"github.com/e154/smart-home/common/events"
 	"github.com/e154/smart-home/common/logger"
-	"github.com/e154/smart-home/system/bus"
 	"github.com/e154/smart-home/system/rbac"
 )
 

diff --git a/api/dto/developer_tools.go b/api/dto/developer_tools.go
@@ -19,8 +19,8 @@
 package dto
 
 import (
+	"github.com/e154/bus"
 	"github.com/e154/smart-home/api/stub"
-	"github.com/e154/smart-home/system/bus"
 )
 
 type DeveloperTools struct {

diff --git a/cmd/server/container/container.go b/cmd/server/container/container.go
@@ -19,6 +19,7 @@
 package container
 
 import (
+	"github.com/e154/bus"
 	"github.com/e154/smart-home/adaptors"
 	"github.com/e154/smart-home/api"
 	"github.com/e154/smart-home/api/controllers"
@@ -27,7 +28,6 @@ import (
 	"github.com/e154/smart-home/system/access_list"
 	"github.com/e154/smart-home/system/automation"
 	"github.com/e154/smart-home/system/backup"
-	"github.com/e154/smart-home/system/bus"
 	"github.com/e154/smart-home/system/gate/client"
 	"github.com/e154/smart-home/system/initial"
 	localMigrations "github.com/e154/smart-home/system/initial/local_migrations"

diff --git a/cmd/server/gate_container/container.go b/cmd/server/gate_container/container.go
@@ -22,7 +22,7 @@ import (
 	"github.com/e154/smart-home/system/gate/server"
 	"go.uber.org/fx"
 
-	"github.com/e154/smart-home/system/bus"
+	"github.com/e154/bus"
 	"github.com/e154/smart-home/system/logging"
 )
 

diff --git a/cmd/server/reset_container/container.go b/cmd/server/reset_container/container.go
@@ -22,7 +22,7 @@ import (
 	"github.com/e154/smart-home/system/migrations"
 	"go.uber.org/fx"
 
-	"github.com/e154/smart-home/system/bus"
+	"github.com/e154/bus"
 	"github.com/e154/smart-home/system/logging"
 )
 

diff --git a/endpoint/auth.go b/endpoint/auth.go
@@ -158,7 +158,8 @@ func (a *AuthEndpoint) PasswordReset(ctx context.Context, userEmail string, toke
 	}
 
 	a.eventBus.Publish(notify.TopicNotify, common.Message{
-		Type: email.Name,
+		Type:     email.Name,
+		EntityId: nil, //todo fix
 		Attributes: map[string]interface{}{
 			email.AttrAddresses: user.Email,
 			email.AttrSubject:   "Reset your Smart home password",

diff --git a/endpoint/common.go b/endpoint/common.go
@@ -21,11 +21,11 @@ package endpoint
 import (
 	"context"
 
+	"github.com/e154/bus"
 	"github.com/e154/smart-home/adaptors"
 	m "github.com/e154/smart-home/models"
 	"github.com/e154/smart-home/system/access_list"
 	"github.com/e154/smart-home/system/automation"
-	"github.com/e154/smart-home/system/bus"
 	"github.com/e154/smart-home/system/cache"
 	"github.com/e154/smart-home/system/jwt_manager"
 	"github.com/e154/smart-home/system/mqtt"

diff --git a/endpoint/developer_tools.go b/endpoint/developer_tools.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/e154/bus"
 	"github.com/e154/smart-home/common"
 	"github.com/e154/smart-home/common/events"
 	m "github.com/e154/smart-home/models"
-	"github.com/e154/smart-home/system/bus"
 )
 
 // DeveloperToolsEndpoint ...