a
/
realize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Daniele Conventi 2017-11-05 22:39:50 +01:00
parent 61fc40089a 83f059a134
commit 7dfa8fe0f2
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bindata.go
View File

@ -123,7 +123,7 @@ func assetsAppComponentsProjectIndexHtml() (*asset, error) {
return a, nil
}
var _assetsAppComponentsSettingsIndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x59\x6d\x8e\xdb\x36\x10\xbd\xca\x2c\x51\xc0\x09\x10\x59\xdb\x00\xfd\x13\x58\x0e\x5a\x34\xbd\x40\x0f\x50\xd0\xd2\x88\x62\x43\x91\x02\x39\x92\x1d\x28\xbe\x7b\xa0\x2f\xeb\x23\xb6\xe3\xf5\x2a\xb1\x77\xff\x08\x96\x34\x7c\x33\x7c\xef\x99\xb3\x3b\x5e\x45\xb2\x00\xc5\xbf\x98\x9c\x02\x66\xcd\x96\x41\xac\x70\x17\xb0\xdf\x1f\x1f\x59\xfb\xdc\xdb\x5a\x9e\x05\x6c\x70\xc3\x40\x46\x01\xcb\xac\xf9\x1f\x43\x72\x6c\xbd\x4a\x23\x6f\x9b\x48\xc2\xd8\xf2\x14\x21\x54\xdc\xb9\x80\x8d\x1e\x7a\xef\xa3\x0c\x36\x66\x07\x2e\xb4\x46\xa9\x23\x69\xda\xf4\x6d\x1a\xae\xa4\xd0\x01\x73\xc4\x2d\x41\x7d\x3d\x53\x4e\x5d\x00\x19\xa3\x36\xdc\x76\xd9\xab\x8f\x1b\x21\x2e\x4e\x94\xf1\x10\xbd\x0d\xd2\x16\x51\x43\x88\x9a\xd0\xb2\x75\xcd\x4e\x0b\xa8\x30\xa6\x0e\xad\xba\x36\x59\x37\x39\x91\xd1\x83\x2d\xcb\xd0\xe8\xee\x69\x62\x0a\xd0\xc6\x4b\xb9\x15\x52\x33\xc8\xa5\xe7\x2c\xc6\x01\xe3\x59\xb6\x6c\xd9\x7b\x53\x6a\x9e\xe2\x07\x08\x73\x6b\x51\xd3\xb2\xba\xdb\xbf\x6d\xb0\x2b\x28\x48\x23\xcf\x15\xc2\x73\x36\x0c\x98\xcf\x9d\x43\x72\xbe\x4c\x85\xef\x0a\xe1\x6f\x78\xf8\xb9\x2e\x7c\xe9\x0a\xc1\xd6\x2b\xbf\x5d\xd4\x7c\x6a\x8a\x58\xaf\xfc\x48\x16\xa3\x9d\x58\x29\x92\xf1\x56\x3a\x32\x32\x1e\x45\x52\x8b\x03\xbb\xed\x3d\x5b\x97\xe5\xb0\x40\xf8\xfa\x15\x16\xde\x62\xbf\x6f\xb1\xfd\x9e\xfe\xba\x70\x25\x1d\x79\x92\x30\x7d\xba\xb3\x9a\x42\x7f\xa0\xd9\xa9\x32\x27\x9a\x36\x2a\x1e\x15\x33\x96\xa8\xa2\xae\xa2\x3f\x1e\xd9\x7a\x6b\xec\x67\xa9\x05\x64\x9c\x92\xef\x19\x2b\xb8\xca\x11\x08\x77\x34\x5c\xd3\x93\x52\xad\xfa\x8e\x94\x03\x35\x07\x3a\x5e\x2a\x39\x19\xb7\x3c\x75\x97\xd2\xb2\x72\x19\xd7\xa0\x85\x27\xe3\x80\x3d\x74\x14\x71\x2b\x1c\x5b\x7b\x2b\xbf\x7a\xdb\xc7\x58\xcc\x90\x53\xc0\xea\x14\x20\x35\x8c\xe3\xcb\xb2\x7e\xb1\xdf\x97\xe5\x6f\x8a\x3b\x82\x8f\xb0\x58\xc0\x07\x58\xbc\x83\x9a\xe9\x06\xec\xd5\x11\xfe\x49\x17\xd2\x1a\x9d\xa2\xa6\xe7\xb1\x8e\x3d\xd0\x19\xf2\x51\x17\x43\xea\x47\x8b\xca\x12\x75\x71\x3d\xff\x0f\x9e\xe7\x30\x24\x69\xb4\xe7\x4d\xd4\x68\xb7\x53\x09\x2c\x2c\xcf\x12\x76\xad\x3e\x43\x16\x81\x24\x29\x3c\xb6\xfa\xe4\xd9\xf6\x2f\x12\x49\x2d\xdc\xcf\x33\xd0\x29\x99\x85\x01\x9b\xeb\x13\x0a\x0f\x02\x2b\xad\xda\x57\x25\x2c\x50\xf3\x8d\xc2\x68\xd1\x37\x8d\xd0\xa4\x29\xd7\x91\x5b\xda\x5c\xbf\x83\x45\x24\x5d\x17\xf1\x70\x2c\x04\xf6\x57\xb6\xc2\xc1\x89\x37\xc2\xfb\x08\x8b\x4f\x6d\x51\x95\x37\xfe\xee\xf2\xc3\xe1\x30\xac\x2f\x55\x2b\xdb\x4a\x0a\x93\xe1\x5f\x08\xdc\xd6\x3d\x2e\xc9\xd1\x7b\xdf\x6c\x34\xe1\x5a\x60\xc0\xdc\x17\x1d\xbe\x79\x5b\x3f\x4a\x4d\x84\x2a\x60\xc7\x72\x33\xe0\x56\x72\x4f\xf1\x4d\x15\xd1\xc0\xb7\x9d\xb0\xb9\xf9\xe9\xa7\xc3\x19\x71\x37\xb9\x54\xd1\x8c\xf2\xd6\x78\x4b\x47\x9c\x72\xf7\x23\x9d\x87\xb1\xb3\x0a\x3e\x02\xbe\x95\xf2\xc3\x22\xee\xda\x02\x52\x3b\xe2\x4a\xcd\x68\x82\x16\xf1\x42\x1b\x8c\xa3\x67\x35\xc2\x04\xfa\x56\x56\x18\x97\x71\xd7\x66\x88\xd3\x53\xed\xfc\x1a\x23\xc4\x29\x5d\x68\x82\x3e\x72\x56\x03\x0c\x60\x6f\x25\x7e\x5f\xc2\x5d\x0b\x5f\xe0\x9c\xc2\x17\x78\xa9\xf0\x7d\xe4\xac\xc2\x0f\x60\x6f\x25\x7c\x5f\xc2\x5d\x0b\x4f\xe8\xe6\x54\xbe\x82\xbb\x50\xfa\x41\xe8\xac\xda\x0f\x71\x6f\x25\xfe\xa0\x86\xbb\x56\x5f\xa0\x46\xcb\x09\x67\x74\x40\x07\x79\xa1\x0b\x26\xe1\xb3\x3a\x61\x8a\x7d\x2b\x37\x4c\xea\x78\x9e\x23\x5e\xc0\xff\xab\x5b\x4e\x61\x82\xf6\xee\xe6\x1d\xe7\xbf\x0e\xff\x18\x15\xa1\x75\x40\x06\xea\x0d\x3c\x79\xae\xd1\x4f\x8a\x28\x19\x4e\x2b\x5a\x3a\xea\x19\x5c\x3b\x31\xa2\xe4\x45\x0e\x8c\xce\x13\x18\x4b\x85\x80\x3b\x42\xed\xa4\xd1\x33\x10\x89\x3b\x3a\xc6\x63\x9f\xa2\x1e\xfe\xec\xe8\x15\x72\x29\x85\x36\x16\x23\x88\x1b\x53\x5e\x4d\x61\x24\xed\x31\x0a\x5b\xf8\xff\x0e\x96\x8c\xa4\x7d\x85\x2c\xfe\x19\x13\x5a\xff\x2f\x8c\x8d\x45\xe8\x8e\xe3\x27\x71\x39\x68\x2b\x1d\x77\x2e\xb4\x32\x23\xb7\x54\xa8\xc5\x68\xa8\xfe\x4b\x78\x3a\xfb\xe5\xcb\x2c\x16\x12\xb7\xcf\xef\xe6\x87\x23\xab\x01\x3c\xd1\xc4\x27\x51\x73\xf4\xee\x29\xe4\x2f\x6e\xd9\x93\xf4\xcf\xeb\xd4\xfe\xe8\xf7\xc5\x36\xe8\x5b\x00\x00\x00\xff\xff\x65\xa8\x57\x17\xcf\x1c\x00\x00")
var _assetsAppComponentsSettingsIndexHtml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x5a\x6d\x8e\xdb\x36\x10\xbd\xca\x2c\x51\xc0\x09\x10\xd9\xdb\x00\xfd\x13\x58\x0e\x5a\x34\xbd\x40\x0f\x50\xd0\xd2\x88\x62\x43\x91\x02\x39\x92\x1d\x28\xbe\x7b\xa0\x2f\x8b\x72\x6c\xc7\xeb\x55\x62\xef\xfe\x11\xf4\x31\x7c\x33\x7c\xef\x2d\x87\xcb\xdd\x65\x2c\x4b\x50\xfc\x8b\x29\x28\x64\xd6\x6c\x18\x24\x0a\xb7\x21\xfb\xfd\xf1\x91\x75\xef\x83\x8d\xe5\x79\xc8\xbc\x07\x06\x32\x0e\x59\x6e\xcd\xff\x18\x91\x63\xab\x65\x16\x07\x9b\x54\x12\x26\x96\x67\x08\x91\xe2\xce\x85\x6c\xf4\x32\x78\x1f\xe7\xb0\x36\x5b\x70\x91\x35\x4a\x1d\x49\xd3\xa5\xef\xd2\x70\x25\x85\x0e\x99\x23\x6e\x09\x9a\xeb\x99\x72\x9a\x02\xc8\x18\xb5\xe6\xb6\xcf\x5e\xdf\xae\x85\xb8\x38\x51\xce\x23\x0c\xd6\x48\x1b\x44\x0d\x11\x6a\x42\xcb\x56\x0d\x3b\x1d\xa0\xc2\x84\x7a\xb4\xfa\xda\x66\x5d\x17\x44\x46\x7b\x53\x96\x91\xd1\xfd\xdb\xd4\x94\xa0\x4d\x90\x71\x2b\xa4\x66\x50\xc8\xc0\x59\x4c\x42\xc6\xf3\x7c\xde\xb1\xf7\xa6\xd2\x3c\xc3\x0f\x10\x15\xd6\xa2\xa6\x79\xfd\xb4\x7b\xdb\x62\xd7\x50\x90\xc5\x81\x2b\x45\xe0\x6c\x14\xb2\x05\x77\x0e\xc9\x2d\x64\x26\x16\xae\x14\x8b\x35\x8f\x3e\x37\x85\xcf\x5d\x29\xd8\x6a\xb9\xe8\x06\xb5\x77\x6d\x11\xab\xe5\x22\x96\xe5\x68\x26\x56\x8a\x74\x3c\x95\x9e\x8c\x9c\xc7\xb1\xd4\x62\xcf\x6e\xf7\xcc\x56\x55\xe5\x17\x08\x5f\xbf\xc2\x2c\x98\xed\x76\x1d\xf6\x62\xa0\xbf\x29\x5c\x49\x47\x81\x24\xcc\x9e\xee\xac\xb6\xd0\x1f\x68\x76\xaa\xcc\x03\x4d\x5b\x15\x8f\x8a\x99\x48\x54\x71\x5f\xd1\x1f\x8f\x6c\xb5\x31\xf6\xb3\xd4\x02\x72\x4e\xe9\xf7\x8c\x95\x5c\x15\x08\x84\x5b\xf2\xc7\x0c\xa4\xd4\xa3\xbe\x23\x65\x4f\xcd\x9e\x8e\x97\x4a\x4e\xce\x2d\xcf\xdc\xa5\xb4\x2c\x5d\xce\x35\x68\x11\xc8\x24\x64\x0f\x3d\x45\xdc\x0a\xc7\x56\xc1\x72\x51\x7f\x1d\x62\x2c\xe6\xc8\x29\x64\x4d\x0a\x90\x1a\xc6\xf1\x55\xd5\x7c\xd8\xed\xaa\xea\x37\xc5\x1d\xc1\x47\x98\xcd\xe0\x03\xcc\xde\x41\xc3\x74\x0b\xf6\xea\x08\xff\xa4\x4b\x69\x8d\xce\x50\xd3\xf3\x58\xc7\x01\xe8\x0c\xf9\xa8\x4b\x9f\xfa\xd1\xa0\xaa\x42\x5d\x5e\xcf\xff\x43\x10\x38\x8c\x48\x1a\x1d\x04\x07\x6a\x74\xd3\xa9\x05\x16\x96\xe7\x29\xbb\x56\x1f\x9f\x45\x20\x49\x0a\x8f\x8d\x3e\xb9\xb6\xfd\x8b\x44\x52\x0b\xf7\xf3\x0c\x74\x4a\x66\x61\xc0\x16\xfa\x84\xc2\x5e\x60\xad\x55\xf7\xa9\x82\x19\x6a\xbe\x56\x18\xcf\x86\xa6\x11\x99\x2c\xe3\x3a\x76\x73\x5b\xe8\x77\x30\x8b\xa5\xeb\x23\x1e\x8e\x85\xc0\xee\xca\x56\xe8\xad\x78\x23\xbc\x8f\x30\xfb\xd4\x15\x55\x7b\xe3\xef\x3e\x3f\xec\x17\xc3\xe6\x52\xb7\xb2\x8d\xa4\x28\xf5\x77\x08\xdc\x36\x3d\x2e\x2d\x30\x78\xdf\x4e\x34\xe5\x5a\x60\xc8\xdc\x17\x1d\xbd\x79\xdb\xbc\xca\x4c\x8c\x2a\x64\xc7\x72\x33\xe0\x56\xf2\x40\xf1\x75\x1d\xd1\xc2\x77\x9d\xb0\x7d\xf8\xe9\xab\xc3\x19\x71\xd7\x85\x54\xf1\x84\xf2\x36\x78\x73\x47\x9c\x0a\xf7\x23\x9d\xfd\xd8\x49\x05\x1f\x01\xdf\x4a\x79\xbf\x88\xbb\xb6\x80\xd4\x8e\xb8\x52\x13\x9a\xa0\x43\xbc\xd0\x06\xe3\xe8\x49\x8d\x70\x00\x7d\x2b\x2b\x8c\xcb\xb8\x6b\x33\x24\xd9\xa9\x76\x7e\x8d\x11\x92\x8c\x2e\x34\xc1\x10\x39\xa9\x01\x3c\xd8\x5b\x89\x3f\x94\x70\xd7\xc2\x97\x38\xa5\xf0\x25\x5e\x2a\xfc\x10\x39\xa9\xf0\x1e\xec\xad\x84\x1f\x4a\xb8\x6b\xe1\x09\xdd\x94\xca\xd7\x70\x17\x4a\xef\x85\x4e\xaa\xbd\x8f\x7b\x2b\xf1\xbd\x1a\xee\x5a\x7d\x81\x1a\x2d\x27\x9c\xd0\x01\x3d\xe4\x85\x2e\x38\x08\x9f\xd4\x09\x87\xd8\xb7\x72\xc3\x41\x1d\x77\xed\x88\x44\x6e\xa7\xdc\x01\xc8\xed\xa5\x3b\x80\x7d\xe4\xb4\x3b\x80\x01\xf6\x66\x3b\x80\x7d\x09\x77\x2d\x7c\xa4\x90\x4f\xf9\x9b\x7e\x83\x77\xa1\xf8\x7e\xec\xa4\xf2\x8f\x80\x6f\x65\x00\xbf\x88\xe7\x59\xe0\x05\x9c\x55\x6d\x38\x45\x29\xda\xbb\x3b\xeb\x3c\xef\xff\x7f\x8c\x8a\xd1\x3a\x20\x03\xcd\x04\x9e\x7c\xa6\x39\x9c\x12\x53\xea\x9f\x54\x76\x74\x34\xe7\xef\xdd\x69\x31\xa5\x2f\xf2\xb0\xf8\x3c\x81\x89\x54\x08\xb8\x25\xd4\x4e\x1a\x3d\x01\x91\xb8\xa5\x63\x3c\x0e\x29\x9a\x83\xdf\x2d\xbd\x42\x2e\xa5\xd0\xc6\x62\x0c\x49\x6b\xca\xab\x29\x8c\xa5\x3d\x46\x61\x07\xff\xdf\xde\x92\xb1\xb4\xaf\x90\xc5\x3f\x13\x42\xbb\xf8\x0b\x13\x63\x11\xfa\xb5\xf8\x49\x5c\x7a\x0d\xa5\xe7\xce\x45\x56\xe6\xe4\xe6\x0a\xb5\x18\xfd\x41\xed\x97\xf0\x74\xf6\x87\x2f\xb7\x58\x4a\xdc\x3c\xbf\x83\xef\x97\xac\x16\xf0\x44\xef\x3e\x88\x9a\xa2\x6b\x1f\x42\xfe\xe2\x7e\x7d\x90\xfe\x79\x9d\x7a\x31\xfa\xdf\x82\x2e\xe8\x5b\x00\x00\x00\xff\xff\xb5\x9f\xd2\x4d\xcb\x20\x00\x00")
func assetsAppComponentsSettingsIndexHtmlBytes() ([]byte, error) {
return bindataRead(
@ -138,7 +138,7 @@ func assetsAppComponentsSettingsIndexHtml() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "assets/app/components/settings/index.html", size: 7375, mode: os.FileMode(420), modTime: time.Unix(1508093483, 0)}
info := bindataFileInfo{name: "assets/app/components/settings/index.html", size: 8395, mode: os.FileMode(420), modTime: time.Unix(1509915898, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -358,7 +358,7 @@ func assetsAssetsJsAllJs() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "assets/assets/js/all.js", size: 3238654, mode: os.FileMode(420), modTime: time.Unix(1508186449, 0)}
info := bindataFileInfo{name: "assets/assets/js/all.js", size: 3238654, mode: os.FileMode(420), modTime: time.Unix(1509916657, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@ -378,7 +378,7 @@ func assetsAssetsJsAllMinJs() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "assets/assets/js/all.min.js", size: 3238654, mode: os.FileMode(420), modTime: time.Unix(1508186449, 0)}
info := bindataFileInfo{name: "assets/assets/js/all.min.js", size: 3238654, mode: os.FileMode(420), modTime: time.Unix(1509916657, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}

2
realize.go
View File

@ -15,7 +15,7 @@ import (
)
const (
version = "1.5.1"
version = "1.5.1r2"
)
// New realize instance

32
server.go
View File

@ -100,32 +100,32 @@ func (s *Server) start(p *cli.Context) (err error) {
e.GET("/app/components/index.html", func(c echo.Context) error {
return s.render(c, "assets/app/components/index.html", 1)
})
e.GET("/assets/img/svg/ic_settings_black_24px.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/ic_settings_black_24px.svg", 4)
e.GET("/assets/img/svg/settings.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/settings.svg", 4)
})
e.GET("/assets/img/svg/ic_fullscreen_black_24px.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/ic_fullscreen_black_24px.svg", 4)
e.GET("/assets/img/svg/fullscreen.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/fullscreen.svg", 4)
})
e.GET("/assets/img/svg/ic_add_black_24px.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/ic_add_black_24px.svg", 4)
e.GET("/assets/img/svg/add.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/add.svg", 4)
})
e.GET("/assets/img/svg/ic_keyboard_backspace_black_24px.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/ic_keyboard_backspace_black_24px.svg", 4)
e.GET("/assets/img/svg/backspace.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/backspace.svg", 4)
})
e.GET("/assets/img/svg/ic_error_black_48px.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/ic_error_black_48px.svg", 4)
e.GET("/assets/img/svg/error.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/error.svg", 4)
})
e.GET("/assets/img/svg/ic_remove_black_24px.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/ic_remove_black_24px.svg", 4)
e.GET("/assets/img/svg/remove.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/remove.svg", 4)
})
e.GET("/assets/img/svg/logo.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/logo.svg", 4)
})
e.GET("/assets/img/favicon-32x32.png", func(c echo.Context) error {
return s.render(c, "assets/assets/img/favicon-32x32.png", 5)
e.GET("/assets/img/fav.png", func(c echo.Context) error {
return s.render(c, "assets/assets/img/fav.png", 5)
})
e.GET("/assets/img/svg/ic_swap_vertical_circle_black_48px.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/ic_swap_vertical_circle_black_48px.svg", 4)
e.GET("/assets/img/svg/circle.svg", func(c echo.Context) error {
return s.render(c, "assets/assets/img/svg/circle.svg", 4)
})
//websocket