From 9a2cdc4a93e2a8aa3f8c9e5713e59a8ad0fe2a9b Mon Sep 17 00:00:00 2001 From: Richard Wei <54336863+WaysonWei@users.noreply.github.com> Date: Fri, 8 Jul 2022 12:57:36 +1200 Subject: [PATCH] feat(ui): replace boxselector with react component EE-3593 (#7215) * replace boxselector and upload vendor icon --- app/assets/ico/custom.svg | 4 + app/assets/ico/theme/auto.svg | 4 + app/assets/ico/theme/darkmode.svg | 4 + app/assets/ico/theme/highcontrastmode.svg | 4 + app/assets/ico/theme/lightmode.svg | 4 + app/assets/ico/vendor/aws.svg | 38 ++ app/assets/ico/vendor/azure.svg | 23 + app/assets/ico/vendor/civo.svg | 24 + app/assets/ico/vendor/digitalocean.svg | 1 + app/assets/ico/vendor/docker.svg | 12 + app/assets/ico/vendor/dockercompose.svg | 71 +++ app/assets/ico/vendor/ecr.svg | 32 + app/assets/ico/vendor/github.svg | 3 + app/assets/ico/vendor/gitlab.svg | 9 + app/assets/ico/vendor/google.svg | 9 + app/assets/ico/vendor/googlecloud.svg | 9 + app/assets/ico/vendor/kubernetes.svg | 12 + app/assets/ico/vendor/linode.svg | 1 + app/assets/ico/vendor/microsoft.svg | 6 + app/assets/ico/vendor/nomad.svg | 3 + app/assets/ico/vendor/openldap.svg | 550 ++++++++++++++++++ app/assets/ico/vendor/proget.svg | 7 + app/assets/ico/vendor/quay.svg | 7 + .../networkMacvlanForm.html | 4 +- app/docker/views/images/build/buildimage.html | 6 +- .../components/edge-job-form/edgeJobForm.html | 6 +- app/edge/components/group-form/groupForm.html | 4 +- .../create/createApplication.html | 14 +- .../create/createConfiguration.html | 4 +- .../porAccessControlForm.html | 8 +- .../endpointSecurity/porEndpointSecurity.html | 8 +- app/portainer/components/theme/options.tsx | 35 ++ .../theme/theme-settings.controller.js | 9 +- .../oauth-options.tsx | 40 ++ .../oauth-provider-selector.controller.js | 10 +- .../ldap/ldap-settings/ldap-options.tsx | 25 + .../ldap-settings/ldap-settings.controller.js | 11 +- .../createCustomTemplateView.html | 6 +- .../devices/profiles/add/addProfile.html | 2 +- .../devices/profiles/edit/editProfile.html | 2 +- .../views/stacks/create/createstack.html | 8 +- .../BoxSelector/BoxSelectorItem.css | 15 +- 42 files changed, 993 insertions(+), 61 deletions(-) create mode 100644 app/assets/ico/custom.svg create mode 100644 app/assets/ico/theme/auto.svg create mode 100644 app/assets/ico/theme/darkmode.svg create mode 100644 app/assets/ico/theme/highcontrastmode.svg create mode 100644 app/assets/ico/theme/lightmode.svg create mode 100644 app/assets/ico/vendor/aws.svg create mode 100644 app/assets/ico/vendor/azure.svg create mode 100644 app/assets/ico/vendor/civo.svg create mode 100644 app/assets/ico/vendor/digitalocean.svg create mode 100644 app/assets/ico/vendor/docker.svg create mode 100644 app/assets/ico/vendor/dockercompose.svg create mode 100644 app/assets/ico/vendor/ecr.svg create mode 100644 app/assets/ico/vendor/github.svg create mode 100644 app/assets/ico/vendor/gitlab.svg create mode 100644 app/assets/ico/vendor/google.svg create mode 100644 app/assets/ico/vendor/googlecloud.svg create mode 100644 app/assets/ico/vendor/kubernetes.svg create mode 100644 app/assets/ico/vendor/linode.svg create mode 100644 app/assets/ico/vendor/microsoft.svg create mode 100644 app/assets/ico/vendor/nomad.svg create mode 100644 app/assets/ico/vendor/openldap.svg create mode 100644 app/assets/ico/vendor/proget.svg create mode 100644 app/assets/ico/vendor/quay.svg create mode 100644 app/portainer/components/theme/options.tsx create mode 100644 app/portainer/oauth/components/oauth-providers-selector/oauth-options.tsx create mode 100644 app/portainer/settings/authentication/ldap/ldap-settings/ldap-options.tsx diff --git a/app/assets/ico/custom.svg b/app/assets/ico/custom.svg new file mode 100644 index 000000000..58db0c6b1 --- /dev/null +++ b/app/assets/ico/custom.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/ico/theme/auto.svg b/app/assets/ico/theme/auto.svg new file mode 100644 index 000000000..d7ed3b96d --- /dev/null +++ b/app/assets/ico/theme/auto.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/ico/theme/darkmode.svg b/app/assets/ico/theme/darkmode.svg new file mode 100644 index 000000000..34357e419 --- /dev/null +++ b/app/assets/ico/theme/darkmode.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/ico/theme/highcontrastmode.svg b/app/assets/ico/theme/highcontrastmode.svg new file mode 100644 index 000000000..5b8551c68 --- /dev/null +++ b/app/assets/ico/theme/highcontrastmode.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/ico/theme/lightmode.svg b/app/assets/ico/theme/lightmode.svg new file mode 100644 index 000000000..f81b64062 --- /dev/null +++ b/app/assets/ico/theme/lightmode.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/assets/ico/vendor/aws.svg b/app/assets/ico/vendor/aws.svg new file mode 100644 index 000000000..4715937ff --- /dev/null +++ b/app/assets/ico/vendor/aws.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + diff --git a/app/assets/ico/vendor/azure.svg b/app/assets/ico/vendor/azure.svg new file mode 100644 index 000000000..f60d954dc --- /dev/null +++ b/app/assets/ico/vendor/azure.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/ico/vendor/civo.svg b/app/assets/ico/vendor/civo.svg new file mode 100644 index 000000000..96f90d696 --- /dev/null +++ b/app/assets/ico/vendor/civo.svg @@ -0,0 +1,24 @@ + + + + + + + + + + diff --git a/app/assets/ico/vendor/digitalocean.svg b/app/assets/ico/vendor/digitalocean.svg new file mode 100644 index 000000000..5a81f2481 --- /dev/null +++ b/app/assets/ico/vendor/digitalocean.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/ico/vendor/docker.svg b/app/assets/ico/vendor/docker.svg new file mode 100644 index 000000000..083a3e3d2 --- /dev/null +++ b/app/assets/ico/vendor/docker.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/app/assets/ico/vendor/dockercompose.svg b/app/assets/ico/vendor/dockercompose.svg new file mode 100644 index 000000000..27559f056 --- /dev/null +++ b/app/assets/ico/vendor/dockercompose.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/ico/vendor/ecr.svg b/app/assets/ico/vendor/ecr.svg new file mode 100644 index 000000000..9459b5d21 --- /dev/null +++ b/app/assets/ico/vendor/ecr.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/ico/vendor/github.svg b/app/assets/ico/vendor/github.svg new file mode 100644 index 000000000..a8d117404 --- /dev/null +++ b/app/assets/ico/vendor/github.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/ico/vendor/gitlab.svg b/app/assets/ico/vendor/gitlab.svg new file mode 100644 index 000000000..5e5cb91d0 --- /dev/null +++ b/app/assets/ico/vendor/gitlab.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/assets/ico/vendor/google.svg b/app/assets/ico/vendor/google.svg new file mode 100644 index 000000000..c652a5a18 --- /dev/null +++ b/app/assets/ico/vendor/google.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/assets/ico/vendor/googlecloud.svg b/app/assets/ico/vendor/googlecloud.svg new file mode 100644 index 000000000..b8478f1f9 --- /dev/null +++ b/app/assets/ico/vendor/googlecloud.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/assets/ico/vendor/kubernetes.svg b/app/assets/ico/vendor/kubernetes.svg new file mode 100644 index 000000000..2eb65a286 --- /dev/null +++ b/app/assets/ico/vendor/kubernetes.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/app/assets/ico/vendor/linode.svg b/app/assets/ico/vendor/linode.svg new file mode 100644 index 000000000..248a1999b --- /dev/null +++ b/app/assets/ico/vendor/linode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/ico/vendor/microsoft.svg b/app/assets/ico/vendor/microsoft.svg new file mode 100644 index 000000000..92eed2df8 --- /dev/null +++ b/app/assets/ico/vendor/microsoft.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/assets/ico/vendor/nomad.svg b/app/assets/ico/vendor/nomad.svg new file mode 100644 index 000000000..0dcf7e3cc --- /dev/null +++ b/app/assets/ico/vendor/nomad.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/ico/vendor/openldap.svg b/app/assets/ico/vendor/openldap.svg new file mode 100644 index 000000000..71f61b2a6 --- /dev/null +++ b/app/assets/ico/vendor/openldap.svg @@ -0,0 +1,550 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Caterpillar 4 LDAP + 2012-04-08T15:30:21 + The OpenLDAP caterpillar mascot . This is a Vector inspired by the "low res" bitmap at the homepage (as of 2012/04) + https://openclipart.org/detail/169427/caterpillar-4-ldap-by-dynnamitt + + + dynnamitt + + + + + LDAP + caterpillar + green + happy + + + + + + + + + + + diff --git a/app/assets/ico/vendor/proget.svg b/app/assets/ico/vendor/proget.svg new file mode 100644 index 000000000..8daaec0f5 --- /dev/null +++ b/app/assets/ico/vendor/proget.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/assets/ico/vendor/quay.svg b/app/assets/ico/vendor/quay.svg new file mode 100644 index 000000000..3de9c16b6 --- /dev/null +++ b/app/assets/ico/vendor/quay.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/docker/components/network-macvlan-form/networkMacvlanForm.html b/app/docker/components/network-macvlan-form/networkMacvlanForm.html index 4e7fe2d24..fb61daa16 100644 --- a/app/docker/components/network-macvlan-form/networkMacvlanForm.html +++ b/app/docker/components/network-macvlan-form/networkMacvlanForm.html @@ -14,7 +14,7 @@