From 676df834f7f228298c4e295fff7999b7e0d11084 Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 30 Apr 2020 10:32:12 +0200 Subject: [PATCH 1/3] Rename project/module to gengitkan --- README.md | 4 +-- client/package-lock.json | 41 ++++++++++++++++++++++-------- cmd/server/container.go | 6 ++--- cmd/server/main.go | 4 +-- go.mod | 5 ++-- go.sum | 5 ++++ internal/config/config.go | 4 +-- internal/middleware/auth.go | 2 +- internal/repository/storm/board.go | 2 +- internal/route/board.go | 2 +- internal/route/logout.go | 2 +- internal/route/oauth2.go | 2 +- internal/route/proxy.go | 4 +-- internal/route/route.go | 4 +-- modd.conf | 4 +-- 15 files changed, 58 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 3c51c77..79bcda4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Debug = false [HTTP] Address = :3000 -PublicDir = ${GITEAKAN_HTTP_PUBDIR} +PublicDir = ${GENGITKAN_HTTP_PUBDIR} [Gitea] BaseURL = https://forge.cadoles.com @@ -36,7 +36,7 @@ Scopes = api [Data] -DBPath = ${GITEAKAN_DATA_DBPATH} +DBPath = ${GENGITKAN_DATA_DBPATH} ``` Les valeurs pour `` et `` sont à récupérer sur la page https://forge.cadoles.com/user/settings/applications, dans la section `Gérer les applications OAuth2`. diff --git a/client/package-lock.json b/client/package-lock.json index c3d363f..a15d158 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -3438,7 +3438,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3459,12 +3460,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3479,17 +3482,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3606,7 +3612,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3618,6 +3625,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3632,6 +3640,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3639,12 +3648,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3663,6 +3674,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3743,7 +3755,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3755,6 +3768,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3840,7 +3854,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3876,6 +3891,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3895,6 +3911,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3938,12 +3955,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/cmd/server/container.go b/cmd/server/container.go index 297cfce..2a6fb05 100644 --- a/cmd/server/container.go +++ b/cmd/server/container.go @@ -1,9 +1,9 @@ package main import ( - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/repository" - stormRepo "forge.cadoles.com/wpetit/gitea-kan/internal/repository/storm" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/repository" + stormRepo "forge.cadoles.com/wpetit/gengitkan/internal/repository/storm" "github.com/asdine/storm" "github.com/gorilla/sessions" "github.com/pkg/errors" diff --git a/cmd/server/main.go b/cmd/server/main.go index e1cf7a8..facc252 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -6,8 +6,8 @@ import ( "net/http" "os" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/route" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/route" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/pkg/errors" diff --git a/go.mod b/go.mod index 2157aca..4ed833b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module forge.cadoles.com/wpetit/gitea-kan +module forge.cadoles.com/wpetit/gengitkan go 1.13 @@ -15,9 +15,10 @@ require ( github.com/smartystreets/assertions v1.0.1 // indirect github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect github.com/stretchr/testify v1.4.0 // indirect + github.com/zserge/lorca v0.1.8 // indirect gitlab.com/wpetit/goweb v0.0.0-20190728111123-bbcb57177273 go.etcd.io/bbolt v1.3.3 - golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect + golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/text v0.3.2 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect diff --git a/go.sum b/go.sum index a2eebae..e25b38c 100644 --- a/go.sum +++ b/go.sum @@ -37,17 +37,22 @@ github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:s github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/zserge/lorca v0.1.8 h1:gZwyvesmaoGCwxF5NssI6pdydXkCVHOoHw2nks/PBRs= +github.com/zserge/lorca v0.1.8/go.mod h1:gTrVdXKyWxNhc8aUb1Uu3s0mY343arR1T6jUtxmBxR8= gitlab.com/wpetit/goweb v0.0.0-20190728111123-bbcb57177273 h1:YtMGT0pEGTQ5MAglg6rvu8pQVQJEtskoeEw+csUqf2o= gitlab.com/wpetit/goweb v0.0.0-20190728111123-bbcb57177273/go.mod h1:5Y/eVplFvdsd6zMdA3bx8KON6Ab1n90+cQeX5uJ6jIE= go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/internal/config/config.go b/internal/config/config.go index 25dc7e8..418efd8 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -57,11 +57,11 @@ func NewDefault() *Config { Debug: false, HTTP: HTTPConfig{ Address: ":3000", - PublicDir: "${GITEAKAN_HTTP_PUBDIR}", + PublicDir: "${GENGITKAN_HTTP_PUBDIR}", }, Gitea: GiteaConfig{}, Data: DataConfig{ - DBPath: "${GITEAKAN_DATA_DBPATH}", + DBPath: "${GENGITKAN_DATA_DBPATH}", }, } } diff --git a/internal/middleware/auth.go b/internal/middleware/auth.go index 428483c..be13319 100644 --- a/internal/middleware/auth.go +++ b/internal/middleware/auth.go @@ -5,7 +5,7 @@ import ( "github.com/pborman/uuid" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/config" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service" diff --git a/internal/repository/storm/board.go b/internal/repository/storm/board.go index 8d04e9f..00d4274 100644 --- a/internal/repository/storm/board.go +++ b/internal/repository/storm/board.go @@ -1,7 +1,7 @@ package storm import ( - "forge.cadoles.com/wpetit/gitea-kan/internal/repository" + "forge.cadoles.com/wpetit/gengitkan/internal/repository" "github.com/asdine/storm" "github.com/pkg/errors" ) diff --git a/internal/route/board.go b/internal/route/board.go index 27aabfc..59d6ffe 100644 --- a/internal/route/board.go +++ b/internal/route/board.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "forge.cadoles.com/wpetit/gitea-kan/internal/repository" + "forge.cadoles.com/wpetit/gengitkan/internal/repository" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" ) diff --git a/internal/route/logout.go b/internal/route/logout.go index b6039fc..089f511 100644 --- a/internal/route/logout.go +++ b/internal/route/logout.go @@ -3,7 +3,7 @@ package route import ( "net/http" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/config" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service/session" diff --git a/internal/route/oauth2.go b/internal/route/oauth2.go index 711f985..2f5c2d9 100644 --- a/internal/route/oauth2.go +++ b/internal/route/oauth2.go @@ -3,7 +3,7 @@ package route import ( "net/http" - "forge.cadoles.com/wpetit/gitea-kan/internal/middleware" + "forge.cadoles.com/wpetit/gengitkan/internal/middleware" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service/session" diff --git a/internal/route/proxy.go b/internal/route/proxy.go index b16fc78..dd9a5dc 100644 --- a/internal/route/proxy.go +++ b/internal/route/proxy.go @@ -6,8 +6,8 @@ import ( "net/http/httputil" "net/url" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/middleware" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/middleware" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service/session" diff --git a/internal/route/route.go b/internal/route/route.go index 53af29f..95dfede 100644 --- a/internal/route/route.go +++ b/internal/route/route.go @@ -4,8 +4,8 @@ import ( "net/http" "path" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/middleware" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/middleware" "github.com/go-chi/chi" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/static" diff --git a/modd.conf b/modd.conf index 91033fd..1478589 100644 --- a/modd.conf +++ b/modd.conf @@ -5,8 +5,8 @@ modd.conf !mage_output_file.go { prep: make build prep: [ -e data/server.conf ] || ( mkdir -p data && bin/server -dump-config > data/server.conf ) - daemon: GITEAKAN_HTTP_PUBDIR=./client/dist \ - GITEAKAN_DATA_DBPATH=./data/data.db \ + daemon: GENGITKAN_HTTP_PUBDIR=./client/dist \ + GENGITKAN_DATA_DBPATH=./data/data.db \ bin/server \ -config ./data/server.conf } From 647c5c08066e4d7554a39f5ce3a1d3e441797638 Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 30 Apr 2020 13:02:56 +0200 Subject: [PATCH 2/3] Migration du client sur Typescript --- client/.babelrc | 10 - client/package-lock.json | 376 ++++++++++++------ client/package.json | 11 +- client/src/components/{App.jsx => App.tsx} | 0 .../{BoardPage.jsx => BoardPage.tsx} | 0 .../{EditBoardPage.jsx => EditBoardPage.tsx} | 63 +-- .../{IssueCard.jsx => IssueCard.tsx} | 2 - .../HomePage/{BoardCard.jsx => BoardCard.tsx} | 6 +- .../HomePage/{HomePage.jsx => HomePage.tsx} | 15 +- .../src/components/{Loader.jsx => Loader.tsx} | 0 .../src/components/{Modal.jsx => Modal.tsx} | 10 +- .../src/components/{Navbar.jsx => Navbar.tsx} | 0 client/src/components/{Page.jsx => Page.tsx} | 6 +- client/src/custom.d.ts | 4 + client/src/{index.js => index.tsx} | 0 .../store/actions/{boards.js => boards.ts} | 4 +- .../store/actions/{issues.js => issues.ts} | 8 +- .../actions/{kanboards.js => kanboards.ts} | 4 +- .../store/actions/{logout.js => logout.ts} | 0 .../actions/{projects.js => projects.ts} | 0 .../store/reducers/{boards.js => boards.ts} | 8 +- .../src/store/reducers/{flags.js => flags.ts} | 2 +- .../store/reducers/{issues.js => issues.ts} | 6 +- .../reducers/{kanboards.js => kanboards.ts} | 6 +- .../reducers/{projects.js => projects.ts} | 6 +- .../src/store/reducers/{root.js => root.ts} | 0 .../src/store/sagas/{boards.js => boards.ts} | 12 +- .../store/sagas/{failure.js => failure.ts} | 0 .../src/store/sagas/{issues.js => issues.ts} | 21 +- .../sagas/{kanboards.js => kanboards.ts} | 23 +- .../src/store/sagas/{logout.js => logout.ts} | 0 .../store/sagas/{projects.js => projects.ts} | 0 client/src/store/sagas/{root.js => root.ts} | 4 +- .../store/selectors/{boards.js => boards.ts} | 6 +- .../store/selectors/{flags.js => flags.ts} | 2 +- client/src/store/{store.js => store.ts} | 0 client/src/util/{api.js => api.ts} | 0 client/src/util/{gitea.js => gitea.ts} | 17 +- client/tsconfig.json | 16 + client/webpack.config.js | 12 +- modd.conf | 2 + 41 files changed, 428 insertions(+), 234 deletions(-) delete mode 100644 client/.babelrc rename client/src/components/{App.jsx => App.tsx} (100%) rename client/src/components/BoardPage/{BoardPage.jsx => BoardPage.tsx} (100%) rename client/src/components/BoardPage/{EditBoardPage.jsx => EditBoardPage.tsx} (85%) rename client/src/components/BoardPage/{IssueCard.jsx => IssueCard.tsx} (97%) rename client/src/components/HomePage/{BoardCard.jsx => BoardCard.tsx} (89%) rename client/src/components/HomePage/{HomePage.jsx => HomePage.tsx} (84%) rename client/src/components/{Loader.jsx => Loader.tsx} (100%) rename client/src/components/{Modal.jsx => Modal.tsx} (62%) rename client/src/components/{Navbar.jsx => Navbar.tsx} (100%) rename client/src/components/{Page.jsx => Page.tsx} (79%) create mode 100644 client/src/custom.d.ts rename client/src/{index.js => index.tsx} (100%) rename client/src/store/actions/{boards.js => boards.ts} (89%) rename client/src/store/actions/{issues.js => issues.ts} (77%) rename client/src/store/actions/{kanboards.js => kanboards.ts} (69%) rename client/src/store/actions/{logout.js => logout.ts} (100%) rename client/src/store/actions/{projects.js => projects.ts} (100%) rename client/src/store/reducers/{boards.js => boards.ts} (70%) rename client/src/store/reducers/{flags.js => flags.ts} (83%) rename client/src/store/reducers/{issues.js => issues.ts} (78%) rename client/src/store/reducers/{kanboards.js => kanboards.ts} (88%) rename client/src/store/reducers/{projects.js => projects.ts} (65%) rename client/src/store/reducers/{root.js => root.ts} (100%) rename client/src/store/sagas/{boards.js => boards.ts} (70%) rename client/src/store/sagas/{failure.js => failure.ts} (100%) rename client/src/store/sagas/{issues.js => issues.ts} (78%) rename client/src/store/sagas/{kanboards.js => kanboards.ts} (73%) rename client/src/store/sagas/{logout.js => logout.ts} (100%) rename client/src/store/sagas/{projects.js => projects.ts} (100%) rename client/src/store/sagas/{root.js => root.ts} (95%) rename client/src/store/selectors/{boards.js => boards.ts} (54%) rename client/src/store/selectors/{flags.js => flags.ts} (72%) rename client/src/store/{store.js => store.ts} (100%) rename client/src/util/{api.js => api.ts} (100%) rename client/src/util/{gitea.js => gitea.ts} (80%) create mode 100644 client/tsconfig.json diff --git a/client/.babelrc b/client/.babelrc deleted file mode 100644 index 90565b8..0000000 --- a/client/.babelrc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "presets": [ - "@babel/preset-env", - "@babel/preset-react" - ], - "plugins": [ - [ "@babel/transform-runtime" ], - [ "@babel/plugin-proposal-class-properties" ] - ] - } \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index a15d158..3cd363d 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1313,6 +1313,84 @@ "resolved": "https://registry.npmjs.org/@redux-saga/types/-/types-1.1.0.tgz", "integrity": "sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg==" }, + "@types/history": { + "version": "4.7.5", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz", + "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==" + }, + "@types/hoist-non-react-statics": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", + "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", + "dev": true, + "requires": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, + "@types/node": { + "version": "13.13.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz", + "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==" + }, + "@types/prop-types": { + "version": "15.7.3", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", + "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" + }, + "@types/react": { + "version": "16.9.34", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.34.tgz", + "integrity": "sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==", + "requires": { + "@types/prop-types": "*", + "csstype": "^2.2.0" + } + }, + "@types/react-dom": { + "version": "16.9.7", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.7.tgz", + "integrity": "sha512-GHTYhM8/OwUCf254WO5xqR/aqD3gC9kSTLpopWGpQLpnw23jk44RvMHsyUSEplvRJZdHxhJGMMLF0kCPYHPhQA==", + "requires": { + "@types/react": "*" + } + }, + "@types/react-redux": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.7.tgz", + "integrity": "sha512-U+WrzeFfI83+evZE2dkZ/oF/1vjIYgqrb5dGgedkqVV8HEfDFujNgWCwHL89TDuWKb47U0nTBT6PLGq4IIogWg==", + "dev": true, + "requires": { + "@types/hoist-non-react-statics": "^3.3.0", + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0", + "redux": "^4.0.0" + } + }, + "@types/react-router": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.7.tgz", + "integrity": "sha512-2ouP76VQafKjtuc0ShpwUebhHwJo0G6rhahW9Pb8au3tQTjYXd2jta4wv6U2tGLR/I42yuG00+UXjNYY0dTzbg==", + "requires": { + "@types/history": "*", + "@types/react": "*" + } + }, + "@types/react-router-dom": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.5.tgz", + "integrity": "sha512-ArBM4B1g3BWLGbaGvwBGO75GNFbLDUthrDojV2vHLih/Tq8M+tgvY1DSwkuNrPSwdp/GUL93WSEpTZs8nVyJLw==", + "requires": { + "@types/history": "*", + "@types/react": "*", + "@types/react-router": "*" + } + }, + "@types/uuid": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz", + "integrity": "sha512-PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw==" + }, "@webassemblyjs/ast": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", @@ -1508,9 +1586,9 @@ "dev": true }, "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true }, "adjust-sourcemap-loader": { @@ -1727,9 +1805,9 @@ "dev": true }, "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==", "dev": true }, "babel-code-frame": { @@ -1885,8 +1963,7 @@ "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, "binary-extensions": { "version": "1.13.1", @@ -2462,8 +2539,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "create-ecdh": { "version": "4.0.3", @@ -2621,6 +2697,11 @@ "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", "dev": true }, + "csstype": { + "version": "2.6.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.10.tgz", + "integrity": "sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w==" + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2881,8 +2962,7 @@ "emojis-list": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" }, "end-of-stream": { "version": "1.4.4", @@ -2897,7 +2977,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", - "dev": true, "requires": { "graceful-fs": "^4.1.2", "memory-fs": "^0.5.0", @@ -2914,7 +2993,6 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, "requires": { "prr": "~1.0.1" } @@ -4122,21 +4200,20 @@ "dev": true }, "globule": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz", + "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==", "dev": true, "requires": { "glob": "~7.1.1", - "lodash": "~4.17.10", + "lodash": "~4.17.12", "minimatch": "~3.0.2" } }, "graceful-fs": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", - "dev": true + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, "gud": { "version": "1.0.0", @@ -4294,9 +4371,9 @@ } }, "hosted-git-info": { - "version": "2.8.5", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", - "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", "dev": true }, "html-loader": { @@ -4462,9 +4539,9 @@ "dev": true }, "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", "dev": true }, "indent-string": { @@ -4495,8 +4572,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.5", @@ -4629,13 +4705,10 @@ "dev": true }, "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -4740,8 +4813,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -4762,9 +4834,9 @@ "dev": true }, "js-base64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", - "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", + "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==", "dev": true }, "js-levenshtein": { @@ -4818,7 +4890,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, "requires": { "minimist": "^1.2.0" } @@ -4836,9 +4907,9 @@ } }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "lcid": { @@ -4873,7 +4944,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", - "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^2.0.0", @@ -5028,7 +5098,6 @@ "version": "0.5.0", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", - "dev": true, "requires": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -5092,18 +5161,18 @@ } }, "mime-db": { - "version": "1.42.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz", - "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==", + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", "dev": true }, "mime-types": { - "version": "2.1.25", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz", - "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==", + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", "dev": true, "requires": { - "mime-db": "1.42.0" + "mime-db": "1.44.0" } }, "mimic-fn": { @@ -5155,10 +5224,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mississippi": { "version": "3.0.0", @@ -5200,20 +5268,12 @@ } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } + "minimist": "^1.2.5" } }, "move-concurrently": { @@ -5388,9 +5448,9 @@ } }, "node-sass": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz", - "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz", + "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -5808,6 +5868,11 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -5966,8 +6031,7 @@ "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, "promise-inflight": { "version": "1.0.1", @@ -5988,8 +6052,7 @@ "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, "pseudomap": { "version": "1.0.2", @@ -5998,9 +6061,9 @@ "dev": true }, "psl": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz", - "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", "dev": true }, "public-encrypt": { @@ -6208,7 +6271,6 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -6411,9 +6473,9 @@ } }, "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -6423,7 +6485,7 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.0", + "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -6433,7 +6495,7 @@ "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", + "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" } @@ -6646,8 +6708,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "safe-regex": { "version": "1.1.0", @@ -6750,12 +6811,6 @@ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true }, - "serialize-javascript": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", - "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==", - "dev": true - }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -6996,9 +7051,9 @@ } }, "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", "dev": true }, "spdx-expression-parse": { @@ -7156,7 +7211,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -7258,8 +7312,7 @@ "tapable": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", - "dev": true + "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, "tar": { "version": "2.2.2", @@ -7292,20 +7345,28 @@ } }, "terser-webpack-plugin": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz", - "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz", + "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==", "dev": true, "requires": { "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", + "serialize-javascript": "^2.1.2", "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", "worker-farm": "^1.7.0" + }, + "dependencies": { + "serialize-javascript": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", + "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==", + "dev": true + } } }, "through": { @@ -7403,21 +7464,13 @@ "dev": true }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } + "psl": "^1.1.28", + "punycode": "^2.1.1" } }, "trim-newlines": { @@ -7435,6 +7488,89 @@ "glob": "^7.1.2" } }, + "ts-loader": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-7.0.2.tgz", + "integrity": "sha512-DwpZFB67RoILQHx42dMjSgv2STpacsQu5X+GD/H9ocd8IhU0m8p3b/ZrIln2KmcucC6xep2PdEMEblpWT71euA==", + "requires": { + "chalk": "^2.3.0", + "enhanced-resolve": "^4.0.0", + "loader-utils": "^1.0.2", + "micromatch": "^4.0.0", + "semver": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "requires": { + "is-number": "^7.0.0" + } + } + } + }, "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", @@ -7474,6 +7610,11 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "typescript": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", + "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==" + }, "typescript-compare": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz", @@ -7687,8 +7828,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "util.promisify": { "version": "1.0.0", diff --git a/client/package.json b/client/package.json index 74dc836..c2a3967 100644 --- a/client/package.json +++ b/client/package.json @@ -25,6 +25,11 @@ "@babel/preset-env": "^7.7.1", "@babel/preset-react": "^7.7.4", "@fortawesome/fontawesome-free": "^5.11.2", + "@types/node": "^13.13.4", + "@types/react-dom": "^16.9.7", + "@types/react-router-dom": "^5.1.5", + "@types/uuid": "^7.0.3", + "@types/react-redux": "^7.1.7", "babel-loader": "^8.0.6", "css-loader": "^1.0.1", "extract-loader": "^3.1.0", @@ -32,14 +37,15 @@ "html-loader": "^0.5.5", "html-webpack-plugin": "^3.2.0", "mini-css-extract-plugin": "^0.4.4", - "node-sass": "^4.10.0", + "node-sass": "^4.14.0", "redux-logger": "^3.0.6", "resolve-url-loader": "^3.0.0", "sass-loader": "^7.1.0", "style-loader": "^0.23.1", "webpack": "^4.25.0", "webpack-cleanup-plugin": "^0.5.1", - "webpack-cli": "^3.1.2" + "webpack-cli": "^3.1.2", + "ts-loader": "^7.0.2" }, "dependencies": { "@lourenci/react-kanban": "^0.15.0", @@ -52,6 +58,7 @@ "redux": "^4.0.4", "redux-saga": "^1.1.3", "styled-components": "^4.4.1", + "typescript": "^3.8.3", "uuid": "^3.3.3" } } diff --git a/client/src/components/App.jsx b/client/src/components/App.tsx similarity index 100% rename from client/src/components/App.jsx rename to client/src/components/App.tsx diff --git a/client/src/components/BoardPage/BoardPage.jsx b/client/src/components/BoardPage/BoardPage.tsx similarity index 100% rename from client/src/components/BoardPage/BoardPage.jsx rename to client/src/components/BoardPage/BoardPage.tsx diff --git a/client/src/components/BoardPage/EditBoardPage.jsx b/client/src/components/BoardPage/EditBoardPage.tsx similarity index 85% rename from client/src/components/BoardPage/EditBoardPage.jsx rename to client/src/components/BoardPage/EditBoardPage.tsx index 89ecc6f..2f35ce4 100644 --- a/client/src/components/BoardPage/EditBoardPage.jsx +++ b/client/src/components/BoardPage/EditBoardPage.tsx @@ -1,13 +1,19 @@ import React from 'react'; import { Page } from '../Page'; -import { connect } from 'react-redux'; +import { connect, DispatchProp } from 'react-redux'; import { selectFlagsIsLoading } from '../../store/selectors/flags'; import { fetchBoards, saveBoard, deleteBoard } from '../../store/actions/boards'; import { fetchProjects } from '../../store/actions/projects'; import uuidv4 from 'uuid/v4'; import { Loader } from '../Loader'; +import { RouteComponentProps } from 'react-router'; -export class EditBoardPage extends React.Component { +export interface EditorBoardPageProps extends DispatchProp, RouteComponentProps { + isLoading: boolean + projects: any +} + +export class EditBoardPage extends React.Component { state = { edited: false, @@ -20,7 +26,12 @@ export class EditBoardPage extends React.Component { }, } - static getDerivedStateFromProps(props, state) { + onBoardTitleChange: (evt: any) => void; + onBoardDescriptionChange: (evt: any) => void; + onBoardLaneTitleChange: (laneIndex: any, evt: any) => void; + onBoardLaneIssueLabelChange: (laneIndex: any, evt: any) => void; + + static getDerivedStateFromProps(props: any, state: any) { const { board, isLoading } = props; if (isLoading || !board || state.edited) return state; @@ -32,12 +43,12 @@ export class EditBoardPage extends React.Component { title: board.title, description: board.description, projects: [ ...board.projects ], - lanes: [ ...board.lanes.map(l => ({ ...l })) ] + lanes: [ ...board.lanes.map((l: any) => ({ ...l })) ] } }; } - constructor(props) { + constructor(props: any) { super(props); this.onBoardTitleChange = this.onBoardAttrChange.bind(this, 'title'); this.onBoardDescriptionChange = this.onBoardAttrChange.bind(this, 'description'); @@ -129,15 +140,15 @@ export class EditBoardPage extends React.Component { const { projects } = this.props; const { board } = this.state; - const projectSelectField = (projectIndex, value, withDeleteAddon) => { + const projectSelectField = (projectIndex: number, value: any, withDeleteAddon: boolean) => { return (
+
+ + Inclure tous les tickets "restants" (i.e. non sélectionnés par les autres voies) + +
+
+
+
@@ -378,13 +395,15 @@ export class EditBoardPage extends React.Component { } onBoardLaneAttrChange(attrName: string, laneIndex: number, evt: React.ChangeEvent) { - const value = (evt.target as HTMLInputElement).value; + const input = evt.target as HTMLInputElement; + const value = input.type === "checkbox" ? input.checked : input.value; this.setState((state: any) => { const lanes = [ ...state.board.lanes ]; lanes[laneIndex] = { ...state.board.lanes[laneIndex], [attrName]: value }; + console.log(lanes); return { ...state, edited: true, diff --git a/client/src/components/BoardPage/IssueCard.tsx b/client/src/components/BoardPage/IssueCard.tsx index cea893d..c865a8a 100644 --- a/client/src/components/BoardPage/IssueCard.tsx +++ b/client/src/components/BoardPage/IssueCard.tsx @@ -1,6 +1,10 @@ import React from 'react'; -export class IssueCard extends React.PureComponent { +export interface IssueCardProps { + card: any +} + +export class IssueCard extends React.PureComponent { render() { const { card } = this.props; const issueURLInfo = extractInfoFromIssueURL(card.issue.url); @@ -49,9 +53,12 @@ export class IssueCard extends React.PureComponent { } } -function extractInfoFromIssueURL(issueURL) { +function extractInfoFromIssueURL(issueURL: string): any|void { const pattern = /^(https?:\/\/[^\/]+)\/api\/v1\/repos\/([^\/]+)\/([^\/]+)\/.*$/; const matches = pattern.exec(issueURL); + + if (!matches) return; + return { baseURL: matches[1], owner: matches[2], diff --git a/client/src/components/Modal.tsx b/client/src/components/Modal.tsx index 48628e7..39e12c7 100644 --- a/client/src/components/Modal.tsx +++ b/client/src/components/Modal.tsx @@ -2,8 +2,8 @@ import React, { PropsWithChildren } from 'react'; export interface ModalProps { active: boolean - showCloseButton: boolean - onClose: (evt: React.MouseEvent) => void + showCloseButton?: boolean + onClose?: (evt: React.MouseEvent) => void } export class Modal extends React.PureComponent> { diff --git a/client/src/custom.d.ts b/client/src/custom.d.ts index c1c6de0..92fcda0 100644 --- a/client/src/custom.d.ts +++ b/client/src/custom.d.ts @@ -1,4 +1,5 @@ declare module "*.svg" { const content: any; export default content; - } \ No newline at end of file +} +declare module '@lourenci/react-kanban'; \ No newline at end of file diff --git a/client/src/store/sagas/kanboards.ts b/client/src/store/sagas/kanboards.ts index 2ec33af..83162cb 100644 --- a/client/src/store/sagas/kanboards.ts +++ b/client/src/store/sagas/kanboards.ts @@ -2,6 +2,9 @@ import { select, put } from 'redux-saga/effects'; import { fetchIssues, addLabel, removeLabel } from '../actions/issues'; import { fetchIssuesSaga } from './issues'; import { BUILD_KANBOARD_SUCCESS, buildKanboard, BUILD_KANBOARD_FAILURE } from '../actions/kanboards'; +import { Project, Issue } from '../../types/gitea'; +import { Board, BoardLane } from '../../types/board'; +import { KanboardLane, Kanboard, KanboardCard } from '../../types/kanboard'; export function* moveCardSaga(action: any) { const { @@ -64,21 +67,21 @@ export function* refreshKanboardSaga(action: any) { } } -function createCards(projects: any[], issues: any, lane: any) { - return projects.reduce((laneCards, p) => { +function createCards(projects: Project[], issues: any, lane: BoardLane, rest: Set) { + const cards: KanboardCard[] = projects.reduce((laneCards, p) => { const projectIssues = p in issues.byProject ? issues.byProject[p] : []; - return projectIssues.reduce((projectCards: any, issue: any) => { + return projectIssues.reduce((projectCards: KanboardCard[], issue: any) => { + const hasLabel = issue.labels.some((l: any) => l.name === lane.issueLabel); + const card = getMemoizedKanboardCard(issue.id, issue.title, p, issue); if (hasLabel) { - projectCards.push({ - id: issue.id, - title: issue.title, - project: p, - issue: issue, - }); + projectCards.push(card); + rest.delete(card); + } else { + rest.add(card); } return projectCards; @@ -86,22 +89,55 @@ function createCards(projects: any[], issues: any, lane: any) { }, laneCards); }, []); + + return cards; } -function createLane(projects: any, issues: any, lane: any, index: any) { - return { - id: index, - title: lane.title, - cards: createCards(projects, issues, lane) - } +const kanboardCardMemo: {[key: string]: KanboardCard} = {}; + +function getMemoizedKanboardCard(id: number, title: string, project: Project, issue: Issue): KanboardCard { + const key = `${project.id}-${issue.id}-${id}`; + if (kanboardCardMemo.hasOwnProperty(key)) return kanboardCardMemo[key]; + kanboardCardMemo[key] = { id, title, project, issue }; + return kanboardCardMemo[key]; } -function createKanboard(board: any, issues: any) { +function resetKandboarCardMemo() { + Object.keys(kanboardCardMemo).forEach(k => delete kanboardCardMemo[k]); +} + +function createKanboardLanes(board: Board, issues: any): KanboardLane[] { + const lanes: KanboardLane[] = []; + const rest = new Set(); + + resetKandboarCardMemo(); + + board.lanes.forEach((l: BoardLane, i: number) => { + const cards = createCards(board.projects, issues, l, rest); + lanes.push({ + id: i, + title: l.title, + cards, + }); + }); + + // Assign remaining issues + board.lanes.forEach((l: BoardLane, i: number) => { + if (!l.collectRemainingIssues) return; + lanes[i].cards.push(...Array.from(rest.values())); + }); + + resetKandboarCardMemo(); + + return lanes; +} + +function createKanboard(board: Board, issues: any) { if (!board) return null; const kanboard = { id: board.id, - lanes: board.lanes.map(createLane.bind(null, board.projects, issues)), + lanes: createKanboardLanes(board, issues), }; return kanboard; diff --git a/client/src/types/board.ts b/client/src/types/board.ts new file mode 100644 index 0000000..e7a96ab --- /dev/null +++ b/client/src/types/board.ts @@ -0,0 +1,19 @@ +import { Project } from "./gitea" + +export type BoardLaneId = string +export type BoardId = string + +export interface Board { + id: BoardId + title: string + description: string + lanes: BoardLane[] + projects: Project[] +}; + +export interface BoardLane { + id: BoardLaneId + title: string + issueLabel: string + collectRemainingIssues: boolean +}; \ No newline at end of file diff --git a/client/src/types/gitea.ts b/client/src/types/gitea.ts new file mode 100644 index 0000000..852cd27 --- /dev/null +++ b/client/src/types/gitea.ts @@ -0,0 +1,2 @@ +export type Project = any +export type Issue = any \ No newline at end of file diff --git a/client/src/types/kanboard.ts b/client/src/types/kanboard.ts new file mode 100644 index 0000000..ad2668b --- /dev/null +++ b/client/src/types/kanboard.ts @@ -0,0 +1,21 @@ +import { Project, Issue } from "./gitea"; +import { BoardId } from "./board"; + +export interface Kanboard { + id: BoardId + lanes: KanboardLane[] +} + +export interface KanboardLane { + id: number + title: string + cards: KanboardCard[] +}; + + +export interface KanboardCard { + id: number + title: string + project: Project + issue: Issue +} \ No newline at end of file diff --git a/internal/repository/board.go b/internal/repository/board.go index c7c1a37..1dcbe4d 100644 --- a/internal/repository/board.go +++ b/internal/repository/board.go @@ -20,7 +20,8 @@ type Board struct { type BoardLaneID string type BoardLane struct { - ID BoardLaneID `json:"id"` - Title string `json:"title"` - IssueLabel string `json:"issueLabel"` + ID BoardLaneID `json:"id"` + Title string `json:"title"` + IssueLabel string `json:"issueLabel"` + CollectRemainingIssues bool `json:"collectRemainingIssues"` }