From bd709576f2b79ebea4ffbf0f89c968fe731531a4 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 22 Sep 2026 12:55:20 +0200
Subject: [PATCH] [MISC] Project configs updated

### Miscellaneous

- Project configs updated
---
 .gitignore                                    |   5 +
 .make/conf.d/npm.mk                           |   4 +
 .make/config.ini                              |  12 +-
 .make/parse_ini_interpolate.py                | 179 ++++++++++++++++++
 Makefile                                      |   9 +-
 eslint.config.js                              |  51 +++--
 package-lock.json                             |  68 ++++++-
 package.json                                  |   1 +
 sovtimer/static/sovtimer/js/aa-sov-timer.js   |  52 ++---
 .../sovtimer/js/aa-sov-timer.min.js.map       |   2 +-
 10 files changed, 333 insertions(+), 50 deletions(-)
 create mode 100644 .make/parse_ini_interpolate.py

diff --git a/.gitignore b/.gitignore
index 27197154..56c3ad3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,11 @@ __pycache__
 /coverage.xml
 alliance_auth.sqlite3
 
+/*.min.css
+/*.min.css.map
+/*.min.js
+/*.min.js.map
+
 /sovtimer/locale/en/
 .esi-compatibility-date
 .make/myauth-path
diff --git a/.make/conf.d/npm.mk b/.make/conf.d/npm.mk
index 8db74994..89c30612 100644
--- a/.make/conf.d/npm.mk
+++ b/.make/conf.d/npm.mk
@@ -27,6 +27,10 @@ npm-audit-fix:
 # Run a specific npm script
 .PHONY: npm-run
 npm-run:
+	@if [ -z "$(script)" ]; then \
+		echo "Error: Please specify the npm script to run using 'make npm-run script=<script>'."; \
+		exit 1; \
+	fi
 	@echo "Running npm script…"
 	@npm run $(script)
 
diff --git a/.make/config.ini b/.make/config.ini
index b081b387..7ed8e8d2 100644
--- a/.make/config.ini
+++ b/.make/config.ini
@@ -30,17 +30,17 @@ password =
 
 [Development]
 base_dir = .
-test_db_name = test_alliance_auth_development
+test_db_name = test_${DB:name}
 
 [Django]
 myauth_path = ../myauth
-translation_directory = sovtimer/locale
-translation_template = sovtimer/locale/django.pot
+translation_directory = ${General:package}/locale
+translation_template = ${Django:translation_directory}/django.pot
 translation_file_relative_path = LC_MESSAGES/django.po
 
 [Git]
-git_repository = https://github.com/ppfeufer/aa-sov-timer
-git_repository_issues = https://github.com/ppfeufer/aa-sov-timer/issues
+git_repository = https://github.com/ppfeufer/${General:appname}
+git_repository_issues = ${Git:git_repository}/issues
 
 [Python]
 executable = ../venv/bin/python
@@ -49,4 +49,4 @@ venv_path = ../venv
 [Weblate]
 base_url = https://weblate.ppfeufer.de
 project_slug = alliance-auth-apps
-component_slug = aa-sovereignty-timer
+component_slug = ${General:appname}
diff --git a/.make/parse_ini_interpolate.py b/.make/parse_ini_interpolate.py
new file mode 100644
index 00000000..27ce287c
--- /dev/null
+++ b/.make/parse_ini_interpolate.py
@@ -0,0 +1,179 @@
+#!/usr/bin/env python3
+
+"""
+This script parses INI files, normalizes the section and key names, and resolves interpolations in the values. It can output the results in different formats based on the specified mode.
+"""
+
+# Standard Library
+import re
+import sys
+from pathlib import Path
+
+
+def normalize_name(section, key):
+    """
+    Normalize the section and key names to a consistent format.
+
+    :param section: The section name from the INI file
+    :param key: The key name from the INI file
+    :return: A normalized name in the format SECTION__KEY, uppercased and with non-alphanumeric characters replaced by underscores
+    """
+
+    if section is None or section == "":
+        name = key
+    else:
+        name = f"{section}__{key}"
+
+    name = name.upper()
+    name = re.sub(r"[^A-Z0-9_]", "_", name)
+
+    return name
+
+
+def parse_files(files):
+    """
+    Parse the given INI files and return a dictionary of normalized names to values, along with the order of the names.
+
+    :param files: A list of file paths to INI files
+    :return: A tuple containing a dictionary of normalized names to values and a list of names in the order they were parsed
+    """
+
+    vals = {}
+    order = []
+    section = ""
+
+    for fp in files:
+        p = Path(fp)
+
+        if not p.exists():
+            continue
+
+        with p.open(encoding="utf-8") as f:
+            for line in f:
+                s = line.rstrip("\n")
+                # section header
+                m = re.match(r"^\s*\[([^]]+)]\s*$", s)
+
+                if m:
+                    section = m.group(1).strip()
+
+                    continue
+
+                # skip comments or empty
+                if re.match(r"^\s*[#;]", s) or not re.search(r"=", s):
+                    continue
+
+                # split on first '='
+                key, val = re.split(r"=", s, maxsplit=1)
+                key = key.strip()
+                val = val.strip()
+                name = normalize_name(section, key)
+                vals[name] = val
+                order.append(name)
+
+    return vals, order
+
+
+def resolve_interpolations(vals, order, max_iters=10):
+    """
+    Resolve interpolations in the values of the given dictionary.
+
+    :param vals: A dictionary of normalized names to values
+    :param order: A list of names in the order they were parsed
+    :param max_iters: The maximum number of iterations to resolve interpolations
+    :return: The dictionary of values with interpolations resolved
+    """
+
+    pattern = re.compile(r"\$\{([^}:]+):?([^}]*)}")
+
+    for _ in range(max_iters):
+        changed = False
+
+        for name in order:
+            v = vals.get(name, "")
+
+            def _repl(m):
+                """
+                Replacement function for regex substitution.
+
+                :param m: The regex match object
+                :return: The replacement string
+                """
+
+                sec = m.group(1) or ""
+                key = m.group(2) or ""
+
+                if key == "":
+                    # If no colon provided, treat whole as key and empty section
+                    ref = normalize_name("", sec)
+                else:
+                    ref = normalize_name(sec, key)
+                return vals.get(ref, "")
+
+            newv = pattern.sub(_repl, v)
+
+            if newv != v:
+                vals[name] = newv
+                changed = True
+
+        if not changed:
+            break
+
+    return vals
+
+
+def main(argv):
+    """
+    Main function to parse INI files and resolve interpolations.
+
+    :param argv: A list of command-line arguments
+    :return: None
+    """
+
+    mode = "make"
+    files = []
+    i = 1
+
+    while i < len(argv):
+        a = argv[i]
+
+        if a.startswith("--mode="):
+            mode = a.split("=", 1)[1]
+        else:
+            files.append(a)
+
+        i += 1
+
+    vals, order = parse_files(files)
+    vals = resolve_interpolations(vals, order)
+    out_lines = []
+
+    if mode == "names":
+        seen = set()
+
+        for name in order:
+            if name in seen:
+                continue
+
+            seen.add(name)
+            out_lines.append(name)
+
+        sys.stdout.write("\n".join(out_lines) + "\n")
+
+        return
+
+    for name in order:
+        v = vals.get(name, "")
+
+        if mode == "make":
+            # Escape $ for Makefile (write $$ so that Makefile sees a single $)
+            v = v.replace("$", "$$")
+            out_lines.append(f"{name} := {v}")
+        else:
+            out_lines.append(f"{name}={v}")
+
+    sys.stdout.write("\n".join(out_lines) + "\n")
+
+
+if __name__ == "__main__":
+    main(sys.argv)
diff --git a/Makefile b/Makefile
index 083ebaba..34ac0a53 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,13 @@ ParsedConfigFiles := $(ConfigFile) $(wildcard $(ConfigFileOverride))
 # Extract all config values from $(ConfigFile) and export them as Makefile variables
 ifneq ($(wildcard $(ConfigFile)),)
 TMPFILE := $(shell mkdir -p $(dir $(ConfigFile)) && mktemp $(dir $(ConfigFile))/make_vars.XXXXXX)
-$(shell awk -F= '/^\[/{gsub(/^^\[|\]$$/, "", $$0); section=$$0; next} /^[^#;].*=/ { key=$$1; val=$$0; sub(/^[^=]*=/, "", val); gsub(/^[ \t]+|[ \t]+$$/, "", val); gsub(/^[ \t]+|[ \t]+$$/, "", key); if(section=="") name=toupper(key); else name=toupper(section"__"key); gsub(/[^A-Z0-9_]/, "_", name); gsub(/[$$]/, "$$$$", val); printf "%s := %s\n", name, val }' $(ParsedConfigFiles) > $(TMPFILE))
+$(shell /usr/bin/env python3 .make/parse_ini_interpolate.py --mode=make $(ParsedConfigFiles) > $(TMPFILE))
 include $(TMPFILE)
 $(shell rm -f $(TMPFILE))
 
 # Also capture the list of variable NAMES (for show-config output).
-ConfigVars := $(shell awk -F= '/^\[/{gsub(/^^\[|\]$$/, "", $$0); section=$$0; next} /^[^#;].*=/ { key=$$1; gsub(/^[ \t]+|[ \t]+$$/, "", key); if(section=="") name=toupper(key); else name=toupper(section"__"key); gsub(/[^A-Z0-9_]/, "_", name); print name }' $(ParsedConfigFiles) | sort -u)
+# Use the Python parser to normalize names (keeps behavior consistent with interpolation)
+ConfigVars := $(shell /usr/bin/env python3 .make/parse_ini_interpolate.py --mode=names $(ParsedConfigFiles) | sort -u)
 else
 # Notify the user that no config file was found.
 $(error Config file '$(ConfigFile)' not found. To configure the project, create '$(ConfigFile)')
@@ -168,9 +169,9 @@ show-parsed-config-files:
 		override="$(ConfigFileOverride)"; \
 		base_tmp=$$(mktemp); \
 		ovr_tmp=$$(mktemp); \
-		awk -F= '/^\[/ {gsub(/^^\[|\]$$/, "", $$0); section=$$0; next} /^[^#;].*=/ { key=$$1; val=$$0; sub(/^[^=]*=/, "", val); gsub(/^[ \t]+|[ \t]+$$/, "", val); gsub(/^[ \t]+|[ \t]+$$/, "", key); if(section=="") name=toupper(key); else name=toupper(section"__"key); gsub(/[^A-Z0-9_]/, "_", name); printf "%s=%s\n", name, val }' "$$base" > "$$base_tmp"; \
+		/usr/bin/env python3 .make/parse_ini_interpolate.py --mode=pair "$$base" > "$$base_tmp"; \
 		if [ -f "$$override" ]; then \
-			awk -F= '/^\[/ {gsub(/^^\[|\]$$/, "", $$0); section=$$0; next} /^[^#;].*=/ { key=$$1; val=$$0; sub(/^[^=]*=/, "", val); gsub(/^[ \t]+|[ \t]+$$/, "", val); gsub(/^[ \t]+|[ \t]+$$/, "", key); if(section=="") name=toupper(key); else name=toupper(section"__"key); gsub(/[^A-Z0-9_]/, "_", name); printf "%s=%s\n", name, val }' "$$override" > "$$ovr_tmp"; \
+			/usr/bin/env python3 .make/parse_ini_interpolate.py --mode=pair "$$override" > "$$ovr_tmp"; \
 			if [ -s "$$ovr_tmp" ]; then \
 				echo "$(TEXT_UNDERLINE)Overridden variables:$(TEXT_RESET)"; \
 				base_sorted="$$base_tmp.sorted"; \
diff --git a/eslint.config.js b/eslint.config.js
index fae03748..4cf8f6af 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,34 +1,61 @@
 import globals from 'globals'; // Import the globals package
 import js from '@eslint/js'; // Import the ESLint JavaScript configuration
-import { defineConfig } from 'eslint/config'; // Import the defineConfig function from ESLint
+import {defineConfig} from 'eslint/config'; // Import the defineConfig function from ESLint
+import stylistic from '@stylistic/eslint-plugin'; // Import the Stylistic ESLint plugin
 
 export default defineConfig([
     {
+        plugins: {
+            '@stylistic': stylistic
+        },
         languageOptions: {
             globals: {
                 ...globals.browser,
                 ...globals.commonjs,
-                ...globals.jquery,
+                ...globals.jquery
             },
             parserOptions: {
                 ...js.configs.recommended.parserOptions,
                 ecmaVersion: 'latest',
                 ecmaFeatures: {
-                    impliedStrict: true,
+                    impliedStrict: true
                 },
-                sourceType: 'module',
-            },
+                sourceType: 'module'
+            }
         },
         rules: {
             ...js.configs.recommended.rules,
-            indent: ['error', 4, {
-                'SwitchCase': 1
+            ...stylistic.configs.recommended.rules,
+            // https://eslint.style/rules/arrow-parens
+            '@stylistic/arrow-parens': ['error', 'always'],
+            // https://eslint.style/rules/brace-style
+            '@stylistic/brace-style': ['error', '1tbs', {
+                allowSingleLine: false
             }],
-            quotes: ['error', 'single', {
-                avoidEscape: true,
-                allowTemplateLiterals: true
+            // https://eslint.style/rules/comma-dangle
+            '@stylistic/comma-dangle': ['error', 'never'],
+            // https://eslint.style/rules/indent
+            '@stylistic/indent': ['error', 4, {
+                SwitchCase: 1
             }],
-            semi: [2, 'always'],
-        },
+            // https://eslint.style/rules/indent-binary-ops
+            '@stylistic/indent-binary-ops': ['error', 4],
+            // https://eslint.style/rules/object-curly-spacing
+            '@stylistic/object-curly-spacing': ['error', 'never'],
+            // https://eslint.style/rules/quotes
+            '@stylistic/quotes': ['error', 'single', {
+                allowTemplateLiterals: 'avoidEscape',
+                avoidEscape: true
+            }],
+            // https://eslint.style/rules/semi
+            '@stylistic/semi': ['error', 'always'],
+            // https://eslint.style/rules/space-before-function-paren
+            '@stylistic/space-before-function-paren': ['error', {
+                anonymous: 'always',
+                asyncArrow: 'always',
+                catch: 'always',
+                named: 'always'
+            }]
+        }
     }
 ]);
diff --git a/package-lock.json b/package-lock.json
index 00d910e1..3dd90e71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
             "version": "5.1.1",
             "devDependencies": {
                 "@eslint/js": "^10.0.1",
+                "@stylistic/eslint-plugin": "^5.10.0",
                 "eslint": "^10.10.0",
                 "globals": "^17.12.0",
                 "sass": "^1.104.0",
@@ -853,6 +854,58 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/@stylistic/eslint-plugin": {
+            "version": "5.10.0",
+            "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
+            "integrity": "sha512-nPK52ZHvot8Ju/0A4ucSX1dcPV2/1clx0kLcH5wDmrE4naKso7TUC/voUyU1O9OTKTrR6MYip6LP0ogEMQ9jPQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.9.1",
+                "@typescript-eslint/types": "^8.56.0",
+                "eslint-visitor-keys": "^4.2.1",
+                "espree": "^10.4.0",
+                "estraverse": "^5.3.0",
+                "picomatch": "^4.0.3"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "peerDependencies": {
+                "eslint": "^9.0.0 || ^10.0.0"
+            }
+        },
+        "node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+            "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/@stylistic/eslint-plugin/node_modules/espree": {
+            "version": "10.4.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+            "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.15.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^4.2.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
         "node_modules/@types/esrecurse": {
             "version": "4.3.1",
             "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz",
@@ -874,6 +927,20 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@typescript-eslint/types": {
+            "version": "8.70.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.70.1.tgz",
+            "integrity": "sha512-Dm1ypdhhrGCTyyehxElhgJ6kgk8MVCv5qXdoOVqPr1uqk42jX8KjrZqhROvdShczA8qrDoYiOWn1ykWlx2k81Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
         "node_modules/acorn": {
             "version": "8.18.0",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.18.0.tgz",
@@ -2196,7 +2263,6 @@
             "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
             "dev": true,
             "license": "MIT",
-            "optional": true,
             "engines": {
                 "node": ">=12"
             },
diff --git a/package.json b/package.json
index 1b037581..240405fc 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
     "type": "module",
     "devDependencies": {
         "@eslint/js": "^10.0.1",
+        "@stylistic/eslint-plugin": "^5.10.0",
         "eslint": "^10.10.0",
         "globals": "^17.12.0",
         "sass": "^1.104.0",
diff --git a/sovtimer/static/sovtimer/js/aa-sov-timer.js b/sovtimer/static/sovtimer/js/aa-sov-timer.js
index 553ca548..20d67a4e 100644
--- a/sovtimer/static/sovtimer/js/aa-sov-timer.js
+++ b/sovtimer/static/sovtimer/js/aa-sov-timer.js
@@ -49,7 +49,7 @@ $(document).ready(() => {
      * @private
      */
     const _removeSearchFromColumnControl = () => {
-        return sovtimerSettings.dataTables.columnControl.map((control, index) => index === 1 ? { ...control, content: [] } : control);
+        return sovtimerSettings.dataTables.columnControl.map((control, index) => index === 1 ? {...control, content: []} : control);
     };
 
     /**
@@ -59,7 +59,7 @@ $(document).ready(() => {
      * @private
      */
     const _removeColumnControl = () => { // eslint-disable-line no-unused-vars
-        return sovtimerSettings.dataTables.columnControl.map((control) => ({ ...control, content: [] }));
+        return sovtimerSettings.dataTables.columnControl.map((control) => ({...control, content: []}));
     };
 
     /**
@@ -135,33 +135,33 @@ $(document).ready(() => {
                     // Column: 0 - System
                     {
                         data: {
-                            display: d => d.solar_system.display,
-                            sort: d => d.solar_system.sort,
-                            filter: d => d.solar_system.sort
+                            display: (d) => d.solar_system.display,
+                            sort: (d) => d.solar_system.sort,
+                            filter: (d) => d.solar_system.sort
                         }
                     },
                     // Column: 1 - Constellation
                     {
                         data: {
-                            display: d => d.constellation.display,
-                            sort: d => d.constellation.sort,
-                            filter: d => d.constellation.sort
+                            display: (d) => d.constellation.display,
+                            sort: (d) => d.constellation.sort,
+                            filter: (d) => d.constellation.sort
                         }
                     },
                     // Column: 2 - Region
                     {
                         data: {
-                            display: d => d.region.display,
-                            sort: d => d.region.sort,
-                            filter: d => d.region.sort
+                            display: (d) => d.region.display,
+                            sort: (d) => d.region.sort,
+                            filter: (d) => d.region.sort
                         }
                     },
                     // Column: 3 - Defender
                     {
                         data: {
-                            display: d => d.defender.display,
-                            sort: d => d.defender.sort,
-                            filter: d => d.defender.sort
+                            display: (d) => d.defender.display,
+                            sort: (d) => d.defender.sort,
+                            filter: (d) => d.defender.sort
                         }
                     },
                     // Column: 4 - Activity Defense Multiplier
@@ -171,25 +171,25 @@ $(document).ready(() => {
                     // Column: 5 - Start Time
                     {
                         data: {
-                            display: d => d.start_time ? moment(d.start_time).utc().format(sovtimerSettings.datetimeFormat.datetimeLong) : '',
-                            sort: d => d.start_time ? moment(d.start_time).unix() : 0,
-                            filter: d => d.start_time || ''
+                            display: (d) => d.start_time ? moment(d.start_time).utc().format(sovtimerSettings.datetimeFormat.datetimeLong) : '',
+                            sort: (d) => d.start_time ? moment(d.start_time).unix() : 0,
+                            filter: (d) => d.start_time || ''
                         }
                     },
                     // Column: 6 - Remaining Time
                     {
                         data: {
-                            display: d => d.remaining_time.display,
-                            sort: d => d.remaining_time.seconds,
-                            filter: d => d.remaining_time.seconds
+                            display: (d) => d.remaining_time.display,
+                            sort: (d) => d.remaining_time.seconds,
+                            filter: (d) => d.remaining_time.seconds
                         }
                     },
                     // Column: 7 - Campaign Progress
                     {
                         data: {
-                            display: d => d.campaign_progress.display,
-                            sort: d => d.campaign_progress.current,
-                            filter: d => d.campaign_status
+                            display: (d) => d.campaign_progress.display,
+                            sort: (d) => d.campaign_progress.current,
+                            filter: (d) => d.campaign_status
                         }
                     }
                 ],
@@ -202,7 +202,7 @@ $(document).ready(() => {
                         targets: [6, 7],
                         type: 'float',
                         width: 175
-                    },
+                    }
                 ],
                 order: [[5, 'asc']],
                 createdRow: (row, data) => {
@@ -328,8 +328,8 @@ $(document).ready(() => {
                     // Define filters
                     const _filters = [
                         ['#aa-sovtimer-filter-total-campaigns', () => true],
-                        ['#aa-sovtimer-filter-upcoming-campaigns', rowData => rowData.campaign_status === 'upcoming'],
-                        ['#aa-sovtimer-filter-active-campaigns', rowData => rowData.campaign_status === 'active']
+                        ['#aa-sovtimer-filter-upcoming-campaigns', (rowData) => rowData.campaign_status === 'upcoming'],
+                        ['#aa-sovtimer-filter-active-campaigns', (rowData) => rowData.campaign_status === 'active']
                     ];
 
                     _filters.forEach(([selector, predicate]) => _filterCampaigns(selector, predicate));
diff --git a/sovtimer/static/sovtimer/js/aa-sov-timer.min.js.map b/sovtimer/static/sovtimer/js/aa-sov-timer.min.js.map
index a94cc930..d9b5aaa4 100644
--- a/sovtimer/static/sovtimer/js/aa-sov-timer.min.js.map
+++ b/sovtimer/static/sovtimer/js/aa-sov-timer.min.js.map
@@ -1 +1 @@
-{"version":3,"names":["$","document","ready","sovtimerSettings","sovtimerJsSettingsOverride","objectDeepMerge","sovtimerJsSettingsDefaults","elements","campaignsTotal","campaignsUpcoming","campaignsActive","_bootstrapTooltip","selector","namespace","querySelectorAll","forEach","tooltipTriggerEl","existing","bootstrap","Tooltip","getInstance","dispose","remove","_removeSearchFromColumnControl","dataTables","columnControl","map","control","index","content","_secondsToRemainingTime","secondsRemaining","isElapsed","prefix","spanClasses","Math","abs","countdown","floor","String","padStart","remainingTimeInSeconds","_updateCampaignCounts","data","counts","reduce","campaigns","item","total","campaign_status","Object","prototype","hasOwnProperty","call","upcoming","active","html","sovCampaignTable","fetchGet","url","ajaxUpdate","then","tableData","DataTable","language","languageUrl","layout","ordering","columns","display","d","solar_system","sort","filter","constellation","region","defender","start_time","moment","utc","format","datetimeFormat","datetimeLong","unix","remaining_time","seconds","campaign_progress","current","columnDefs","targets","type","width","order","createdRow","row","addClass","paging","initComplete","dt","_rowCache","rows","indexes","toArray","rowIdx","rowData","cellNode","cell","node","remainingSeconds","Number","_rebuildRowCache","_tick","i","length","r","remaining","innerHTML","_filterCampaigns","predicate","click","fn","dataTable","ext","search","settings","searchData","push","removeClass","draw","setInterval","newData","clear","add","catch","console","error","on"],"sources":["aa-sov-timer.js"],"mappings":"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","ignoreList":[]}
\ No newline at end of file
+{"version":3,"names":["$","document","ready","sovtimerSettings","sovtimerJsSettingsOverride","objectDeepMerge","sovtimerJsSettingsDefaults","elements","campaignsTotal","campaignsUpcoming","campaignsActive","_bootstrapTooltip","selector","namespace","querySelectorAll","forEach","tooltipTriggerEl","existing","bootstrap","Tooltip","getInstance","dispose","remove","_removeSearchFromColumnControl","dataTables","columnControl","map","control","index","content","_secondsToRemainingTime","secondsRemaining","isElapsed","prefix","spanClasses","Math","abs","countdown","floor","String","padStart","remainingTimeInSeconds","_updateCampaignCounts","data","counts","reduce","campaigns","item","total","campaign_status","Object","prototype","hasOwnProperty","call","upcoming","active","html","sovCampaignTable","fetchGet","url","ajaxUpdate","then","tableData","DataTable","language","languageUrl","layout","ordering","columns","display","d","solar_system","sort","filter","constellation","region","defender","start_time","moment","utc","format","datetimeFormat","datetimeLong","unix","remaining_time","seconds","campaign_progress","current","columnDefs","targets","type","width","order","createdRow","row","addClass","paging","initComplete","dt","_rowCache","rows","indexes","toArray","rowIdx","rowData","cellNode","cell","node","remainingSeconds","Number","_rebuildRowCache","_tick","i","length","r","remaining","innerHTML","_filterCampaigns","predicate","click","fn","dataTable","ext","search","settings","searchData","push","removeClass","draw","setInterval","newData","clear","add","catch","console","error","on"],"sources":["aa-sov-timer.js"],"mappings":"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","ignoreList":[]}
\ No newline at end of file