Version 0.4.0

Update dependency kubernetes to v26

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/build-container.yaml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Login to GHCR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         if: github.event_name != 'pull_request'
         with:
           registry: ghcr.io
@@ -24,7 +24,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           push: true
           tags: |

.github/workflows/lint.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: wemake-python-styleguide
-        uses: wemake-services/wemake-python-styleguide@0.16.0
+        uses: wemake-services/wemake-python-styleguide@0.17.0

.github/workflows/release-chart.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -21,12 +21,12 @@ jobs:
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
       - name: Install Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v3
         with:
           version: v3.6.3
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.2.1
+        uses: helm/chart-releaser-action@v1.5.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_RELEASE_NAME_TEMPLATE: "ohayodash-helm-chart-{{ .Version }}"

.github/workflows/release.yaml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
       - run: pip install -r requirements-dev.txt
 
       - name: Build Assets

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-alpine
+FROM python:3.11-alpine
 WORKDIR /app
 COPY ./requirements.txt /app/requirements.txt
 RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt

README.md

@@ -2,4 +2,97 @@
 
 Ohayo Dash is a Kubernetes driven start page and dashboard. All configuration is done by standard Kubernetes objects and ConfigMaps.
 
-This is inspired by [Hajimari](https://github.com/toboshii/hajimari) and [SUI](https://github.com/jeroenpardon/sui) projects.
+This is inspired by [Hajimari](https://github.com/toboshii/hajimari) and [SUI](https://github.com/jeroenpardon/sui) projects.
+
+## Configuration
+
+All configuration is handled with `ConfigMap` and `Ingress` objects within Kubernetes.
+
+### Ingresses
+
+All namespaces as processed by default, only Ingress objects with `ohayodash.github.io/enabled` annotation are then displayed.
+
+Annotations can be used to customize the display of the Ingress objects:
+
+* `ohayodash.github.io/name` - Display name of the app, defaults to the Ingress name.
+* `ohayodash.github.io/url` - Target URL of the service, defaults to `https://<ingress host>`
+* `ohayodash.github.io/show_url` - Shows the URL under the link, defaults to `false`
+
+### Bookmarks
+
+Bookmark are stored in `ConfigMap` resources, which are identified by the `ohayodash.github.io/bookmarks` annotation.
+
+Values are pulled from the `bookmarks` key in the config map, which consists of a list of objects with the following keys:
+
+* `name` - the display name of the link
+* `url` - the target URL.
+* `group` - the name the link is to be grouped under.
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ohayodash-bookmarks
+  namespace: web
+  annotations:
+    ohayodash.github.io/bookmarks: 'true'
+data:
+  bookmarks: |
+    - name: Renovate Dashboard
+      url: "https://app.renovatebot.com/dashboard#github/nikdoof/flux-gitops"
+      group: Github
+```
+
+### Providers
+
+Providers are stored in `ConfigMap` resources, which are identified by the `ohayodash.github.io/providers` annotation.
+
+Values are pulled from the `providers` key in the config map, which consists of a list of objects with the following keys:
+
+* `name` - the display name of the link
+* `url` - the target URL of the service.
+* `search` - suffix to add to search on the service, this will combine the URL, Search value and the text to search for into a URL.
+* `prefix` - prefix to use on the URL bar on Ohayodash.
+
+*Note*: If no Providers ConfigMaps are found then a [default](ohayodash/data/providers.yaml) list is used.
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ohayodash-providers
+  namespace: web
+  annotations:
+    ohayodash.github.io/providers: 'true'
+data:
+  providers: |
+    - name: Allmusic
+      url: https://www.allmusic.com/
+      search: search/all/
+      prefix: /a
+```
+
+### Combining ConfigMaps
+
+ConfigMaps can be combined to allow for easier management:
+
+```yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ohayodash-config
+  namespace: web
+  annotations:
+    ohayodash.github.io/bookmarks: 'true'
+    ohayodash.github.io/providers: 'true'
+data:
+  bookmarks: |
+    - name: Renovate Dashboard
+      url: "https://app.renovatebot.com/dashboard#github/nikdoof/flux-gitops"
+      group: Github
+  providers: |
+    - name: Allmusic
+      url: https://www.allmusic.com/
+      search: search/all/
+      prefix: /a
+```

charts/ohayodash/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 0.1.0
+appVersion: 0.3.0
 description: Ohayo Dash is a Kubernetes driven start page and dashboard. All configuration is done by standard Kubernetes objects and ConfigMaps.
 name: ohayodash
-version: 0.1.1
-kubeVersion: ">=1.16.0-0"
+version: 0.3.0
+kubeVersion: ">=1.19.0-0"
 keywords:
 - ohayodash
 - startpage
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
 - name: common
   repository: https://library-charts.k8s-at-home.com
-  version: 4.2.0
+  version: 4.3.0

charts/ohayodash/README.md

@@ -0,0 +1,112 @@
+# ohayodash
+
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![AppVersion: 0.2.0](https://img.shields.io/badge/AppVersion-0.2.0-informational?style=flat-square)
+
+Ohayo Dash is a Kubernetes driven start page and dashboard. All configuration is done by standard Kubernetes objects and ConfigMaps.
+
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/nikdoof/helm-charts/issues/new/choose)**
+
+## Source Code
+
+* <https://github.com/nikdoof/ohayodash>
+
+## Requirements
+
+Kubernetes: `>=1.16.0-0`
+
+## Dependencies
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://library-charts.k8s-at-home.com | common | 4.3.0 |
+
+## TL;DR
+
+```console
+helm repo add ohayodash https://nikdoof.github.io/ohayodash/
+helm repo update
+helm install ohayodash ohayodash/ohayodash
+```
+
+## Installing the Chart
+
+To install the chart with the release name `ohayodash`
+
+```console
+helm install ohayodash ohayodash/ohayodash
+```
+
+## Uninstalling the Chart
+
+To uninstall the `ohayodash` deployment
+
+```console
+helm uninstall ohayodash
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+
+## Configuration
+
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install ohayodash \
+  --set env.TZ="Europe/London"\
+    ohayodash/ohayodash
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install ohayodash ohayodash/ohayodash -f values.yaml
+```
+
+## Custom configuration
+
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| env | object | See below | environment variables. |
+| env.TZ | string | `"UTC"` | Set the container timezone |
+| image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
+| image.repository | string | `"ghcr.io/nikdoof/ohayodash"` | image repository |
+| image.tag | string | `"0.2.0"` | image tag |
+| ingress.main | object | See values.yaml | Enable and configure ingress settings for the chart under this key. |
+| service | object | See values.yaml | Configures service settings for the chart. |
+| serviceAccount | object | See below | Configures service account needed for reading k8s ingress objects |
+| serviceAccount.create | bool | `true` | Create service account |
+
+## Changelog
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [0.1.2]
+
+#### Added
+
+- Started the Changelog
+- Pinned to 0.1.2 rather than latest
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+## Support
+
+- Open an [issue](https://github.com/nikdoof/ohayodash/issues/new/choose)
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)

charts/ohayodash/README.md.gotmpl

@@ -0,0 +1,143 @@
+{{- define "custom.repository.organization" -}}
+ohayodash
+{{- end -}}
+
+{{- define "custom.repository.url" -}}
+https://github.com/nikdoof/ohayodash
+{{- end -}}
+
+{{- define "custom.helm.url" -}}
+https://nikdoof.github.io/ohayodash/
+{{- end -}}
+
+{{- define "custom.helm.path" -}}
+{{ template "custom.repository.organization" . }}/{{ template "chart.name" . }}
+{{- end -}}
+
+{{- define "custom.notes" -}}
+**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/nikdoof/helm-charts/issues/new/choose)**
+{{- end -}}
+
+{{- define "custom.requirements" -}}
+## Requirements
+
+{{ template "chart.kubeVersionLine" . }}
+{{- end -}}
+
+{{- define "custom.dependencies" -}}
+## Dependencies
+
+{{ template "chart.requirementsTable" . }}
+{{- end -}}
+
+{{- define "custom.install.tldr" -}}
+## TL;DR
+
+```console
+helm repo add {{ template "custom.repository.organization" . }} {{ template "custom.helm.url" . }}
+helm repo update
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.install" -}}
+## Installing the Chart
+
+To install the chart with the release name `{{ template "chart.name" . }}`
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.uninstall" -}}
+## Uninstalling the Chart
+
+To uninstall the `{{ template "chart.name" . }}` deployment
+
+```console
+helm uninstall {{ template "chart.name" . }}
+```
+
+The command removes all the Kubernetes components associated with the chart **including persistent volumes** and deletes the release.
+{{- end -}}
+
+{{- define "custom.configuration.header" -}}
+## Configuration
+{{- end -}}
+
+{{- define "custom.configuration.readValues" -}}
+Read through the [values.yaml](./values.yaml) file. It has several commented out suggested values.
+Other values may be used from the [values.yaml](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common/values.yaml) from the [common library](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common).
+{{- end -}}
+
+{{- define "custom.configuration.example.set" -}}
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+
+```console
+helm install {{ template "chart.name" . }} \
+  --set env.TZ="Europe/London"\
+    {{ template "custom.helm.path" . }}
+```
+{{- end -}}
+
+{{- define "custom.configuration.example.file" -}}
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
+
+```console
+helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} -f values.yaml
+```
+{{- end -}}
+
+{{- define "custom.valuesSection" -}}
+## Values
+
+**Important**: When deploying an application Helm chart you can add more values from our common library chart [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common)
+
+{{ template "chart.valuesTable" . }}
+{{- end -}}
+
+{{- define "custom.support" -}}
+## Support
+
+- Open an [issue](https://github.com/nikdoof/ohayodash/issues/new/choose)
+{{- end -}}
+
+{{ template "chart.header" . }}
+
+{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "custom.notes" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "custom.requirements" . }}
+
+{{ template "custom.dependencies" . }}
+
+{{ template "custom.install.tldr" . }}
+
+{{ template "custom.install" . }}
+
+{{ template "custom.uninstall" . }}
+
+{{ template "custom.configuration.header" . }}
+
+{{ template "custom.configuration.readValues" . }}
+
+{{ template "custom.configuration.example.set" . }}
+
+{{ template "custom.configuration.example.file" . }}
+
+{{ template "custom.custom.configuration" . }}
+
+{{ template "custom.valuesSection" . }}
+
+{{ template "custom.changelog" . }}
+
+{{ template "custom.support" . }}
+
+{{ template "helm-docs.versionFooter" . }}
+{{ "" }}

charts/ohayodash/README_CHANGELOG.md.gotmpl

@@ -0,0 +1,27 @@
+{{- define "custom.changelog.header" -}}
+## Changelog
+{{- end -}}
+
+{{- define "custom.changelog" -}}
+{{ template "custom.changelog.header" . }}
+
+All notable changes to this application Helm chart will be documented in this file but does not include changes from our common library. To read those click [here](https://github.com/k8s-at-home/library-charts/tree/main/charts/stable/common#changelog).
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+### [0.1.2]
+
+#### Added
+
+- Started the Changelog
+- Pinned to 0.1.2 rather than latest
+
+#### Changed
+
+- N/A
+
+#### Removed
+
+- N/A
+
+{{- end -}}

charts/ohayodash/README_CONFIG.md.gotmpl

@@ -0,0 +1,7 @@
+{{- define "custom.custom.configuration.header" -}}
+## Custom configuration
+{{- end -}}
+
+{{- define "custom.custom.configuration" -}}
+{{ template "custom.custom.configuration.header" . }}
+{{- end -}}

charts/ohayodash/values.yaml

@@ -9,9 +9,9 @@ image:
   # -- image repository
   repository: ghcr.io/nikdoof/ohayodash
   # -- image pull policy
-  pullPolicy: Always
+  pullPolicy: IfNotPresent
   # -- image tag
-  tag: latest
+  tag: 0.3.0
 
 # -- environment variables.
 # @default -- See below
@@ -38,3 +38,24 @@ ingress:
   # @default -- See values.yaml
   main:
     enabled: false
+
+# configmap:
+#   bookmarks:
+#     enabled: false
+#     annotations:
+#       ohayodash.github.io/bookmarks: "true"
+#     data:
+#       bookmarks:
+#         - name: TV Calendar
+#           url: https://www.pogdesign.co.uk/cat/
+#           group: Tools
+#   providers:
+#     enabled: false
+#     annotations:
+#       ohayodash.github.io/providers: "true"
+#     data:
+#       providers:
+#         - name: Trakt
+#           url: https://trakt.tv/
+#           search: search?query=
+#           prefix: /t

ohayodash/app.py

@@ -1,4 +1,5 @@
 from flask import Flask
+
 from ohayodash.base import base
 
 app = Flask(__name__)

ohayodash/base.py

@@ -1,23 +1,35 @@
-import datetime
-import logging
 import os
-import zoneinfo
 
 import kubernetes
+import pkg_resources
 import yaml
-from flask import Blueprint, render_template
+from flask import Blueprint, jsonify, render_template
 
 ANNOTATION_BASE = 'ohayodash.github.io'
 
 base = Blueprint('base', __name__, template_folder='templates')
 
+if 'KUBERNETES_SERVICE_HOST' in os.environ:
+    kubernetes.config.load_incluster_config()
+else:
+    kubernetes.config.load_kube_config()
 
-def get_k8s_applications() -> list:
+
+def check_tags(tag, kubeobj):
+    # Skip if we're limited to a tag, and the CM has tags but not that one.
+    tags = kubeobj.metadata.annotations.get('{0}/tags'.format(ANNOTATION_BASE), '')
+    obj_tags = {tagname for tagname in tags.split(',') if tagname != ''}
+
+    # If its not tagged, allow
+    if not obj_tags:
+        return True
+
+    # If tag is on the object, allow
+    return tag in obj_tags
+
+
+def get_k8s_applications(tag: str = None) -> list:
     """Get all ingresses from the cluster and produce a application list."""
-    if 'KUBERNETES_SERVICE_HOST' in os.environ:
-        kubernetes.config.load_incluster_config()
-    else:
-        kubernetes.config.load_kube_config()
     api = kubernetes.client.NetworkingV1Api()
 
     applications = []
@@ -30,6 +42,10 @@ def get_k8s_applications() -> list:
         if ingress.metadata.annotations[enable_annotation] == 'false':
             continue
 
+        # Skip if we're limited to a tag, and the Ingress has tags but not that one.
+        if not check_tags(tag, ingress):
+            continue
+
         # Set to some basic values from the ingress
         application_values = {
             'name': ingress.metadata.name,
@@ -48,57 +64,99 @@ def get_k8s_applications() -> list:
     return sorted(applications, key=lambda item: item['name'])
 
 
-def get_bookmarks() -> list:
+def get_bookmarks(tag: str = None) -> list:
     """Get all 'bookmark' ConfigMaps from the cluster and produce a bookmark list."""
-    if 'KUBERNETES_SERVICE_HOST' in os.environ:
-        kubernetes.config.load_incluster_config()
-    else:
-        kubernetes.config.load_kube_config()
     v1 = kubernetes.client.CoreV1Api()
     ret = v1.list_config_map_for_all_namespaces(watch=False)
 
-    bookmarks = {}
+    bookmarks = []
     for cm in ret.items:
-
-        # Skip if
-        if not cm.metadata.annotations or '{0}/bookmarks'.format(ANNOTATION_BASE) not in cm.metadata.annotations:
+        # Skip if the CM has no annotations
+        if cm.metadata.annotations is None:
             continue
 
+        # Skip if its not tagged as bookmark CM
+        if '{0}/bookmarks'.format(ANNOTATION_BASE) not in cm.metadata.annotations:
+            continue
+
+        # Skip if we're limited to a tag, and the CM has tags but not that one.
+        if not check_tags(tag, cm):
+            continue
+
+        # Load bookmark data
         bookmark_data = yaml.safe_load(cm.data['bookmarks'])
+
+        # Iterate each bookmark
         for bookmark in bookmark_data:
             if 'group' not in bookmark:
                 group = 'default'
             else:
                 group = bookmark['group'].lower()
-            if group not in bookmarks:
-                bookmarks[group] = []
-            bookmarks[group].append(bookmark)
+
+            # Find category dict and append or create
+            for cat in bookmarks:
+                if cat['category'] == group:
+                    cat['links'].append(bookmark)
+                    break
+            else:
+                bookmarks.append({'category': group, 'links': [bookmark]})
 
     return bookmarks
 
 
-def get_greeting():
-    """Generate the greeting string based on the defined timezone."""
-    try:
-        tz = zoneinfo.ZoneInfo(os.environ.get('TZ', 'UTC'))
-    except zoneinfo.ZoneInfoNotFound:
-        logging.warning('Timezone {0} is invalid, using UTC'.format(os.environ.get('TZ', 'UTC')))
-        tz = zoneinfo.ZoneInfo('UTC')
+def get_providers(tag: str = None) -> list:
+    """Get all 'provider' ConfigMaps from the cluster and produce a provider list."""
+    v1 = kubernetes.client.CoreV1Api()
+    ret = v1.list_config_map_for_all_namespaces(watch=False)
 
-    current_time = datetime.datetime.now(tz)
+    providers = []
+    for cm in ret.items:
+        # Skip if the CM has no annotations
+        if cm.metadata.annotations is None:
+            continue
 
-    if 0 < current_time.hour < 12:
-        return 'おはようございます!'
-    elif current_time.hour >= 19:
-        return 'こんばんは'
-    return 'こんにちは'
+        # Skip if its not tagged as bookmark CM
+        if '{0}/providers'.format(ANNOTATION_BASE) not in cm.metadata.annotations:
+            continue
+
+        # Skip if we're limited to a tag, and the CM has tags but not that one.
+        if not check_tags(tag, cm):
+            continue
+
+        provider_data = yaml.safe_load(cm.data['providers'])
+        providers.extend(provider_data)
+
+    return providers
 
 
 @base.route('/')
-def index():
-    return render_template('index.j2',
-                           greeting=get_greeting(),
-                           now=datetime.datetime.utcnow(),
-                           applications=get_k8s_applications(),
-                           bookmarks=get_bookmarks(),
-                           )
+@base.route('/<tag>/')
+def index(tag=None):
+    return render_template('index.j2')
+
+
+@base.route('/providers.json')
+@base.route('/<tag>/providers.json')
+def providers(tag=None):
+    k8s_providers = get_providers(tag)
+    if not k8s_providers:
+        data_file = pkg_resources.resource_filename(__name__, 'data/providers.yaml')
+        with open(data_file, 'r') as fobj:
+            k8s_providers.extend(yaml.safe_load(fobj))
+    return jsonify({'providers': k8s_providers})
+
+
+@base.route('/apps.json')
+@base.route('/<tag>/apps.json')
+def applications(tag=None):
+    return jsonify({
+        'apps': get_k8s_applications(tag),
+    })
+
+
+@base.route('/links.json')
+@base.route('/<tag>/links.json')
+def bookmarks(tag=None):
+    return jsonify({
+        'bookmarks': get_bookmarks(tag),
+    })

ohayodash/data/providers.yaml

@@ -0,0 +1,49 @@
+---
+- name: Allmusic
+  url: https://www.allmusic.com/
+  search: search/all/
+  prefix: /a
+- name: Discogs
+  url: https://www.discogs.com/
+  search: search/?q=
+  prefix: /di
+- name: DuckDuckGo
+  url: https://duckduckgo.com/
+  search: "?q="
+  prefix: /d
+- name: Google
+  url: https://google.com/
+  search: search/?q=
+  prefix: /g
+- name: iMDB
+  url: https://imbdb.com/
+  search: find?q=
+  prefix: /i
+- name: TheMovieDB
+  url: https://www.themoviedb.org/
+  search: search/?query=
+  prefix: /m
+- name: Reddit
+  url: https://www.reddit.com/
+  search: search?q=
+  prefix: /r
+- name: Qwant
+  url: https://www.qwant.com/
+  search: "?q="
+  prefix: /q
+- name: Soundcloud
+  url: https://soundcloud.com/
+  search: search?q=
+  prefix: /so
+- name: Spotify
+  url: https://open.spotify.com/
+  search: search/results/
+  prefix: /s
+- name: TheTVDB
+  url: https://www.thetvdb.com/
+  search: search?query=
+  prefix: /tv
+- name: Trakt
+  url: https://trakt.tv/
+  search: search?query=
+  prefix: /t

ohayodash/static/css/styles.css

@@ -1,21 +1,35 @@
-html{
+html {
 	box-sizing: border-box;
 	moz-box-sizing: border-box;
 	webkit-box-sizing: border-box;
 	webkit-text-size-adjust: none;
 }
 
-::-webkit-scrollbar-thumb {background: var(--color-text-acc); border: 5px solid var(--color-background); border-radius: 10px;}
-::-webkit-scrollbar-track {background: var(--color-text-acc); border: 7px solid var(--color-background);}
-::-webkit-scrollbar {width: 15px;}
-::-webkit-scrollbar-corner { background: var(--color-background); }
+::-webkit-scrollbar-thumb {
+	background: var(--color-text-acc);
+	border: 5px solid var(--color-background);
+	border-radius: 10px;
+}
+
+::-webkit-scrollbar-track {
+	background: var(--color-text-acc);
+	border: 7px solid var(--color-background);
+}
+
+::-webkit-scrollbar {
+	width: 15px;
+}
+
+::-webkit-scrollbar-corner {
+	background: var(--color-background);
+}
 
 html,
-body{
+body {
 	background-color: var(--color-background);
 	color: var(--color-text-pri);
 	scrollbar-color: var(--color-text-acc) var(--color-background);
-    scrollbar-width: thin;
+	scrollbar-width: thin;
 	font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, Roboto, sans-serif;
 	font-size: 14px;
 	font-weight: 400;
@@ -29,73 +43,72 @@ body{
 
 *,
 *:before,
-*:after{
+*:after {
 	box-sizing: inherit;
 	moz-box-sizing: inherit;
 	webkit-box-sizing: inherit;
 }
 
-:root{
+:root {
 	module-spacing: 3vh;
 }
 
 
 /* TEXT STYLES */
 
-h1, h2{
+h1, h2 {
 	font-weight: 300;
 	margin: 0;
 	padding: 0;
 	text-align: left;
 }
 
-h2, h3, h4{
-    text-transform: uppercase;
+h2, h3, h4 {
+	text-transform: uppercase;
 }
 
-h1{
+h1 {
 	font-size: 4em;
 	font-weight: 700;
 	margin-bottom: 0.5em;
 }
 
-h2{
+h2 {
 	font-size: 16px;
 	height: 30px;
-	
+
 }
 
-h3{
+h3 {
 	font-size: 20px;
 	font-weight: 900;
 	height: 10px;
 }
 
-h4{
+h4 {
 	font-size: 1.1em;
 	font-weight: 400;
 	height: 10px;
 }
 
-a{
+a {
 	color: var(--color-text-pri);
 	text-decoration: none;
 }
 
-a:hover{
+a:hover {
 	text-decoration: underline;
 	webkit-text-decoration-color: var(--color-text-acc);
 	webkit-text-decoration-skip: true;
 }
 
-.icon{
+.icon {
 	font-size: 2.5em;
 }
 
-
 /* FORMS */
 
-input{
+input {
 	background-color: transparent;
 	border: 0;
 	border-bottom: thin solid var(--color-text-acc);
@@ -106,19 +119,19 @@ input{
 	width: 100%;
 }
 
-input:focus{
+input:focus {
 	color-border: var(--color-text-pri);
 	outline: none;
 }
 
-input:focus{
+input:focus {
 	opacity: 1;
 }
 
 
 /* TABLES */
 
-table{
+table {
 	border: thin solid #e4e4e4;
 	border-collapse: collapse;
 	border-spacing: 0;
@@ -127,11 +140,11 @@ table{
 	width: 100%;
 }
 
-table td:nth-of-type(2){
+table td:nth-of-type(2) {
 	padding-right: 5em;
 }
 
-table td{
+table td {
 	border: thin solid #e4e4e4;
 	color: #333333;
 	font-size: 1em;
@@ -140,46 +153,45 @@ table td{
 	word-break: normal;
 }
 
-table th{
+table th {
 	border: thin solid #e4e4e4;
 	color: #333333;
 	font-weight: bold;
 	padding: 10px 5px;
 }
 
-table a{
+table a {
 	color: #333333;
 }
 
 
 /* ANIMATION */
 
-.fade{
+.fade {
 	opacity: 0;
 }
 
-@keyframes fadeseq{
-	100%	{
+@keyframes fadeseq {
+	100% {
 		opacity: 1;
 	}
 }
 
-.fade{
+.fade {
 	opacity: 0;
 }
 
-.fade{
+.fade {
 	animation: fadeseq .3s forwards;
 }
 
-.fade:nth-child(2){
+.fade:nth-child(2) {
 	animation-delay: .4s;
 }
 
-
 /* LAYOUT */
 
-#container{
+#container {
 	align-items: stretch;
 	display: grid;
 	grid-column-gap: 20px;
@@ -193,16 +205,14 @@ table a{
 	width: 60%;
 }
 
-
-
 /* SECTIONS */
 
-#header{
+#header {
 	border-bottom: 0px solid var(--color-text-acc);
 	z-index: 1;
 }
 
-#apps_loop{
+#apps_loop {
 	border-bottom: 0px solid var(--color-text-acc);
 	display: grid;
 	grid-column-gap: 0px;
@@ -212,18 +222,18 @@ table a{
 	padding-bottom: var(--module-spacing);
 }
 
-.apps_icon{
+.apps_icon {
 	height: 64px;
 	margin-right: 1em;
 	padding-top: 15px;
 }
 
-.apps_icon span{
+.apps_icon span {
 	font-size: 2.5em;
 	line-height: 3rem;
 }
 
-.apps_item{
+.apps_item {
 	display: flex;
 	flex-direction: row;
 	flex-wrap: wrap;
@@ -231,7 +241,7 @@ table a{
 	margin: 0;
 }
 
-.apps_text{
+.apps_text {
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
@@ -239,20 +249,20 @@ table a{
 	overflow: hidden;
 }
 
-.apps_text a{
+.apps_text a {
 	font-size: 1em;
 	font-weight: 500;
 	text-transform: uppercase;
 }
 
-.apps_text span{
+.apps_text span {
 	color: var(--color-text-acc);
 	font-size: 0.8em;
 	text-transform: uppercase;
 }
 
 
-#links_loop{
+#links_loop {
 	display: grid;
 	flex-wrap: nowrap;
 	grid-column-gap: 20px;
@@ -261,39 +271,24 @@ table a{
 	grid-template-rows: auto;
 }
 
-#links_item{
+#links_item {
 	line-height: 1.5rem;
 	margin-bottom: 2em;
 	webkit-font-smoothing: antialiased;
 }
 
-#links_item h4{
+#links_item h4 {
 	color: var(--color-text-acc);
 }
 
-#links_item a{
+#links_item a {
 	display: block;
 	line-height: 2;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /* MODAL */
 
-
-#modal{
+#modal {
 	overflow-y: auto;
 	bottom: 0;
 	left: 0;
@@ -306,79 +301,79 @@ table a{
 	z-index: 20;
 }
 
-#modal:target{
+#modal:target {
 	opacity: 1;
 	pointer-events: auto;
 }
 
-#modal>div{
+#modal>div {
 	background-color: #ffffff;
 	box-shadow: 0 14px 28px rgba(0, 0, 0, 0.30), 0 15px 12px rgba(0, 0, 0, 0.25);
 	margin-left: auto;
-    margin-right: auto;
+	margin-right: auto;
 	padding: 2em;
 	margin-top: 5vh;
 	width: 50%;
-    display: flex;
-    flex-direction: column;
+	display: flex;
+	flex-direction: column;
 }
 
-#modal h1{
+#modal h1 {
 	color: #333333;
 	font-size: 2em;
 }
 
-#modal h2{
-	margin-top:1.5em;
+#modal h2 {
+	margin-top: 1.5em;
 }
 
-#modal-header{
-    display:flex;
-    justify-content: space-between;
+#modal-header {
+	display: flex;
+	justify-content: space-between;
 }
 
-#modal-footer{
-    display:flex;
-    font-size:2em;
-    justify-content: flex-start;
+#modal-footer {
+	display: flex;
+	font-size: 2em;
+	justify-content: flex-start;
 }
 
-#modal-footer a{
-    margin-right:0.25em;
-	color:rgba(0, 0, 0, 0.35)
+#modal-footer a {
+	margin-right: 0.25em;
+	color: rgba(0, 0, 0, 0.35)
 }
 
-.modal-close{
+.modal-close {
 	color: #000000;
 	font-size: 1.5em;
 	text-align: center;
 	text-decoration: none;
 }
 
-.modal-close:hover{
+.modal-close:hover {
 	color: #000;
 }
 
-#modal_init a{
+#modal_init a {
 	bottom: 1vh;
 	color: var(--color-text-acc);
 	left: 1vw;
 	position: fixed;
 }
 
-#modal_init a:hover{
+#modal_init a:hover {
 	color: var(--color-text-pri);
 }
 
-#modal-theme{
+#modal-theme {
 	border-bottom: 0px solid var(--color-text-acc);
 	display: flex;
 	flex-wrap: wrap;
-    margin-bottom: 2em;
+	margin-bottom: 2em;
 }
 
-#providers{
-    margin-bottom: 2em;
+#providers {
+	margin-bottom: 2em;
 }
 
 #editor {
@@ -419,88 +414,92 @@ table a{
 
 /* THEMING */
 
-.theme-button{
+.theme-button {
 	font-size: 0.8em;
 	margin: 2px;
-    width:128px;
+	width: 128px;
 	line-height: 3em;
 	text-align: center;
 	text-transform: uppercase;
 }
 
-.theme-blackboard{
+.theme-blackboard {
 	background-color: #000000;
 	border: 4px solid #5c5c5c;
-    color: #FFFDEA;
+	color: #FFFDEA;
 }
 
-.theme-gazette{
+.theme-gazette {
 	background-color: #F2F7FF;
 	border: 4px solid #5c5c5c;
-    color: #000000;
+	color: #000000;
 }
 
-.theme-espresso{
+.theme-espresso {
 	background-color: #21211F;
 	border: 4px solid #4E4E4E;
-    color: #D1B59A;
+	color: #D1B59A;
 }
 
-.theme-cab{
+.theme-cab {
 	background-color: #FEED01;
 	border: 4px solid #424242;
-    color: #1F1F1F;
+	color: #1F1F1F;
 }
 
-.theme-cloud{
+.theme-cloud {
 	background-color: #f1f2f0;
 	border: 4px solid #35342f;
-    color: #37bbe4;
+	color: #37bbe4;
 }
 
-.theme-lime{
+.theme-lime {
 	background-color: #263238;
 	border: 4px solid #AABBC3;
-    color: #aeea00;
+	color: #aeea00;
 }
 
-.theme-passion{
+.theme-passion {
 	background-color: #f5f5f5;
 	border: 4px solid #8e24aa;
-    color: #12005e;
+	color: #12005e;
 }
 
-.theme-blues{
+.theme-blues {
 	background-color: #2B2C56;
 	border: 4px solid #6677EB;
-    color: #EFF1FC;
+	color: #EFF1FC;
 }
 
-.theme-chalk{
+.theme-chalk {
 	background-color: #263238;
 	border: 4px solid #FF869A;
-    color: #AABBC3;
+	color: #AABBC3;
 }
 
-.theme-tron{
+.theme-tron {
 	background-color: #242B33;
 	border: 4px solid #6EE2FF;
-    color: #EFFBFF;
+	color: #EFFBFF;
 }
 
-.theme-paper{
+.theme-paper {
 	background-color: #F8F6F1;
 	border: 4px solid #F5E1A4;
-    color: #4C432E;
+	color: #4C432E;
+}
+
+.theme-nord {
+	background-color: #2E3440;
+	border: 4px solid #8FBCBB;
+	color: #E5E9F0;
 }
 
 
 /* MEDIA QUERIES */
 
-@media screen and (max-width: 1260px)
-{
-	#container
-	{
+@media screen and (max-width: 1260px) {
+	#container {
 		align-items: stretch;
 		display: grid;
 		grid-column-gap: 10px;
@@ -513,31 +512,30 @@ table a{
 		margin-right: auto;
 		width: 90%;
 	}
-    
-	#apps_loop{
+
+	#apps_loop {
 		grid-template-columns: 1fr 1fr 1fr;
 		width: 90vw;
 	}
 
-	#links_loop	{
+	#links_loop {
 		grid-template-columns: 1fr 1fr 1fr;
 	}
 
-    #modal>div{
-        margin-left: auto;
-        margin-right: auto;
-        margin-top: 5vh;
-        width: 90%;
-    }
+	#modal>div {
+		margin-left: auto;
+		margin-right: auto;
+		margin-top: 5vh;
+		width: 90%;
+	}
 }
 
-@media screen and (max-width: 667px)
-{
-	html{
+@media screen and (max-width: 667px) {
+	html {
 		font-size: calc(16px + 6 * ((100vw - 320px) / 680));
 	}
 
-	#container{
+	#container {
 		align-items: stretch;
 		display: grid;
 		grid-column-gap: 20px;
@@ -549,41 +547,41 @@ table a{
 		width: 90%;
 	}
 
-	h1{
+	h1 {
 		font-size: 4em;
 		height: auto;
 		margin-bottom: 0em;
 	}
 
-	h2{
+	h2 {
 		font-size: 1em;
 		height: auto;
 		margin-bottom: 0em;
 	}
 
-	h3{
+	h3 {
 		font-size: 1em;
 	}
 
-	#apps_loop{
+	#apps_loop {
 		grid-column-gap: 0px;
 		grid-row-gap: 0px;
 		grid-template-columns: 1fr 1fr;
 		width: 90vw;
 	}
 
-	.apps_icon{
+	.apps_icon {
 		height: 64px;
 		margin-right: 0.8em;
 		padding-top: 14px;
 	}
 
-	.apps_icon span{
+	.apps_icon span {
 		font-size: 2em;
 		line-height: 2.5rem;
 	}
-    
-	#links_loop{
+
+	#links_loop {
 		display: grid;
 		flex-wrap: nowrap;
 		grid-column-gap: 20px;
@@ -598,4 +596,4 @@ table a{
 	#app-address {
 		display: none;
 	}
-}
+}

ohayodash/static/js/data.js

@@ -0,0 +1,16 @@
+function fetchAndRender (name) {
+    fetch(name + '.json')
+        .then(response => response.json())
+        .then(data => {
+            const mysource = document.getElementById(name + '-template').innerHTML;
+            const mytemplate = Handlebars.compile(mysource);
+            const myresult = mytemplate(data);
+            document.getElementById(name).innerHTML = myresult;
+        });
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    fetchAndRender('apps');
+    fetchAndRender('links');
+    fetchAndRender('providers');
+});

ohayodash/static/js/script.js

@@ -0,0 +1,38 @@
+function date() {
+    let currentDate = new Date();
+    let dateOptions = {
+        weekday: "long",
+        year: "numeric",
+        month: "long",
+        day: "numeric"
+    };
+    let date = currentDate.toLocaleDateString("en-GB", dateOptions);
+    document.getElementById("header_date").innerHTML = date;
+}
+
+function greet() {
+    let currentTime = new Date();
+    let greet = Math.floor(currentTime.getHours() / 6);
+    let greeting = "こんにちは!";
+    switch (greet) {
+        case 0:
+            greeting = "おやすみなさい!";
+            break;
+        case 1:
+            greeting = "おはようございます!";
+            break;
+        case 2:
+            greeting = "こんにちは!";
+            break;
+        case 3:
+            greeting = "こんばんは!";
+            break;
+    }
+    document.getElementById("header_greet").innerHTML = greeting;
+    document.title = greeting;
+}
+
+function loadFunctions() {
+    date();
+    greet();
+}

ohayodash/static/js/search.js

@@ -1,5 +1,15 @@
 var sindex = 0;
 var cycle = false;
+var sengine = "https://www.google.com/search?q="; // Default search engine
+var providers = [];
+
+fetch('providers.json')
+    .then(response => response.json())
+    .then(data => storeProviders(data));
+
+function storeProviders(data) {
+    providers = data['providers'];
+}
 
 function start() {
     var query = getParameterByName('q');
@@ -15,12 +25,10 @@ function start() {
 function handleKeyPress(e) {
     var key = e.keyCode || e.which;
     var text = document.getElementById("keywords").value.replaceAll("+", "%2B");
-    var option = text.substr(1, text.indexOf(' ') - 1) || text.substr(1);
-    var subtext = text.substr(2 + option.length);
     if (key == 13) { // Search functions
-        search(text);
+        search(text.trim());
     }
-    if(key == 32){ //Space to go to search
+    if (key == 32) { //Space to go to search
         document.getElementById("keywords").focus();
     }
     sindex = 0;
@@ -31,45 +39,24 @@ function search(text) {
     var option = text.substr(1, text.indexOf(' ') - 1) || text.substr(1);
     var subtext = text.substr(2 + option.length);
     if (text[0] === '/') {
-        if (text.indexOf(' ') > -1) {
-            switch (option) {
-                case "d":
-                    window.location = "https://duckduckgo.com/?q=" + subtext;
-                    break;
-                case "i":
-                    window.location = "https://www.imdb.com/find?q=" + subtext;
-                    break;
-                case "r":
-                    window.location = "https://www.reddit.com/search?q=" + subtext;
-                    break;
-                case "y":
-                    window.location = "https://www.youtube.com/results?search_query=" + subtext;
-                    break;
+        providers.every(function (item) {
+            if ('/' + option == item['prefix']) {
+                if (text.indexOf(' ') > -1) {
+                    window.location = item['url'] + item['search'] + subtext;
+                } else {
+                    window.location = item['url'] + subtext;
+                }
+                return false;
             }
-        } else {
-            var option = text.substr(1);
-            switch (option) {
-                case "d":
-                    window.location = "https://www.duckduckgo.com";
-                    break;
-                case "y":
-                    window.location = "https://www.youtube.com";
-                    break;
-                case "r":
-                    window.location = "https://reddit.com";
-                    break;
-                case "s":
-                    window.location = "https://open.spotify.com";
-                    break;
-            }
-        }
+            return true;
+        });
     } else if (validURL(text)) {
         if (containsProtocol(text))
             window.location = text;
         else
             window.location = "https://" + text;
     } else {
-        window.location = "https://www.google.com/search?q=" + text;
+        window.location = sengine + text;
     }
 }
 
@@ -89,7 +76,7 @@ function containsProtocol(str) {
     return !!pattern.test(str);
 }
 
-String.prototype.replaceAll = function(search, replacement) {
+String.prototype.replaceAll = function (search, replacement) {
     var target = this;
     return target.split(search).join(replacement);
-};
+};

ohayodash/static/js/themer.js

@@ -101,7 +101,7 @@ for (let i = 0; i < dataThemeButtons.length; i++) {
                     'color-text-acc': '#6EE2FF'
                 });
                 return;
-            
+
             case 'blues':
                 setTheme({
                     'color-background': '#2B2C56',
@@ -109,7 +109,7 @@ for (let i = 0; i < dataThemeButtons.length; i++) {
                     'color-text-acc': '#6677EB'
                 });
                 return;
-            
+
             case 'passion':
                 setTheme({
                     'color-background': '#f5f5f5',
@@ -117,7 +117,7 @@ for (let i = 0; i < dataThemeButtons.length; i++) {
                     'color-text-acc': '#8e24aa'
                 });
                 return;
-            
+
             case 'chalk':
                 setTheme({
                     'color-background': '#263238',
@@ -125,7 +125,7 @@ for (let i = 0; i < dataThemeButtons.length; i++) {
                     'color-text-acc': '#FF869A'
                 });
                 return;
-            
+
             case 'paper':
                 setTheme({
                     'color-background': '#F8F6F1',
@@ -134,6 +134,15 @@ for (let i = 0; i < dataThemeButtons.length; i++) {
                 });
                 return;
 
+            case 'nord':
+                setTheme({
+                    'color-background': '#2E3440',
+                    'color-text-pri': '#E5E9F0',
+                    'color-text-acc': '#8FBCBB'
+                });
+                return;
+    
+
         }
     })
 }

ohayodash/templates/index.j2

@@ -2,21 +2,19 @@
 <html lang="en">
 
 <head>
-    <title>{{ title | default("おはよう!") }}</title>
+    <title>おはよう!</title>
     <meta charset="utf-8">
+    <meta name="description" content="a startpage for your server and / or new tab page">
     <meta http-equiv="Default-Style" content="">
-    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon">
     <meta content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
-    <link type="text/css" rel="stylesheet" href="./static/css/styles.css" media="screen,projection" />
+    <link type="text/css" rel="stylesheet" href="/static/css/styles.css" media="screen,projection" />
     <link href="//fonts.googleapis.com/css?family=Roboto:400,500,700,900" rel="stylesheet">
-    <link href="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/codemirror.min.css" rel="stylesheet" type="text/css">
-    <link href="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/addon/lint/lint.min.css" rel="stylesheet" type="text/css">
-    <link href="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/theme/dracula.min.css" rel="stylesheet" type="text/css">
-    <link href="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/addon/fold/foldgutter.min.css" rel="stylesheet" type="text/css">
+    <script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.7.7/handlebars.min.js"></script>
     <script src="//code.iconify.design/1/1.0.7/iconify.min.js"></script>
 </head>
 
-<body>
+<body onload="loadFunctions()">
+
     <section id="modal">
         <div>
             <header id="modal-header">
@@ -30,68 +28,98 @@
 
             <div id="modal-theme">
                 <button data-theme="blackboard" class="theme-button theme-blackboard">Blackboard</button>
-                <button data-theme="gazette" class="theme-button theme-gazette">Gazette</button>
-                <button data-theme="espresso" class="theme-button theme-espresso">Espresso</button>
-                <button data-theme="cab" class="theme-button theme-cab">Cab</button>
-                <button data-theme="cloud" class="theme-button theme-cloud">Cloud</button>
-                <button data-theme="lime" class="theme-button theme-lime">Lime</button>
-                <button data-theme="passion" class="theme-button theme-passion">Passion</button>
                 <button data-theme="blues" class="theme-button theme-blues">Blues</button>
+                <button data-theme="cab" class="theme-button theme-cab">Cab</button>
                 <button data-theme="chalk" class="theme-button theme-chalk">Chalk</button>
-                <button data-theme="tron" class="theme-button theme-tron">Tron</button>
+                <button data-theme="cloud" class="theme-button theme-cloud">Cloud</button>
+                <button data-theme="espresso" class="theme-button theme-espresso">Espresso</button>
+                <button data-theme="gazette" class="theme-button theme-gazette">Gazette</button>
+                <button data-theme="lime" class="theme-button theme-lime">Lime</button>
+                <button data-theme="nord" class="theme-button theme-nord">Nord</button>
                 <button data-theme="paper" class="theme-button theme-paper">Paper</button>
+                <button data-theme="passion" class="theme-button theme-passion">Passion</button>
+                <button data-theme="tron" class="theme-button theme-tron">Tron</button>
             </div>
 
+            <h2>Search options</h2>
+
+            <section id="providers">
+                {% raw %}
+                <script type="text/handlebars-template" id="providers-template">
+                    <table>
+                        <tr>
+                            <th>Website</th>
+                            <th>Prefix</th>
+                        </tr>
+                        {{#providers}}
+                        <tr>
+                            <td><a href="{{url}}">{{name}}</a></td>
+                            <td>{{prefix}}</td>
+                        </tr>
+                        {{/providers}}
+                    </table>
+                </script>
+                {% endraw %}
+            </section>
+
+            <header id="modal-footer">
+                <a href="https://github.com/nikdoof/ohayodash/"><span class="iconify" data-icon="mdi-github-box"></span></a>
+                <a href="https://materialdesignicons.com/"><span class="iconify"
+                        data-icon="mdi-material-design"></span></a>
+            </header>
         </div>
     </section>
 
     <main id="container" class="fade">
+
         <section id="search">
             <input name="keywords" type="text" id="keywords" size="50" spellcheck="false" autofocus="true"
                 onkeydown="handleKeyPress(event)">
         </section>
 
         <section id="header">
-            <h1>{{ greeting | default("Welcome")}}</h1>
-            <h2>{{ now }}</h2>
+            <h2 id="header_date"></h2>
+            <h1 id="header_greet"></h1>
         </section>
 
-        {% if applications %}
         <section id="apps">
+            {% raw %}
+            <script type="text/handlebars-template" id="apps-template">
             <h3>Applications</h3>
             <div id="apps_loop">
-                {% for app in applications %}
-                <div class="apps_item">
-                    <div class="apps_icon">
-                        <span class="iconify icon" data-icon="mdi-{{ app.icon | default("application") }}"></span>
+                {{#apps}}
+                    <div class="apps_item">
+                        <div class="apps_icon">
+                            <span class="iconify icon" data-icon="mdi-{{icon}}"></span>
+                        </div>
+                        <div class="apps_text">
+                            <a href="{{url}}" {{#if target}}target="{{target}}"{{/if}} >{{name}}</a>
+                            {{#if show_url}}<span id="app-address">{{url}}</span>{{/if}}
+                        </div>
                     </div>
-                    <div class="apps_text">
-                        <a href="{{ app.url }}">{{ app.name }}</a>
-                        {% if app.show_url %}
-                        <span id="app-address">{{ app.url }}</span>
-                        {% endif %}
-                    </div>
-                </div>
-                {% endfor %}
+                {{/apps}}
             </div>
+            </script>
+            {% endraw %}
         </section>
-        {% endif %}
 
-        {% if bookmarks %}
         <section id="links">
+            {% raw %}
+            <script type="text/handlebars-template" id="links-template">
             <h3>Bookmarks</h3>
             <div id="links_loop">
-                {% for group, value in bookmarks|dictsort %}
-                <div id="links_item">
-                    <h4>{{ group }}</h4>
-                    {% for link in bookmarks[group] %}
-                    <a href="{{ link.url }}" class="theme_color-border theme_text-select">{{ link.name }}</a>
-                    {% endfor %}
-                </div>
-                {% endfor %}
+                {{#bookmarks}}
+                    <div id="links_item">
+                        <h4>{{category}}</h4>
+                        {{#links}}
+                            <a href="{{url}}" target="{{target}}" class="theme_color-border theme_text-select">{{name}}</a>
+                        {{/links}}
+                    </div>
+                {{/bookmarks}}
             </div>
+            </script>
+            {% endraw %}
         </section>
-        {% endif %}
     </main>
 
     <div id="modal_init">
@@ -100,16 +128,11 @@
         </a>
     </div>
 
-    <script src="./static/js/themer.js" type="text/javascript"></script>
-    <script src="./static/js/search.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/codemirror.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/mode/yaml/yaml.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/addon/lint/yaml-lint.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/addon/lint/lint.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/addon/fold/foldcode.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/addon/fold/foldgutter.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.2/addon/fold/indent-fold.min.js" type="text/javascript"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/js-yaml/4.1.0/js-yaml.min.js" type="text/javascript"></script>
+    <script src="/static/js/data.js" type="text/javascript"></script>
+    <script src="/static/js/script.js" type="text/javascript"></script>
+    <script src="/static/js/themer.js" type="text/javascript"></script>
+    <script src="/static/js/search.js" type="text/javascript"></script>
+
 </body>
 
 </html>

requirements.txt

@@ -1,4 +1,4 @@
-flask==2.0.2
-kubernetes==21.7.0
+flask==2.2.3
+kubernetes==26.1.0
 pyyaml==6.0
 gunicorn==20.1.0

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ohayodash
-version = 0.1.1
+version = 0.4.0
 description = A Kubernetes driven start page and dashboard. All configuration is done by standard Kubernetes objects and ConfigMaps.
 long_description = file: README.md, LICENSE
 license = MIT
@@ -13,6 +13,7 @@ classifiers =
 
 [options]
 zip_safe = False
+include_package_data = True
 packages = ohayodash
 install_requires =
     flask
@@ -20,9 +21,12 @@ install_requires =
     pyyaml
     gunicorn
 
+[options.package_data]
+ohayodash = data/*.yaml
+
 [flake8]
 format = wemake
-ignore = E501
+ignore = E501,D,WPS226,WPS110, WPS210,WPS231,WPS202
 max-line-length = 120
 exclude = setup.py