From f883c5bd0becc3e5d68169d3bf4d972390e5c394 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Tue, 30 Jun 2020 16:47:30 +0200 Subject: [PATCH] Set up reflex for `make watch` --- go.mod | 1 - go.sum | 46 +++++++----------------------------------- pkg/assets/assets.go | 24 ++++++++++++++++++++++ pkg/assets/embed.go | 6 +++--- pkg/config/config.go | 6 ++++++ pkg/flagset/flagset.go | 7 +++++++ reflex.conf | 5 +++++ ui/components/App.vue | 8 +++++--- 8 files changed, 57 insertions(+), 46 deletions(-) create mode 100644 reflex.conf diff --git a/go.mod b/go.mod index e49b08c384..75f8c8e4c7 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,6 @@ require ( github.com/golang/protobuf v1.4.2 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/joho/godotenv v1.3.0 github.com/micro/cli/v2 v2.1.2 github.com/micro/go-micro/v2 v2.6.0 github.com/oklog/run v1.1.0 diff --git a/go.sum b/go.sum index cc00b5b9c9..91bbac9cd7 100644 --- a/go.sum +++ b/go.sum @@ -57,14 +57,10 @@ github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3Q github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/semver/v3 v3.0.2 h1:tRi7ENs+AaOUCH+j6qwNQgPYfV26dX3JNonq+V4mhqc= github.com/Masterminds/semver/v3 v3.0.2/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= github.com/Masterminds/sprig/v3 v3.0.1 h1:RuaOafp+8qOLUPX1lInLfUrLc1MEVbnz7a40RLoixKY= github.com/Masterminds/sprig/v3 v3.0.1/go.mod h1:Cp7HwZjmqKrC+Y7XqSJOU2yRvAJRGLiohfgz5ZJj8+4= -github.com/Masterminds/sprig/v3 v3.1.0 h1:j7GpgZ7PdFqNsmncycTHsLmVPf5/3wJtlgW9TNDYD9Y= -github.com/Masterminds/sprig/v3 v3.1.0/go.mod h1:ONGMf7UfYGAbMXCZmQLy8x3lCDIPrEZE/rU8pmrbihA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= @@ -171,6 +167,7 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/cenkalti/backoff/v3 v3.0.0/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/reflex v0.2.0 h1:6d9WpWJseKjJvZEevKP7Pk42nPx2+BUTqmhNk8wZPwM= github.com/cespare/reflex v0.2.0/go.mod h1:ooqOLJ4algvHP/oYvKWfWJ9tFUzCLDk5qkIJduMYrgI= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -223,6 +220,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cs3org/go-cs3apis v0.0.0-20200306065539-29abc33f5be0 h1:jTKILSBtDm0GEw3FtXPxc5wxGpaw2pxzREg1GBV9LIQ= github.com/cs3org/go-cs3apis v0.0.0-20200306065539-29abc33f5be0/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= @@ -502,17 +500,12 @@ github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/huandu/xstrings v1.3.0 h1:gvV6jG9dTgFEncxo+AF7PH6MZXi/vZl25owA/8Dg8Wo= github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= -github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd/go.mod h1:3LVOLeyx9XVvwPgrt2be44XgSqndprz1G18rSk8KD84= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= -github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= @@ -544,6 +537,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA= github.com/karrick/godirwalk v1.7.8 h1:VfG72pyIxgtC7+3X9CMHI0AOl4LwyRAg98WAgsvffi8= github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= @@ -561,6 +555,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -655,8 +650,6 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= -github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -705,6 +698,7 @@ github.com/nrdcg/namesilo v0.2.1/go.mod h1:lwMvfQTyYq+BbjJd30ylEG4GPSS6PII0Tia4r github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d h1:x3S6kxmy49zXVVyhcnrFqxvNVCBPb2KZ9hV2RBdS840= github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ= github.com/nsqio/go-nsq v1.0.7/go.mod h1:XP5zaUs3pqf+Q71EqUJs3HYfBIqfK6G83WQMdNN+Ito= +github.com/ogier/pflag v0.0.1 h1:RW6JSWSu/RkSatfcLtogGfFgpim5p7ARQ10ECk5O750= github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= @@ -739,13 +733,7 @@ github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY github.com/owncloud/ocis-hello v0.1.0-alpha1/go.mod h1:tU2bOB7DjuXZ+ju+5A+7pUHmTfPIYUk3tMflqHTBTpE= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596 h1:3aMNmuDCIdKsaa4YdVTQEBJMjGz8KiuIB/+xlJUCT3k= github.com/owncloud/ocis-pkg v1.2.1-0.20191217084055-eab942498596/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= -github.com/owncloud/ocis-pkg v1.2.1-0.20200115112437-3dd614fdcd51 h1:K720zP/n/8Y451mz3tSUAz4JkarK0GBqbF1A3i3294M= -github.com/owncloud/ocis-pkg v1.2.1-0.20200115112437-3dd614fdcd51/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= -github.com/owncloud/ocis-pkg v1.3.0 h1:2fkgvfd/spTjschuulYMHRuzxkCGGXae9ocebVYkm74= -github.com/owncloud/ocis-pkg v1.3.0/go.mod h1:Wo0QfOmhadh2vNcUoQIsw2yaOT3zeftk+xaOOwP3y88= github.com/owncloud/ocis-pkg/v2 v2.0.1/go.mod h1:7bVnn3VUaqdmvpMkXF0QVEF1fRugs35hSkuVTAq9yjk= -github.com/owncloud/ocis-pkg/v2 v2.2.1 h1:LK7WxHYugEFQ9NHTOz0EP8DRjbt51wXhyqruV03z6zI= -github.com/owncloud/ocis-pkg/v2 v2.2.1/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170 h1:MYfyffPyTZbTofJjAz3LSQUIaKKcjjBBBIJGaEAkP8g= github.com/owncloud/ocis-pkg/v2 v2.2.2-0.20200602070144-cd0620668170/go.mod h1:s894msGwDsULmsROHkbsXFCP/eSqDcteDFUntZOiJdc= github.com/owncloud/ocis-settings v0.0.0-20200522101320-46ea31026363 h1:wk/7aAUITTrM192TFoIDq4fqzJQtFOQ0dDdSRkJ25SU= @@ -866,8 +854,6 @@ github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -895,7 +881,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -946,7 +931,6 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -1008,9 +992,6 @@ golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1027,17 +1008,11 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1076,7 +1051,6 @@ golang.org/x/net v0.0.0-20191109021931-daa7c04131f5/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20191207000613-e7e4b65ae663/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1174,16 +1148,11 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361 h1:RIIXAeV6GvDBuADKumTODatUqANFZ+5BPMnzsy4hulY= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200427214658-4697a2867c88 h1:Nj7oNnL9tSACMt2JvszZN6P4IXiy1t6E/YRMr7YtaSw= -golang.org/x/tools v0.0.0-20200427214658-4697a2867c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f h1:JcoF/bowzCDI+MXu1yLqQGNO3ibqWsWq+Sk7pOT218w= -golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= @@ -1201,6 +1170,7 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1293,8 +1263,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.0.20200427215036-cd1ad299aeab h1:33/51YKJC1SC6WAomp3Feij834LXL1uK1Jmt45mkghE= -honnef.co/go/tools v0.0.1-2020.1.0.20200427215036-cd1ad299aeab/go.mod h1:NELv708mC2Q9lQf29l+sO/v7NIOAQzEXu7jcugNzwvM= honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20191109101513-0171b7c15da1/go.mod h1:VJq7+38rpM4TSUbRiZX4P5UVAKK2UQpNQLZClkFQkpE= diff --git a/pkg/assets/assets.go b/pkg/assets/assets.go index 82f05233b0..a09debf445 100644 --- a/pkg/assets/assets.go +++ b/pkg/assets/assets.go @@ -3,6 +3,7 @@ package assets import ( "net/http" "os" + "path" "github.com/owncloud/ocis-accounts/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" @@ -18,6 +19,29 @@ type assets struct { // Open just implements the HTTP filesystem interface. func (a assets) Open(original string) (http.File, error) { + if a.config.Asset.Path != "" { + if stat, err := os.Stat(a.config.Asset.Path); err == nil && stat.IsDir() { + custom := path.Join( + a.config.Asset.Path, + original, + ) + + if _, err := os.Stat(custom); !os.IsNotExist(err) { + f, err := os.Open(custom) + + if err != nil { + return nil, err + } + + return f, nil + } + } else { + a.logger.Warn(). + Str("path", a.config.Asset.Path). + Msg("Assets directory doesn't exist") + } + } + return FS.OpenFile( CTX, original, diff --git a/pkg/assets/embed.go b/pkg/assets/embed.go index aee06a1542..fb7bc4040b 100644 --- a/pkg/assets/embed.go +++ b/pkg/assets/embed.go @@ -1,5 +1,5 @@ -// Code generated by fileb0x at "2020-06-29 17:28:18.895015 +0200 CEST m=+0.002488382" from config file "embed.yml" DO NOT EDIT. -// modification hash(2779c5cda0c9231b4f83452cd22127b5.8058aec596c5fb73022d09bb97af796e) +// Code generated by fileb0x at "2020-06-30 16:23:26.152338 +0200 CEST m=+0.001900579" from config file "embed.yml" DO NOT EDIT. +// modification hash(8102574180b123058ca85f1208ee4e4c.8058aec596c5fb73022d09bb97af796e) package assets @@ -36,7 +36,7 @@ type HTTPFS struct { } // FileAccountsJs is "accounts.js" -var FileAccountsJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x59\x6d\x8f\xdb\xb8\x73\x7f\xdf\x4f\x21\x0b\x81\x4e\xc4\x31\xca\xee\xf5\x55\xa5\xb0\x7b\x41\xb0\x57\x04\x48\x93\x43\x92\x16\x2d\x5c\xc3\xe0\x4a\xa3\x15\x1b\x99\x14\x28\xca\xbb\x86\xcd\xef\x5e\xf0\x49\xa2\xbd\xde\xf6\xfa\x07\xfe\xaf\x2c\x3e\x0d\x87\x3f\xce\xfc\x66\x86\x6e\xa0\x65\x1c\xf2\xbc\x9d\x78\xad\x98\xe0\x39\x3a\xa6\xd3\x08\xc9\xa8\x24\xab\x55\x5a\xad\xe6\x01\x85\x01\x1d\x55\x0e\xe4\x08\xcf\x83\x90\x6a\x2c\x8f\x5a\x63\x28\x7c\x0b\xe9\x48\x88\x42\xc7\x3d\x95\x09\x90\x97\x3d\x5f\x1f\xfe\x1b\x6a\x55\x0c\x52\x28\xa1\x0e\x03\x60\x49\xa0\xe8\xe8\xf8\xf5\x89\xff\x29\xc5\x00\x52\x1d\x30\x27\x69\x58\x98\x12\x62\x66\x89\x36\xf9\x7e\xd8\x3d\x88\xfe\xce\xfd\x94\x47\x8d\x05\xe1\x05\x53\x20\xa9\x12\xf2\x74\x4a\x7f\xff\x3d\x34\x52\xcc\x08\x2f\xe8\x78\xe0\xf5\xa7\x78\xfc\xac\x27\xc5\x94\xf0\x42\x89\xef\x4a\x32\xfe\xf8\x83\x3e\xda\x29\x51\x3b\xad\x82\x0e\x49\x6d\x0e\x8f\x25\xe6\xee\x10\x82\x40\x96\xc1\x72\x84\x84\xf1\x51\x51\x5e\x1b\x2d\xbb\x3b\x28\x3b\xcc\xc2\x31\x6b\x09\x54\x41\x2e\x96\xc9\xc8\xec\x0b\x4f\xc9\x7d\xce\x4f\xa7\xf5\x06\x55\x12\xd4\x24\x79\xc2\x8a\x2d\xe3\x7b\xf1\x33\xc6\xcc\x6c\xea\xb6\xe4\x24\x1d\xa7\x71\x00\xde\x40\xf3\x5d\x51\xa9\xd2\xb0\x6e\x9e\x2d\x30\x43\x47\xd6\xe6\x29\x3c\x43\x3d\x29\xc6\x1f\x53\x42\x08\x47\xaa\x93\xe2\x29\xb1\x5b\x4a\x29\x64\x9e\xfe\x0b\x70\x07\x41\xc2\xc6\x84\xf6\x12\x68\x73\x48\xe4\xc4\xb9\x59\x82\x2a\x23\xa2\x16\xbb\xa1\x07\x05\x8d\x13\x61\xc5\x5a\x39\xa6\x2d\xbc\x48\x16\x54\x78\xc8\x91\x6e\x85\xcc\x65\xb1\x03\xd5\x89\x86\x08\x2c\x0b\x2a\x1f\x09\xab\x2a\xa7\x3e\x25\xb2\x68\xa0\x87\x47\xaa\xc0\x6c\x40\x5d\x77\x4d\x9e\x72\x8a\xa5\xdd\xb3\xb6\xbb\xd4\x84\x90\x09\xd5\x82\x2b\xc6\x27\x08\x1b\xd4\x5a\x1b\x0d\x38\x3c\x2b\xa3\x40\xd8\x07\xc9\x62\x04\xae\x88\x2c\xb6\xfe\x97\xca\xc7\x0a\xfa\x11\x92\x33\x85\xe7\xf9\xf6\x1c\x17\x38\xc6\x18\x91\xe8\xe0\xee\x08\x95\x2c\x1a\x36\x0e\x54\xd5\xdd\xfd\x73\x0d\x83\x45\xda\x8e\x20\x6d\x36\x4a\x9d\x86\xf1\x2e\x59\x26\x0b\xfa\x20\xa7\x41\xe5\x61\xd4\xc9\x42\x15\x27\xd1\xe5\x54\x06\x81\x8e\x8c\xfe\x9a\x2d\xee\x5c\xc8\x1d\xed\x8d\xb4\xae\xb0\xc6\x62\x34\xe6\x06\x3c\xc1\xe1\x2e\xd2\xae\x5c\x8e\xf1\x9f\x0c\xfa\x26\xc5\x9d\x45\xfc\x0a\x7a\xc7\x3d\xed\x27\x28\xed\x38\x36\x72\x4a\x27\x4e\xeb\x05\x21\xb7\x5b\x96\xe5\x97\x10\xf8\x0b\xf5\x33\xfd\xb5\x76\xee\xfc\x5a\xe7\x0a\x4b\x4c\x11\x66\x7a\x76\x95\x70\x9c\xa3\x92\x87\xa3\x57\xc0\xc8\x2e\xc3\xd9\x30\x95\x8f\xa5\x2a\x6a\xda\xf7\xb9\x99\xa8\x75\x6d\xd0\x35\x04\x71\x36\xdd\xef\x68\x67\x6b\xad\x55\xf1\x24\xe9\x40\x6a\x8b\xda\x44\x8e\x7a\xf1\xce\x2e\x47\xc7\x45\x81\xf6\xac\xd5\x9b\x96\x59\x32\x98\x25\xc3\x5a\x6c\x48\xc4\x74\xde\xbc\x54\xc7\x46\x6d\x05\x37\xc1\x6f\x1f\x41\xfd\x19\x3c\xf6\x6b\x8b\xf7\xa4\xc9\xb2\x26\x6f\xf2\xcf\xf9\x7a\x83\x10\xaa\xf6\x59\xb6\x5f\x11\xc3\x03\xd2\x1d\x65\x8f\x05\xca\xb2\x7c\x20\x7b\x64\x25\x1d\x48\xbf\xf8\x3c\xe9\xa2\xef\x73\x66\x18\xd0\x72\x90\x47\x03\xc2\xda\x99\x39\x0e\x00\x04\x1b\xda\x14\xad\x90\xf7\xb4\xee\x22\x9a\x35\x84\xbc\x86\xcd\x19\xcb\x46\x67\x0a\x8c\x92\x03\x56\x48\x6b\x84\x16\x5c\x76\x8e\xce\x2d\xb5\x54\xf1\x5c\x72\xce\x27\xf3\x02\xba\xc0\x65\xa8\x24\x8e\x18\x1c\x53\x74\x9c\xe3\x44\x62\x57\x62\x8a\x6b\x27\x7e\x32\x16\xbe\x16\x1b\xac\x30\x73\x46\xee\x0e\xb6\x22\x64\xf2\x36\xee\x1c\x61\xb2\x06\xda\x92\xae\xb0\x06\x3b\xf3\x5b\x96\xa5\xc2\x42\xb6\x84\x82\x76\x86\xbd\xc5\xe9\x76\x4b\x9f\x28\x53\x29\xba\x83\x42\xc2\x28\xfa\x3d\xe4\x6d\xe1\x7b\x51\xa1\x3a\xe0\xe7\x91\x89\x7b\x26\xc1\xca\x6a\xa9\x11\xbe\x1c\xf6\xd0\x87\x71\x54\x46\x92\xaf\x49\xf4\x2a\x13\x85\x69\xde\xbd\x10\x18\x60\x7b\x29\x57\xd7\xf9\xe4\x7c\xc9\x62\x66\x80\x34\xbd\x61\x01\xe1\x77\xdc\xed\x46\x31\x45\x25\xcd\x91\x5e\x6e\xf0\x69\xb9\x41\x49\xd4\x1c\x08\xd7\xe0\x7d\x76\x63\xb0\xde\x0b\xd6\x24\x37\x86\x9c\x2c\x93\xc0\x4c\xc2\x84\x4f\x7d\x8f\x17\x02\x80\x98\x22\x17\x69\x85\x53\x25\xcb\x72\x98\xa9\x20\x70\x1a\x58\x2e\x70\x3b\x60\xa7\xcd\x35\x81\xc8\x9f\x66\xaa\xe0\x92\x4d\x9c\x04\x63\x4e\x3f\x0e\x03\xf8\xe8\xf4\xa3\x83\x24\x6c\x9f\x34\x02\xc6\x84\x0b\x95\x0c\x52\xec\x59\x03\x09\x4d\x7e\xb1\x8b\x7f\x49\x9c\xac\x74\x46\x6b\xd2\x2e\x4e\x8e\xb9\xc4\xcb\x01\xdc\x1e\xb1\xdd\x19\xbe\x77\x76\xe7\x17\xbe\xa6\x96\x35\xc7\x4b\xc4\xa6\xca\x25\x00\xdc\x05\x07\x27\x41\xdc\x09\x47\xd0\x39\xac\x95\xb1\x94\xa9\x57\x5f\xe8\x0e\x36\x44\x38\xc3\xc0\x50\x18\x8b\x23\xca\xfe\x7c\x16\xf5\xec\xd5\xab\x05\xa9\x33\x90\x9d\x81\xc6\x10\xa3\x97\xba\xa0\x52\x94\xf9\x5f\x43\x75\x46\xd4\x69\x67\x22\xbf\x81\x95\xf2\xc4\xfb\xd6\x35\xf1\x8b\xb1\x6d\x97\xfc\xcd\x10\xfb\x67\x51\x97\x6a\x7d\xb3\xd1\xd5\x6d\xc2\x78\xa2\xac\xea\x96\xc6\x3f\x8b\x9a\xa8\xf5\xed\x06\xe1\xdf\x96\x91\x96\x71\xda\xf7\x07\x37\xf6\xdb\xc6\x68\xd8\x2a\x90\xae\xfd\x8f\x1b\x84\x2d\x01\x29\x79\xb8\xe7\x4a\x32\x18\x8b\x61\x1a\xbb\x1c\xa2\xfd\x9f\x97\xfd\x55\xe1\x03\x14\x13\xfc\x74\x3a\xea\x0a\xec\x6d\x92\x39\xbe\x98\x53\x28\x48\x2c\x0c\x38\x9e\x4d\x60\x11\x78\x6f\x04\x5e\x6c\x4b\xd6\xe1\x6c\xa9\x14\x42\xa5\x7a\x83\xd5\x4c\xba\x5b\xab\xa4\x57\x55\xc2\x08\x2a\x5f\xdd\x44\x1a\x7e\x36\x02\x8d\xef\xcc\x7a\xae\x85\x75\xc1\xc8\xce\x2c\x63\x29\x67\x8c\x2f\xf3\x5b\x67\x1c\x61\xb6\x32\xb3\x56\x6c\xfc\x42\xbf\xe4\xaa\xe8\x81\x3f\xaa\x0e\x85\x5c\xf0\xed\x2d\x66\x33\x51\x27\x90\xa3\xa3\x49\xbf\xaa\x5f\x7f\xe5\xef\xc3\xdc\x0a\xb1\x36\xf7\x24\xa9\x30\x47\x8b\x16\x9e\xaa\xd6\xdc\x5c\x84\x31\x5b\xb2\xba\xc5\x33\xdd\x86\x71\xef\xd7\x61\xc6\x0d\x06\xbd\x64\xaa\xd6\x98\x99\xf6\xae\x77\x34\xcd\xf2\x21\xe2\xa6\x87\x39\x58\xf8\xe4\xc3\x4b\xb3\xd9\xc7\xea\x26\x2c\x4c\xda\x28\x2c\x1e\x8a\x5a\xf0\x51\xc9\xa9\x56\x42\x92\x1e\xf7\x67\xed\x16\xf7\x6b\xba\x21\xad\xcd\xc6\x7a\x7a\x30\xee\x45\x96\x4c\xf6\x8f\x80\xa6\x71\xfd\xf1\x45\xf7\x95\x32\xe4\xda\x05\x64\x99\x8a\x37\xf5\xe7\x5d\xad\x4c\x62\x04\x84\x90\xf6\x74\xba\xb2\x25\x21\xc4\x10\xeb\xa2\xd7\xe9\x04\x05\xa7\x3b\x40\x48\x63\x55\xec\xa8\xfc\x79\x2d\x40\xfb\x34\x60\x3c\x4b\x34\xee\xae\xf6\xe6\x0a\xf7\xa8\xcc\x55\xb1\xdd\x5a\xbc\xb6\x5b\xd2\x63\x6a\xfd\xeb\x74\xca\x95\x01\xe6\x8a\x5e\x08\x61\xf5\x6a\xda\x71\x40\x58\x19\xed\xa8\xcd\xaa\x5e\xaa\x77\xf4\xf1\xd3\xe4\x5e\xf8\x31\xdf\xc5\xf5\x4b\xd4\x58\xb3\x57\xf3\x29\xac\x8a\x0f\x71\xbd\x45\x76\x66\x3b\xd3\xb3\xac\xb0\x35\x15\xb6\x89\xc6\x1c\xa9\x58\x96\xe5\x8c\xfc\x29\xc5\x8e\x8d\xe0\x72\x29\x57\x30\xed\xf2\x3a\x2c\x40\x26\x95\x08\x9b\x5d\xbb\xf0\x5c\xa2\x3b\x5a\x52\x6b\xa8\xf9\xb5\x88\x3d\x2f\xb6\xbc\xad\x9c\xd1\xcf\x0b\x4c\x10\xc6\x8f\x06\xa4\xc3\x39\xb8\x29\x3e\xfc\x2f\x29\x24\x3e\xcc\xf5\xe4\xcb\x29\xe9\xda\x31\x6d\x32\x0b\xdb\xa4\x06\xa4\x9f\x70\x18\xaf\xd8\xe7\x7a\x53\x19\x9f\xb6\xe1\xdd\xde\x34\x02\x47\x8b\x12\x2d\xae\x2a\x61\x0f\x72\x84\x1c\xe1\xd9\xf5\x64\x20\x03\x98\x89\xc0\x93\x06\x14\x83\x18\x72\xcb\x3e\xdc\x49\xf4\x72\xa4\x77\x79\x8e\xe5\xcc\x07\x52\xcf\x83\x81\x00\xa4\x36\xea\xda\xa9\x23\xf9\x8c\xef\x23\xdb\x3a\x46\x5e\x53\xde\x63\x4b\x8f\x65\x7c\x26\x43\x8c\x86\x38\x07\x09\x7b\x72\xe3\x48\xd4\x92\x88\xff\xb6\xe5\x9b\x4b\x43\xed\xa7\xe7\x0b\xdb\x13\x54\x72\x8d\xb3\x10\x65\xbb\xce\x43\xa6\xed\x8a\x12\x93\xcb\xd0\x12\xf8\xfc\x19\xe1\x95\x42\x01\x62\xb0\x80\x18\x82\x4f\x95\xcb\x5e\xea\x8e\xca\x0f\x2a\xbf\x41\x73\xaa\x69\x86\x31\xa0\x2c\xf3\xac\xfc\x2b\x14\x63\xcf\x6a\xc8\x6f\x91\xc9\xfc\xcd\xb0\xc9\xc5\x7d\xb4\xd6\x78\x54\x62\x28\x23\x33\x88\x0e\x73\x63\xcd\xda\x9f\x78\x51\x6e\x7d\xb3\x89\xc2\xd5\x79\xce\xa2\x5c\xce\xe2\x0a\x55\x15\x67\x1f\x2e\x22\xed\x69\xaf\xf1\x8b\x52\xf5\xea\x25\x18\x1d\x82\xa0\xca\x07\xab\x8e\x8d\x55\x94\xc1\xdb\xa7\x0e\x2f\x9f\xfa\xf8\x1a\x0a\x32\x8b\xae\x0a\x29\x8d\xc4\xfc\xff\x4c\x5c\x56\x2b\xae\x03\xd2\xe2\xf2\xd0\xde\x4c\xdf\xde\x56\xe2\x9f\xc9\x4d\xf5\xf6\xad\x70\x06\xcb\x5e\xa0\x23\x36\x98\x12\x76\x89\x90\x0d\xd5\x86\x37\x0a\x17\xbc\xd1\x92\x6e\x03\x6f\xdc\x7b\x46\x18\x7b\x4f\x66\x2b\x0c\x0f\x10\xfe\x72\x19\x4e\x43\xfe\x92\x22\x3c\x46\xdd\x4b\xf2\xe2\x64\xd5\x59\x36\x9e\x1b\xf4\x7b\x36\xe7\x3e\xcb\xe6\x4b\x1f\x5e\xdd\xd8\x85\xf1\xfc\x45\x68\xbc\x22\xea\xd5\xe1\x15\xa3\xfe\x7f\xef\x65\x97\x9a\x45\xab\xf1\xe5\xdb\x8f\x92\x87\x64\x54\x54\xc1\x0e\xb8\x4a\x9e\x98\xea\xc4\xa4\x12\xbb\x3c\x11\x32\xf1\x1a\xa4\x7f\x83\xc2\x5a\x6b\xec\x9e\x3d\xca\xf3\x27\xc3\x70\xf3\xfc\xf5\x9b\xe7\xee\xe6\xe7\xe7\xb5\xcb\x9b\xe7\x36\x93\x12\x2f\x6f\x71\x76\x4e\x71\x7e\x51\x59\xb6\x28\x2f\x62\x35\xbd\x69\x89\xea\x41\x02\xfd\xa9\xb5\x89\x36\xa9\xfd\xb6\x4e\x76\x3a\xa5\xe1\xf5\xc4\xb6\x51\x96\x2d\xb6\x03\x59\x06\xef\x49\x7c\x6a\x1b\xaa\x0c\x13\x85\x38\xc5\xee\x62\xfb\x2c\x8f\x73\xce\xe4\x9d\x48\x79\xf7\x01\xcc\xee\xf2\xd7\xd8\xcb\x65\x57\xd1\x36\x26\xd3\xb7\x23\xe1\x69\x26\xa7\x48\xe3\xd0\xb8\x80\xfb\xaf\xb1\x46\x74\x66\x3b\xe5\xf2\xe0\xb6\xf3\x6e\x51\xc7\xae\x2d\xa3\xd7\x2e\x3f\x23\x9f\xd9\x87\xcc\xcc\xab\x5c\xe6\x1d\x9f\x2e\xd4\x8c\x8b\x40\xe7\x9c\x65\xf4\xe2\xa5\xfc\x1b\x14\x78\x32\x75\xf3\x00\xe1\x49\xe3\x96\x71\x36\x76\x67\x6c\x36\x53\xf7\xeb\x66\x05\xce\xac\x96\x2a\xf9\xc2\xac\xc0\x9a\x95\x8c\xeb\x13\x73\xe7\x31\xaf\xce\x88\xcb\xe8\x5e\xb1\x9c\x0b\x18\x84\x9f\x73\x69\x54\xd4\xd8\x3a\xd1\xdf\x4b\x45\x67\x83\x56\x3d\x1f\xce\xe5\xab\xa1\x82\x47\xcf\x2a\xa1\x52\x35\x5a\x86\x90\x2e\xb4\x7e\xc1\x0b\xac\x37\x71\xb5\xf7\x4c\x40\x95\x82\xdd\xa0\x52\xa4\x71\x08\xb8\xf6\x95\xb1\xbc\x7c\x9a\x8e\xa1\x9a\x43\xf3\x31\x14\x9b\xa5\x29\x8a\xf0\x52\x0f\x97\x80\x7d\xfd\x5b\x4a\x8d\xe7\xe7\xdc\xc8\x52\xc2\xd5\xc7\xd1\xc3\x60\xab\x74\xae\xe6\x3f\x1a\x2a\xf7\xb4\xf8\x18\xf2\xa8\x6f\x13\x57\x6c\x07\x04\x96\x97\xc4\x39\x0f\x4c\xa5\x7d\x41\xbb\x9c\x9b\x90\x44\xa6\xc8\x94\x98\x1a\x45\x0f\x70\x2a\xbc\xf3\x63\xff\x84\x85\x47\x3c\xa1\x63\xfa\x20\x44\x0f\xd4\x54\xeb\xbe\x54\xa0\x59\x96\x8f\xa4\xc6\x35\xa1\x98\x92\xd5\x2d\xaa\x6c\x06\x94\x74\xd7\xea\x0a\x79\x27\x0b\x61\xc3\xf1\x58\xca\xaa\x07\x95\xb4\x96\x5e\x4d\xb9\x21\x81\x37\x20\xb3\x2c\xef\xfc\x27\x09\x7d\xb8\x2b\x0c\x51\xb3\xfa\x9b\x6d\xfe\xc1\x47\xa2\x2e\x7b\x70\x57\x6c\x8d\x15\xb0\x1e\x1a\x93\xa2\x09\x2b\x28\x68\x40\x7b\xb2\xba\x41\xc8\x06\xe8\xae\xd8\x8e\xb5\x18\xe0\x53\x43\x38\x32\xe4\xd3\x9e\xe5\x9c\xb9\x32\xdc\x67\xa1\x7f\xb3\xe7\xa2\x01\x4f\xa0\xae\x51\x8c\xa3\xfc\x28\xb8\x82\xe7\x30\x69\xa0\x12\xb8\x0a\x2c\x6b\x1b\xe7\x0b\xcf\xfa\xa2\xf5\xe8\x74\x4a\x27\xee\xfe\x74\x6a\x16\x88\xb6\xdb\x7f\xff\xb7\xfb\xed\xf7\xef\xdf\xb6\x1f\xbf\x7e\xf9\x71\xff\x1f\x3f\xb6\x5b\x53\xd9\x90\x2b\xfd\x08\xdb\x3f\x5f\x96\x94\x6c\xcc\x95\x29\x75\x0c\x9a\x5b\x09\x8f\x6c\x54\x20\xa1\xf9\x28\x76\x83\xe0\xc0\xd5\xf8\xea\x40\x41\x9b\x26\x67\x48\x1b\x14\xc7\x51\x7e\xf3\x53\x48\x8b\x4a\xc3\x41\x2d\xa1\x77\x31\x46\xf1\x9e\x53\xae\x1c\x97\xbd\x31\xe9\x47\xf1\xc6\x5f\x6f\x31\x76\xb4\x11\x4f\xdf\x84\x50\x08\xe9\xf2\xb5\xd5\xb5\xd1\x58\x23\xdc\x9a\x1a\x3d\xbe\x2f\xe4\x12\xe9\x44\x91\x60\x0e\xd5\x6c\x17\x71\xd1\x34\x3b\x5e\xeb\xa4\x4a\x84\x95\x7f\x4c\xb7\xc1\x7f\x91\xf2\x00\xad\x90\xf0\xd1\x16\x7d\xd5\x79\x93\xa8\xbb\xb5\xc9\x37\x79\x4d\x8d\xdd\xb7\xa8\x5c\xb7\x9b\x39\xed\xd7\x4e\x06\x90\xa3\x29\x65\xcb\xf4\xc3\x30\xa4\xee\x8d\x5c\xc6\xb5\x4d\x94\xc7\xbe\x71\xa5\xe5\x7d\x6f\x73\x8b\x2a\x64\xf3\x7d\x5b\x6c\xeb\xb3\x5c\x75\xbb\xcb\x6f\x90\xae\x64\xb1\x35\xf9\x87\xa9\x97\x86\xc1\xda\x6f\xe5\x98\x2d\xec\x58\xd7\x62\xe2\x6a\x4c\x31\x6b\xca\x94\x2e\xad\x5a\xf0\x32\x35\xc6\xf4\x76\x5f\x53\xd9\xa4\x98\x8d\x7f\xb0\x1e\xee\x1b\x66\x38\x67\x75\x8b\xe1\x59\x01\x1f\xad\xbf\xad\x37\xb8\x16\xbc\x65\x8f\xe5\x71\x92\x7d\x99\x76\x4a\x0d\x63\xf9\xee\x5d\x2f\x6a\xda\x77\x62\x54\xe5\x3f\xfd\x76\x73\x93\xea\x10\xa8\x8f\x74\x18\x3e\xf1\x56\x94\x1c\x4b\x31\x29\x18\xcb\xb5\x57\x67\x51\x60\xa0\xaa\x2b\xd3\x77\xa9\x8d\xc0\xce\x94\x4a\xb3\xae\x54\xf9\xd1\x5d\x56\x29\xf1\x85\xa7\x96\xeb\xbf\x02\x1a\x06\x72\x06\xdb\xe9\xa4\xe6\x62\x2f\x4f\x1b\xb6\x4f\xf1\x1a\xf2\xb4\xbb\x4d\xf1\xda\x4d\xdc\xe7\xe9\x7f\xf1\x24\x49\x92\x80\x56\x42\x79\x93\x8c\x6a\x6a\xdb\xc2\x0c\xa4\x68\x83\x36\x48\x6f\x34\x0e\x0f\x3a\xe1\x63\x75\xfb\xf2\xeb\xec\x07\x69\xbd\xc1\x9c\xee\x3f\x29\xd8\x2d\x30\x7c\x38\xbb\x87\x7f\xa5\x0a\x24\xa3\x7d\xc9\x0b\xd3\x74\x98\x95\xaf\x22\x16\xac\x8d\x17\xac\xc1\xe9\xbb\xd4\x6c\x61\x19\xf8\x1f\xfe\x27\x00\x00\xff\xff\xfe\xde\x2b\xee\x87\x1e\x00\x00") +var FileAccountsJs = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x59\x6d\x8f\xe3\xb6\x73\x7f\xdf\x4f\x21\x0b\x81\xfe\x22\xc2\x55\x76\x93\xbe\xa9\x14\x76\x13\x1c\x36\x45\x80\x6b\x2e\xb8\xbb\x16\x2d\x5c\xc3\xe0\x4a\x23\x8b\x3d\x99\x14\x28\xca\xbb\x86\xcd\xef\x5e\xf0\x49\xa2\xbd\xde\x36\x2d\xd0\xbb\x17\x16\x9f\x66\x86\x3f\x0e\x7f\x33\xc3\x6d\xa0\x65\x1c\xf2\xbc\x9d\x78\xad\x98\xe0\x39\x3a\xa5\xd3\x08\xc9\xa8\x24\xab\x55\x5a\xad\xe6\x01\x85\x01\x9d\x54\x0e\xe4\x04\xaf\x83\x90\x6a\x2c\x4f\x5a\x63\x28\x7c\x0b\xe9\x48\x88\x42\xa7\x03\x95\x09\x90\xb7\x3d\x9f\x9e\xff\x13\x6a\x55\x0c\x52\x28\xa1\x8e\x03\x60\x49\xa0\xe8\xe8\xf8\xe9\x85\xff\x29\xc5\x00\x52\x1d\x31\x27\x69\x58\x98\x12\x62\x66\x89\x36\xf9\x72\xdc\x3f\x8b\xfe\xd1\xfd\x94\x27\x8d\x05\xe1\x05\x53\x20\xa9\x12\xf2\x7c\x4e\x7f\xf9\x25\x34\x52\xcc\x08\x2f\xe8\x78\xe4\xf5\xef\xf1\xf8\x45\x4f\x8a\x29\xe1\x85\x12\x5f\x94\x64\x7c\xf7\x95\xee\xec\x94\xa8\x9d\x56\xc1\x86\xa4\x36\x9b\xc7\x12\x73\xb7\x09\x41\x20\xcb\x60\xd9\x42\xc2\xf8\xa8\x28\xaf\x8d\x95\xdd\x23\x94\x1d\x66\x61\x9b\xb5\x04\xaa\x20\x17\xcb\x64\x64\xf4\xc2\x4b\xf2\x94\xf3\xf3\x79\xbd\x41\x95\x04\x35\x49\x9e\xb0\x62\xcb\xf8\x41\x7c\x8b\x31\x33\x4a\x9d\x4a\x4e\xd2\x71\x1a\x07\xe0\x0d\x34\x5f\x14\x95\x2a\x0d\xeb\xe6\xd9\x02\x33\x74\x62\x6d\x9e\xc2\x2b\xd4\x93\x62\x7c\x97\x12\x42\x38\x52\x9d\x14\x2f\x89\x55\x29\xa5\x90\x79\xfa\x4f\xc0\x1d\x04\x09\x1b\x13\xda\x4b\xa0\xcd\x31\x91\x13\xe7\x66\x09\xaa\x8c\x88\x5a\xec\x87\x1e\x14\x34\x4e\x84\x15\x6b\xe5\x98\xb6\xf0\x22\x59\x30\xe1\x39\x47\xba\x15\x32\x97\xc5\x1e\x54\x27\x1a\x22\xb0\x2c\xa8\xdc\x11\x56\x55\xce\x7c\x4a\x64\xd1\x40\x0f\x3b\xaa\xc0\x28\xa0\xae\xbb\x26\x2f\x39\xc5\xd2\xea\xac\xad\x96\x9a\x10\x32\xa1\x5a\x70\xc5\xf8\x04\x41\x41\xad\xb5\xb1\x80\xc3\xab\x32\x06\x04\x3d\x48\x16\x23\x70\x45\x64\xb1\xf5\xbf\x54\xee\x2a\xe8\x47\x48\x2e\x0c\x9e\xe7\xdb\x7d\x5c\xe1\x18\x63\x44\xa2\x8d\xbb\x2d\x54\xb2\x68\xd8\x38\x50\x55\x77\x4f\xaf\x35\x0c\x16\x69\x3b\x82\xb4\x51\x94\x3a\x0b\x63\x2d\x59\x26\x0b\xfa\x2c\xa7\x41\xe5\x61\xd4\xc9\x42\x15\x27\xd1\xe1\x54\x06\x81\x8e\x8c\xfe\x98\x2d\xee\x5c\xc8\x3d\xed\x8d\xb4\xae\xb0\xce\x62\x2c\xe6\x06\x3c\xc1\xe1\x31\xb2\xae\x5c\xb6\xf1\xef\x0c\xfa\x26\xc5\x9d\x45\xfc\x06\x7a\xa7\x03\xed\x27\x28\xed\x38\x36\x72\x4a\x27\x4e\xeb\x05\x21\xa7\x2d\xcb\xf2\x6b\x08\xfc\x81\xfa\x99\xfe\x58\x3b\xb7\x7f\xad\x73\x85\x25\xa6\x08\x33\x3d\x5f\x95\xb0\x9d\x93\x92\xc7\x93\x37\xc0\xc8\x2e\xc3\xde\x30\x95\xbb\x52\x15\x35\xed\xfb\xdc\x4c\xd4\xba\x36\xe8\x1a\x82\xb8\x98\xee\x35\xda\xd9\x5a\x6b\x55\xbc\x48\x3a\x90\xda\xa2\x36\x91\x93\x5e\x6e\x67\x97\xa3\xd3\x62\x40\x7b\xd1\xea\x4d\xcb\x2c\x19\xcc\x92\x61\x2d\x36\x24\x62\x3a\xef\x5e\xaa\x63\xa3\xb6\x82\x9b\x70\x6f\x77\xa0\xfe\x0c\x37\xf6\x53\x8b\x0f\xa4\xc9\xb2\x26\x6f\xf2\x8f\xf9\x7a\x83\x10\xaa\x0e\x59\x76\x58\x11\xc3\x03\xd2\x6d\xe5\x80\x05\xca\xb2\x7c\x20\x07\x64\x25\x1d\x49\xbf\xdc\x79\xd2\x45\xdf\x97\xcc\x30\xa0\x65\x23\x3b\x03\xc2\xda\xb9\x39\x0e\x00\x04\x1f\xda\x14\xad\x90\x4f\xb4\xee\x22\x9a\x35\x84\xbc\x86\xcd\x05\xcb\x46\x7b\x0a\x8c\x92\x03\x56\x48\x6b\x84\x16\x5c\xf6\x8e\xce\x2d\xb5\x54\xf1\x5c\x72\xc9\x27\xf3\x02\xba\xc0\x65\xa8\x24\x8e\x18\x1c\x53\x74\x9a\xe3\x44\x62\x57\x62\x8a\x6b\x27\x7e\x32\x1e\xbe\x16\x1b\xac\x30\x73\x4e\xee\x36\xb6\x22\x64\xf2\x3e\xee\x2e\xc2\x64\x1d\xb4\x25\x5d\x61\x1d\x76\xe6\xb7\x2c\x4b\x85\x85\x6c\x09\x05\xed\x0c\x7b\x8b\xd3\xed\x96\xbe\x50\xa6\x52\xf4\x08\x85\x84\x51\xf4\x07\xc8\xdb\xc2\xf7\xa2\x42\x75\xc0\x2f\x23\x13\xf7\x4c\x82\x95\xb5\x52\x23\x7c\x3d\xec\xa1\x0f\xe3\xa8\x8c\x24\xdf\x92\xe8\x4d\x26\x0a\xd3\xbc\x7b\x23\x30\xc0\xf6\x56\xae\xae\xf3\xc9\xdd\x25\x8b\x99\x01\xd2\xf4\x86\x05\x84\x3f\x72\xa7\x8d\x62\x8a\x4a\x9a\x23\xbd\x9c\xe0\xcb\x72\x82\x92\xa8\x39\x10\xae\xc1\xdf\xd9\x8d\xc1\xfa\x20\x58\x93\xdc\x1b\x72\xb2\x4c\x02\x33\x09\x13\x3e\xf5\x3d\x5e\x08\x00\x62\x8a\x5c\xa4\x15\xce\x94\x2c\xcb\x61\xa6\x82\xc0\x69\x60\xb9\xc0\x69\xc0\xce\x9a\x5b\x02\x91\xdf\xcd\x54\xc1\x35\x9b\x38\x09\xc6\x9d\xbe\x1e\x07\xf0\xd1\xe9\x6b\x07\x49\x50\x9f\x34\x02\xc6\x84\x0b\x95\x0c\x52\x1c\x58\x03\x09\x4d\xfe\x66\x17\xff\x2d\x71\xb2\xd2\x19\xad\x49\xbb\x38\x39\xe6\x12\x2f\x1b\x70\x3a\x62\xbf\x33\x7c\xef\xfc\xce\x2f\x7c\xcf\x2c\xeb\x8e\xd7\x88\x4d\x95\x4b\x00\xb8\x0b\x0e\x4e\x82\x78\x14\x8e\xa0\x73\x58\x2b\xe3\x29\x53\xaf\xfe\xa0\x7b\xd8\x10\xe1\x1c\x03\x43\x61\x3c\x8e\x28\xfb\xf3\x51\xd4\xf3\xad\x5e\x2d\x48\x5d\x80\xec\x1c\x34\x86\x18\xbd\xb5\x05\x95\xa2\xcc\xff\x1a\xaa\x33\xa2\xce\x3a\x13\xf9\x0d\xac\x94\x27\xfe\x6e\xdd\x12\xbf\x38\xdb\x76\xc9\xdf\x0c\xb1\x7f\x14\x75\xa9\xd6\xf7\x1b\x5d\x3d\x24\x8c\x27\xca\x9a\x6e\x69\xfc\xa3\xa8\x89\x5a\x3f\x6c\x10\xfe\x71\x19\x69\x19\xa7\x7d\x7f\x74\x63\x3f\x6e\x8c\x85\xad\x02\xe9\xda\x3f\x6d\x10\xb6\x04\xa4\xe4\xf1\x89\x2b\xc9\x60\x2c\x86\x69\xec\x72\x88\xf4\xbf\x2e\xfa\x55\xe1\x03\x14\x13\xfc\x7c\x3e\xe9\x0a\xec\x69\x92\x39\xbe\x98\x5d\x28\x48\x2c\x0c\x38\x9e\x4d\x60\x11\xf8\x64\x04\x5e\xa9\x25\xeb\xb0\xb7\x54\x0a\xa1\x52\xbd\xc1\x6a\x26\xdd\xad\x35\xd2\x9b\x2a\x61\x04\x95\xaf\xee\x23\x0b\x3f\x1a\x81\xe6\xee\xcc\x76\xae\x85\xbd\x82\x91\x9f\x59\xc6\x52\xce\x19\xdf\xe6\xb7\xce\x39\xc2\x6c\x65\x66\xad\xd8\xf8\x07\xfd\x23\x57\x45\x0f\x7c\xa7\x3a\x14\x72\xc1\xbb\x07\xcc\x66\xa2\x4e\x20\x47\x27\x93\x7e\x55\xdf\x7f\xcf\x7f\x0e\x73\x2b\xc4\xda\xdc\x93\xa4\xc2\x1c\x2d\x56\x78\xaa\x5a\x73\x73\x10\xc6\x6d\xc9\xea\x01\xcf\x74\x1b\xc6\xfd\xbd\x0e\x33\xee\x31\xe8\x25\x53\xb5\xce\xcc\xb4\xbf\x7a\x27\xd3\x2c\x9f\x23\x6e\x7a\x9e\x83\x85\x4f\x3e\xbc\x34\x9b\x7d\xac\xee\xc3\xc2\xa4\x8d\xc2\xe2\xb1\xa8\x05\x1f\x95\x9c\x6a\x25\x24\xe9\x71\x7f\xd1\x6e\x71\xbf\xa6\x1b\xd2\xda\x6c\xac\xa7\x47\x73\xbd\xc8\x92\xc9\xfe\x16\xd0\x34\x57\x7f\x7c\xd3\x7d\xa3\x0c\xb9\x75\x00\x59\xa6\x62\xa5\x7e\xbf\xab\x95\x49\x8c\x80\x10\xd2\x9e\xcf\x37\x54\x12\x42\x0c\xb1\x2e\x76\x9d\xcf\x50\x70\xba\x07\x84\x34\x56\xc5\x9e\xca\x6f\xb7\x02\xb4\x4f\x03\xc6\x8b\x44\xe3\xf1\x66\x6f\xae\x70\x8f\xca\x5c\x15\xdb\xad\xc5\x6b\xbb\x25\x3d\xa6\xf6\x7e\x9d\xcf\xb9\x32\xc0\xdc\xb0\x0b\x21\xac\xde\x4d\x3b\x8e\x08\x2b\x63\x1d\xb5\x59\xd5\x5b\xf3\x4e\x3e\x7e\x9a\xdc\x0b\xef\xf2\x7d\x5c\xbf\x44\x8d\x35\x7b\x37\x9f\xc2\xaa\xf8\x35\xae\xb7\xc8\xde\xa8\x33\x3d\xcb\x0a\x5b\x53\x61\x9b\x68\xcc\x91\x8a\x65\x59\xce\xc8\x9f\x52\xec\xd9\x08\x2e\x97\x72\x05\xd3\x3e\xaf\xc3\x02\x64\x52\x89\xa0\xec\xd6\x81\xe7\x12\x3d\xd2\x92\x5a\x47\xcd\x6f\x45\xec\x79\xb1\xe5\x6d\xe5\x9c\x7e\x5e\x60\x82\x30\xde\x19\x90\x8e\x97\xe0\xa6\xf8\xf8\xdf\xa4\x90\xf8\x38\xd7\x93\x6f\xa7\xa4\x6b\xc7\xb4\xc9\x2c\x6c\x93\x1a\x90\xbe\xc1\x71\xbc\xe1\x9f\xeb\x4d\x65\xee\xb4\x0d\xef\xf6\xa4\x11\x38\x5a\x94\x68\xb9\xaa\x12\x0e\x20\x47\xc8\x11\x9e\xaf\x9e\x0c\x64\x00\x33\x11\x78\xd2\x80\x62\x10\x43\x6e\xd9\x87\x3b\x89\x5e\x8e\xf4\x57\x9e\x63\x39\xf3\x81\xd4\xf3\x60\x20\x00\xa9\x8d\xb9\x76\xea\x48\x3e\xe2\xa7\xc8\xb7\x4e\xd1\xad\x29\x9f\xb0\xa5\xc7\x32\xde\x93\x21\x46\x43\x9c\x83\x84\x03\xb9\x77\x24\x6a\x49\xc4\x7f\xdb\xf2\xcd\xa5\xa1\xf6\xd3\xf3\x85\xed\x09\x26\xb9\xc6\x45\x88\xb2\x5d\x97\x21\xd3\x76\x45\x89\xc9\x75\x68\x09\x7c\xfe\x8a\xf0\x4a\xa1\x00\x31\x58\x40\x0c\xc1\xa7\xca\x65\x2f\x75\x47\xe5\xaf\x2a\xbf\x47\x73\xaa\x69\x86\x31\xa0\x2c\xf3\xac\xfc\x3d\x14\x63\xcf\x6a\xc8\x1f\x90\xc9\xfc\xcd\xb0\xc9\xc5\x7d\xb4\xd6\x78\x54\x62\x28\x23\x37\x88\x36\x73\x6f\xdd\xda\xef\x78\x31\x6e\x7d\xbf\x89\xc2\xd5\x65\xce\xa2\x5c\xce\xe2\x0a\x55\x15\x67\x1f\x2e\x22\x1d\x68\xaf\xf1\x9b\x52\xf5\xe6\x21\x18\x1b\x82\xa0\xca\x07\xab\x8e\x8d\x55\x94\xc1\xdb\xa7\x0e\x2f\x9f\xfa\xf8\x1a\x0a\x32\x8b\xae\x0a\x29\x8d\xc4\xfc\x7f\x4c\x5c\x56\x2b\xae\x03\xd2\xe2\x7a\xd3\xde\x4d\xef\x1e\x2a\xf1\x8f\xe4\xbe\xba\xbb\x13\xce\x61\xd9\x1b\x74\xc4\x06\x53\xc2\xae\x11\xb2\xa1\xda\xf0\x46\xe1\x82\x37\x5a\xd2\x6d\xe0\x8d\x7b\xcf\x08\x63\x3f\x93\xd9\x0b\xc3\x03\x84\x3f\x5c\x86\xd3\x90\xbf\xa4\x08\x8f\x51\xf7\x92\xbc\x38\x59\x75\x96\x8d\x97\x0e\xfd\x33\x9b\x73\x9f\x45\xf9\xd2\x87\x57\xf7\x76\x61\x3c\x7f\x11\x1a\xaf\x88\x7a\x75\x78\xc5\xa8\xff\xd7\xba\xec\x52\xb3\x68\x35\xbe\x7d\xfb\x51\xf2\x98\x8c\x8a\x2a\xd8\x03\x57\xc9\x0b\x53\x9d\x98\x54\x62\x97\x27\x42\x26\xde\x82\xf4\xff\x60\xb0\xd6\x1a\xbb\x67\x8f\xf2\xf2\xc9\x30\x9c\x3c\x7f\xff\xe4\xb9\x3b\xf9\xf9\x79\xed\xfa\xe4\xb9\xcd\xa4\xc4\xdb\x53\x9c\x2f\xa7\xb8\x3c\xa8\x2c\x5b\x8c\x17\xb1\x99\xde\xb5\x44\xf5\x2c\x81\x7e\xd3\xda\x44\x9b\xd4\x7e\xdb\x4b\x76\x3e\xa7\xe1\xf5\xc4\xb6\x51\x96\x2d\xbe\x03\x59\x06\x3f\x93\x78\xd7\x36\x54\x19\x26\x0a\x71\x8a\x3d\xc6\xfe\x59\x9e\xe6\x9c\xc9\x5f\x22\xe5\xaf\x0f\x60\xf6\x98\xbf\xc7\x5e\x2e\xbb\x8a\xd4\x98\x4c\xdf\x8e\x84\xa7\x99\x9c\x22\x8d\x43\xe3\x0a\xee\xbf\xc6\x1a\xd1\x9e\xed\x94\xeb\x8d\xdb\xce\xc7\xc5\x1c\xbb\xb6\x8c\x5e\xbb\xfc\x8c\x7c\x66\x1f\x32\x33\xaf\x72\x99\x77\xbc\xbb\x50\x33\x2e\x02\xdd\xe5\x2c\xa3\x17\x2f\xe5\xdf\xa0\xc0\x93\xa9\x9b\x07\x08\x4f\x1a\xb7\x8c\xb3\xb1\xbb\x60\xb3\x99\xba\xdf\x77\x2b\x70\x6e\xb5\x54\xc9\x57\x6e\x05\xd6\xad\x64\x5c\x9f\x98\x33\x8f\x79\x75\x46\x5c\x46\xe7\x8a\xe5\x5c\xc0\x20\xfc\x9a\x4b\x63\xa2\xc6\xf6\x12\xfd\x7f\x99\xe8\x7c\xd0\x9a\xe7\xc3\xb9\x7c\x37\x54\xf0\xe8\x59\x25\x54\xaa\xc6\xca\x10\xd2\x85\xd6\x6f\x78\x81\xf5\x26\xae\xf6\x9e\x09\xa8\x52\xb0\x1f\x54\x8a\x34\x0e\x01\xd7\xbe\x32\x96\xd7\x4f\xd3\x31\x54\x73\x68\x3e\x85\x62\xb3\x34\x45\x11\x5e\xea\xe1\x12\xb0\xaf\x7f\x4b\xa9\xf1\xfc\x9c\x1b\x79\x4a\x38\xfa\x38\x7a\x18\x6c\x95\xce\xd5\xfc\x87\x86\xca\x3d\x2d\xee\x42\x1e\xf5\x79\xe2\x8a\xed\x81\xc0\xf2\x92\x38\xe7\x81\xa9\xb4\x2f\x68\xd7\x73\x13\x92\xc8\x14\x99\x12\x53\xa3\xe8\x01\x4e\x85\x77\x7e\xec\x9f\xb0\xf0\x88\x27\x74\x4a\x9f\x85\xe8\x81\x9a\x6a\xdd\x97\x0a\x34\xcb\xf2\x91\xd4\xb8\x26\x14\x53\xb2\x7a\x40\x95\xcd\x80\x92\xee\x56\x5d\x21\x1f\x65\x21\x6c\x38\x1e\x4b\x59\xf5\xa0\x92\xd6\xd2\xab\x29\x37\x24\xf0\x06\x64\x96\xe5\x9d\xff\x24\xa1\x0f\x77\x85\x21\x6a\x56\x7f\xb6\xcd\xdf\xf8\x48\xd4\x75\x0f\xee\x8a\xad\xf1\x02\xd6\x43\x63\x52\x34\x61\x05\x05\x0b\x68\x4f\x56\xf7\x08\xd9\x00\xdd\x15\xdb\xb1\x16\x03\xfc\xde\x10\x8e\x0c\xf9\xb4\x17\x39\x67\xae\x0c\xf7\x59\xe8\xbf\x3b\x70\xd1\x80\x27\x50\xd7\x28\xc6\x51\x7e\x10\x5c\xc1\x6b\x98\x34\x50\x09\x5c\x05\x96\xb5\x8d\xcb\x85\x17\x7d\xd1\x7a\x74\x3e\xa7\x13\x77\x7f\x74\x6a\x16\x88\xb6\xdb\x7f\xfd\x97\xa7\xed\x97\x2f\x9f\xb7\x1f\x3e\xfd\xf1\xf5\xe9\xdf\xbe\x6e\xb7\xa6\xb2\x21\x37\xfa\x11\xb6\x7f\x7c\x59\x52\xb2\x31\x57\xa6\xd4\x31\x68\x6e\x25\xec\xd8\xa8\x40\x42\xf3\x41\xec\x07\xc1\x81\xab\xf1\xdd\x81\x82\x36\x4d\xce\x90\x36\x28\x8e\xa3\xfc\xec\xa7\x90\x16\x95\x86\x83\x5a\x42\x1f\x63\x8c\x62\x9d\x53\xae\x1c\x97\x7d\x67\xd2\x8f\xe2\x3b\x7f\xbc\xc5\xd8\xd1\x46\xbc\x7c\x16\x42\x21\xa4\xcb\xf7\x56\xd7\xc6\x62\x8d\x70\x6b\x6a\xf4\xf8\xbc\x90\x4b\xa4\x13\x45\x82\x3b\x54\xb3\x5f\xc4\x45\xd3\x7c\xf1\x5a\x27\x55\x22\xac\xfc\x63\xba\x0d\xfe\x8b\x94\x67\x68\x85\x84\x0f\xb6\xe8\xab\x2e\x9b\x44\x3d\xae\x4d\xbe\xc9\x6b\x6a\xfc\xbe\x45\xe5\xba\xdd\xcc\x69\xbf\x76\x32\x80\x9c\x4c\x29\x5b\xa6\xbf\x0e\x43\xea\xde\xc8\x65\x5c\xdb\x44\x79\xec\x77\xae\xb4\x7c\xea\x6d\x6e\x51\x85\x6c\xbe\x6f\x8b\x6d\x7d\x91\xab\x6e\xf7\xf9\x3d\xd2\x95\x2c\xb6\x26\xff\x30\xf5\xd2\x30\x58\xff\xad\x1c\xb3\x05\x8d\x75\x2d\x26\xae\xc6\x14\xb3\xa6\x4c\xe9\xd2\xaa\x05\x2f\x53\xe3\x4c\x77\x87\x9a\xca\x26\xc5\x6c\xfc\x8d\xf5\xf0\xd4\x30\xc3\x39\xab\x07\x0c\xaf\x0a\xf8\x68\xef\xdb\x7a\x83\x6b\xc1\x5b\xb6\x2b\x4f\x93\xec\xcb\xb4\x53\x6a\x18\xcb\x1f\x7e\xe8\x45\x4d\xfb\x4e\x8c\xaa\xfc\x87\x1f\xef\xef\x53\x1d\x02\xf5\x89\x0e\xc3\xef\xbc\x15\x25\xc7\x52\x4c\x0a\xc6\x72\xed\xcd\x59\x0c\x18\xa8\xea\xca\xf4\x87\xd4\x46\x60\xe7\x4a\xa5\x59\x57\xaa\xfc\xe4\x0e\xab\x94\xf8\xea\xa6\x96\xeb\xbf\x02\x1a\x06\x72\x01\xdb\xf9\xac\xe6\x62\x2f\x4f\x1b\x76\x48\xf1\x3a\x7c\x9c\x9c\x86\x0f\x3d\x1d\xc7\x32\x9d\xbe\xdd\xbd\xb0\x46\x75\x77\x3f\xdd\xfd\xfd\x2f\xfb\x64\xfa\x76\x67\xc2\x39\x65\x1c\xa4\x69\x0c\xb4\x69\x18\xdf\xa5\xda\xae\xef\x1e\x52\xbc\x76\x8a\x0e\x79\xfa\x1f\x3c\xb1\xff\x02\xde\xae\x9d\xa2\x8d\xfd\xaf\x37\x1a\x87\xb7\xa0\xf0\xb1\x7a\x78\xfb\x75\xf1\x83\xb4\xde\x60\x4e\x0f\xbf\x2b\xd8\x2f\x08\xfe\x7a\x71\x84\xff\x4c\x15\x48\x46\xfb\x92\x17\xa6\xe9\xe0\x2e\xdf\x05\x3b\x38\x2a\x2f\x58\x83\xd3\x1f\x52\xa3\xc2\x92\xf7\xdf\xfd\x57\x00\x00\x00\xff\xff\xdc\xb4\xa5\xe2\xc2\x1e\x00\x00") func init() { err := CTX.Err() diff --git a/pkg/config/config.go b/pkg/config/config.go index faaaf44d2c..3c9f59bfc2 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -43,6 +43,11 @@ type Server struct { AccountsDataPath string } +// Asset defines the available asset configuration. +type Asset struct { + Path string +} + // Log defines the available logging configuration. type Log struct { Level string @@ -56,6 +61,7 @@ type Config struct { HTTP HTTP GRPC GRPC Server Server + Asset Asset Log Log } diff --git a/pkg/flagset/flagset.go b/pkg/flagset/flagset.go index c52509a7b7..35195fac05 100644 --- a/pkg/flagset/flagset.go +++ b/pkg/flagset/flagset.go @@ -84,5 +84,12 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag { EnvVars: []string{"ACCOUNTS_DATA_PATH"}, Destination: &cfg.Server.AccountsDataPath, }, + &cli.StringFlag{ + Name: "asset-path", + Value: "", + Usage: "Path to custom assets", + EnvVars: []string{"HELLO_ASSET_PATH"}, + Destination: &cfg.Asset.Path, + }, } } diff --git a/reflex.conf b/reflex.conf new file mode 100644 index 0000000000..3e496fb0b4 --- /dev/null +++ b/reflex.conf @@ -0,0 +1,5 @@ +# backend +-r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-accounts && bin/ocis-accounts server --asset-path assets/' + +# frontend +-r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'yarn build && make generate' diff --git a/ui/components/App.vue b/ui/components/App.vue index bd2a699917..0f572a2877 100644 --- a/ui/components/App.vue +++ b/ui/components/App.vue @@ -1,8 +1,10 @@