diff --git a/controller/util.go b/controller/util.go index 86cafc93..83329638 100644 --- a/controller/util.go +++ b/controller/util.go @@ -9,11 +9,9 @@ import ( "github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_util" "github.com/pkg/errors" - "github.com/sirupsen/logrus" ) func ZrokAuthenticate(token string) (*rest_model_zrok.Principal, error) { - logrus.Infof("authenticating") tx, err := str.Begin() if err != nil { return nil, err diff --git a/ui/package-lock.json b/ui/package-lock.json index c4f3db62..e13fef70 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -2007,6 +2007,19 @@ "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" }, + "@mdi/js": { + "version": "7.0.96", + "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.0.96.tgz", + "integrity": "sha512-lNqhkV3cpPfYb/Avh+vXLFukUTbHbyHoFo4Jdc7Oc9UvURGVhamFIpgOVvEf2bNA78zvjXTZeVWExUTR+DLBfQ==" + }, + "@mdi/react": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.6.1.tgz", + "integrity": "sha512-4qZeDcluDFGFTWkHs86VOlHkm6gnKaMql13/gpIcUQ8kzxHgpj31NuCkD8abECVfbULJ3shc7Yt4HJ6Wu6SN4w==", + "requires": { + "prop-types": "^15.7.2" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", diff --git a/ui/package.json b/ui/package.json index 3062650f..974e4e79 100644 --- a/ui/package.json +++ b/ui/package.json @@ -3,6 +3,8 @@ "version": "0.1.0", "private": true, "dependencies": { + "@mdi/js": "^7.0.96", + "@mdi/react": "^1.6.1", "@testing-library/jest-dom": "^5.16.4", "@testing-library/react": "^13.3.0", "@testing-library/user-event": "^13.5.0", diff --git a/ui/public/ziggy.png b/ui/public/ziggy.png deleted file mode 100755 index e4a15772..00000000 Binary files a/ui/public/ziggy.png and /dev/null differ diff --git a/ui/public/ziggy.svg b/ui/public/ziggy.svg new file mode 100755 index 00000000..73647067 --- /dev/null +++ b/ui/public/ziggy.svg @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/src/App.js b/ui/src/App.js index 7271d7b9..23b2193d 100644 --- a/ui/src/App.js +++ b/ui/src/App.js @@ -17,9 +17,7 @@ const App = () => { if (!user) { return ( - + ); } @@ -27,9 +25,9 @@ const App = () => {
- +

zrok

-
+
{ setUser(null); @@ -42,7 +40,6 @@ const App = () => {
-
diff --git a/ui/src/Identities.js b/ui/src/Identities.js index bee5f6d9..97201428 100644 --- a/ui/src/Identities.js +++ b/ui/src/Identities.js @@ -39,12 +39,13 @@ const Identities = (props) => { return (
-

Identities

+

Identities

{ identities && identities.length > 0 && (
)} diff --git a/ui/src/Logout.js b/ui/src/Logout.js index e226db35..f78bad00 100644 --- a/ui/src/Logout.js +++ b/ui/src/Logout.js @@ -1,10 +1,15 @@ +import Icon from '@mdi/react'; +import { mdiLogout } from '@mdi/js'; + +const logoutIcon = mdiLogout; + const Logout = (props) => { const onClick = () => { props.logout() } return ( - [x] {props.user.email} + {props.user.email} ); } diff --git a/ui/src/index.css b/ui/src/index.css index 0b77adb7..f94e5c1e 100644 --- a/ui/src/index.css +++ b/ui/src/index.css @@ -17,6 +17,7 @@ h1, h2, h3, h4, h5, h6 { .title { font-family: 'Russo One', sans-serif; font-size: 3em; + margin-left: 0.53em; } .container { @@ -26,11 +27,12 @@ h1, h2, h3, h4, h5, h6 { } .header { - background-color: #3c2693; + background-color: #3b2693; color: white; padding-left: 2em; padding-right: 2em; display: flex; + border-radius: 0 0 25px 25px; } .header-left { @@ -45,4 +47,9 @@ h1, h2, h3, h4, h5, h6 { .main { padding: 2em; +} + +.rdt_TableCol_Sortable div { + font-family: 'Russo One', sans-serif; + font-size: 1.25em; } \ No newline at end of file