Use Alpine 3.14

Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.4.1 to 0.4.2.
- [Release notes](https://github.com/andialbrecht/sqlparse/releases)
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](https://github.com/andialbrecht/sqlparse/compare/0.4.1...0.4.2)

---
updated-dependencies:
- dependency-name: sqlparse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/build-docker-edge.yml

@@ -0,0 +1,48 @@
+name: Build edge Docker images
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish_to_docker_hub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set swap space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 5
+    
+      - name: Checkout code
+        uses: actions/checkout@v2
+      
+      - name: Prepare tags
+        id: prep
+        run: |
+          DOCKER_IMAGE=milesmcc/shynet
+          TAGS="${DOCKER_IMAGE}:edge"
+          echo ::set-output name=tags::${TAGS}
+          
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Build and push advanced image
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.prep.outputs.tags }}

.github/workflows/build-docker-manual.yml

@@ -0,0 +1,48 @@
+name: Build manual Docker images
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Docker image tag'  
+jobs:
+  publish_to_docker_hub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set swap space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 5
+      
+      - name: Checkout code
+        uses: actions/checkout@v2
+      
+      - name: Prepare tags
+        id: prep
+        run: |
+          DOCKER_IMAGE=milesmcc/shynet
+          TAGS="${DOCKER_IMAGE}:${{ github.event.inputs.tag }}"
+          echo ::set-output name=tags::${TAGS}
+          
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Build and push advanced image
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.prep.outputs.tags }}

.github/workflows/build-docker-release.yml

@@ -1,4 +1,4 @@
-name: Build docker images
+name: Build release Docker images
 
 on:
   push:
@@ -7,10 +7,13 @@ on:
 
 jobs:
   publish_to_docker_hub:
-
     runs-on: ubuntu-latest
-
     steps:
+      - name: Set swap space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 5
+
       - name: Checkout code
         uses: actions/checkout@v2
       
@@ -41,6 +44,6 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.prep.outputs.tags }}

.github/workflows/run-tests.yml

@@ -0,0 +1,37 @@
+name: Run tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      db:
+        image: postgres:12.3-alpine
+        env:
+          POSTGRES_USER: shynet_db_user
+          POSTGRES_PASSWORD: shynet_db_user_password
+          POSTGRES_DB: shynet_db
+        ports:
+          - 5432:5432
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.9]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Run image
+        uses: abatilo/actions-poetry@v2.0.0
+        with:
+          poetry-version: 1.1.6
+      - name: Install dependencies 
+        run: poetry install
+        
+      - name: Django Testing project
+        run: |
+          cp TEMPLATE.env .env
+          poetry run ./shynet/manage.py test

CONTRIBUTING.md

@@ -0,0 +1,15 @@
+# Contributing
+
+This document provides an overview of how to contribute to Shynet. Currently, it focuses on the more technical elements of contributing --- for example, setting up your development environment. Eventually, we will expand this guide to cover the social and governance oriented side of contributing as well.
+
+## Setting up your development environment
+
+To contribute to Shynet, you must have a reliable development environment. Because Shynet is intended to be run inside containers, we strongly encourage you to run Shynet in a container in development as well. The development setup described in this guide will use Docker and Docker Compose.
+
+To begin, clone the Shynet repository to your computer, and ensure that you have Docker and Docker Compose installed.
+
+Copy `TEMPLATE.env` to a new file called `.env`. This `.env` file will be used in your development environment. Paste `DEBUG=True` into the end of your new `.env` file so that Shynet will know to run in development mode.
+
+Finally, follow the steps in [GUIDE.md](GUIDE.md) on setting up a Shynet instance with Docker Compose. This is where you'll setup an admin user.
+
+_Did you have to perform additional steps to setup your environment? Document them here and submit a pull request!_

Dockerfile

@@ -1,26 +1,39 @@
-FROM python:alpine3.12
+FROM python:alpine3.14
 
 # Getting things ready
 WORKDIR /usr/src/shynet
-COPY Pipfile.lock Pipfile ./
-COPY package.json package-lock.json ../
-# Django expects node_modules to be in its parent directory.
 
 # Install dependencies & configure machine
 ARG GF_UID="500"
 ARG GF_GID="500"
 RUN apk update && \
-	apk add gettext curl bash npm && \
-	curl -m 180 "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=kKG1ebhL3iWVd0iv&suffix=tar.gz" | tar -xvz -C /tmp && \
+	apk add gettext curl bash npm libffi-dev rust cargo
+	# libffi-dev and rust are used for the cryptography package,
+	# which we indirectly rely on. Necessary for aarch64 support.
+
+# Collect GeoIP Database
+RUN curl -m 180 "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-ASN&license_key=kKG1ebhL3iWVd0iv&suffix=tar.gz" | tar -xvz -C /tmp && \
 	curl -m 180 "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-City&license_key=kKG1ebhL3iWVd0iv&suffix=tar.gz" | tar -xvz -C /tmp && \
 	mv /tmp/GeoLite2*/*.mmdb /etc && \
-	apk del curl && \
-	apk add --no-cache postgresql-libs && \
+	apk del curl
+
+# Move dependency files
+COPY poetry.lock pyproject.toml ./
+COPY package.json package-lock.json ../
+# Django expects node_modules to be in its parent directory.
+
+# Install more dependencies
+RUN apk add --no-cache postgresql-libs && \
 	apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev && \
 	npm i -P --prefix .. && \
-	pip install pipenv~=2020.6.2 && \
-	pipenv install --system --deploy && \
-	apk --purge del .build-deps && \
+	pip install poetry==1.1.7
+
+# Install Python dependencies
+RUN poetry config virtualenvs.create false && \
+    poetry install --no-dev --no-interaction --no-ansi
+
+# Cleanup dependencies & setup user group
+RUN apk --purge del .build-deps && \
 	rm -rf /var/lib/apt/lists/* && \
 	rm /var/cache/apk/* && \
 	addgroup --system -g $GF_GID appgroup && \
@@ -28,10 +41,15 @@ RUN apk update && \
 
 # Install Shynet
 COPY shynet .
+
+# Build Tailwind CSS and build static files
+COPY tailwind.config.js .
+RUN npx tailwindcss -i ./a17t/static/a17t/css/tailwind.css -o ./a17t/static/a17t/dist/tailwind.css --jit --minify
 RUN python manage.py collectstatic --noinput && \
 	python manage.py compilemessages
 
 # Launch
 USER appuser
 EXPOSE 8080
+HEALTHCHECK CMD bash -c 'wget -o /dev/null -O /dev/null --header "Host: ${ALLOWED_HOSTS%%,*}" "http://127.0.0.1:$PORT/healthz/?format=json"'
 CMD [ "./entrypoint.sh" ]

GUIDE.md

@@ -7,7 +7,6 @@
 - [Render](#render)
 - [Updating Your Configuration](#updating-your-configuration)
 - [Advanced Usage](#advanced-usage)
-  * [Installation with SSL](#installation-with-ssl)
   * [Configuring a Reverse Proxy](#configuring-a-reverse-proxy)
     + [Cloudflare](#cloudflare)
     + [Nginx](#nginx)
@@ -23,7 +22,7 @@
 
 ## Installation
 
-Installation of Shynet is easy! Follow the [Basic Installation](#basic-installation) guide or the [Basic Installation with Docker Compose](#basic-installation-with-docker-compose) below for a minimal installation, or if you are going to be running Shynet over HTTPS through a reverse proxy. If you'd like to run Shynet over HTTPS without a reverse proxy, skip ahead to [Installation with SSL](#installation-with-ssl) instead.
+Installation of Shynet is easy! Follow the [Basic Installation](#basic-installation) guide or the [Basic Installation with Docker Compose](#basic-installation-with-docker-compose) below for a minimal installation, or if you are going to be running Shynet over HTTPS through a reverse proxy.
 
 > **These commands assume Ubuntu.** If you're installing Shynet on a different platform, the process will be different.
 
@@ -35,21 +34,19 @@ Before continuing, please be sure to have the latest version of Docker installed
 
 2. Have a PostgreSQL server ready to go. This can be on the same machine as the deployment, or elsewhere. You'll just need a username, password, host, and port. (For info on how to setup a PostgreSQL server on Ubuntu, follow [this guide](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-18-04)).
 
-3. Configure an environment file for Shynet, using [this file](/TEMPLATE.env) as a template. (This file is typically named `.env`.) Make sure you set the database settings, or Shynet won't be able to run.
+3. Configure an environment file for Shynet, using [this file](/TEMPLATE.env) as a template. (This file is typically named `.env`.) Make sure you set the database settings, or Shynet won't be able to run. Also consider setting `ALLOWED_HOSTS` inside the environment file to your deployment's domain for better security.
 
 4. Launch the Shynet server for the first time by running `docker run --env-file=<your env file> milesmcc/shynet:latest`. Provided you're using the default environment information (i.e., `PERFORM_CHECKS_AND_SETUP` is `True`), you'll see a few warnings about not having an admin user or host setup; these are normal. Don't worry — we'll do this in the next step. You only need to stop if you see a stacktrace about being unable to connect to the database.
 
 5. Create an admin user by running `docker run --env-file=<your env file> milesmcc/shynet:latest ./manage.py registeradmin <your email>`. A temporary password will be printed to the console.
 
-6. Set the hostname of your Shynet instance by running `docker run --env-file=<your env file> milesmcc/shynet:latest ./manage.py hostname <your public hostname>`, where `<your public hostname>` is the _publicly accessible hostname_ of your instance, including port. This setting affects the URL that the tracking script sends its results to, so make sure it's correct. (Example hostnames: `shynet.example.com` or `example.com:8000`.)
+6. Set the whitelabel of your Shynet instance by running `docker run --env-file=<your env file> milesmcc/shynet:latest ./manage.py whitelabel <whitelabel>`. While this setting doesn't affect any core operations of Shynet, it lets you rename Shynet to whatever you want. (Example whitelabels: `"My Shynet Instance"` or `"Acme Analytics"`.)
 
-7. Set the whitelabel of your Shynet instance by running `docker run --env-file=<your env file> milesmcc/shynet:latest ./manage.py whitelabel <whitelabel>`. While this setting doesn't affect any core operations of Shynet, it lets you rename Shynet to whatever you want. (Example whitelabels: `"My Shynet Instance"` or `"Acme Analytics"`.)
+7. Launch your webserver by running `docker run --env-file=<your env file> milesmcc/shynet:latest`. You may need to bind Docker's port 8080 (where Shynet runs) to your local port 80 (http); this can be done using the flag `-p 80:8080` after `run`. Visit your service's homepage, and verify everything looks right! You should see a login prompt. Log in with the credentials from step 5. You'll probably be prompted to "confirm your email"—if you haven't set up an email server, the confirmation email will be printed to the console instead.
 
-8. Launch your webserver by running `docker run --env-file=<your env file> milesmcc/shynet:latest`. You may need to bind Docker's port 8080 (where Shynet runs) to your local port 80 (http); this can be done using the flag `-p 80:8080` after `run`. Visit your service's homepage, and verify everything looks right! You should see a login prompt. Log in with the credentials from step 5. You'll probably be prompted to "confirm your email"—if you haven't set up an email server, the confirmation email will be printed to the console instead.
+8. Create a service by clicking "+ Create Service" in the top right hand corner. Fill out the options as appropriate. Once you're done, press "create" and you'll be redirected to your new service's analytics page.
 
-9. Create a service by clicking "+ Create Service" in the top right hand corner. Fill out the options as appropriate. Once you're done, press "create" and you'll be redirected to your new service's analytics page.
-
-10. Finally, click on "Manage" in the top right of the service's page to get the tracking script code. Inject this script on all pages you'd like the service to track.
+9. Finally, click on "Manage" in the top right of the service's page to get the tracking script code. Inject this script on all pages you'd like the service to track.
 
 
 ### Basic Installation with Docker Compose
@@ -58,7 +55,7 @@ Before continuing, please be sure to have the latest version of Docker installed
 
 1. Clone the repository.
 
-2. Using [TEMPLATE.env](/TEMPLATE.env) as a template, confiure the environment for your Shynet instance and place the modified config in a file called `.env` in the root of the repository. Do _not_ change the port number at the end; you can set the public facing port in the next step. 
+2. Using [TEMPLATE.env](/TEMPLATE.env) as a template, configure the environment for your Shynet instance and place the modified config in a file called `.env` in the root of the repository. Do _not_ change the port number at the end; you can set the public facing port in the next step. 
 
 3. On line 2 of the `nginx.conf` file located in the root of the repository, replace `example.com` with your hostname. Then, in the `docker-compose.yml` file, set the port number by replacing `8080` in line 38 ( `- 8080:80` ) with whatever local port you want to bind it to. For example, set the port number to `- 80:80` if you want your site will be available via HTTP (port 80) at `http://<your hostname>`.
 
@@ -66,9 +63,7 @@ Before continuing, please be sure to have the latest version of Docker installed
 
 5. Create an admin user by running `docker exec -it shynet_main ./manage.py registeradmin <your email>`. A temporary password will be printed to the console.
 
-6. Set the hostname of your Shynet instance by running `docker exec -it shynet_main ./manage.py hostname <your public hostname>`, where `<your public hostname>` is the same as the hostname you set in step 3. This setting affects the URL that the tracking script sends its results to, so make sure it's correct. (Example hostnames: shynet.example.com or example.com:8000.)
-
-7. Set the whitelabel of your Shynet instance by running `docker exec -it shynet_main ./manage.py whitelabel <whitelabel>`. While this setting doesn't affect any core operations of Shynet, it lets you rename Shynet to whatever you want. (Example whitelabels: "My Shynet Instance" or "Acme Analytics".)
+6. Set the whitelabel of your Shynet instance by running `docker exec -it shynet_main ./manage.py whitelabel <whitelabel>`. While this setting doesn't affect any core operations of Shynet, it lets you rename Shynet to whatever you want. (Example whitelabels: "My Shynet Instance" or "Acme Analytics".)
 
 Your site should now be accessible at `http://hostname:port`. Now you can follow steps 9-10 of the [Basic Installation](#basic-installation) guide above to get Shynet integrated on your sites.
 
@@ -78,11 +73,10 @@ You may wish to deploy Shynet on Heroku. Note that Heroku's free offerings (name
 
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/milesmcc/shynet/tree/master)
 
-Once you deploy, you'll need to setup an admin user, whitelabel, and hostname before you can use Shynet. Do that with the following commands:
+Once you deploy, you'll need to setup an admin user and whitelabel before you can use Shynet. Do that with the following commands:
 
 1. `heroku run --app=<your app> ./manage.py registeradmin <your email>`
-2. `heroku run --app=<your app> ./manage.py hostname <the hostname where you will run Shynet>`
-3. `heroku run --app=<your app> ./manage.py whitelabel "<your Shynet instance's name>"`
+2. `heroku run --app=<your app> ./manage.py whitelabel "<your Shynet instance's name>"`
 
 ## Render
 
@@ -93,8 +87,7 @@ Once you deploy, you'll need to setup an admin user, whitelabel, and hostname be
 Once your deploy has completed, use the **Render Shell** to configure your app:
 
 1. Set your email: `./manage.py registeradmin your-email@example.com`
-1. Add your onrender.com domain: `./manage.py hostname your-shynet-domain.onrender.com`
-1. Set your whitelabel: `./manage.py whitelabel "Your Shynet Instance Name"`
+2. Set your whitelabel: `./manage.py whitelabel "Your Shynet Instance Name"`
 
 See the [Render docs](https://render.com/docs/deploy-shynet) for more information on deploying your application on Render.
 
@@ -102,40 +95,6 @@ See the [Render docs](https://render.com/docs/deploy-shynet) for more informatio
 
 ## Advanced Usage
 
-### Installation with SSL
-
-If you are going to be running Shynet through a reverse proxy, please see [Configuring a Reverse Proxy](#configuring-a-reverse-proxy) instead.
-
-0. We'll be cloning this into the home directory to make this installation easier, so run `cd ~/` if you need to.
-
-1. Instead of pulling from Docker, we will be pulling from GitHub and building using Docker in order to easily add SSL certificates. You will want to run `git clone https://github.com/milesmcc/shynet.git` to clone the GitHub repo to your current working directory.
-
-2. To install `certbot` follow [the guide here](https://certbot.eff.org/instructions) or follow along below
-   * Ubuntu 18.04
-     * `sudo apt-get update`
-     * `sudo apt-get install software-properties-common`
-     * `sudo add-apt-repository universe`
-     * `sudo add-apt-repository ppa:certbot/certbot`
-     * `sudo apt-get update`
-     * `sudo apt-get install certbot`
-
-3. Run `sudo certbot certonly --standalone` and follow the instructions to generate your SSL certificate.
-   * If you registering the certificate to a domain name like `example.com`, please be sure to point your DNS records to your current server before running `certbot`.
-
-4. We are going to move the SSL certificates to the Shynet repo with with command below. Replace `<domain>` with the domain name you used in step 3.
-   * `cp /etc/letsencrypt/live/<domain>/{cert,privkey}.pem ~/shynet/shynet/`
-
-5. With that, we are going to replace the `webserver.sh` with `ssl.webserver.sh` to enable the use of SSL certificates. The original `webserver.sh` will be backed up to `backup.webserver.sh`
-   * `mv ~/shynet/shynet/webserver.sh ~/shynet/shynet/backup.webserver.sh`
-   * `mv ~/shynet/shynet/ssl.webserver.sh ~/shynet/shynet/webserver.sh`
-
-6. Now we build the image!
-   * `docker image build shynet -t shynet-ssl:latest`
-
-7. Have a PostgreSQL server ready to go. This can be on the same machine as the deployment, or elsewhere. You'll just need a username, password, host, and port (default is `5432`). (For info on how to setup a PostgreSQL server on Ubuntu, follow [this guide](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-18-04)).
-
-8. Follow the [Basic Installation](#basic-installation) guide with just one modification: in step #4, change the local bind port from `80` to `443`, and use `shynet-ssl:latest` as your Docker image instead of `milesmcc/shynet:latest`.
-
 ### Configuring a Reverse Proxy
 
 A reverse proxy has many benefits. It can be used for DDoS protection, caching files to reduce server load, routing HTTPS and/or HTTP connections, hosting multiple services on a single server, [and more](https://www.cloudflare.com/learning/cdn/glossary/reverse-proxy/)!

Pipfile

@@ -1,25 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[packages]
-django = "~=3.1"
-django-allauth = "~=0.42.0"
-geoip2 = "~=3.0.0"
-whitenoise = "~=5.1.0"
-celery = "~=4.4.6"
-django-ipware = "~=2.1.0"
-pyyaml = "~=5.4"
-ua-parser = "~=0.10.0"
-user-agents = "~=2.1"
-rules = "~=2.2"
-gunicorn = "~=20.0.4"
-psycopg2-binary = "~=2.8.5"
-redis = "~=3.5.3"
-django-redis-cache = "~=3.0.0"
-pycountry = "~=19.8.18"
-html2text = "~=2020.1.16"
-django-health-check = "~=3.12.1"
-django-npm = "~=1.0.0"
-django-debug-toolbar = "*"

Pipfile.lock

@@ -1,343 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "c51ea0205c9ffe753b9ef5249cd49c2338bb50768ae104113bfb7b97b5f9d70c"
-        },
-        "pipfile-spec": 6,
-        "requires": {},
-        "sources": [
-            {
-                "name": "pypi",
-                "url": "https://pypi.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {
-        "amqp": {
-            "hashes": [
-                "sha256:70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21",
-                "sha256:aa7f313fb887c91f15474c1229907a04dac0b8135822d6603437803424c0aa59"
-            ],
-            "version": "==2.6.1"
-        },
-        "asgiref": {
-            "hashes": [
-                "sha256:92906c611ce6c967347bbfea733f13d6313901d54dcca88195eaeb52b2a8e8ee",
-                "sha256:d1216dfbdfb63826470995d31caed36225dcaf34f182e0fa257a4dd9e86f1b78"
-            ],
-            "version": "==3.3.4"
-        },
-        "billiard": {
-            "hashes": [
-                "sha256:299de5a8da28a783d51b197d496bef4f1595dd023a93a4f59dde1886ae905547",
-                "sha256:87103ea78fa6ab4d5c751c4909bcff74617d985de7fa8b672cf8618afd5a875b"
-            ],
-            "version": "==3.6.4.0"
-        },
-        "celery": {
-            "hashes": [
-                "sha256:a92e1d56e650781fb747032a3997d16236d037c8199eacd5217d1a72893bca45",
-                "sha256:d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f"
-            ],
-            "index": "pypi",
-            "version": "==4.4.7"
-        },
-        "certifi": {
-            "hashes": [
-                "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
-                "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
-            ],
-            "version": "==2020.12.5"
-        },
-        "chardet": {
-            "hashes": [
-                "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa",
-                "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"
-            ],
-            "version": "==4.0.0"
-        },
-        "defusedxml": {
-            "hashes": [
-                "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69",
-                "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"
-            ],
-            "version": "==0.7.1"
-        },
-        "django": {
-            "hashes": [
-                "sha256:c348b3ddc452bf4b62361f0752f71a339140c777ebea3cdaaaa8fdb7f417a862",
-                "sha256:f8393103e15ec2d2d313ccbb95a3f1da092f9f58d74ac1c61ca2ac0436ae1eac"
-            ],
-            "index": "pypi",
-            "version": "==3.1.8"
-        },
-        "django-allauth": {
-            "hashes": [
-                "sha256:f17209410b7f87da0a84639fd79d3771b596a6d3fc1a8e48ce50dabc7f441d30"
-            ],
-            "index": "pypi",
-            "version": "==0.42.0"
-        },
-        "django-debug-toolbar": {
-            "hashes": [
-                "sha256:a5ff2a54f24bf88286f9872836081078f4baa843dc3735ee88524e89f8821e33",
-                "sha256:e759e63e3fe2d3110e0e519639c166816368701eab4a47fed75d7de7018467b9"
-            ],
-            "index": "pypi",
-            "version": "==3.2.1"
-        },
-        "django-health-check": {
-            "hashes": [
-                "sha256:2667b89b8f85ad9b2a24c90581b376016d22ea912fedf37f9866413a3c2e0a5d",
-                "sha256:894738bd7e461b2405c005927403ad5ee8048bbaf5934cf30b2c81a4e047d4b0"
-            ],
-            "index": "pypi",
-            "version": "==3.12.3"
-        },
-        "django-ipware": {
-            "hashes": [
-                "sha256:a7c7a8fd019dbdc9c357e6e582f65034e897572fc79a7e467674efa8aef9d00b"
-            ],
-            "index": "pypi",
-            "version": "==2.1.0"
-        },
-        "django-npm": {
-            "hashes": [
-                "sha256:2e6bba65e728fa18b9db3c8dc0d4490b70cb7f43bacf60eb3654d7dcb6424272"
-            ],
-            "index": "pypi",
-            "version": "==1.0.0"
-        },
-        "django-redis-cache": {
-            "hashes": [
-                "sha256:9a2eebef421d996a82098a19d17ff6b321265cd73178fa398913019764e8394a"
-            ],
-            "index": "pypi",
-            "version": "==3.0.0"
-        },
-        "geoip2": {
-            "hashes": [
-                "sha256:5869e987bc54c0d707264fec4710661332cc38d2dca5a7f9bb5362d0308e2ce0",
-                "sha256:99ec12d2f1271a73a0a4a2b663fe6ce25fd02289c0a6bef05c0a1c3b30ee95a4"
-            ],
-            "index": "pypi",
-            "version": "==3.0.0"
-        },
-        "gunicorn": {
-            "hashes": [
-                "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626",
-                "sha256:cd4a810dd51bf497552cf3f863b575dabd73d6ad6a91075b65936b151cbf4f9c"
-            ],
-            "index": "pypi",
-            "version": "==20.0.4"
-        },
-        "html2text": {
-            "hashes": [
-                "sha256:c7c629882da0cf377d66f073329ccf34a12ed2adf0169b9285ae4e63ef54c82b",
-                "sha256:e296318e16b059ddb97f7a8a1d6a5c1d7af4544049a01e261731d2d5cc277bbb"
-            ],
-            "index": "pypi",
-            "version": "==2020.1.16"
-        },
-        "idna": {
-            "hashes": [
-                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
-                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
-            ],
-            "version": "==2.10"
-        },
-        "kombu": {
-            "hashes": [
-                "sha256:be48cdffb54a2194d93ad6533d73f69408486483d189fe9f5990ee24255b0e0a",
-                "sha256:ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74"
-            ],
-            "version": "==4.6.11"
-        },
-        "maxminddb": {
-            "hashes": [
-                "sha256:47e86a084dd814fac88c99ea34ba3278a74bc9de5a25f4b815b608798747c7dc"
-            ],
-            "version": "==2.0.3"
-        },
-        "oauthlib": {
-            "hashes": [
-                "sha256:bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889",
-                "sha256:df884cd6cbe20e32633f1db1072e9356f53638e4361bef4e8b03c9127c9328ea"
-            ],
-            "version": "==3.1.0"
-        },
-        "psycopg2-binary": {
-            "hashes": [
-                "sha256:0deac2af1a587ae12836aa07970f5cb91964f05a7c6cdb69d8425ff4c15d4e2c",
-                "sha256:0e4dc3d5996760104746e6cfcdb519d9d2cd27c738296525d5867ea695774e67",
-                "sha256:11b9c0ebce097180129e422379b824ae21c8f2a6596b159c7659e2e5a00e1aa0",
-                "sha256:15978a1fbd225583dd8cdaf37e67ccc278b5abecb4caf6b2d6b8e2b948e953f6",
-                "sha256:1fabed9ea2acc4efe4671b92c669a213db744d2af8a9fc5d69a8e9bc14b7a9db",
-                "sha256:2dac98e85565d5688e8ab7bdea5446674a83a3945a8f416ad0110018d1501b94",
-                "sha256:42ec1035841b389e8cc3692277a0bd81cdfe0b65d575a2c8862cec7a80e62e52",
-                "sha256:6422f2ff0919fd720195f64ffd8f924c1395d30f9a495f31e2392c2efafb5056",
-                "sha256:6a32f3a4cb2f6e1a0b15215f448e8ce2da192fd4ff35084d80d5e39da683e79b",
-                "sha256:7312e931b90fe14f925729cde58022f5d034241918a5c4f9797cac62f6b3a9dd",
-                "sha256:7d92a09b788cbb1aec325af5fcba9fed7203897bbd9269d5691bb1e3bce29550",
-                "sha256:833709a5c66ca52f1d21d41865a637223b368c0ee76ea54ca5bad6f2526c7679",
-                "sha256:89705f45ce07b2dfa806ee84439ec67c5d9a0ef20154e0e475e2b2ed392a5b83",
-                "sha256:8cd0fb36c7412996859cb4606a35969dd01f4ea34d9812a141cd920c3b18be77",
-                "sha256:950bc22bb56ee6ff142a2cb9ee980b571dd0912b0334aa3fe0fe3788d860bea2",
-                "sha256:a0c50db33c32594305b0ef9abc0cb7db13de7621d2cadf8392a1d9b3c437ef77",
-                "sha256:a0eb43a07386c3f1f1ebb4dc7aafb13f67188eab896e7397aa1ee95a9c884eb2",
-                "sha256:aaa4213c862f0ef00022751161df35804127b78adf4a2755b9f991a507e425fd",
-                "sha256:ac0c682111fbf404525dfc0f18a8b5f11be52657d4f96e9fcb75daf4f3984859",
-                "sha256:ad20d2eb875aaa1ea6d0f2916949f5c08a19c74d05b16ce6ebf6d24f2c9f75d1",
-                "sha256:b4afc542c0ac0db720cf516dd20c0846f71c248d2b3d21013aa0d4ef9c71ca25",
-                "sha256:b8a3715b3c4e604bcc94c90a825cd7f5635417453b253499664f784fc4da0152",
-                "sha256:ba28584e6bca48c59eecbf7efb1576ca214b47f05194646b081717fa628dfddf",
-                "sha256:ba381aec3a5dc29634f20692349d73f2d21f17653bda1decf0b52b11d694541f",
-                "sha256:bd1be66dde2b82f80afb9459fc618216753f67109b859a361cf7def5c7968729",
-                "sha256:c2507d796fca339c8fb03216364cca68d87e037c1f774977c8fc377627d01c71",
-                "sha256:cec7e622ebc545dbb4564e483dd20e4e404da17ae07e06f3e780b2dacd5cee66",
-                "sha256:d14b140a4439d816e3b1229a4a525df917d6ea22a0771a2a78332273fd9528a4",
-                "sha256:d1b4ab59e02d9008efe10ceabd0b31e79519da6fb67f7d8e8977118832d0f449",
-                "sha256:d5227b229005a696cc67676e24c214740efd90b148de5733419ac9aaba3773da",
-                "sha256:e1f57aa70d3f7cc6947fd88636a481638263ba04a742b4a37dd25c373e41491a",
-                "sha256:e74a55f6bad0e7d3968399deb50f61f4db1926acf4a6d83beaaa7df986f48b1c",
-                "sha256:e82aba2188b9ba309fd8e271702bd0d0fc9148ae3150532bbb474f4590039ffb",
-                "sha256:ee69dad2c7155756ad114c02db06002f4cded41132cc51378e57aad79cc8e4f4",
-                "sha256:f5ab93a2cb2d8338b1674be43b442a7f544a0971da062a5da774ed40587f18f5"
-            ],
-            "index": "pypi",
-            "version": "==2.8.6"
-        },
-        "pycountry": {
-            "hashes": [
-                "sha256:3c57aa40adcf293d59bebaffbe60d8c39976fba78d846a018dc0c2ec9c6cb3cb"
-            ],
-            "index": "pypi",
-            "version": "==19.8.18"
-        },
-        "python3-openid": {
-            "hashes": [
-                "sha256:33fbf6928f401e0b790151ed2b5290b02545e8775f982485205a066f874aaeaf",
-                "sha256:6626f771e0417486701e0b4daff762e7212e820ca5b29fcc0d05f6f8736dfa6b"
-            ],
-            "version": "==3.2.0"
-        },
-        "pytz": {
-            "hashes": [
-                "sha256:83a4a90894bf38e243cf052c8b58f381bfe9a7a483f6a9cab140bc7f702ac4da",
-                "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"
-            ],
-            "version": "==2021.1"
-        },
-        "pyyaml": {
-            "hashes": [
-                "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
-                "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696",
-                "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393",
-                "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77",
-                "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922",
-                "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5",
-                "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8",
-                "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10",
-                "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc",
-                "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018",
-                "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e",
-                "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253",
-                "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347",
-                "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183",
-                "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541",
-                "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb",
-                "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185",
-                "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc",
-                "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db",
-                "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa",
-                "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46",
-                "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122",
-                "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b",
-                "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63",
-                "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df",
-                "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc",
-                "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247",
-                "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6",
-                "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"
-            ],
-            "index": "pypi",
-            "version": "==5.4.1"
-        },
-        "redis": {
-            "hashes": [
-                "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2",
-                "sha256:432b788c4530cfe16d8d943a09d40ca6c16149727e4afe8c2c9d5580c59d9f24"
-            ],
-            "index": "pypi",
-            "version": "==3.5.3"
-        },
-        "requests": {
-            "hashes": [
-                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
-                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
-            ],
-            "version": "==2.25.1"
-        },
-        "requests-oauthlib": {
-            "hashes": [
-                "sha256:7f71572defaecd16372f9006f33c2ec8c077c3cfa6f5911a9a90202beb513f3d",
-                "sha256:b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a"
-            ],
-            "version": "==1.3.0"
-        },
-        "rules": {
-            "hashes": [
-                "sha256:9bae429f9d4f91a375402990da1541f9e093b0ac077221d57124d06eeeca4405"
-            ],
-            "index": "pypi",
-            "version": "==2.2"
-        },
-        "sqlparse": {
-            "hashes": [
-                "sha256:017cde379adbd6a1f15a61873f43e8274179378e95ef3fede90b5aa64d304ed0",
-                "sha256:0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8"
-            ],
-            "version": "==0.4.1"
-        },
-        "ua-parser": {
-            "hashes": [
-                "sha256:46ab2e383c01dbd2ab284991b87d624a26a08f72da4d7d413f5bfab8b9036f8a",
-                "sha256:47b1782ed130d890018d983fac37c2a80799d9e0b9c532e734c67cf70f185033"
-            ],
-            "index": "pypi",
-            "version": "==0.10.0"
-        },
-        "urllib3": {
-            "hashes": [
-                "sha256:2f4da4594db7e1e110a944bb1b551fdf4e6c136ad42e4234131391e21eb5b0df",
-                "sha256:e7b021f7241115872f92f43c6508082facffbd1c048e3c6e2bb9c2a157e28937"
-            ],
-            "version": "==1.26.4"
-        },
-        "user-agents": {
-            "hashes": [
-                "sha256:a98c4dc72ecbc64812c4534108806fb0a0b3a11ec3fd1eafe807cee5b0a942e7",
-                "sha256:d36d25178db65308d1458c5fa4ab39c9b2619377010130329f3955e7626ead26"
-            ],
-            "index": "pypi",
-            "version": "==2.2.0"
-        },
-        "vine": {
-            "hashes": [
-                "sha256:133ee6d7a9016f177ddeaf191c1f58421a1dcc6ee9a42c58b34bed40e1d2cd87",
-                "sha256:ea4947cc56d1fd6f2095c8d543ee25dad966f78692528e68b4fada11ba3f98af"
-            ],
-            "version": "==1.3.0"
-        },
-        "whitenoise": {
-            "hashes": [
-                "sha256:60154b976a13901414a25b0273a841145f77eb34a141f9ae032a0ace3e4d5b27",
-                "sha256:6dd26bfda3af29177d8ab7333a0c7b7642eb615ce83764f4d15a9aecda3201c4"
-            ],
-            "index": "pypi",
-            "version": "==5.1.0"
-        }
-    },
-    "develop": {}
-}

README.md

@@ -8,7 +8,7 @@
     <br>
     <strong><a href="#installation">Getting started »</a></strong>
   </p>
-  <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#features">Features</a> &bull; <a href="https://github.com/milesmcc/a17t">Design</a></p>
+  <p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#features">Features</a> &bull; <a href="https://miles.land/officehours/">Office Hours</a></p>
 </p>
 
 <br>

TEMPLATE.env

@@ -33,6 +33,8 @@ ACCOUNT_SIGNUPS_ENABLED=False
 ACCOUNT_EMAIL_VERIFICATION=none
 
 # The timezone of the admin panel. Affects how dates are displayed.
+# This must match a value from the IANA's tz database.
+# Wikipedia has a list of valid strings: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 TIME_ZONE=America/New_York
 
 # Set to "False" if you will not be serving content over HTTPS
@@ -96,3 +98,6 @@ LOCATION_URL=https://www.openstreetmap.org/?mlat=$LATITUDE&mlon=$LONGITUDE
 # How many services should be displayed on dashboard page?
 # Set to big number if you don't want pagination at all.
 DASHBOARD_PAGE_SIZE=5
+
+# Should background bars be scaled to full width?
+USE_RELATIVE_MAX_IN_BAR_VISUALIZATION=True

app.json

@@ -132,6 +132,11 @@
       "description": "How many services should be displayed on dashboard page?",
       "value": "5",
       "required": false
+    },
+    "USE_RELATIVE_MAX_IN_BAR_VISUALIZATION": {
+      "description": "Should background bars be scaled to full width?",
+      "value": "True",
+      "required": false
     }
   }
 }

docker-compose.dev.yml

@@ -0,0 +1,46 @@
+version: '3'
+services:
+  shynet:
+    container_name: shynet_main
+    build: .
+    restart: unless-stopped
+    expose:
+      - 8080
+    env_file:
+      # Create a file called '.env' if it doesn't already exist.
+      # You can use `TEMPLATE.env` as a guide.
+      - .env
+    environment:
+      - DB_HOST=db
+    networks:
+      - internal
+    depends_on:
+      - db
+  db:
+    container_name: shynet_database
+    image: postgres
+    restart: always
+    environment:
+      - "POSTGRES_USER=${DB_USER}"
+      - "POSTGRES_PASSWORD=${DB_PASSWORD}"
+      - "POSTGRES_DB=${DB_NAME}"
+    volumes:
+      - shynet_db:/var/lib/postgresql/data
+    networks:
+      - internal
+  webserver:
+    container_name: shynet_webserver
+    image: nginx
+    restart: always
+    volumes:
+      - ./nginx.conf:/etc/nginx/conf.d/default.conf    
+    ports:
+      - 8080:80
+    depends_on:
+      - shynet
+    networks:
+      - internal
+volumes:
+  shynet_db:
+networks:
+  internal:

kubernetes/deployments.yml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: "shynet-webserver"
-        image: "milesmcc/shynet:dev"
+        image: "milesmcc/shynet:latest"
         imagePullPolicy: Always
         envFrom:
         - secretRef:
@@ -42,7 +42,7 @@ spec:
     spec:
       containers:
       - name: "shynet-celeryworker"
-        image: "milesmcc/shynet:dev"
+        image: "milesmcc/shynet:latest"
         command: ["./celeryworker.sh"]
         imagePullPolicy: Always
         envFrom:

package.json

@@ -18,8 +18,10 @@
   "homepage": "https://github.com/milesmcc/shynet#readme",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",
-    "a17t": "^0.5.1",
+    "a17t": "^0.10.1",
+    "tailwindcss": "^3.0.1",
     "apexcharts": "^3.24.0",
+    "datamaps": "^0.5.9",
     "flag-icon-css": "^3.5.0",
     "inter-ui": "^3.15.0",
     "litepicker": "^2.0.11"

pyproject.toml

@@ -0,0 +1,40 @@
+[tool.poetry]
+name = "shynet"
+version = "0.10.0"
+description = "Modern, privacy-friendly, and cookie-free web analytics."
+authors = ["R. Miles McCain <github@sendmiles.email>"]
+license = "Apache-2.0"
+
+[tool.poetry.dependencies]
+python = "^3.8"
+Django = "^3.2.5"
+django-allauth = "^0.45.0"
+geoip2 = "^4.2.0"
+whitenoise = "^5.3.0"
+celery = "^5.1.2"
+django-ipware = "^3.0.2"
+PyYAML = "^5.4.1"
+user-agents = "^2.2.0"
+rules = "^3.0"
+gunicorn = "^20.1.0"
+psycopg2-binary = "^2.9.2"
+redis = "^3.5.3"
+django-redis-cache = "^3.0.0"
+pycountry = "^20.7.3"
+html2text = "^2020.1.16"
+django-health-check = "^3.16.4"
+django-npm = "^1.0.0"
+python-dotenv = "^0.18.0"
+django-debug-toolbar = "^3.2.1"
+
+[tool.poetry.dev-dependencies]
+pytest-sugar = "^0.9.4"
+factory-boy = "^3.2.0"
+pytest-django = "^4.4.0"
+django-coverage-plugin = "^2.0.0"
+django-stubs = "^1.8.0"
+mypy = "^0.910"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

shynet/a17t/static/a17t/css/tailwind.css

@@ -0,0 +1,9 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer components {
+    .litepicker .container__main {
+        @apply card p-2;
+    }
+}

shynet/a17t/templates/a17t/includes/field.html

@@ -28,10 +28,10 @@
     {% endfor %}
     {% elif field|is_input %}
     {% include 'a17t/includes/label.html' %}
-    {{field|add_class:"input my-1"}}
+    {{field|add_class:"input ~neutral my-1"}}
     {% elif field|is_textarea %}
     {% include 'a17t/includes/label.html' %}
-    {{ field|add_class:'textarea my-1' }}
+    {{ field|add_class:'textarea ~neutral my-1' }}
     {% elif field|is_select %}
     {% include 'a17t/includes/label.html' %}
     <div class="select {% if field.errors|length > 0 %}~critical{% endif %} my-1">
@@ -39,7 +39,7 @@
     </div>
     {% else %}
     {% include 'a17t/includes/label.html' %}
-    {{field|add_class:"field my-1"}}
+    {{field|add_class:"field ~neutral my-1"}}
     {% endif %}
 
     {% for error in field.errors %}

shynet/a17t/templates/a17t/includes/head.html

@@ -1,6 +1,5 @@
 {% load static %}
 
-<link rel="stylesheet" href="{% static 'a17t/dist/a17t.css' %}">
 <script async src="{% static '@fortawesome/fontawesome-free/js/all.min.js' %}" data-mutate-approach="sync"></script>
 <link href="{% static 'a17t/dist/tailwind.css' %}" rel="stylesheet">
 <link href="{% static 'inter-ui/Inter (web)/inter.css' %}" rel="stylesheet">

shynet/a17t/templates/a17t/includes/pagination.html

@@ -1,23 +1,23 @@
 <nav class="flex w-full flex-wrap items-center justify-between" role="navigation" aria-label="pagination">
     <div class="w-full md:w-auto mb-2">
         {% if page.has_previous %}
-        <a href="?page={{ page.previous_page_number }}&{{url_parameters}}" class="button field bg-neutral-000 w-auto mr-1">Previous</a>
+        <a href="?page={{ page.previous_page_number }}&{{url_parameters}}" class="button ~neutral @low w-auto mr-1">Previous</a>
         {% else %}
-        <a class="button field bg-neutral-000 w-auto mr-1" disabled>Previous</a>
+        <a class="button ~neutral @low w-auto mr-1" disabled>Previous</a>
         {% endif %}
         {% if page.has_next %}
-        <a href="?page={{ page.next_page_number }}&{{url_parameters}}" class="button field bg-neutral-000 w-auto">Next</a>
+        <a href="?page={{ page.next_page_number }}&{{url_parameters}}" class="button ~neutral @low w-auto">Next</a>
         {% else %}
-        <a class="button field bg-neutral-000 w-auto" disabled>Next</a>
+        <a class="button ~neutral @low w-auto" disabled>Next</a>
         {% endif %}
     </div>
 
     <ul class="pagination-list w-full md:w-auto mb-2 flex">
         {% for pnum in begin %}
         {% ifequal page.number pnum %}
-        <li><a class="button field w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
+        <li><a class="button ~neutral @high w-auto mx-1">{{ pnum }}</a></li>
         {% else %}
-        <li><a class="button field bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
+        <li><a class="button ~neutral @low w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
         {% endifequal %}
         {% endfor %}
 
@@ -25,9 +25,9 @@
         <li><span class="pagination-ellipsis">&hellip;</span></li>
         {% for pnum in middle %}
         {% ifequal page.number pnum %}
-        <li><a class="button field w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
+        <li><a class="button ~neutral @high w-auto mx-1">{{ pnum }}</a></li>
         {% else %}
-        <li><a class="button field bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
+        <li><a class="button ~neutral @low w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
         {% endifequal %}
         {% endfor %}
         {% endif %}
@@ -36,9 +36,9 @@
         <li><span class="pagination-ellipsis">&hellip;</span></li>
         {% for pnum in end %}
         {% ifequal page.number pnum %}
-        <li><a class="button field w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
+        <li><a class="button ~neutral @high  w-auto mx-1">{{ pnum }}</a></li>
         {% else %}
-        <li><a class="button field bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
+        <li><a class="button ~neutral @low w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
         {% endifequal %}
         {% endfor %}
         {% endif %}

shynet/analytics/templates/analytics/scripts/page.js

@@ -19,7 +19,7 @@ var Shynet = {
       var xhr = new XMLHttpRequest();
       xhr.open(
         "POST",
-        "{{protocol}}://{{request.site.domain|default:request.META.HTTP_HOST}}{{endpoint}}",
+        "{{protocol}}://{{request.get_host}}{{endpoint}}",
         true
       );
       xhr.setRequestHeader("Content-Type", "application/json");

shynet/core/factories.py

@@ -0,0 +1,37 @@
+from django.contrib.auth import get_user_model
+import factory
+from factory.django import DjangoModelFactory
+from .models import Service
+
+
+class UserFactory(DjangoModelFactory):
+    username = factory.Faker("user_name")
+    email = factory.Faker("email")
+    name = factory.Faker("name")
+
+    @post_generation
+    def password(self, create, extracted, **kwargs):
+        password = (
+            extracted
+            if extracted
+            else factory.Faker(
+                "password",
+                length=42,
+                special_chars=True,
+                digits=True,
+                upper_case=True,
+                lower_case=True,
+            ).evaluate(None, None, extra={"locale": None})
+        )
+        self.set_password(password)
+
+    class Meta:
+        model = get_user_model()
+        django_get_or_create = ["username"]
+
+
+class ServiceFactory(DjangoModelFactory):
+    class Meta:
+        model = Service
+
+    name = factory.Faker("company")

shynet/core/management/commands/hostname.py

@@ -1,35 +0,0 @@
-import traceback
-import uuid
-
-from django.conf import settings
-from django.contrib.sites.models import Site
-from django.core.management.base import BaseCommand, CommandError
-from django.utils.crypto import get_random_string
-
-from core.models import User
-
-
-class Command(BaseCommand):
-    help = "Configures the Shynet hostname"
-
-    def add_arguments(self, parser):
-        parser.add_argument(
-            "hostname",
-            type=str,
-        )
-
-    def handle(self, *args, **options):
-        site = Site.objects.get(pk=settings.SITE_ID)
-        site.domain = options.get("hostname")
-        if options.get("hostname").lower().startswith("http"):
-            self.stdout.write(
-                self.style.WARNING(
-                    f"Warning: the hostname '{options.get('hostname')}' starts with `http`. You almost certainly don't want this. The hostname is supposed to be the raw domain name of your Shynet instance, without `http://` or `https://`. For example, if your Shynet instance will eventually be hosted at `https://analytics.example.com`, the hostname should be `analytics.example.com`."
-                )
-            )
-        site.save()
-        self.stdout.write(
-            self.style.SUCCESS(
-                f"Successfully set the hostname to '{options.get('hostname')}'"
-            )
-        )

shynet/core/management/commands/startup_checks.py

@@ -35,15 +35,9 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         migration = self.check_migrations()
 
-        admin, hostname, whitelabel = [True] * 3
+        admin, whitelabel = [True] * 2
         if not migration:
             admin = not User.objects.all().exists()
-            hostname = (
-                not Site.objects.filter(domain__isnull=False)
-                .exclude(domain__exact="")
-                .exclude(domain__exact="example.com")
-                .exists()
-            )
             whitelabel = (
                 not Site.objects.filter(name__isnull=False)
                 .exclude(name__exact="")
@@ -51,6 +45,4 @@ class Command(BaseCommand):
                 .exists()
             )
 
-        self.stdout.write(
-            self.style.SUCCESS(f"{migration} {admin} {hostname} {whitelabel}")
-        )
+        self.stdout.write(self.style.SUCCESS(f"{migration} {admin} {whitelabel}"))

shynet/core/models.py

@@ -198,6 +198,36 @@ class Service(models.Model):
 
         avg_hits_per_session = hit_count / session_count if session_count > 0 else None
 
+        avg_session_duration = self._get_avg_session_duration(sessions, session_count)
+
+        chart_data, chart_tooltip_format, chart_granularity = self._get_chart_data(
+            sessions, hits, start_time, end_time, tz_now
+        )
+        return {
+            "currently_online": currently_online,
+            "session_count": session_count,
+            "hit_count": hit_count,
+            "has_hits": has_hits,
+            "bounce_rate_pct": bounce_count * 100 / session_count
+            if session_count > 0
+            else None,
+            "avg_session_duration": avg_session_duration,
+            "avg_load_time": avg_load_time,
+            "avg_hits_per_session": avg_hits_per_session,
+            "locations": locations,
+            "referrers": referrers,
+            "countries": countries,
+            "operating_systems": operating_systems,
+            "browsers": browsers,
+            "devices": devices,
+            "device_types": device_types,
+            "chart_data": chart_data,
+            "chart_tooltip_format": chart_tooltip_format,
+            "chart_granularity": chart_granularity,
+            "online": True,
+        }
+
+    def _get_avg_session_duration(self, sessions, session_count):
         try:
             avg_session_duration = sessions.annotate(
                 duration=models.F("last_seen") - models.F("start_time")
@@ -212,68 +242,75 @@ class Service(models.Model):
         if session_count == 0:
             avg_session_duration = None
 
+        return avg_session_duration
+
+    def _get_chart_data(self, sessions, hits, start_time, end_time, tz_now):
         # Show hourly chart for date ranges of 3 days or less, otherwise daily chart
         if (end_time - start_time).days < 3:
-            session_chart_tooltip_format = "MM/dd HH:mm"
-            session_chart_granularity = "hourly"
-            session_chart_data = {
-                k["hour"]: k["count"]
-                for k in sessions.annotate(hour=TruncHour("start_time"))
+            chart_tooltip_format = "MM/dd HH:mm"
+            chart_granularity = "hourly"
+            sessions_per_hour = (
+                sessions.annotate(hour=TruncHour("start_time"))
                 .values("hour")
                 .annotate(count=models.Count("uuid"))
                 .order_by("hour")
+            )
+            chart_data = {
+                k["hour"]: {"sessions": k["count"]} for k in sessions_per_hour
             }
-            for hour_offset in range(int((end_time - start_time).total_seconds() / 3600) + 1):
-                hour = (start_time + timezone.timedelta(hours=hour_offset))
-                if hour not in session_chart_data:
-                    session_chart_data[hour] = 0 if hour <= tz_now else None
+            hits_per_hour = (
+                hits.annotate(hour=TruncHour("start_time"))
+                .values("hour")
+                .annotate(count=models.Count("id"))
+                .order_by("hour")
+            )
+            for k in hits_per_hour:
+                if k["hour"] not in chart_data:
+                    chart_data[k["hour"]] = {"hits": k["count"], "sessions": 0}
+                else:
+                    chart_data[k["hour"]]["hits"] = k["count"]
+
+            hours_range = range(int((end_time - start_time).total_seconds() / 3600) + 1)
+            for hour_offset in hours_range:
+                hour = start_time + timezone.timedelta(hours=hour_offset)
+                if hour not in chart_data and hour <= tz_now:
+                    chart_data[hour] = {"sessions": 0, "hits": 0}
         else:
-            session_chart_tooltip_format = "MMM d"
-            session_chart_granularity = "daily"
-            session_chart_data = {
-                k["date"]: k["count"]
-                for k in sessions.annotate(date=TruncDate("start_time"))
+            chart_tooltip_format = "MMM d"
+            chart_granularity = "daily"
+            sessions_per_day = (
+                sessions.annotate(date=TruncDate("start_time"))
                 .values("date")
                 .annotate(count=models.Count("uuid"))
                 .order_by("date")
-            }
+            )
+            chart_data = {k["date"]: {"sessions": k["count"]} for k in sessions_per_day}
+            hits_per_day = (
+                hits.annotate(date=TruncDate("start_time"))
+                .values("date")
+                .annotate(count=models.Count("id"))
+                .order_by("date")
+            )
+            for k in hits_per_day:
+                if k["date"] not in chart_data:
+                    chart_data[k["date"]] = {"hits": k["count"], "sessions": 0}
+                else:
+                    chart_data[k["date"]]["hits"] = k["count"]
+
             for day_offset in range((end_time - start_time).days + 1):
                 day = (start_time + timezone.timedelta(days=day_offset)).date()
-                if day not in session_chart_data:
-                    session_chart_data[day] = 0 if day <= tz_now.date() else None
+                if day not in chart_data and day <= tz_now.date():
+                    chart_data[day] = {"sessions": 0, "hits": 0}
 
-        return {
-            "currently_online": currently_online,
-            "session_count": session_count,
-            "hit_count": hit_count,
-            "has_hits": has_hits,
-            "avg_hits_per_session": hit_count / (max(session_count, 1)),
-            "bounce_rate_pct": bounce_count * 100 / session_count
-            if session_count > 0
-            else None,
-            "avg_session_duration": avg_session_duration,
-            "avg_load_time": avg_load_time,
-            "avg_hits_per_session": avg_hits_per_session,
-            "locations": locations,
-            "referrers": referrers,
-            "countries": countries,
-            "operating_systems": operating_systems,
-            "browsers": browsers,
-            "devices": devices,
-            "device_types": device_types,
-            "session_chart_data": json.dumps(
-                [
-                    {"x": str(key), "y": value}
-                    for key, value in sorted(
-                        session_chart_data.items(), key=lambda k: k[0]
-                    )
-                ]
-            ),
-            "session_chart_tooltip_format": session_chart_tooltip_format,
-            "session_chart_granularity": session_chart_granularity,
-            "online": True,
+        chart_data = sorted(chart_data.items(), key=lambda k: k[0])
+        chart_data = {
+            "sessions": [v["sessions"] for k, v in chart_data],
+            "hits": [v["hits"] for k, v in chart_data],
+            "labels": [str(k) for k, v in chart_data],
         }
 
+        return chart_data, chart_tooltip_format, chart_granularity
+
     def get_absolute_url(self):
         return reverse(
             "dashboard:service",

shynet/core/tests/__init__.py

@@ -0,0 +1 @@
+

shynet/dashboard/mixins.py

@@ -26,34 +26,34 @@ class DateRangeMixin:
         now = timezone.now()
         return [
             {
-                'name': 'Last 3 days',
-                'start': now - timezone.timedelta(days=2),
-                'end': now,
+                "name": "Last 3 days",
+                "start": now - timezone.timedelta(days=2),
+                "end": now,
             },
             {
-                'name': 'Last 30 days',
-                'start': now - timezone.timedelta(days=29),
-                'end': now,
+                "name": "Last 30 days",
+                "start": now - timezone.timedelta(days=29),
+                "end": now,
             },
             {
-                'name': 'Last 90 days',
-                'start': now - timezone.timedelta(days=89),
-                'end': now,
+                "name": "Last 90 days",
+                "start": now - timezone.timedelta(days=89),
+                "end": now,
             },
             {
-                'name': 'This month',
-                'start': now.replace(day=1),
-                'end': now,
+                "name": "This month",
+                "start": now.replace(day=1),
+                "end": now,
             },
             {
-                'name': 'Last month',
-                'start': now.replace(day=1, month=now.month - 1),
-                'end': now.replace(day=1, month=now.month) - timezone.timedelta(days=1),
+                "name": "Last month",
+                "start": now.replace(day=1, month=now.month - 1),
+                "end": now.replace(day=1, month=now.month) - timezone.timedelta(days=1),
             },
             {
-                'name': 'This year',
-                'start': now.replace(day=1, month=1),
-                'end': now,
+                "name": "This year",
+                "start": now.replace(day=1, month=1),
+                "end": now,
             },
         ]
 

shynet/dashboard/static/dashboard/css/global.css

@@ -23,16 +23,18 @@
     max-width: 0;
 }
 
-:root {
-    --color-neutral-000: white;
-    --color-neutral-50: #F8FAFC;
-    --color-neutral-100: #F1F5F9;
-    --color-neutral-200: #E2E8F0;
-    --color-neutral-300: #CBD5E1;
-    --color-neutral-400: #94A3B8;
-    --color-neutral-500: #64748B;
-    --color-neutral-600: #475569;
-    --color-neutral-700: #334155;
-    --color-neutral-800: #1E293B;
-    --color-neutral-900: #0F172A;
+.min-w-48 {
+    min-width: 48px;
+}
+
+.geo-table {
+    display: none;
+}
+
+.geo-card--use-table-view .geo-map {
+    display: none;
+}
+
+.geo-card--use-table-view .geo-table {
+    display: inline-block;
 }

shynet/dashboard/templates/account/base.html

@@ -6,7 +6,7 @@
 </div>
 <hr class="sep">
 {% block main %}
-<div class="card ~neutral !low max-w-lg content">
+<div class="card max-w-lg content">
     {% block card %}
     {% endblock %}
 </div>

shynet/dashboard/templates/account/email.html

@@ -6,7 +6,7 @@
 {% block page_title %}{% trans "Email Addresses" %}{% endblock %}
 
 {% block main %}
-<div class="card ~neutral !low max-w-lg">
+<div class="card max-w-lg">
 
   {% if user.emailaddress_set.all %}
   <p>{% trans 'These are your known email addresses:' %}</p>
@@ -33,7 +33,7 @@
       {% endfor %}
 
       <div class="block mt-4">
-        <button class="button ~neutral !high mb-1" type="submit" name="action_primary">{% trans 'Make Primary' %}</button>
+        <button class="button ~neutral @high mb-1" type="submit" name="action_primary">{% trans 'Make Primary' %}</button>
         <button class="button ~neutral mb-1" type="submit" name="action_send">{% trans 'Resend Verification' %}</button>
         <button class="button ~neutral mb-1" type="submit" name="action_remove">{% trans 'Remove' %}</button>
       </div>
@@ -51,10 +51,10 @@
 
 <hr class="sep">
 
-<form method="post" action="{% url 'account_email' %}" class="card ~neutral !low max-w-lg">
+<form method="post" action="{% url 'account_email' %}" class="card max-w-lg">
   {% csrf_token %}
   {{ form|a17t }}
-  <button name="action_add" class="button ~neutral !high" type="submit">{% trans "Add Address" %}</button>
+  <button name="action_add" class="button ~neutral @high" type="submit">{% trans "Add Address" %}</button>
 </form>
 
 {% endblock %}

shynet/dashboard/templates/account/email/email_confirmation_message.txt

@@ -1,10 +1,10 @@
-{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Hi there,
+{% load account %}{% user_display user as user_display %}{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name site_domain=request.get_host %}Hi there,
 
 You're receiving this email because {{ user_display }} has listed this email as a valid contact address for their account.
 
 To confirm this is correct, go to {{ activate_url }}
 {% endblocktrans %}
-{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Thank you,
+{% blocktrans with site_name=current_site.name site_domain=request.get_host %}Thank you,
 {{ site_name }}
 {% endblocktrans %}
 {% endautoescape %}

shynet/dashboard/templates/account/email/password_reset_key_message.txt

@@ -1,4 +1,4 @@
-{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Hi there,
+{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name site_domain=request.get_host %}Hi there,
 
 You're receiving this email because you or someone else has requested a password for your account.
 
@@ -6,7 +6,7 @@ This message can be safely ignored if you did not request a password reset. Clic
 
 {{ password_reset_url }}
 
-{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Thank you,
+{% blocktrans with site_name=current_site.name site_domain=request.get_host %}Thank you,
 {{ site_name }}
 {% endblocktrans %}
 {% endautoescape %}

shynet/dashboard/templates/account/email_confirm.html

@@ -18,7 +18,7 @@
 
 <form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
     {% csrf_token %}
-    <button type="submit" class="button ~positive !high">{% trans 'Confirm' %}</button>
+    <button type="submit" class="button ~positive @high">{% trans 'Confirm' %}</button>
 </form>
 
 {% else %}

shynet/dashboard/templates/account/login.html

@@ -16,7 +16,7 @@
   {% if redirect_field_value %}
   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
   {% endif %}
-  <button class="button ~urge !high mr-2" type="submit">{% trans "Sign In" %}</button>
+  <button class="button ~urge @high mr-2" type="submit">{% trans "Sign In" %}</button>
   <a href="{% url 'account_reset_password' %}" class="button ~neutral mr-2">{% trans "Reset Password" %}</a>
   <a href="{{ signup_url }}" class="button ~neutral">Sign Up</a>
 </form>

shynet/dashboard/templates/account/logout.html

@@ -13,6 +13,6 @@
   {% if redirect_field_value %}
   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
   {% endif %}
-  <button type="submit" class="button ~neutral !high">{% trans 'Sign Out' %}</button>
+  <button type="submit" class="button ~neutral @high">{% trans 'Sign Out' %}</button>
 </form>
 {% endblock %}

shynet/dashboard/templates/account/password_change.html

@@ -9,6 +9,6 @@
 <form method="POST" action="{% url 'account_change_password' %}" class="password_change max-w-lg">
     {% csrf_token %}
     {{ form|a17t }}
-    <button type="submit" name="action" class="button ~urge !high">{% trans "Change Password" %}</button>
+    <button type="submit" name="action" class="button ~urge @high">{% trans "Change Password" %}</button>
 </form>
 {% endblock %}

shynet/dashboard/templates/account/password_reset.html

@@ -18,6 +18,6 @@
 <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset max-w-lg">
     {% csrf_token %}
     {{ form|a17t }}
-    <button type="submit" class="button ~urge !high">{% trans 'Reset Password' %}</button>
+    <button type="submit" class="button ~urge @high">{% trans 'Reset Password' %}</button>
 </form>
 {% endblock %}

shynet/dashboard/templates/account/password_reset_from_key.html

@@ -13,7 +13,7 @@
 <form method="POST" action="{{ action_url }}" class="max-w-lg">
     {% csrf_token %}
     {{ form|a17t }}
-    <button type="submit" name="action" class="button ~urge !high">{% trans 'Change Password' %}</button>
+    <button type="submit" name="action" class="button ~urge @high">{% trans 'Change Password' %}</button>
 </form>
 {% else %}
 <p>{% trans 'Your password is now changed.' %}</p>

shynet/dashboard/templates/account/password_reset_from_key_done.html

@@ -6,5 +6,5 @@
 
 {% block card %}
     <p>{% trans 'Your password is now changed.' %}</p>
-    <a href="{% url 'account_login' %}" class="button ~urge !high">Log In</a>
+    <a href="{% url 'account_login' %}" class="button ~urge @high">Log In</a>
 {% endblock %}

shynet/dashboard/templates/account/password_set.html

@@ -9,6 +9,6 @@
 <form method="POST" action="{% url 'account_set_password' %}" class="password_set">
     {% csrf_token %}
     {{ form|a17t }}
-    <button type="submit" name="action" class="button ~urge !high">{% trans 'Set Password' %}</button>
+    <button type="submit" name="action" class="button ~urge @high">{% trans 'Set Password' %}</button>
 </form>
 {% endblock %}

shynet/dashboard/templates/account/signup.html

@@ -14,7 +14,7 @@
   {% if redirect_field_value %}
   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
   {% endif %}
-  <button type="submit" class="button ~urge !high">{% trans "Sign Up" %}</button>
+  <button type="submit" class="button ~urge @high">{% trans "Sign Up" %}</button>
 </form>
 
 {% endblock %}

shynet/dashboard/templates/base.html

@@ -12,16 +12,18 @@
   <script src="{% static 'apexcharts/dist/apexcharts.min.js'%}"></script>
   <script src="{% static 'litepicker/dist/nocss/litepicker.js' %}"></script>
   <script src="{% static 'litepicker/dist/plugins/ranges.js' %}"></script>
-  <link rel="stylesheet" href="{% static 'litepicker/dist/css/litepicker.css' %}">
-
+  <script src="{% static 'd3/d3.min.js' %}"></script>
+  <script src="{% static 'topojson/build/topojson.min.js' %}"></script>
+  <script src="{% static 'datamaps/dist/datamaps.world.min.js' %}"></script>
   <script src="{% static 'dashboard/js/base.js' %}"></script>
   <link rel="stylesheet" href="{% static 'dashboard/css/global.css' %}">
   <link rel="stylesheet" href="{% static 'flag-icon-css/css/flag-icon.min.css' %}">
+  <link rel="stylesheet" href="{% static 'litepicker/dist/css/litepicker.css' %}">
   {% block extra_head %}
   {% endblock %}
 </head>
 
-<body class="bg-neutral-100 min-h-full overflow-x-hidden">
+<body class="bg-neutral-50 min-h-full overflow-x-hidden">
   {% block body %}
 
   <section class="max-w-screen-xl mx-auto px-4 py-4 md:py-12 md:flex">
@@ -32,7 +34,7 @@
         <i class="fas fa-binoculars fa-2x text-urge-600 md:hidden"></i>
       </a>
 
-      <a tabindex="0" role="button" class="button ~neutral !low md:hidden"
+      <a tabindex="0" role="button" class="text-neutral-600 md:hidden"
         onclick="document.getElementById('navMenuExpanded').classList.toggle('hidden')">
         <span class="icon">
           <i class="fas fa-bars"></i>
@@ -108,7 +110,7 @@
       {% if messages %}
       <div>
         {% for message in messages %}
-        <article class="card {{message.tags}} !high mb-2 w-full">{{message}}</article>
+        <article class="card {{message.tags}} @high mb-2 w-full">{{message}}</article>
         {% endfor %}
         </ul>
       </div>

shynet/dashboard/templates/dashboard/includes/bar.html

@@ -0,0 +1,6 @@
+{% load helpers %}
+<div
+    class="absolute h-6 rounded-md"
+    style="width: {% bar_width count max total %}; top: 6px; left: 0px; height: calc(100% - 12px); background-color: var(--color-urge-100-fallback)"
+>
+</div>

shynet/dashboard/templates/dashboard/includes/date_range.html

@@ -1,18 +1,20 @@
-<form method="GET" id="datePicker">
-    <input type="hidden" name="startDate" value="{{start_date.isoformat}}" id="startDate">
-    <input type="hidden" name="endDate" value="{{end_date.isoformat}}" id="endDate">
-</form>
-<input type="input" id="rangePicker" placeholder="Date range" class="input ~neutral bg-neutral-000 cursor-pointer w-auto" readonly>
+<div class="~urge">
+    <form method="GET" id="datePicker" class="~urge">
+        <input type="hidden" name="startDate" value="{{start_date.isoformat}}" id="startDate">
+        <input type="hidden" name="endDate" value="{{end_date.isoformat}}" id="endDate">
+    </form>
+    <input type="input" id="rangePicker" placeholder="Date range" class="button ~neutral @low cursor-pointer" style="max-width: 200px;" readonly>
+</div>
 <style>
     :root {
-        --litepicker-button-prev-month-color-hover: var(--color-urge);
-        --litepicker-button-next-month-color-hover: var(--color-urge);
-        --litepicker-day-color-hover: var(--color-urge);
-        --litepicker-is-today-color: var(--color-urge);
-        --litepicker-is-in-range-color: var(--color-urge-normal-fill);
-        --litepicker-is-start-color-bg: var(--color-urge);
-        --litepicker-is-end-color-bg: var(--color-urge);
-        --litepicker-button-apply-color-bg: var(--color-urge);
+        --litepicker-button-prev-month-color-hover: #7c3aed;
+        --litepicker-button-next-month-color-hover: #7c3aed;
+        --litepicker-day-color-hover: #7c3aed;
+        --litepicker-is-today-color: #7c3aed;
+        --litepicker-is-in-range-color: #ddd6fe;
+        --litepicker-is-start-color-bg: #7c3aed;
+        --litepicker-is-end-color-bg: #7c3aed;
+        --litepicker-button-apply-color-bg: #7c3aed;
     }
 
     .litepicker .container__predefined-ranges, .litepicker .container__months {

shynet/dashboard/templates/dashboard/includes/map_chart.html

@@ -0,0 +1,66 @@
+{% load helpers %}
+
+<div id="map-chart" class="relative"></div>
+<script>
+    // Colors
+    const lightBlue = "#C4B5FD";
+    const highlightBlue = "#8B5CF6";
+    const white = "#ffffff";
+    
+    // Data maps
+    const countryMapData = {};
+    const countryMapColors = {};
+    const countryMap = {
+        {% for country in countries %}"{{country.country|safe|datamap_id}}": {{country.count}},
+        {% endfor %}
+    };
+
+    // Max session count will be full opacity
+    const maxSessionCount = Math.max(...Object.values(countryMap));
+
+    // Color scale starts from opacity 0.1 - 1.0, 0 sessions gets opacity 0
+    const minPercentage = 0.1
+
+    // Loop over country map and transform data for Datamaps use
+    const keys = Object.keys(countryMap);
+    const length = keys.length;
+    for (let i = 0; i < length; i++) {
+        countryMapData[keys[i]] = {
+            sessionCount: countryMap[keys[i]],
+            color: `rgba(124, 58, 237, ${countryMap[keys[i]] === 0 ? 0 : minPercentage + (countryMap[keys[i]] / maxSessionCount * (1 - minPercentage))})`
+        };
+        countryMapColors[keys[i]] = countryMapData[keys[i]].color;
+    }
+
+    // Create datamap
+    var geoMap = new Datamap({
+        element: document.getElementById('map-chart'),
+        projection: 'mercator',
+        responsive: true,
+        geographyConfig: {
+            borderColor: lightBlue,
+            highlightBorderColor: highlightBlue,
+            highlightBorderWidth: 1.5,
+            highlightFillColor: (geography) => geography.color || white,
+            highlightFillOpacity: 0.9,
+            popupTemplate: (geography, data) => '<div class="hoverinfo"><strong>' + geography.properties.name + '</strong>: ' +  data.sessionCount + ' sessions</div>'
+    
+        },
+        fills: {
+            defaultFill: white
+        },
+        data: countryMapData,
+        aspectRatio: 0.68
+    });
+    geoMap.updateChoropleth(countryMapColors);
+    
+    let debounceTimeout
+    const debounce = (func, debounce) => {
+        return function(event){
+            if(debounceTimeout) clearTimeout(debounceTimeout);
+            debounceTimeout = setTimeout(func,debounce,event);
+        };
+    }
+
+    window.addEventListener("resize",debounce(() => geoMap.resize(), 100))
+</script>

shynet/dashboard/templates/dashboard/includes/service_overview.html

@@ -1,6 +1,6 @@
 {% load humanize helpers %}
 
-<a class="card chart-card overflow-visible ~neutral !low service mb-6 p-0" href="{% contextual_url 'dashboard:service' object.uuid %}">
+<a class="card chart-card overflow-visible service mb-6 p-0" href="{% contextual_url 'dashboard:service' object.uuid %}">
     {% with stats=object.stats %}
     <div class="p-4 md:flex justify-between overflow-none">
         <div class="flex items-center mb-4 md:mb-0 md:flex-1 md:min-w-0 truncate pr-0 md:pr-2">
@@ -51,7 +51,7 @@
     </div>
     <hr class="sep h-4">
     <div style="bottom: -1px;">
-        {% include 'dashboard/includes/time_chart.html' with data=stats.session_chart_data sparkline=True height=100 name=object.uuid tooltip_format=stats.session_chart_tooltip_format granularity=stats.session_chart_granularity %}
+        {% include 'dashboard/includes/time_chart.html' with data=stats.chart_data sparkline=True height=100 name=object.uuid tooltip_format=stats.chart_tooltip_format granularity=stats.chart_granularity %}
     </div>
     {% endwith %}
 </a>

shynet/dashboard/templates/dashboard/includes/service_snippet.html

@@ -1,5 +1,5 @@
-<div class="card ~neutral !high font-mono text-sm whitespace-pre-wrap break-all">{% filter force_escape %}<noscript>
-    <img src="{{script_protocol}}{{request.site.domain}}{% url 'ingress:endpoint_pixel' object.uuid %}">
+<div class="card ~neutral @high font-mono text-sm whitespace-pre-wrap break-all">{% filter force_escape %}<noscript>
+    <img src="{{script_protocol}}{{request.get_host}}{% url 'ingress:endpoint_pixel' object.uuid %}">
 </noscript>
-<script defer src="{{script_protocol}}{{request.site.domain}}{% url 'ingress:endpoint_script' object.uuid %}"></script>{% endfilter %}
+<script defer src="{{script_protocol}}{{request.get_host}}{% url 'ingress:endpoint_script' object.uuid %}"></script>{% endfilter %}
 </div>

shynet/dashboard/templates/dashboard/includes/sidebar_portal.html

@@ -1,6 +1,6 @@
 {% load helpers %}
 
 <div>
-    <a class="portal !low {% if request.get_full_path|startswith:url %}~urge active bg-neutral-100{% endif %} flex items-center" title="{{label}}"
-        {% if disable_turbolinks %}data-turbolinks="false"{% endif %} href="{{url}}">{{icon}} <span class="truncate">{{label}}</span></a>
+    <a class="portal {% if request.get_full_path|startswith:url %}text-urge-600{% endif %} flex items-center" title="{{label}}"
+        href="{{url}}">{{icon}} <span class="truncate">{{label}}</span></a>
 </div>

shynet/dashboard/templates/dashboard/includes/stats_status_chip.html

@@ -2,7 +2,7 @@
 
 {% with stats=object.get_daily_stats %}
 {% if stats.currently_online > 0 %}
-<span class="chip ~positive !high whitespace-nowrap">
+<span class="chip ~positive @high whitespace-nowrap">
     {{stats.currently_online|intcomma}} online
 </span>
 {% endif %}

shynet/dashboard/templates/dashboard/includes/time_chart.html

@@ -5,12 +5,14 @@
             enabled: false
         },
         tooltip: {
-            shared: false,
+            shared: true,
             x: {
                 format: '{{tooltip_format|default:"MMM d"}}',
             },
         },
-        colors: ["#805AD5"],
+        legend: {
+            show: false,
+        },
         chart: {
             zoom: {
                 enabled: false,
@@ -18,7 +20,7 @@
             toolbar: {
                 show: false,
             },
-            type: 'area',
+            type: 'line',
             height: {{height|default:"200"}},
             offsetY: -1,
             animations: {
@@ -27,20 +29,10 @@
             sparkline: {
                 enabled: {% if sparkline %}true{% else %}false{% endif %},
             },
-            fill: {
-                type: 'gradient',
-                gradient: {
-                    shadeIntensity: 1,
-                    inverseColors: false,
-                    opacityFrom: 0.8,
-                    opacityTo: 0,
-                    stops: [0, 75, 100]
-                },
-            },
             {% if granularity == "daily" and click_zoom %}
             events: {
                 markerClick: function(event, chartContext, { seriesIndex, dataPointIndex, w: {config}}) {
-                    const day = config.series[seriesIndex].data[dataPointIndex].x
+                    const day = config.labels[dataPointIndex]
                     window.location.href = `?startDate=${day}&endDate=${day}`
                 },
             },
@@ -79,12 +71,21 @@
             },
         },
         stroke: {
-            width: 1.5,
+            width: 2,
+            curve: 'smooth',
         },
         series: [{
-            name: "{{unit|default:'Sessions'}}",
-            data: {{data|safe}}
-        }]
+            name: "Hits",
+            type: 'area',
+            color: "#ddd6fe",
+            data: {{data.hits|safe}}
+        }, {
+            name: "Sessions",
+            type: 'line',
+            color: "#805AD5",
+            data: {{data.sessions|safe}}
+        }],
+        labels: {{data.labels|safe}}
     };
     var triggerMatchesChart = new ApexCharts(document.querySelector("#chart{{name|default:'Main'}}"), triggerMatchesChartOptions);
     triggerMatchesChart.render();

shynet/dashboard/templates/dashboard/pages/dashboard.html

@@ -13,7 +13,7 @@
         </div>
         {% has_perm "core.create_service" user as can_create %}
         {% if can_create %}
-        <a href="{% url 'dashboard:service_create' %}" class="button field bg-neutral-000 w-auto">+ New Service</a>
+        <a href="{% url 'dashboard:service_create' %}" class="button ~neutral @low w-auto">+ New Service</a>
         {% endif %}
     </div>
 </div>
@@ -21,7 +21,7 @@
 {% for object in object_list|dictsortreversed:"stats.session_count" %}
 {% include 'dashboard/includes/service_overview.html' %}
 {% empty %}
-<p class="aside ~urge !high">You don't have any services yet. {% if can_create %}Get started by <a href="{% url 'dashboard:service_create' %}" class="underline">creating one</a>.{% endif %}</p>
+<p class="aside ~urge @high">You don't have any services yet. {% if can_create %}Get started by <a href="{% url 'dashboard:service_create' %}" class="underline">creating one</a>.{% endif %}</p>
 {% endfor %}
 
 {% if object_list %}

shynet/dashboard/templates/dashboard/pages/index.html

@@ -4,6 +4,6 @@
 <section class="content">
     <h2>{{request.site.name}} Analytics</h2>
     <p>{{request.site.name}} uses Shynet. Eventually, more information about Shynet will be available here.</p>
-    <a href="{% url 'account_login' %}" class="button ~urge !high">Log In</a>
+    <a href="{% url 'account_login' %}" class="button ~urge @high">Log In</a>
 </section>
 {% endblock %}

shynet/dashboard/templates/dashboard/pages/service.html

@@ -6,7 +6,7 @@
 <div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
 {% has_perm 'core.change_service' user object as can_update %}
 {% if can_update %}
-<a href="{% contextual_url 'dashboard:service_update' service.uuid %}" class="button field bg-neutral-000 w-auto">Manage &rarr;</a>
+<a href="{% contextual_url 'dashboard:service_update' service.uuid %}" class="button ~neutral @low w-auto">Manage &rarr;</a>
 {% endif %}
 {% endblock %}
 
@@ -19,7 +19,7 @@
     {% include 'dashboard/includes/service_snippet.html' %}
 </div>
 {% else %}
-<div class="grid grid-cols-2 gap-6 md:flex justify-between mb-6 card ~neutral !high px-6" id="stats">
+<div class="grid grid-cols-2 gap-6 md:flex justify-between mb-6 card ~neutral @high px-6" id="stats">
     {% with classes="text-sm font-semibold" good_classes="text-positive-400" bad_classes="text-critical-400" neutral_classes="text-gray-400" %}
     <article class="">
         <p class="label text-gray-400">Sessions</p>
@@ -93,12 +93,12 @@
     </article>
     {% endwith %}
 </div>
-<div class="card overflow-visible ~neutral !low py-0 mb-6">
-    {% include 'dashboard/includes/time_chart.html' with data=stats.session_chart_data tooltip_format=stats.session_chart_tooltip_format granularity=stats.session_chart_granularity click_zoom=True %}
+<div class="card overflow-visible py-0 mb-6">
+    {% include 'dashboard/includes/time_chart.html' with data=stats.chart_data tooltip_format=stats.chart_tooltip_format granularity=stats.chart_granularity click_zoom=True %}
 </div>
 {% endif %}
-<div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-6">
-    <div class="card ~neutral !low limited-height py-2">
+<div id="card-grid" class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-6">
+    <div class="card limited-height py-2">
         <table class="table">
             <thead class="text-sm">
                 <tr>
@@ -109,8 +109,20 @@
             <tbody>
                 {% for location in stats.locations %}
                 <tr>
-                    <td class="truncate w-full max-w-0">{{location.location|default:"Unknown"|urldisplay}}</td>
-                    <td class="rf">{{location.count|intcomma}}</td>
+                    <td class="truncate w-full max-w-0 relative">
+                        {% include 'dashboard/includes/bar.html' with count=location.count max=stats.locations.0.count total=stats.hit_count %}
+                        <div class="relative flex items-center">
+                            {{location.location|default:"Unknown"|urldisplay}}
+                        </div>
+                    </td>
+                    <td>
+                        <div class="flex justify-end items-center">
+                            {{location.count|intcomma}}
+                            <span class="text-xs rf min-w-48">
+                                ({{location.count|percent:stats.hit_count}})
+                            </span>
+                        </div>
+                    </td>
                 </tr>
                 {% empty %}
                 <tr>
@@ -120,7 +132,55 @@
             </tbody>
         </table>
     </div>
-    <div class="card ~neutral !low limited-height py-2">
+    <div class="geo-map card py-2 overflow-y-hidden">
+        <p class="text-sm font-semibold p-2 border-b mb-2" style="color: var(--color-title)">
+            Sessions by Geography &nbsp
+            <button onclick="document.getElementById('card-grid').classList.add('geo-card--use-table-view')" class="text-xs select-none p-0 text-urge-600">
+                (view table)
+            </button>
+        </p>
+        {% include 'dashboard/includes/map_chart.html' with countries=stats.countries %}
+    </div>
+    <div class="geo-table card limited-height py-2">
+        <table class="table">
+            <thead class="text-sm">
+                <tr>
+                    <th>
+                        Country &nbsp
+                        <button onclick="document.getElementById('card-grid').classList.remove('geo-card--use-table-view'); geoMap.resize()" class="text-xs select-none p-0 text-urge-600">
+                            (view map)
+                        </button>
+                    </th>
+                    <th class="rf">Sessions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for country in stats.countries %}
+                <tr>
+                    <td class="truncate w-full max-w-0 relative" title="{{country.country|country_name}}">
+                        {% include 'dashboard/includes/bar.html' with count=country.count max=stats.countries.0.count total=stats.session_count %}
+                        <div class="relative flex items-center">
+                            <span class="flex-none {{country.country|flag_class}}"></span> <span class="truncate">{{country.country|country_name}}</span>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="flex justify-end items-center">
+                            {{country.count|intcomma}}
+                            <span class="text-xs rf min-w-48">
+                                ({{country.count|percent:stats.session_count}})
+                            </span>
+                        </div>
+                    </td>
+                </tr>
+                {% empty %}
+                <tr>
+                    <td><span class="text-gray-600">No data yet...</span></td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+    <div class="card limited-height py-2">
         <table class="table">
             <thead class="text-sm">
                 <tr>
@@ -131,32 +191,20 @@
             <tbody>
                 {% for referrer in stats.referrers %}
                 <tr>
-                    <td class="truncate w-full max-w-0">{{referrer.referrer|default:"Direct"|urldisplay}}</td>
-                    <td class="rf">{{referrer.count|intcomma}}</td>
-                </tr>
-                {% empty %}
-                <tr>
-                    <td><span class="text-gray-600">No data yet...</span></td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-    <div class="card ~neutral !low limited-height py-2">
-        <table class="table">
-            <thead class="text-sm">
-                <tr>
-                    <th>Country</th>
-                    <th class="rf">Sessions</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for country in stats.countries %}
-                <tr>
-                    <td class="truncate w-full max-w-0" title="{{country.country|country_name}}">
-                        <span class="{{country.country|flag_class}}"></span> {{country.country|country_name}}
+                    <td class="truncate w-full max-w-0 relative">
+                        {% include 'dashboard/includes/bar.html' with count=referrer.count max=stats.referrers.0.count total=stats.session_count %}
+                        <div class="relative flex items-center">
+                            {{referrer.referrer|default:"Direct"|urldisplay}}
+                        </div>
+                    </td>
+                    <td>
+                        <div class="flex justify-end items-center">
+                            {{referrer.count|intcomma}}
+                            <span class="text-xs rf min-w-48">
+                                ({{referrer.count|percent:stats.session_count}})
+                            </span>
+                        </div>
                     </td>
-                    <td class="rf">{{country.count|intcomma}}</td>
                 </tr>
                 {% empty %}
                 <tr>
@@ -166,7 +214,7 @@
             </tbody>
         </table>
     </div>
-    <div class="card ~neutral !low limited-height py-2">
+    <div class="card limited-height py-2">
         <table class="table">
             <thead class="text-sm">
                 <tr>
@@ -177,10 +225,20 @@
             <tbody>
                 {% for os in stats.operating_systems %}
                 <tr>
-                    <td class="flex items-center truncate w-full max-w-0" title="{{os.os|default:'Unknown'}}">
-                        {{os.os|iconify}}<span>{{os.os|default:"Unknown"}}</span>
+                    <td class="flex items-center truncate w-full max-w-0 relative" title="{{os.os|default:'Unknown'}}">
+                        {% include 'dashboard/includes/bar.html' with count=os.count max=stats.operating_systems.0.count total=stats.session_count %}
+                        <div class="relative flex items-center">
+                            {{os.os|iconify}}<span class="truncate">{{os.os|default:"Unknown"}}</span>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="flex justify-end items-center">
+                            {{os.count|intcomma}}
+                            <span class="text-xs rf min-w-48">
+                                ({{os.count|percent:stats.session_count}})
+                            </span>
+                        </div>
                     </td>
-                    <td class="rf">{{os.count|intcomma}}</td>
                 </tr>
                 {% empty %}
                 <tr>
@@ -190,7 +248,7 @@
             </tbody>
         </table>
     </div>
-    <div class="card ~neutral !low limited-height py-2">
+    <div class="card limited-height py-2">
         <table class="table">
             <thead class="text-sm">
                 <tr>
@@ -201,9 +259,21 @@
             <tbody>
                 {% for browser in stats.browsers %}
                 <tr>
-                    <td class="flex items-center truncate w-full max-w-0" title="{{browser.browser|default:'Unknown'}}">
-                        {{browser.browser|iconify}}<span>{{browser.browser|default:"Unknown"}}</span></td>
-                    <td class="rf">{{browser.count|intcomma}}</td>
+                    <td class="flex items-center truncate w-full max-w-0 relative" title="{{browser.browser|default:'Unknown'}}">
+                        {% include 'dashboard/includes/bar.html' with count=browser.count max=stats.browsers.0.count total=stats.session_count %}
+                        </div>
+                        <div class="relative flex items-center">
+                            {{browser.browser|iconify}}<span class="truncate">{{browser.browser|default:"Unknown"}}</span>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="flex justify-end items-center">
+                            {{browser.count|intcomma}}
+                            <span class="text-xs rf min-w-48">
+                                ({{browser.count|percent:stats.session_count}})
+                            </span>
+                        </div>
+                    </td>
                 </tr>
                 {% empty %}
                 <tr>
@@ -213,7 +283,7 @@
             </tbody>
         </table>
     </div>
-    <div class="card ~neutral !low limited-height py-2">
+    <div class="card limited-height py-2">
         <table class="table">
             <thead class="text-sm">
                 <tr>
@@ -224,8 +294,20 @@
             <tbody>
                 {% for device_type in stats.device_types %}
                 <tr>
-                    <td class="truncate w-full max-w-0">{{device_type.device_type|default:"Unknown"|title}}</td>
-                    <td class="rf">{{device_type.count|intcomma}}</td>
+                    <td class="truncate w-full max-w-0 relative">
+                        {% include 'dashboard/includes/bar.html' with count=device_type.count max=stats.device_types.0.count total=stats.session_count %}
+                        <div class="relative flex items-center">
+                            <span class="truncate">{{device_type.device_type|default:"Unknown"|title}}</span>
+                        </div>
+                    </td>
+                    <td>
+                        <div class="flex justify-end items-center">
+                            {{device_type.count|intcomma}}
+                            <span class="text-xs rf min-w-48">
+                                ({{device_type.count|percent:stats.session_count}})
+                            </span>
+                        </div>
+                    </td>
                 </tr>
                 {% empty %}
                 <tr>
@@ -236,7 +318,7 @@
         </table>
     </div>
 </div>
-<div class="card ~neutral !low limited-height py-2">
+<div class="card py-2 overflow-auto">
     {% include 'dashboard/includes/session_list.html' %}
     <hr class="sep h-8 md:h-12">
     <a href="{% contextual_url 'dashboard:service_session_list' service.uuid %}" class="button ~neutral w-auto mb-2">View more

shynet/dashboard/templates/dashboard/pages/service_create.html

@@ -7,14 +7,14 @@
 {% block content %}
 <h4 class="heading leading-none">Create Service</h4>
 <hr class="sep">
-<form class="card ~neutral !low p-0 max-w-xl" method="POST">
+<form class="card p-0 max-w-xl" method="POST">
     {% csrf_token %}
     <div class="p-4">
         {% include 'dashboard/includes/service_form.html' %}
     </div>
-    <div class="section ~urge !normal p-4">
-        <button type="submit" class="button ~urge !high">Create</button>
-        <a href="{% url 'dashboard:dashboard' %}" class="button ~urge !low">Cancel</a>
+    <div class="section ~urge @low p-4">
+        <button type="submit" class="button ~urge @high">Create</button>
+        <a href="{% url 'dashboard:dashboard' %}" class="ml-4 text-urge-600">Cancel</a>
     </div>
 </form>
 {% endblock %}

shynet/dashboard/templates/dashboard/pages/service_delete.html

@@ -5,16 +5,16 @@
 {% block head_title %}Delete {{object.name}}{% endblock %}
 
 {% block service_content %}
-<form class="card ~neutral !low p-0 max-w-xl" method="POST">
+<form class="card p-0 max-w-xl" method="POST">
     {% csrf_token %}
     <div class="p-4">
         <p>Are you sure you want to delete this service? All of its
             analytics and associated data will be permanently deleted.</p>
         {{form|a17t}}
     </div>
-    <div class="section ~critical !normal p-4">
-        <button type="submit" class="button ~critical !high">Delete</button>
-        <a href="{% url 'dashboard:service' object.uuid %}" class="button ~critical !low">Cancel</a>
+    <div class="section ~critical @low p-4">
+        <button type="submit" class="button ~critical @high">Delete</button>
+        <a href="{% url 'dashboard:service' object.uuid %}" class="ml-4 text-critical-600">Cancel</a>
     </div>
 </form>
 {% endblock %}

shynet/dashboard/templates/dashboard/pages/service_session.html

@@ -5,11 +5,11 @@
 {% block head_title %}{{object.name}} Session{% endblock %}
 
 {% block service_actions %}
-<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field bg-neutral-000 w-auto">Analytics &rarr;</a>
+<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button ~neutral @low w-auto">Analytics &rarr;</a>
 {% endblock %}
 
 {% block service_content %}
-<article class="card ~neutral !high">
+<article class="card ~neutral @high">
     <div class="md:flex items-center justify-between">
         <div>
             <h3 class="heading text-2xl mr-4">
@@ -18,7 +18,7 @@
         </div>
         <div>
             <p class="font-medium text-lg">{{session.start_time|date:"M j Y, g:i a"}} to
-                {{session.last_seen|date:"g:i a"}}{% if session.is_currently_active %} <span class="chip ~positive !high text-base">Online</span>{% endif %}</p>
+                {{session.last_seen|date:"g:i a"}}{% if session.is_currently_active %} <span class="chip ~positive @high text-base">Online</span>{% endif %}</p>
         </div>
     </div>
     <hr class="sep h-8 md:h-12">
@@ -70,7 +70,7 @@
         <div class="md:w-2/12 mb-2 md:mr-4 pt-4 md:text-right">
             <div class="text-lg font-medium">{{hit.start_time|date:"g:i a"}}</div>
         </div>
-        <div class="md:flex card ~neutral !low flex-grow justify-between">
+        <div class="md:flex card flex-grow justify-between">
             <div class="mb-4 md:mb-0 md:w-1/2">
                 <p class="label font-medium text-lg truncate">{{hit.location|default:"Unknown"|urlize}}</p>
                 {% if hit.referrer %}

shynet/dashboard/templates/dashboard/pages/service_session_list.html

@@ -6,11 +6,11 @@
 
 {% block service_actions %}
 <div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
-<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field ~neutral bg-neutral-000 w-auto">Analytics &rarr;</a>
+<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button ~neutral @low bg-neutral-000 w-auto">Analytics &rarr;</a>
 {% endblock %}
 
 {% block service_content %}
-<div class="card ~neutral !low mb-8 pt-2 max-w-full overflow-x-auto">
+<div class="card mb-8 pt-2 max-w-full overflow-x-auto">
     {% include 'dashboard/includes/session_list.html' %}
 </div>
 {% pagination page_obj request %}

shynet/dashboard/templates/dashboard/pages/service_update.html

@@ -5,7 +5,7 @@
 {% block head_title %}{{object.name}} Management{% endblock %}
 
 {% block service_actions %}
-<a href="{% url 'dashboard:service' object.uuid %}" class="button field bg-neutral-000 w-auto">View &rarr;</a>
+<a href="{% url 'dashboard:service' object.uuid %}" class="button ~neutral @low w-auto">View &rarr;</a>
 {% endblock %}
 
 {% block service_content %}
@@ -15,18 +15,18 @@
     {% include 'dashboard/includes/service_snippet.html' %}
     <hr class="sep h-4">
     <h5>Settings</h5>
-    <form class="card ~neutral !low p-0" method="POST">
+    <form class="card p-0" method="POST">
         {% csrf_token %}
         <div class="p-4">
             {% include 'dashboard/includes/service_form.html' %}
         </div>
-        <div class="section ~neutral !normal p-4 flex justify-between">
+        <div class="section ~neutral @low p-4 flex justify-between">
             <div>
-                <button type="submit" class="button ~neutral !high">Save</button>
-                <a href="{% url 'dashboard:service' object.uuid %}" class="button ~neutral !low">Cancel</a>
+                <button type="submit" class="button ~neutral @high">Save</button>
+                <a href="{% url 'dashboard:service' object.uuid %}" class="button ~neutral @low">Cancel</a>
             </div>
             <div>
-                <a href="{% url 'dashboard:service_delete' object.uuid %}" class="button ~critical !high">Delete</a>
+                <a href="{% url 'dashboard:service_delete' object.uuid %}" class="button ~critical @high">Delete</a>
             </div>
         </div>
     </form>

shynet/dashboard/templatetags/helpers.py

@@ -43,6 +43,14 @@ def country_name(isocode):
         return "Unknown"
 
 
+@register.filter
+def datamap_id(isocode):
+    try:
+        return pycountry.countries.get(alpha_2=isocode).alpha_3
+    except:
+        return "UNKNOWN"
+
+
 @register.simple_tag
 def relative_stat_tone(
     start,
@@ -181,11 +189,12 @@ def urldisplay(url):
     if url.startswith("http"):
         display_url = url.replace("http://", "").replace("https://", "")
         return SafeString(
-            f"<a href='{url}' title='{url}' rel='nofollow' class='flex items-center mr-1'>{iconify(url)}<span class='truncate'>{escape(display_url)}</span></a>"
+            f"<a href='{url}' title='{url}' rel='nofollow' class='flex items-center mr-1 truncate'>{iconify(url)}<span class='truncate'>{escape(display_url)}</span></a>"
         )
     else:
         return url
 
+
 class ContextualURLNode(template.Node):
     """Extension of the Django URLNode to support including contextual parameters in URL outputs. In other words, URLs generated will keep the start and end date parameters."""
 
@@ -205,9 +214,13 @@ class ContextualURLNode(template.Node):
         url_parts = list(urlparse(url))
         query = dict(urllib.parse.parse_qsl(url_parts[4]))
 
-        query.update({
-            param: context.request.GET.get(param) for param in self.CONTEXT_PARAMS if param in context.request.GET and param not in query
-        })
+        query.update(
+            {
+                param: context.request.GET.get(param)
+                for param in self.CONTEXT_PARAMS
+                if param in context.request.GET and param not in query
+            }
+        )
 
         url_parts[4] = urllib.parse.urlencode(query)
 
@@ -215,7 +228,7 @@ class ContextualURLNode(template.Node):
 
         if self.urlnode.asvar:
             context[self.urlnode.asvar] = url_final
-            return ''
+            return ""
         else:
             return url_final
 
@@ -225,6 +238,38 @@ def contextual_url(*args, **kwargs):
     urlnode = url_tag(*args, **kwargs)
     return ContextualURLNode(urlnode)
 
+
 @register.filter
 def location_url(session):
-    return settings.LOCATION_URL.replace("$LATITUDE", str(session.latitude)).replace("$LONGITUDE", str(session.longitude))
+    return settings.LOCATION_URL.replace("$LATITUDE", str(session.latitude)).replace(
+        "$LONGITUDE", str(session.longitude)
+    )
+
+
+@register.filter
+def percent(value, total):
+    if total == 0:
+        return "N/A"
+
+    percent = value / total
+
+    if percent < 0.001:
+        return "<0.1%"
+
+    return f"{percent:.1%}"
+
+
+@register.simple_tag
+def bar_width(count, max, total):
+    if total == 0 or max == 0:
+        return "0"
+
+    if settings.USE_RELATIVE_MAX_IN_BAR_VISUALIZATION:
+        percent = count / max
+    else:
+        percent = count / total
+
+    if percent < 0.001:
+        return "0"
+
+    return f"{percent:.1%}"

shynet/dashboard/tests/tests_dashboard_views.py

@@ -0,0 +1,43 @@
+from django.test import TestCase, RequestFactory
+from django.conf import settings
+from django.urls import reverse
+from core.factories import UserFactory
+
+from dashboard.views import DashboardView
+
+
+class QuestionModelTests(TestCase):
+    def setUp(self):
+        # Every test needs access to the request factory.
+        self.factory = RequestFactory()
+        self.user = UserFactory()
+
+    def tearDown(self):
+        pass
+
+    def tests_unauthenticated_dashboard_view(self):
+        """
+        GIVEN: Unauthenticated user
+        WHEN: Accessing the dashboard view
+        THEN: It's redirected to login page with NEXT url to dashboard
+        """
+        login_url = settings.LOGIN_URL
+        response = self.client.get(reverse("dashboard:dashboard"))
+
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(
+            response.url, f"{login_url}?next={reverse('dashboard:dashboard')}"
+        )
+
+    def tests_authenticated_dashboard_view(self):
+        """
+        GIVEN: Authenticated user
+        WHEN: Accessing the dashboard view
+        THEN: It should respond with 200 and render the view
+        """
+        request = self.factory.get(reverse("dashboard:dashboard"))
+        request.user = self.user
+
+        # Use this syntax for class-based views.
+        response = DashboardView.as_view()(request)
+        self.assertEqual(response.status_code, 200)

shynet/shynet/settings.py

@@ -9,6 +9,7 @@ https://docs.djangoproject.com/en/2.2/ref/settings/
 """
 
 import os
+from dotenv import load_dotenv
 
 # import module sys to get the type of exception
 import sys
@@ -17,8 +18,11 @@ import urllib.parse as urlparse
 # Messages
 from django.contrib.messages import constants as messages
 
+# Load environment variables
+load_dotenv()
+
 # Increment on new releases
-VERSION = "v0.9.0"
+VERSION = "0.11.0"
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -294,23 +298,29 @@ else:
     EMAIL_USE_SSL = os.environ.get("EMAIL_USE_SSL")
     EMAIL_USE_TLS = os.environ.get("EMAIL_USE_TLS")
 
+# Auto fields
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
 # NPM
 
 NPM_ROOT_PATH = "../"
 
 NPM_FILE_PATTERNS = {
-    "a17t": [os.path.join("dist", "a17t.css"), os.path.join("dist", "tailwind.css")],
     "apexcharts": [os.path.join("dist", "apexcharts.min.js")],
     "litepicker": [
         os.path.join("dist", "nocss", "litepicker.js"),
         os.path.join("dist", "css", "litepicker.css"),
         os.path.join("dist", "plugins", "ranges.js"),
     ],
-    "turbolinks": [os.path.join("dist", "turbolinks.js")],
-    "stimulus": [os.path.join("dist", "stimulus.umd.js")],
     "inter-ui": [os.path.join("Inter (web)", "*")],
     "@fortawesome": [os.path.join("fontawesome-free", "js", "all.min.js")],
-    "flag-icon-css": [os.path.join("css", "flag-icon.min.css"), os.path.join("flags", "*")],
+    "datamaps": [os.path.join("dist", "datamaps.world.min.js")],
+    "d3": ["d3.min.js"],
+    "topojson": [os.path.join("build", "topojson.min.js")],
+    "flag-icon-css": [
+        os.path.join("css", "flag-icon.min.css"),
+        os.path.join("flags", "*"),
+    ],
 }
 
 # Shynet
@@ -346,7 +356,14 @@ BLOCK_ALL_IPS = os.getenv("BLOCK_ALL_IPS", "False") == "True"
 AGGRESSIVE_HASH_SALTING = os.getenv("AGGRESSIVE_HASH_SALTING", "False") == "True"
 
 # What location url should be linked to in the frontend?
-LOCATION_URL = os.getenv("LOCATION_URL", "https://www.openstreetmap.org/?mlat=$LATITUDE&mlon=$LONGITUDE")
+LOCATION_URL = os.getenv(
+    "LOCATION_URL", "https://www.openstreetmap.org/?mlat=$LATITUDE&mlon=$LONGITUDE"
+)
 
 # How many services should be displayed on dashboard page?
 DASHBOARD_PAGE_SIZE = int(os.getenv("DASHBOARD_PAGE_SIZE", "5"))
+
+# Should background bars be scaled to full width?
+USE_RELATIVE_MAX_IN_BAR_VISUALIZATION = (
+    os.getenv("USE_RELATIVE_MAX_IN_BAR_VISUALIZATION", "True") == "True"
+)

shynet/startup_checks.sh

@@ -16,9 +16,6 @@ if [[ ${startup_results[1]} == True ]]; then
   echo "Warning: no admin user available. Consult docs for instructions."
 fi
 if [[ ${startup_results[2]} == True ]]; then
-  echo "Warning: Shynet's hostname is not set. The script won't work correctly. Consult docs for instructions."
-fi
-if [[ ${startup_results[3]} == True ]]; then
   echo "Warning: Shynet's whitelabel is not set. Consult docs for instructions."
 fi
 echo "Startup checks complete!"

tailwind.config.js

@@ -0,0 +1,22 @@
+let colors = require("tailwindcss/colors")
+
+module.exports = {
+  content: ["./**/*.{html,py}"],
+  theme: {
+    extend: {
+      colors: {
+        neutral: colors.slate,
+        positive: colors.green,
+        urge: colors.violet,
+        warning: colors.yellow,
+        info: colors.blue,
+        critical: colors.red,
+        inf: "white",
+        zero: colors.slate[900]
+      }
+    },
+  },
+  plugins: [
+    require("a17t")
+  ],
+}