NOISSUE - Sync with new Mainflux (#74)

* add new mainflux sdk to UI Signed-off-by: ianmuchyri <[email protected]> * remove policy endpoints Signed-off-by: ianmuchyri <[email protected]> * fix functionality of current services Signed-off-by: ianmuchyri <[email protected]> * add missing functionality Signed-off-by: ianmuchyri <[email protected]> * add usergroups.html file Signed-off-by: ianmuchyri <[email protected]> * update ui to sync with new mainflux Signed-off-by: ianmuchyri <[email protected]> * fix errors Signed-off-by: ianmuchyri <[email protected]> * add period to end of comment Signed-off-by: ianmuchyri <[email protected]> * add period to comment Signed-off-by: ianmuchyri <[email protected]> * fix port Signed-off-by: ianmuchyri <[email protected]> * fix port in env Signed-off-by: ianmuchyri <[email protected]> * fix rebase error Signed-off-by: ianmuchyri <[email protected]> * update error handling of new functions Signed-off-by: ianmuchyri <[email protected]> * fix linter error Signed-off-by: ianmuchyri <[email protected]> * add empty line to html files Signed-off-by: ianmuchyri <[email protected]> --------- Signed-off-by: ianmuchyri <[email protected]>
absmach · Oct 26, 2023 · 39e7ac3 · 39e7ac3
1 parent d787c79
commit 39e7ac3
Show file tree

Hide file tree

Showing 611 changed files with 15,468 additions and 82,312 deletions.
diff --git a/cmd/ui/main.go b/cmd/ui/main.go
@@ -23,13 +23,13 @@ import (
 
 type config struct {
 	LogLevel        string          `env:"MF_UI_LOG_LEVEL"       envDefault:"info"`
-	Port            string          `env:"MF_UI_PORT"            envDefault:"9090"`
+	Port            string          `env:"MF_UI_PORT"            envDefault:"9095"`
 	InstanceID      string          `env:"MF_UI_INSTANCE_ID"     envDefault:""`
 	HTTPAdapterURL  string          `env:"MF_HTTP_ADAPTER_URL"   envDefault:"http://localhost:8008"`
 	ReaderURL       string          `env:"MF_READER_URL"         envDefault:""`
 	ThingsURL       string          `env:"MF_THINGS_URL"         envDefault:"http://localhost:9000"`
 	UsersURL        string          `env:"MF_USERS_URL"          envDefault:"http://localhost:9002"`
-	HostURL         string          `env:"MF_UI_HOST_URL"        envDefault:"http://localhost:9090"`
+	HostURL         string          `env:"MF_UI_HOST_URL"        envDefault:"http://localhost:9095"`
 	BootstrapURL    string          `env:"MF_BOOTSTRAP_URL"      envDefault:"http://localhost:9013"`
 	MsgContentType  sdk.ContentType `env:"MF_CONTENT-TYPE"       envDefault:"application/senml+json"`
 	TLSVerification bool            `env:"MF_VERIFICATION_TLS"   envDefault:"false"`

diff --git a/docker/.env b/docker/.env
@@ -2,15 +2,15 @@
 
 ## UI
 MF_UI_LOG_LEVEL=debug
-MF_UI_PORT=9090
+MF_UI_PORT=9095
 MF_HTTP_ADAPTER_URL=http://localhost:8008
 MF_READER_URL=
 MF_THINGS_URL=http://localhost:9000
 MF_USERS_URL=http://localhost:9002
 MF_VERIFICATION_TLS=false
 MF_BOOTSTRAP_URL=http://localhost:9013
 MF_UI_INSTANCE_ID=
-MF_UI_HOST_URL=http://localhost:9090
+MF_UI_HOST_URL=http://localhost:9095
 
 # Docker image tag
 MF_RELEASE_TAG=latest
diff --git a/go.mod b/go.mod
@@ -4,58 +4,48 @@ go 1.21
 
 require (
 	github.com/caarlos0/env/v9 v9.0.0
-	github.com/go-kit/kit v0.12.0
+	github.com/go-kit/kit v0.13.0
 	github.com/go-zoo/bone v1.3.0
 	github.com/mainflux/agent v0.11.1-0.20230724130550-0cd3f4c8c27c
-	github.com/mainflux/mainflux v0.0.0-20230825135111-320921a63e54
-	github.com/prometheus/client_golang v1.16.0
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
-	golang.org/x/sync v0.3.0
-	google.golang.org/grpc v1.56.1
+	github.com/mainflux/mainflux v0.0.0-20231021215047-ab832aff1b52
+	github.com/prometheus/client_golang v1.17.0
+	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
+	golang.org/x/sync v0.4.0
+	google.golang.org/grpc v1.58.3
 )
 
 require (
 	github.com/creack/pty v1.1.18 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/edgexfoundry/go-mod-core-contracts v0.1.70 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/klauspost/compress v1.16.7 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
-	github.com/lestrrat-go/httpcc v1.0.1 // indirect
-	github.com/lestrrat-go/httprc v1.0.4 // indirect
-	github.com/lestrrat-go/iter v1.0.2 // indirect
-	github.com/lestrrat-go/jwx/v2 v2.0.11 // indirect
-	github.com/lestrrat-go/option v1.0.1 // indirect
+	github.com/klauspost/compress v1.17.0 // indirect
 	github.com/mainflux/export v0.1.1-0.20230724124847-67d0bc7f38cb // indirect
-	github.com/nats-io/nats.go v1.27.1 // indirect
-	github.com/nats-io/nkeys v0.4.4 // indirect
+	github.com/nats-io/nats.go v1.30.2 // indirect
+	github.com/nats-io/nkeys v0.4.5 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/segmentio/asm v1.2.0 // indirect
-	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a // indirect
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/eclipse/paho.mqtt.golang v1.4.2
-	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+	github.com/eclipse/paho.mqtt.golang v1.4.3
+	github.com/fxamacker/cbor/v2 v2.5.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/mainflux/senml v1.5.0
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.11.0 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 )