Merge pull request #1101 from totaldebug/bugbash

Bugbash
totaldebug · Aug 24, 2023 · 2627992 · 2627992
2 parents 1fc230f + 6352171
commit 2627992
Show file tree

Hide file tree

Showing 16 changed files with 2,591 additions and 1,615 deletions.
diff --git a/.devcontainer/post-install.sh b/.devcontainer/post-install.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -ex
+
+# Convenience workspace directory for later use
+WORKSPACE_DIR=$(pwd)
+
+# Now install all dependencies
+yarn install
+
+# Install documentation dependencies
+pip3 install -r docs/requirements.txt
+pip3 install sphinx-autobuild
+
+echo "Done!"
diff --git a/.devcontainer/recommended-Dockerfile b/.devcontainer/recommended-Dockerfile
@@ -1,16 +1,9 @@
-FROM node:latest
+FROM mcr.microsoft.com/devcontainers/typescript-node:1-20-bullseye
 
-RUN apt update
+RUN apt update && apt upgrade -y
 
-RUN apt upgrade  -y
-
-RUN apt install python3 zsh -y
+RUN apt install -y zsh python3 python3-sphinx python3-pip
 
 RUN wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh -O - | zsh || true
 
-RUN yarn install
-
-RUN pip3 install -r ../docs/requirements.txt
-RUN pip3 install sphinx
-
 CMD ["zsh"]
diff --git a/.devcontainer/recommended-devcontainer.json b/.devcontainer/recommended-devcontainer.json
@@ -2,28 +2,31 @@
     "name": "Atomic Calendar Revive",
     "dockerFile": "Dockerfile",
     "context": "..",
-    "appPorts": [
-        5000
-    ],
-    "postCreateCommand": "npm install",
-    "extensions": [
-        "github.vscode-pull-request-github",
-        "yzhang.markdown-all-in-one",
-        "bierner.lit-html",
-        "runem.lit-plugin",
-        "davidanson.vscode-markdownlint",
-        "redhat.vscode-yaml",
-        "eamodio.gitlens",
-        "ms-python.python",
-        "tht13.html-preview-vscode"
-    ],
-    "settings": {
-        "files.eol": "\n",
-        "editor.tabSize": 4,
-        "terminal.integrated.shell.linux": "/bin/zsh",
-        "editor.formatOnPaste": false,
-        "editor.formatOnSave": true,
-        "editor.formatOnType": true,
-        "files.trimTrailingWhitespace": true
-    }
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "files.eol": "\n",
+                "editor.tabSize": 4,
+                "terminal.integrated.shell.linux": "/bin/zsh",
+                "editor.formatOnPaste": false,
+                "editor.formatOnSave": true,
+                "editor.formatOnType": true,
+                "files.trimTrailingWhitespace": true
+            },
+            "extensions": [
+                "github.vscode-pull-request-github",
+                "yzhang.markdown-all-in-one",
+                "bierner.lit-html",
+                "runem.lit-plugin",
+                "davidanson.vscode-markdownlint",
+                "redhat.vscode-yaml",
+                "eamodio.gitlens",
+                "ms-python.python",
+                "tht13.html-preview-vscode",
+                "sourcery.sourcery",
+                "tabnine.tabnine-vscode"
+            ]
+        }
+    },
+    "postCreateCommand": "zsh ./.devcontainer/post-install.sh"
 }
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,38 @@
+<!--- Provide a general summary of your changes in the Title above. -->
+
+## Description
+<!--- Describe your changes in detail. -->
+<!--- If the change is breaking, it must be detailed what breaks and what users need to do to fix it -->
+
+## Related issues
+<!--- This project only accepts pull requests related to open issues. -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first. -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce. -->
+<!--- Please link to the issue here. e.g. fixes #123 closes #123 -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? What additions does it bring? -->
+
+## How has this been tested
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of the tests you ran. -->
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## Checklist
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] Any dependent changes have been merged and published in downstream modules
+- [ ] I have updated the version in `package.json` following [semver](https://semver.org/)
diff --git a/.github/workflows/hacs_validate.yml b/.github/workflows/hacs_validate.yml
@@ -1,17 +1,18 @@
-name: Validate HACS
+name: Validate
 
 on:
   push:
   pull_request:
   schedule:
-    - cron: "0 0 1 * *"
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
 jobs:
-  validate:
+  validate-hacs:
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v2"
+      - uses: "actions/checkout@v3"
       - name: HACS validation
-        uses: "hacs/integration/action@master"
+        uses: "hacs/action@main"
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CATEGORY: "plugin"
+          category: "plugin"
diff --git a/.github/workflows/pull_requests.yaml b/.github/workflows/pull_requests.yaml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,24 +1,28 @@
-name: release
+name: Release
 
 on:
   push:
-    tags:
-      - "v*"
-  workflow_dispatch:
+    branches:
+      - master  # Change this to your main branch name
 
 jobs:
   release:
-    name: Create release
-    if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
+
     steps:
-      - name: Getting your configuration from GitHub
-        uses: actions/checkout@v2
-      - name: 🛎️ Create release
-        id: create_release
-        uses: softprops/action-gh-release@v1
-        with:
-          generate_release_notes: true
-          prerelease: ${{ contains(needs.tag_version.outputs.tag, '-rc*') || contains(needs.tag_version.outputs.tag, '-b*') || contains(needs.tag_version.outputs.tag, '-a*') }}
-      - name: 🏷️ Update latest tag
-        uses: EndBug/latest-tag@latest
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v2
+
+    - name: Install dependencies
+      run: yarn install
+
+    - name: Build
+      run: yarn run build
+
+    - name: Run Semantic Release
+      run: npx semantic-release
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@ dist/*
 .devcontainer/*
 !.devcontainer/recommended-devcontainer.json
 !.devcontainer/recommended-Dockerfile
+!.devcontainer/post-install.sh
+dist
 
 .vscode/*
 

diff --git a/dist/atomic-calendar-revive.js b/dist/atomic-calendar-revive.js
diff --git a/docs/overview/quickstart.rst b/docs/overview/quickstart.rst
@@ -25,7 +25,7 @@ HACS (Recommended)
 Install using `HACS` component:
 
 #. You need HACS installed and configured
-#. Go to plugins tab
+#. Go to frontend tab
 #. Search for ``Atomic Calendar Revive``
 #. Install the card
 

diff --git a/info.md b/info.md
@@ -29,40 +29,6 @@
          alt="Buy me a Pizza"></a>
 </p>
 
-{% if prerelease %}
-
-### NB!: This is a Beta version!
-
-Not all features may function as expected when using pre-release versions.
-
-If using a pre-release, we do request that any bugs or unexpected behaviour is reported on Github
-
-{% endif %}
-
-{% if selected_tag.replace("v", "").replace(".","") | int = 700  %}
-
-# v7.0.0
-
-This release sees some major changes in the way the card functions, when upgrading
-please check your configuration **before** submitting an issue as many have changed.
-
-Documentation has been updated to reflect any changes made.
-
-# Changed configuration options
-
-- `blacklist` renamed to `blocklist`
-- `whitelist` renamed to `allowlist`
-- `locationWhitelist` changed to `allowlistLocation`
-- added `blocklistLocation`
-- Blocklist and allowlist now changed to use Regex for more flexibility
-- `showDeclined` changed to `hideDeclined`
-- `eventCalName` changed to `name` under each entity
-- added `showCalendarName`
-- added `showMultiDayEventParts`
-- added `showWeekNumber`
-
-{% endif %}
-
 # Atomic Calendar Revive
 
 A _Calendar Card_ for Home Assistant that adds **advanced settings** to allow much
@@ -79,17 +45,6 @@ Add either a Google calendar or CalDav calendar to home assistant.
 
 Setup & Configuration is all provided within the [documentation](https://docs.totaldebug.uk/atomic-calendar-revive)
 
-## Compatibility
-
-| Card Version    |     HA Version      |                                        Notes                                         |
-| --------------- | :-----------------: | :----------------------------------------------------------------------------------: |
-| v7.0.0          |   2022.6 Upwards    |                     Should work on older versions but not tested                     |
-| v6.0.0          |   2021.11 Upwards   |                   Progress bar will not work on older HA Versions                    |
-| v5.0.0 - v5.2.2 | 2021.6 to 2021.10.x | May work on older HA Versions but `hoursFormat` option will need to be manually set. |
-| v4.1.1          |    0.117 Upwards    |                                                                                      |
-
-Home Assistant 2022.5 will not work with the card you must upgrade to 2022.6
-
 ## Support
 
 Reach out to me at one of the following places: