fix: remove any trailing / in auth authority (#201 )

Fix elements alignment for the ACLs view
Udpate acceess control table layout (#199 )
2026-09-23 00:30:43 -07:00 · 2023-06-07 15:35:20 +02:00 · 2023-06-06 15:07:51 +02:00 · 2023-06-06 14:31:18 +02:00 · 2023-06-05 18:44:18 +02:00 · 2023-06-05 18:10:21 +02:00
50 changed files with 6259 additions and 3356 deletions
@@ -43,6 +43,7 @@ fi

 export AUTH_AUTHORITY=${AUTH_AUTHORITY:-https://$AUTH0_DOMAIN}
 export AUTH_CLIENT_ID=${AUTH_CLIENT_ID:-$AUTH0_CLIENT_ID}
+export AUTH_CLIENT_SECRET=${AUTH_CLIENT_SECRET}
 export AUTH_AUDIENCE=${AUTH_AUDIENCE:-$AUTH0_AUDIENCE}
 export AUTH_REDIRECT_URI=${AUTH_REDIRECT_URI}
 export AUTH_SILENT_REDIRECT_URI=${AUTH_SILENT_REDIRECT_URI}
@@ -57,7 +58,7 @@ export NETBIRD_TOKEN_SOURCE=${NETBIRD_TOKEN_SOURCE:-accessToken}
 echo "NetBird latest version: ${NETBIRD_LATEST_VERSION}"

 # replace ENVs in the config
-ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE"
+ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_CLIENT_SECRET \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE"

 MAIN_JS=$(find /usr/share/nginx/html/static/js/main.*js)
 OIDC_TRUSTED_DOMAINS="/usr/share/nginx/html/OidcTrustedDomains.js"
@@ -10395,9 +10395,9 @@
      }
    },
    "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
      "bin": {
        "json5": "lib/cli.js"
      },
@@ -15701,9 +15701,9 @@
      }
    },
    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
      "dependencies": {
        "minimist": "^1.2.0"
      },
@@ -16110,9 +16110,9 @@
      }
    },
    "node_modules/webpack": {
-      "version": "5.74.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+      "version": "5.76.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+      "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
      "dependencies": {
        "@types/eslint-scope": "^3.7.3",
        "@types/estree": "^0.0.51",
@@ -24411,9 +24411,9 @@
      }
    },
    "json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
    },
    "jsonfile": {
      "version": "6.1.0",
@@ -28108,9 +28108,9 @@
      },
      "dependencies": {
        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
          "requires": {
            "minimist": "^1.2.0"
          }
@@ -28411,9 +28411,9 @@
      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
    },
    "webpack": {
-      "version": "5.74.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+      "version": "5.76.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz",
+      "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==",
      "requires": {
        "@types/eslint-scope": "^3.7.3",
        "@types/estree": "^0.0.51",
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="29.435" height="7.636" viewBox="0 0 29.435 7.636">
-  <path id="direct_bi" d="M3.64,8.158-.178,4.34,3.64.522,4.3,1.17l-2.7,2.7h25.89l-2.7-2.7.656-.648L29.257,4.34,27.213,6.384,25.439,8.158,24.783,7.5l2.7-2.693H1.595L4.3,7.5Z" transform="translate(0.178 -0.522)" fill="#1e429f"/>
+<svg width="39" height="6" viewBox="0 0 39 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.451731 2.66267C0.315048 2.79935 0.315048 3.02096 0.451731 3.15764L2.67912 5.38503C2.8158 5.52171 3.03741 5.52171 3.17409 5.38503C3.31078 5.24835 3.31078 5.02674 3.17409 4.89006L1.19419 2.91016L3.17409 0.930257C3.31078 0.793574 3.31078 0.571966 3.17409 0.435282C3.03741 0.298599 2.8158 0.298599 2.67912 0.435282L0.451731 2.66267ZM38.3807 3.15764C38.5174 3.02096 38.5174 2.79935 38.3807 2.66267L36.1533 0.435282C36.0166 0.298599 35.795 0.298599 35.6583 0.435282C35.5216 0.571966 35.5216 0.793574 35.6583 0.930257L37.6382 2.91016L35.6583 4.89006C35.5216 5.02674 35.5216 5.24835 35.6583 5.38503C35.795 5.52171 36.0166 5.52171 36.1533 5.38503L38.3807 3.15764ZM0.699219 3.26016H38.1332V2.56016H0.699219V3.26016Z" fill="#03543F"/>
 </svg>
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="29.497" height="7.636" viewBox="0 0 29.497 7.636">
-  <path id="direct_out" d="M26.589,8l-.656-.656,2.7-2.693H.91V3.713H28.635l-2.7-2.7.656-.648,3.818,3.818Z" transform="translate(-0.91 -0.364)" fill="#03543f"/>
+<svg width="39" height="6" viewBox="0 0 39 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.3807 3.15764C38.5174 3.02096 38.5174 2.79935 38.3807 2.66267L36.1533 0.435282C36.0166 0.298599 35.795 0.298599 35.6583 0.435282C35.5216 0.571966 35.5216 0.793574 35.6583 0.930257L37.6382 2.91016L35.6583 4.89006C35.5216 5.02674 35.5216 5.24835 35.6583 5.38503C35.795 5.52171 36.0166 5.52171 36.1533 5.38503L38.3807 3.15764ZM0.699219 3.26016H38.1332V2.56016H0.699219V3.26016Z" fill="#1E429F"/>
 </svg>
@@ -22,7 +22,7 @@ const Banner = () => {
 	const linkLearnMore = () => {
 		return (
 			<a
-				href="https://netbird.io/docs/how-to-guides/nameservers"
+				href="https://docs.netbird.io/how-to/manage-dns-in-your-network"
 				className="font-bold underline"
 				target="_blank"
 				rel="noreferrer"
@@ -604,7 +604,7 @@ const NameServerGroupUpdate = () => {
                                <Col span={24}>
                                    <Divider></Divider>
                                    <Button icon={<QuestionCircleFilled/>} type="link" target="_blank"
-                                            href="https://netbird.io/docs/how-to-guides/nameservers">Learn more about nameservers</Button>
+                                            href="https://docs.netbird.io/how-to/manage-dns-in-your-network">Learn more about nameservers</Button>
                                </Col>
                            </Row>
                        </Form>) :
@@ -458,7 +458,7 @@ const RouteUpdate = () => {
                            <Col span={24}>
                                <Divider></Divider>
                                <Button icon={<QuestionCircleFilled/>} type="link" target="_blank"
-                                        href="https://netbird.io/docs/how-to-guides/network-routes">Learn more about network routes</Button>
+                                        href="https://docs.netbird.io/how-to/routing-traffic-to-private-networks">Learn more about network routes</Button>
                            </Col>
                        </Row>
                    </Form>
@@ -130,27 +130,25 @@ const AddPATPopup = () => {
                }
                width={460}
            >
-                <Container style={{textAlign: "start"}}>
+                <Container style={{textAlign: "start", marginLeft: "-15px", marginRight: "-15px"}}>
                    <Paragraph
-                        style={{textAlign: "start", whiteSpace: "pre-line", fontSize: "22px", fontWeight: "500"}}>
-                        {showPlainToken ? "Token created successfully!" : "Create a Personal Access Token"}
+                        style={{textAlign: "start", whiteSpace: "pre-line", fontSize: "22px"}}>
+                        {showPlainToken ? "Token created successfully!" : "Create token"}
                    </Paragraph>
                    {!showPlainToken && <Paragraph type={"secondary"}
                               style={{
                                   textAlign: "start",
-                                   fontSize: "14px",
                                   whiteSpace: "pre-line",
                                   marginTop: "-23px",
                                   paddingBottom: "25px",
                               }}>
-                        {"This token can be used to authenticate against" + "\n" + "NetBird's Public API."}
+                        {"Use this token to access NetBird's public API"}
                    </Paragraph>}
                    {showPlainToken && <Paragraph type={"secondary"} style={{
                        textAlign: "start",
-                        fontSize: "14px",
                        whiteSpace: "pre-line",
-                        marginTop: "40px",
-                    }}>{"This token will not be shown again, so be sure to copy it and" + "\n" + "store in a secure location."}</Paragraph>}
+                        marginTop: "25px",
+                    }}>{"This token won't be shown again, so be sure to copy and store it in a secure location"}</Paragraph>}
                    {!showPlainToken && <Form layout="vertical" hideRequiredMark form={form}
                                              initialValues={{
                                                  expires_in: ExpiresInDefault,
@@ -160,14 +158,14 @@ const AddPATPopup = () => {
                            <Col span={24}>
                                <Row align="top">
                                    <Col flex="auto">
-                                        <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "-8px"}}>Token name</Paragraph>
-                                        <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Create a name to identify the token easily</Paragraph>
+                                        <Paragraph style={{fontWeight: "bold", marginTop: "-10px"}}>Name</Paragraph>
+                                        <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Set an easily identifiable name for your token</Paragraph>
                                        <Form.Item
                                            name="name"
                                            style={{marginTop: "-10px"}}
                                            rules={[{
                                                required: true,
-                                                message: 'Please add a name for this personal access token',
+                                                message: 'Please add a name for this token',
                                                whitespace: true
                                            }]}
                                        >
@@ -179,9 +177,9 @@ const AddPATPopup = () => {
                                    </Col>
                                </Row>
                            </Col>
-                            <Col span={24} style={{textAlign: "left"}}>
-                                <Paragraph style={{fontSize: "16px", fontWeight: "500"}}>Expires in</Paragraph>
-                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Number of days this token is valid for</Paragraph>
+                            <Col span={24} style={{textAlign: "left", marginTop: "10px"}}>
+                                <Paragraph style={{fontWeight: "bold", marginTop: "-10px"}}>Expires in</Paragraph>
+                                <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Number of days this token will be valid for</Paragraph>
                                <Form.Item
                                    name="expires_in"
                                    style={{marginTop: "-10px"}}
@@ -195,10 +193,10 @@ const AddPATPopup = () => {
                                </Form.Item>
                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Should be between 1 and 365 days</Paragraph>
                            </Col>
-                            {/*<Col span={24}>*/}
-                            {/*    <Button icon={<QuestionCircleFilled/>} type="link" target="_blank" disabled={true} style={{marginTop: "20px", marginBottom: "20px"}}*/}
-                            {/*            href="https://netbird.io/docs/overview/personal-access-tokens">Learn more about personal access tokens</Button>*/}
-                            {/*</Col>*/}
+                            <Col span={24}>
+                                <Button icon={<QuestionCircleFilled/>} type="link" target="_blank" disabled={true} style={{marginTop: "20px", marginBottom: "20px"}}
+                                        href="https://docs.netbird.io/how-to/access-netbird-public-api">Learn more about personal access tokens</Button>
+                            </Col>
                        </Row>
                    </Form>}
                    {showPlainToken &&
@@ -199,10 +199,10 @@ const AddServiceUserPopup = () => {
                }
                width={460}
            >
-                <Container style={{textAlign: "start"}}>
+                <Container style={{textAlign: "start", marginLeft: "-15px", marginRight: "-15px"}}>
                    <Paragraph
-                        style={{textAlign: "start", whiteSpace: "pre-line", fontSize: "22px", fontWeight: "500"}}>
-                        {"Add Service User"}
+                        style={{textAlign: "start", whiteSpace: "pre-line", fontSize: "22px"}}>
+                        {"Add service user"}
                    </Paragraph>
                    <Paragraph type={"secondary"}
                               style={{
@@ -211,7 +211,7 @@ const AddServiceUserPopup = () => {
                                   marginTop: "-23px",
                                   paddingBottom: "25px",
                               }}>
-                        {"Service Users are non-login users that are not associated with any specific person."}
+                        {"Service users are non-login users that are not associated with any specific person."}
                    </Paragraph>
                    <Form layout="vertical" hideRequiredMark form={form}
                          initialValues={{
@@ -220,8 +220,8 @@ const AddServiceUserPopup = () => {
                    >
                        <Row gutter={16}>
                            <Col span={24}>
-                                <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "-10px"}}>Name</Paragraph>
-                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Set a name to easily identify the user</Paragraph>
+                                <Paragraph style={{fontWeight: "bold", marginTop: "-10px"}}>Name</Paragraph>
+                                <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Set a name to easily identify the user</Paragraph>
                                <Form.Item
                                    name="name"
                                    rules={[{
@@ -232,14 +232,14 @@ const AddServiceUserPopup = () => {
                                    style={{marginTop: "-8px"}}
                                >
                                    <Input
-                                        placeholder={'for example "Ansible User"'}
+                                        placeholder={'for example "Ansible user"'}
                                        ref={inputNameRef}
                                        autoComplete="off"/>
                                </Form.Item>
                            </Col>
                            <Col span={24}>
-                                <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "0px"}}>Role</Paragraph>
-                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Set a role for the user to assign dashboard access permissions</Paragraph>
+                                <Paragraph style={{fontWeight: "bold", marginTop: "0px"}}>Role</Paragraph>
+                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-15px"}}>Set a role for the user to assign access permissions</Paragraph>
                                <Form.Item
                                    name="role"
                                    rules={[{
@@ -256,8 +256,8 @@ const AddServiceUserPopup = () => {
                                </Form.Item>
                            </Col>
                            {/*<Col span={24}>*/}
-                            {/*    <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "0px"}}>Auto-assigned groups</Paragraph>*/}
-                            {/*    <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Add groups, that will be assigned to peers added by this user</Paragraph>*/}
+                            {/*    <Paragraph style={{fontWeight: "bold", marginTop: "0px"}}>Auto-assigned groups</Paragraph>*/}
+                            {/*    <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-15px"}}>Add groups, that will be assigned to peers added by this user</Paragraph>*/}
                            {/*    <Form.Item*/}
                            {/*        name="autoGroupsNames"*/}
                            {/*        label="Auto-assigned groups"*/}
@@ -12,7 +12,6 @@ import {
    Typography
 } from "antd";
 import {Container} from "../Container";
-import {CloseOutlined} from "@ant-design/icons";
 import React, {useEffect, useRef, useState} from "react";
 import {useDispatch, useSelector} from "react-redux";
 import {RootState} from "typesafe-actions";
@@ -20,9 +19,9 @@ import {useGetTokenSilently} from "../../utils/token";
 import {actions as userActions} from "../../store/user";
 import {actions as groupActions} from "../../store/group";
 import {User, UserToSave} from "../../store/user/types";
-import {Header} from "antd/es/layout/layout";
 import {RuleObject} from "antd/lib/form";
 import {CustomTagProps} from "rc-select/lib/BaseSelect";
+import {QuestionCircleFilled} from "@ant-design/icons";

 const {Title, Text, Paragraph} = Typography;
 const {Option} = Select;
@@ -200,10 +199,10 @@ const InviteUserPopup = () => {
                }
                width={460}
            >
-                <Container style={{textAlign: "start"}}>
+                <Container style={{textAlign: "start", marginLeft: "-15px", marginRight: "-15px"}}>
                    <Paragraph
                        style={{textAlign: "start", whiteSpace: "pre-line", fontSize: "22px", fontWeight: "500"}}>
-                        {"Invite User"}
+                        {"Invite user"}
                    </Paragraph>
                    <Paragraph type={"secondary"}
                               style={{
@@ -222,8 +221,8 @@ const InviteUserPopup = () => {
                    >
                        <Row gutter={16}>
                            <Col span={24}>
-                                <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "-10px"}}>Name</Paragraph>
-                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Set a name to easily identify the user</Paragraph>
+                                <Paragraph style={{fontWeight: "bold", marginTop: "-10px"}}>Name</Paragraph>
+                                <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Set a name to easily identify the user</Paragraph>
                                <Form.Item
                                    name="name"
                                    rules={[{
@@ -240,8 +239,8 @@ const InviteUserPopup = () => {
                                </Form.Item>
                            </Col>
                            <Col span={24}>
-                                <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "0px"}}>Email</Paragraph>
-                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Provide the email address of the user</Paragraph>
+                                <Paragraph style={{ fontWeight: "bold", marginTop: "0px"}}>Email</Paragraph>
+                                <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Provide the email address of the user</Paragraph>
                                <Form.Item
                                    name="email"
                                    rules={[{
@@ -259,8 +258,8 @@ const InviteUserPopup = () => {
                                </Form.Item>
                            </Col>
                            <Col span={24}>
-                                <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "0px"}}>Role</Paragraph>
-                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Set a role for the user to assign dashboard access permissions</Paragraph>
+                                <Paragraph style={{ fontWeight: "bold", marginTop: "0px"}}>Role</Paragraph>
+                                <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Set a role for the user to assign access permissions</Paragraph>
                                <Form.Item
                                    name="role"
                                    rules={[{
@@ -277,8 +276,8 @@ const InviteUserPopup = () => {
                                </Form.Item>
                            </Col>
                            <Col span={24}>
-                                <Paragraph style={{fontSize: "16px", fontWeight: "500", marginTop: "0px"}}>Auto-assigned groups</Paragraph>
-                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Add groups, that will be assigned to peers added by this user</Paragraph>
+                                <Paragraph style={{fontWeight: "bold", marginTop: "0px"}}>Auto-assigned groups</Paragraph>
+                                <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Add groups, that will be assigned to peers added by this user</Paragraph>
                                <Form.Item
                                    name="autoGroupsNames"
                                    tooltip="Every peer enrolled with this user will be automatically added to these groups"
@@ -300,10 +299,10 @@ const InviteUserPopup = () => {
                                    </Select>
                                </Form.Item>
                            </Col>
-                            {/*<Col span={24}>*/}
-                            {/*    <Button icon={<QuestionCircleFilled/>} type="link" target="_blank" disabled={true} style={{marginTop: "20px", marginBottom: "20px"}}*/}
-                            {/*            href="https://netbird.io/docs/overview/personal-access-tokens">Learn more about user</Button>*/}
-                            {/*</Col>*/}
+                            <Col span={24}>
+                                <Button icon={<QuestionCircleFilled/>} type="link" target="_blank" disabled={true} style={{marginTop: "20px", marginBottom: "20px"}}
+                                        href="https://docs.netbird.io/how-to/access-netbird-public-api">Learn more about user</Button>
+                            </Col>
                        </Row>
                    </Form>
                </Container>
@@ -10,6 +10,7 @@ import WindowsTab from "./WindowsTab";
 import MacTab from "./MacTab";
 import Link from "antd/lib/typography/Link";
 import DockerTab from "./DockerTab";
+import AndroidTab from "./AndroidTab";

 type Props = {
    greeting?: string;
@@ -48,14 +49,14 @@ export const AddPeerPopup: React.FC<Props> = ({
        },
        {
            key: "3",
-            label: <span><AppleFilled/>macOS</span>,
+            label: <span><AppleFilled/>MacOS</span>,
            children: <MacTab/>,
        },
-        /*{
+        {
            key: "4",
            label: <span><AndroidFilled/>Android</span>,
-            children: <></>,
-        },*/
+            children: <AndroidTab/>,
+        },
        {
            key: "5",
            label: <span><Icon component={DockerSVG}/>Docker</span>,
@@ -91,7 +92,7 @@ export const AddPeerPopup: React.FC<Props> = ({
            After that you should be connected. Add more devices to your network or manage your existing devices in the
            admin panel.
            If you have further questions check out our {<Link target="_blank"
-                                                               href={"https://netbird.io/docs/getting-started/installation"}>installation
+                                                               href={"https://docs.netbird.io/how-to/getting-started#installation"}>installation
            guide</Link>}
        </Paragraph>
    </>
@@ -0,0 +1,51 @@
+import React, {useState} from 'react';
+
+import {Button, Image, Typography} from "antd";
+import TabSteps from "./TabSteps";
+import { StepCommand } from "./types"
+import googleplay from '../../../../assets/google-play-badge.png';
+const {Text} = Typography;
+
+export const AndroidTab = () => {
+
+    const [steps, setSteps] = useState([
+        {
+            key: 1,
+            title: 'Download and install the application from Google Play Store:',
+            commands: (
+                <a href="https://play.google.com/store/apps/details?id=io.netbird.client" target="_blank">
+                    <Image width="12em" preview={false} style={{marginTop: "5px"}} src={googleplay}/>
+                </a>
+            ),
+            copied: false
+        } as StepCommand,
+        {
+            key: 2,
+            title: 'Run the application and click on the "Connect" button in the middle of the screen',
+            commands: '',
+            copied: false,
+            showCopyButton: false
+        },
+        {
+            key: 3,
+            title: 'Sign up using your email address',
+            commands: '',
+            copied: false,
+            showCopyButton: false
+        }
+    ])
+
+    return (
+        <div style={{marginTop: 10}}>
+            <Text style={{fontWeight: "bold"}}>
+                Install on Android
+            </Text>
+            <div style={{marginTop: 5}}>
+                <TabSteps stepsItems={steps}/>
+            </div>
+
+        </div>
+    )
+}
+
+export default AndroidTab
@@ -31,7 +31,7 @@ export const DockerTab = () => {
            key: 3,
            title: "Read docs",
            commands: (
-                <Link href="https://netbird.io/docs/getting-started/installation#running-netbird-in-docker" target="_blank">Running NetBird in Docker</Link>
+                <Link href="https://docs.netbird.io/how-to/getting-started#running-net-bird-in-docker" target="_blank">Running NetBird in Docker</Link>
            ),
            copied: false,
            showCopyButton: false
@@ -12,7 +12,7 @@ export const OtherTab = () => {
            key: 1,
            title: 'For other installation options check our documentation.',
            commands: (
-                <Button type="primary" href={`https://netbird.io/docs/getting-started/installation#binary-install`} target="_blank">
+                <Button type="primary" href={`https://docs.netbird.io/how-to/getting-started#binary-install`} target="_blank">
                    Documentation
                </Button>
            ),
Author	SHA1	Message	Date
Bethuel	899f56acdc	fix: remove any trailing / in auth authority (#201 )	2023-06-07 15:35:20 +02:00
braginini	dc2760d5ff	Fix elements alignment for the ACLs view	2023-06-06 15:07:51 +02:00
Sarooj bukhariandSarooj Bukhari	5ae4fd31f1	Udpate acceess control table layout (#199 ) Co-authored-by: Sarooj Bukhari <120650489+saroojbukhari2022@users.noreply.github.com>	2023-06-06 14:31:18 +02:00
braginini	54d9d7c768	Remove peer view header	2023-06-05 18:44:18 +02:00
braginini	3a73781fca	Merge remote-tracking branch 'origin/main'	2023-06-05 18:10:21 +02:00
braginini	f3c5d4df6a	Fix color scheme for disabled fields	2023-06-05 18:07:28 +02:00
Bethuel	b4c9135c58	support authentication with client_secret (#198 )	2023-06-05 18:02:43 +02:00
Sarooj bukhari	a280d9c67c	Update peers layout and add routes component on peers edit (#196 )	2023-06-05 15:22:03 +02:00
Misha Bragin	5caf06b086	Decrease length of the hidden setup key prefix (#195 )	2023-06-02 11:06:05 +02:00
braginini	95af1c4e32	lower case of the Create key button	2023-06-02 10:53:47 +02:00
Sarooj bukhari	d247e7f3ed	Change edit key on group from popup to page (#194 )	2023-06-01 16:51:51 +02:00
Sarooj bukhari	391e534253	Show setupkey once on creation (#191 )	2023-06-01 12:08:58 +02:00
Sarooj bukhari	a7f64d4a15	Update setup key edit layout (#190 ) https://github.com/netbirdio/dashboard/issues/187	2023-06-01 09:49:10 +02:00
Givi Khojanashvili	53ed514803	ACL to firewall rules (#163 ) ACL based on the firewall rules	2023-06-01 10:06:08 +04:00
pascal-fischer	6cadce1598	Add pkg installer to MacOS popup (#188 )	2023-05-30 19:05:29 +02:00
pascal-fischer	c03d4b8a4b	Fix peers views in safari	2023-05-30 13:42:29 +02:00
dependabot[bot]	bc1053fbb4	Bump json5 from 1.0.1 to 1.0.2 (#124 )	2023-05-29 13:58:20 +02:00
dependabot[bot]	d154bfb799	Bump webpack from 5.74.0 to 5.76.1 (#148 )	2023-05-29 13:57:48 +02:00
pascal-fischer	67fd2fcb2e	Update links to docs (#182 )	2023-05-24 17:31:57 +02:00
Misha Bragin	f4933e45ee	Add peer on Android (#185 )	2023-05-19 21:42:13 +02:00
Misha Bragin	331dd2b429	Make it more visible that user can be blocked (#184 )	2023-05-19 12:40:08 +02:00
Misha Bragin	3a8106c1e7	Track block/unblock user activity (#181 )	2023-05-17 09:53:46 +02:00
Misha Bragin	b595e0d6a8	Switch to activate/deactivate a user (#179 ) This PR adds a switch to deactivate (or block) a user. Only admins can block/unblock users. Users can't block themselves.	2023-05-15 16:57:35 +02:00
pascal-fischer	33621cae5d	remove href- from breadcrumbs (#180 )	2023-05-15 14:28:14 +02:00
Maycon Santos	360d807008	Enable creating service user for all domains (#178 ) Removed unnecessary check from create button.	2023-05-14 11:56:14 +02:00
Misha Bragin	6f8897ffa5	Make breadcrumbs look like links (#176 )	2023-05-10 18:48:11 +02:00
pascal-fischer	75d5f804c5	fix dropdown button in lists to only show ellipsis (#175 )	2023-05-10 16:45:47 +02:00
pascal-fischer	f7cac02a2d	reduce api calls on user edit (#174 )	2023-05-10 16:44:43 +02:00
Misha Bragin	ec40730cb2	Fix setup key layout (#172 )	2023-05-08 17:49:27 +02:00
Misha Bragin	7f3648861b	Fix popups layout (#171 )	2023-05-08 12:30:53 +02:00
Crusadero	b50464db43	Setup keys screen (#167 )	2023-05-07 18:39:28 +02:00
pascal-fischer	1eb5ccc131	displaying proper groups and name on route peer update (#169 )	2023-05-05 15:50:39 +02:00