Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
goshimmer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iota-imt
goshimmer
Commits
45f14a52
Unverified
Commit
45f14a52
authored
5 years ago
by
Angelo Capossele
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix/upgrade packr (#291)
*
upgrades packr *
go mod tidy
parent
59212ea2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
go.mod
+5
-9
5 additions, 9 deletions
go.mod
go.sum
+37
-34
37 additions, 34 deletions
go.sum
plugins/analysis/webinterface/httpserver/plugin.go
+3
-1
3 additions, 1 deletion
plugins/analysis/webinterface/httpserver/plugin.go
plugins/spa/routes.go
+7
-3
7 additions, 3 deletions
plugins/spa/routes.go
with
52 additions
and
47 deletions
go.mod
+
5
−
9
View file @
45f14a52
...
@@ -6,9 +6,7 @@ require (
...
@@ -6,9 +6,7 @@ require (
github.com/dgraph-io/badger/v2
v2.0.1
github.com/dgraph-io/badger/v2
v2.0.1
github.com/dgrijalva/jwt-go
v3.2.0+incompatible
github.com/dgrijalva/jwt-go
v3.2.0+incompatible
github.com/dgryski/go-farm
v0.0.0-20191112170834-c2139c5d712b // indirect
github.com/dgryski/go-farm
v0.0.0-20191112170834-c2139c5d712b // indirect
github.com/gobuffalo/envy
v1.8.1 // indirect
github.com/gobuffalo/packr/v2
v2.8.0
github.com/gobuffalo/logger
v1.0.3 // indirect
github.com/gobuffalo/packr/v2
v2.7.1
github.com/golang/protobuf
v1.3.2
github.com/golang/protobuf
v1.3.2
github.com/googollee/go-engine.io
v1.4.3-0.20190924125625-798118fc0dd2
github.com/googollee/go-engine.io
v1.4.3-0.20190924125625-798118fc0dd2
github.com/googollee/go-socket.io
v1.4.3-0.20191204093753-683f8725b6d0
github.com/googollee/go-socket.io
v1.4.3-0.20191204093753-683f8725b6d0
...
@@ -27,21 +25,19 @@ require (
...
@@ -27,21 +25,19 @@ require (
github.com/panjf2000/ants/v2
v2.2.2
github.com/panjf2000/ants/v2
v2.2.2
github.com/pelletier/go-toml
v1.6.0 // indirect
github.com/pelletier/go-toml
v1.6.0 // indirect
github.com/pkg/errors
v0.9.1
github.com/pkg/errors
v0.9.1
github.com/rogpeppe/go-internal
v1.5.2 // indirect
github.com/sergi/go-diff
v1.1.0 // indirect
github.com/sergi/go-diff
v1.1.0 // indirect
github.com/spf13/afero
v1.2.2 // indirect
github.com/spf13/afero
v1.2.2 // indirect
github.com/spf13/cast
v1.3.1 // indirect
github.com/spf13/cast
v1.3.1 // indirect
github.com/spf13/jwalterweatherman
v1.1.0 // indirect
github.com/spf13/jwalterweatherman
v1.1.0 // indirect
github.com/spf13/pflag
v1.0.5
github.com/spf13/pflag
v1.0.5
github.com/spf13/viper
v1.6.1
github.com/spf13/viper
v1.6.1
github.com/stretchr/testify
v1.
4.0
github.com/stretchr/testify
v1.
5.1
github.com/valyala/fasttemplate
v1.1.0 // indirect
github.com/valyala/fasttemplate
v1.1.0 // indirect
go.uber.org/atomic
v1.5.1
go.uber.org/atomic
v1.5.1
go.uber.org/zap
v1.13.0
go.uber.org/zap
v1.13.0
golang.org/x/crypto
v0.0.0-20200214034016-1d94cc7ab1c6
golang.org/x/crypto
v0.0.0-20200311171314-f7b00557c8c4
golang.org/x/net
v0.0.0-20200202094626-16171245cfb2
golang.org/x/net
v0.0.0-20200226121028-0de0cce0169b
golang.org/x/sys
v0.0.0-20200212091648-12a6c2dcc1e4 // indirect
golang.org/x/sys
v0.0.0-20200302150141-5c8b2ff67527 // indirect
golang.org/x/tools
v0.0.0-20200130002326-2f3ba24bd6e7 // indirect
gopkg.in/ini.v1
v1.51.1 // indirect
gopkg.in/ini.v1
v1.51.1 // indirect
gopkg.in/src-d/go-git.v4
v4.13.1
gopkg.in/src-d/go-git.v4
v4.13.1
gopkg.in/yaml.v2
v2.2.7 // indirect
gopkg.in/yaml.v2
v2.2.7 // indirect
...
...
This diff is collapsed.
Click to expand it.
go.sum
+
37
−
34
View file @
45f14a52
This diff is collapsed.
Click to expand it.
plugins/analysis/webinterface/httpserver/plugin.go
+
3
−
1
View file @
45f14a52
...
@@ -35,7 +35,9 @@ func Configure() {
...
@@ -35,7 +35,9 @@ func Configure() {
engine
.
Static
(
"/static"
,
"./plugins/analysis/webinterface/httpserver/static"
)
engine
.
Static
(
"/static"
,
"./plugins/analysis/webinterface/httpserver/static"
)
engine
.
File
(
"/"
,
"./plugins/analysis/webinterface/httpserver/static/index.html"
)
engine
.
File
(
"/"
,
"./plugins/analysis/webinterface/httpserver/static/index.html"
)
}
else
{
}
else
{
engine
.
GET
(
"/static/*"
,
echo
.
WrapHandler
(
http
.
StripPrefix
(
"/static"
,
http
.
FileServer
(
assetsBox
))))
for
_
,
res
:=
range
assetsBox
.
List
()
{
engine
.
GET
(
"/static/"
+
res
,
echo
.
WrapHandler
(
http
.
StripPrefix
(
"/static"
,
http
.
FileServer
(
assetsBox
))))
}
engine
.
GET
(
"/"
,
index
)
engine
.
GET
(
"/"
,
index
)
}
}
...
...
This diff is collapsed.
Click to expand it.
plugins/spa/routes.go
+
7
−
3
View file @
45f14a52
...
@@ -10,7 +10,6 @@ import (
...
@@ -10,7 +10,6 @@ import (
"github.com/iotaledger/goshimmer/packages/parameter"
"github.com/iotaledger/goshimmer/packages/parameter"
"github.com/labstack/echo"
"github.com/labstack/echo"
"github.com/pkg/errors"
"github.com/pkg/errors"
)
)
var
ErrInvalidParameter
=
errors
.
New
(
"invalid parameter"
)
var
ErrInvalidParameter
=
errors
.
New
(
"invalid parameter"
)
...
@@ -48,8 +47,13 @@ func setupRoutes(e *echo.Echo) {
...
@@ -48,8 +47,13 @@ func setupRoutes(e *echo.Echo) {
}
else
{
}
else
{
// load assets from packr: either from within the binary or actual disk
// load assets from packr: either from within the binary or actual disk
e
.
GET
(
"/app/*"
,
echo
.
WrapHandler
(
http
.
StripPrefix
(
"/app"
,
http
.
FileServer
(
appBox
))))
for
_
,
res
:=
range
appBox
.
List
()
{
e
.
GET
(
"/assets/*"
,
echo
.
WrapHandler
(
http
.
StripPrefix
(
"/assets"
,
http
.
FileServer
(
assetsBox
))))
e
.
GET
(
"/app/"
+
res
,
echo
.
WrapHandler
(
http
.
StripPrefix
(
"/app"
,
http
.
FileServer
(
appBox
))))
}
for
_
,
res
:=
range
assetsBox
.
List
()
{
e
.
GET
(
"/assets/"
+
res
,
echo
.
WrapHandler
(
http
.
StripPrefix
(
"/assets"
,
http
.
FileServer
(
assetsBox
))))
}
}
}
e
.
GET
(
"/ws"
,
websocketRoute
)
e
.
GET
(
"/ws"
,
websocketRoute
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment