Force service worker uninstall

.eslintrc.json

@@ -1,13 +0,0 @@
-{
-  "extends": ["next/core-web-vitals","prettier"],
-  "plugins": ["simple-import-sort"],
-  "rules": {
-    "simple-import-sort/imports": [
-      "warn",
-      {
-        "groups": [["^\\u0000", "^@?\\w", "^[^.]", "^\\."]]
-      }
-    ],
-    "simple-import-sort/exports": "warn"
-  }
-}

.github/workflows/build_and_push.yml

@@ -5,56 +5,51 @@ on:
       - main
     tags:
       - "**"
-  pull_request:
-
-env:
-  IMAGE_NAME: netbirdio/dashboard
 
 jobs:
   build_n_push:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: setup-node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v2
         with:
-          node-version: '18'
+          node-version: '16'
           cache: 'npm'
 
-      - name: Install dependencies
+      - name: Install dependecies
         run: npm install
 
-      - run: echo '{}' > .local-config.json
-
       - name: Build 
-        run: npm run build
+        # skiping fail on warning for now
+        run: CI=false npm run build
       - 
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
       - 
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v3
         with:
-          images: ${{ env.IMAGE_NAME }}
+          images: wiretrustee/dashboard
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
-          username: ${{ secrets.NB_DOCKER_USER }}
-          password: ${{ secrets.NB_DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
       -
         name: Docker build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
         with:
           context: .
           file: docker/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64,linux/arm
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/codespell.yml

@@ -1,15 +0,0 @@
-name: Codespell
-on: [pull_request]
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: codespell
-        uses: codespell-project/actions-codespell@v2
-        with:
-          only_warn: 1
-          skip: package-lock.json,*.svg

.gitignore

@@ -8,36 +8,21 @@
 # testing
 /coverage
 
-# next.js
-/.next/
-/out/
-
 # production
 /build
-/out
 
 # misc
 .DS_Store
-*.pem
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
 
-# debug
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# local env files
-.env*.local
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
-
-# config
-.local-config.json
-.configs/.local-config.zitadel.json
-.configs/.staging-config.json
-.configs/.temp-config.json
-.configs
+src/auth_config.json
+.idea
+.eslintcache
+src/.local-config.json

AUTHORS

@@ -1,3 +1,2 @@
 Mikhail Bragin (https://github.com/braginini)
 Maycon Santos (https://github.com/mlsmaycon)
-Wiretrustee UG (haftungsbeschränkt)

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2024 Wiretrustee UG (haftungsbeschränkt) & AUTHORS
+Copyright (c) 2021 Wiretrustee AUTHORS
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

README.md

@@ -1,4 +1,4 @@
-# NetBird Dashboard
+# NetBird dashboard
 
 This project is the UI for NetBird's Management service.
 
@@ -17,15 +17,15 @@ The dashboard makes it possible to:
 - define access controls
 
 ## Some Screenshots
-<img src="./src/assets/screenshots/peers.png" alt="peers"/>
-<img src="./src/assets/screenshots/add-peer.png" alt="add-peer"/>
+<img src="./media/auth.png" alt="auth"/>
+<img src="./media/peers.png" alt="peers"/>
+<img src="./media/add-peer.png" alt="add-peer"/>
 
 
 ## Technologies Used
 
-- NextJS
 - ReactJS
-- Tailwind CSS
+- AntD UI framework
 - Auth0
 - Nginx
 - Docker
@@ -36,58 +36,24 @@ Disclaimer. We believe that proper user management system is not a trivial task
 use Auth0 service that covers all our needs (user management, social login, JTW for the management API).
 Auth0 so far is the only 3rd party dependency that can't be really self-hosted.
 
-1. Install [Docker](https://docs.docker.com/get-docker/)
-2. Register [Auth0](https://auth0.com/) account
-3. Running NetBird UI Dashboard requires the following Auth0 environmental variables to be set (see docker command below):
+1. install [Docker](https://docs.docker.com/get-docker/)
+2. register [Auth0](https://auth0.com/) account
+3. running Wiretrustee UI Dashboard requires the following Auth0 environmental variables to be set (see docker command below):
 
-   `AUTH0_DOMAIN` `AUTH0_CLIENT_ID` `AUTH0_AUDIENCE`
+   ```AUTH0_DOMAIN``` ```AUTH0_CLIENT_ID``` ```AUTH0_AUDIENCE```
 
    To obtain these, please use [Auth0 React SDK Guide](https://auth0.com/docs/quickstart/spa/react/01-login#configure-auth0) up until "Configure Allowed Web Origins"
 
-4. NetBird UI Dashboard uses NetBirds Management Service HTTP API, so setting `NETBIRD_MGMT_API_ENDPOINT` is required. Most likely it will be `http://localhost:33071` if you are hosting Management API on the same server.
+4. Wiretrustee UI Dashboard uses Wiretrustee Management Service HTTP API, so setting ```WIRETRUSTEE_MGMT_API_ENDPOINT``` is required. Most likely it will be ```http://localhost:33071``` if you are hosting Management API on the same server.
 5. Run docker container without SSL (Let's Encrypt):
 
-   ```shell
-   docker run -d --name netbird-dashboard \
-     --rm -p 80:80 -p 443:443 \
-     -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> \
-     -e AUTH0_CLIENT_ID=<SET YOUR CLIENT ID> \
-     -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> \
-     -e NETBIRD_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> \
-     netbirdio/dashboard:main
-   ```
+   ```docker run -d --name wiretrustee-dashboard --rm -p 80:80 -p 443:443  -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> -e AUTH0_CLIENT_ID=<SET YOUR CLIENT ID> -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> -e  WIRETRUSTEE_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> wiretrustee/dashboard:main```
 6. Run docker container with SSL (Let's Encrypt):
 
-   ```shell
-   docker run -d --name netbird-dashboard \
-     --rm -p 80:80 -p 443:443 \
-     -e NGINX_SSL_PORT=443 \
-     -e LETSENCRYPT_DOMAIN=<YOUR PUBLIC DOMAIN> \
-     -e LETSENCRYPT_EMAIL=<YOUR EMAIL> \
-     -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> \
-     -e AUTH0_CLIENT_ID=<SET YOUR CLEITN ID> \
-     -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> \
-     -e NETBIRD_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> \
-     netbirdio/dashboard:main
-   ```
+   ```docker run -d --name wiretrustee-dashboard --rm -p 80:80 -p 443:443 -e NGINX_SSL_PORT=443 -e LETSENCRYPT_DOMAIN=<YOUR PUBLIC DOMAIN> -e LETSENCRYPT_EMAIL=<YOUR EMAIL>  -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> -e AUTH0_CLIENT_ID=<SET YOUR CLEITN ID> -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> -e  WIRETRUSTEE_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> wiretrustee/dashboard:main```
 
 ## How to run local development
-
-1. Install [Node](https://nodejs.org/)
-2. Create and update the `.local-config.json` file. This file should contain values to be replaced from `config.json`
-3. Run `npm install` to install dependencies
-4. Run `npm run dev` to start the development server
-
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-You can start editing by modifying the code inside `src/..`  
-The page auto-updates as you edit the file.
-
-## How to migrate from old dashboard (v1) 
-
-The new dashboard comes with a new docker image `netbirdio/dashboard:main`.  
-To migrate from the old dashboard (v1) `wiretrustee/dashboard:main` to the new one, please follow the steps below.
-
-1. Stop the dashboard container `docker compose down dashboard`
-2. Replace the docker image name in your `docker-compose.yml` with `netbirdio/dashboard:main`
-3. Recreate the dashboard container `docker compose up -d --force-recreate dashboard`
+1. Install node 16
+2. create and update the src/.local-config.json file. This file should contain values to be replaced from src/config.json
+3. run `npm install`
+4. run `npm run start dev`

components.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
-  "rsc": true,
-  "tsx": true,
-  "tailwind": {
-    "config": "tailwind.config.ts",
-    "css": "src/app/globals.css",
-    "baseColor": "neutral",
-    "cssVariables": false
-  },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/utils/helpers"
-  }
-}

config.json

@@ -1,16 +0,0 @@
-{
-  "auth0Auth": "$USE_AUTH0",
-  "authAuthority": "$AUTH_AUTHORITY",
-  "authClientId": "$AUTH_CLIENT_ID",
-  "authClientSecret": "$AUTH_CLIENT_SECRET",
-  "authScopesSupported": "$AUTH_SUPPORTED_SCOPES",
-  "authAudience": "$AUTH_AUDIENCE",
-  "apiOrigin": "$NETBIRD_MGMT_API_ENDPOINT",
-  "grpcApiOrigin": "$NETBIRD_MGMT_GRPC_API_ENDPOINT",
-  "redirectURI": "$AUTH_REDIRECT_URI",
-  "silentRedirectURI": "$AUTH_SILENT_REDIRECT_URI",
-  "tokenSource": "$NETBIRD_TOKEN_SOURCE",
-  "dragQueryParams": "$NETBIRD_DRAG_QUERY_PARAMS",
-  "hotjarTrackID": "$NETBIRD_HOTJAR_TRACK_ID",
-  "googleAnalyticsID": "$NETBIRD_GOOGLE_ANALYTICS_ID"
-}

cypress.config.ts

@@ -1,15 +0,0 @@
-import { defineConfig } from "cypress";
-
-export default defineConfig({
-  e2e: {
-    baseUrl: "http://localhost:3000",
-  },
-  component: {
-    devServer: {
-      framework: "next",
-      bundler: "webpack",
-    },
-  },
-  viewportWidth: 1920,
-  viewportHeight: 1080,
-});

cypress/e2e/test.cy.ts

@@ -1,13 +0,0 @@
-describe("Click all tabs in peer modal", () => {
-  it("passes", () => {
-    cy.visit("/install");
-    cy.get("div").contains("Linux").click();
-    cy.get("[data-cy=copy-to-clipboard]").click();
-    cy.get("div").contains("Windows").click();
-    cy.get("[data-cy=copy-to-clipboard]").click();
-    cy.get("div").contains("Android").click();
-    cy.get("[data-cy=copy-to-clipboard]").click();
-    cy.get("div").contains("Docker").click();
-    cy.get("[data-cy=copy-to-clipboard]").click();
-  });
-});

cypress/fixtures/example.json

@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}

cypress/support/commands.ts

@@ -1,37 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************
-// This example commands.ts shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-//
-// declare global {
-//   namespace Cypress {
-//     interface Chainable {
-//       login(email: string, password: string): Chainable<void>
-//       drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
-//     }
-//   }
-// }

cypress/support/e2e.ts

@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/e2e.ts is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')

cypress/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": ["es5", "dom"],
-    "baseUrl": "http://localhost:3000",
-    "types": ["cypress", "node"],
-  },
-  "include": ["**/*.ts"]
-}

docker/Dockerfile

@@ -21,4 +21,4 @@ RUN chmod +x /usr/local/init_react_envs.sh
 # configure supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf
 # copy build files
-COPY out/ /usr/share/nginx/html/
+COPY build/ /usr/share/nginx/html/

docker/README.md

@@ -1,20 +1,20 @@
-# NetBird Dashboard
-NetBird Dashboard is NetBirds Management server UI. It allows users to signin, view setup keys and manage peers. This image is **not ready** for production use.
+# Wiretrustee Dashboard
+Wiretrustee Dashboard is a the Wiretrustee Managemenet server UI. It allow users to signin, view setup keys and manage peers. This image is **not ready** for production use.
 ## Tags
 ```latest``` ```vX.X.X``` not available yet.
 
-```main``` built on every PR being merged to the repository
+```main``` builded on every PR being merged to the repository
 ## How to use this image
 HTTP run:
 ```shell
 docker run -d --rm -p 80:80 wiretrustee/dashboard:main
 ```
-Using SSL certificate from Let's Encrypt®:
+Using SSL certificate from Let's Encript®:
 ```shell
 docker run -d --rm -p 80:80 -p 443:443 \
   -e LETSENCRYPT_DOMAIN=app.mydomain.com \
   -e LETSENCRYPT_EMAIL=hello@mydomain.com \
-  netbirdio/dashboard:main
+  wiretrustee/dashboard:main
 ```
 > For SSL generation, you need to run this image in a server with proper public IP and a domain name pointing to it.
 ## Environment variables

docker/default.conf

@@ -6,11 +6,11 @@ server {
     root /usr/share/nginx/html;
 
     location / {
-      try_files $uri $uri.html $uri/ =404;
-   }
+        try_files $uri /index.html;
+    }
+	# You may need this to prevent return 404 recursion.
+	location = /404.html {
+		internal;
+	}
 
-   error_page 404 /404.html;
-   location = /404.html {
-      internal;
-   }
 }

docker/init_react_envs.sh

@@ -1,43 +1,19 @@
 #!/bin/bash
 set -e
 
-if [[ -z "${AUTH_AUTHORITY}" ]]; then
-    if [[ -z "${AUTH0_DOMAIN}" ]]; then
-        echo "AUTH_AUTHORITY or AUTH0_DOMAIN environment variable must be set"
-        exit 1
-    fi
+if [[ -z "${AUTH0_DOMAIN}" ]]; then
+    echo "AUTH0_DOMAIN environment variable must be set"
+    exit 1
 fi
 
-if [[ -z "${AUTH_CLIENT_ID}" ]]; then
-    if [[ -z "${AUTH0_CLIENT_ID}" ]]; then
-        echo "AUTH_CLIENT_ID or AUTH0_CLIENT_ID environment variable must be set"
-        exit 1
-    fi
+if [[ -z "${AUTH0_CLIENT_ID}" ]]; then
+    echo "AUTH0_CLIENT_ID environment variable must be set"
+    exit 1
 fi
 
-if [[ -z "${AUTH_AUDIENCE}" ]]; then
-    if [[ -z "${AUTH0_AUDIENCE}" ]]; then
-        echo "AUTH_AUDIENCE or AUTH0_AUDIENCE environment variable must be set"
-        exit 1
-    fi
-fi
-
-if [[ "${AUTH_AUDIENCE}" == "none" ]]; then
-    unset AUTH_AUDIENCE
-fi
-
-if [[ -z "${AUTH_SUPPORTED_SCOPES}" ]]; then
-    if [[ -z "${AUTH0_DOMAIN}" ]]; then
-        echo "AUTH_SUPPORTED_SCOPES environment variable must be set"
-        exit 1
-    fi
-fi
-
-if [[ -z "${USE_AUTH0}" ]]; then
-    if [[ -z "${AUTH0_DOMAIN}" ]]; then
-        echo "USE_AUTH0 environment variable must be set"
-        exit 1
-    fi
+if [[ -z "${AUTH0_AUDIENCE}" ]]; then
+    echo "AUTH0_AUDIENCE environment variable must be set"
+    exit 1
 fi
 
 if [[ -z "${NETBIRD_MGMT_API_ENDPOINT}" ]]; then
@@ -45,31 +21,23 @@ if [[ -z "${NETBIRD_MGMT_API_ENDPOINT}" ]]; then
     exit 1
 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}
-export USE_AUTH0=${USE_AUTH0:-true}
-export AUTH_SUPPORTED_SCOPES=${AUTH_SUPPORTED_SCOPES:-openid profile email api offline_access email_verified}
-
-export NETBIRD_MGMT_API_ENDPOINT=$(echo $NETBIRD_MGMT_API_ENDPOINT | sed -E 's/(:80|:443)$//')
-export NETBIRD_MGMT_GRPC_API_ENDPOINT=${NETBIRD_MGMT_GRPC_API_ENDPOINT}
-export NETBIRD_HOTJAR_TRACK_ID=${NETBIRD_HOTJAR_TRACK_ID}
-export NETBIRD_GOOGLE_ANALYTICS_ID=${NETBIRD_GOOGLE_ANALYTICS_ID}
-export NETBIRD_TOKEN_SOURCE=${NETBIRD_TOKEN_SOURCE:-accessToken}
-export NETBIRD_DRAG_QUERY_PARAMS=${NETBIRD_DRAG_QUERY_PARAMS:-false}
+AUTH0_DOMAIN=${AUTH0_DOMAIN}
+AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID}
+AUTH0_AUDIENCE=${AUTH0_AUDIENCE}
+NETBIRD_MGMT_API_ENDPOINT=${NETBIRD_MGMT_API_ENDPOINT}
+NETBIRD_MGMT_GRPC_API_ENDPOINT=${NETBIRD_MGMT_GRPC_API_ENDPOINT}
 
+REPO="https://github.com/netbirdio/netbird/"
+# this command will fetch the latest release e.g. v0.6.3
+export NETBIRD_LATEST_VERSION=$(basename $(curl -fs -o/dev/null -w %{redirect_url} ${REPO}releases/latest))
 echo "NetBird latest version: ${NETBIRD_LATEST_VERSION}"
 
 # replace ENVs in the config
-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 \$\$NETBIRD_GOOGLE_ANALYTICS_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS"
+ENV_STR="\$\$AUTH0_DOMAIN \$\$AUTH0_CLIENT_ID \$\$AUTH0_AUDIENCE \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_LATEST_VERSION"
+MAIN_JS=$(find /usr/share/nginx/html/static/js/main.*js)
+cp "$MAIN_JS" "$MAIN_JS".copy
+envsubst "$ENV_STR" < "$MAIN_JS".copy > "$MAIN_JS"
+rm "$MAIN_JS".copy
+
+
 
-OIDC_TRUSTED_DOMAINS="/usr/share/nginx/html/OidcTrustedDomains.js"
-envsubst "$ENV_STR" < "$OIDC_TRUSTED_DOMAINS".tmpl > "$OIDC_TRUSTED_DOMAINS"
-for f in $(grep -R -l AUTH_SUPPORTED_SCOPES /usr/share/nginx/html); do
-    cp "$f" "$f".copy
-    envsubst "$ENV_STR" < "$f".copy > "$f"
-    rm "$f".copy
-done