Merge pull request #147 from marksie1988/dev

v1.7.0

Author: marksie1988

dist/atomic-calendar-revive.js

@@ -17,9 +17,9 @@ The easiest way to contribute is to spin up a devcontainer with Visual Studio Co
 
 # Fork the Repo
 
-* Fork the Atomic Calendar Repo
-* Clone the repository to your computer
-* Open the repository in VS Code
+- Fork the Atomic Calendar Repo
+- Clone the repository to your computer
+- Open the repository in VS Code
 
 When you open this repository with VS code you are asked to "Reopen in Container". This will start the build of the container.
 

docs/contribute/devcontainer.md

@@ -11,13 +11,14 @@ The below will provide a guide on how you should develop for this plugin to have
 
 ## Setup Repository
 
-* Fork the repo in [GitHub](https://github.com/marksie1988/atomic-calendar-revive)
-* Clone the project from your fork
+- Fork the repo in [GitHub](https://github.com/marksie1988/atomic-calendar-revive)
+- Clone the project from your fork
   ```shell
   git clone https://github.com/your-fork/atomic-calendar-revive.git
   ```
 
 ## Create topic branch
+
 You should be working on a topic branch (not master). Also, make sure that you have pulled the latest master into your repo.
 
 Start on your master branch, grab the latest upstream master, and merge it in:
@@ -57,8 +58,8 @@ from within the clone repository run `npm install`
 2. Update the version number in package.json
 3. Run the command `npm run build`
 4. Rename the files:
-  `dist/app-editor.js` to `dist/atomic-calendar-revive-editor.js`
-  `dist/app.js` to `dist/atomic-calendar-revive.js`
+   `dist/app-editor.js` to `dist/atomic-calendar-revive-editor.js`
+   `dist/app.js` to `dist/atomic-calendar-revive.js`
 5. Amend the file `dist/atomic-calendar-revive.js` search for the text `app-editor.js` and change it to `atomic-calendar-revive-editor.js`
 
 ## Testing
@@ -70,6 +71,7 @@ You can either upload the files to a test HA Server as normal or if using devcon
 If using DevContainer you can test the files with `npm start`, the file will be accessible on http://127.0.0.1:5000/app.js
 
 To add this to your Home assistant configuration add the following:
+
 ```yaml
 - url: "http://127.0.0.1:5000/app.js"
   type: module
@@ -86,23 +88,24 @@ git commit -v
 
 ### Commit style guide
 
-* Use the present tense ("Add feature" not "Added feature")
-* Use the imperative mood ("Move the option..." not "Moves the option...")
-* Limit the first line to 72 characters or less
-* Reference issues and pull requests liberally after the first line
-* Consider starting the commit message with an applicable emoji:
-    * :art: `:art:` when improving the format/structure of the code
-    * :racehorse: `:racehorse:` when improving performance
-    * :non-potable_water: `:non-potable_water:` when plugging memory leaks
-    * :memo: `:memo:` when writing docs
-    * :bug: `:bug:` when fixing a bug
-    * :fire: `:fire:` when removing code or files
-    * :green_heart: `:green_heart:` when fixing the CI build
-    * :white_check_mark: `:white_check_mark:` when adding tests
-    * :lock: `:lock:` when dealing with security
-    * :arrow_up: `:arrow_up:` when upgrading dependencies
-    * :arrow_down: `:arrow_down:` when downgrading dependencies
-    * :shirt: `:shirt:` when removing linter warnings
+- Use the present tense ("Add feature" not "Added feature")
+- Use the imperative mood ("Move the option..." not "Moves the option...")
+- Limit the first line to 72 characters or less
+- Reference issues and pull requests liberally after the first line
+- Consider starting the commit message with an applicable emoji:
+  - :star: `:star:` when adding a new feature
+  - :art: `:art:` when improving the format/structure of the code
+  - :racehorse: `:racehorse:` when improving performance
+  - :non-potable_water: `:non-potable_water:` when plugging memory leaks
+  - :memo: `:memo:` when writing docs
+  - :bug: `:bug:` when fixing a bug
+  - :fire: `:fire:` when removing code or files
+  - :green_heart: `:green_heart:` when fixing the CI build
+  - :white_check_mark: `:white_check_mark:` when adding tests
+  - :lock: `:lock:` when dealing with security
+  - :arrow_up: `:arrow_up:` when upgrading dependencies
+  - :arrow_down: `:arrow_down:` when downgrading dependencies
+  - :shirt: `:shirt:` when removing linter warnings
 
 ## Submit for review
 

docs/contribute/devcycle.md

@@ -52,8 +52,8 @@ Then you need to use:
 
 # New pages
 
-* Create a new .md file under the directory docs/ in a sub-directory if required that fits the purpose of the file.
-* At the top of all pages you should have this:
+- Create a new .md file under the directory docs/ in a sub-directory if required that fits the purpose of the file.
+- At the top of all pages you should have this:
 
 ```md
 ---

docs/contribute/documentation.md

@@ -15,27 +15,27 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r
 
 ## Before Submitting A Bug Report
 
-* **Check the [QucikStart Guide](/atomic-calendar-revive/quickstart).** You may have miss-configured the plugin and this is resulting in the issue you see
-* **Check the [FAQs](/atomic-calendar-revive/faq)** for a list of common questions and problems.
-* **Perform a [cursory search](https://github.com/marksie1988/atomic-calendar-revive/issues?q=is%3Aissue)** to see if the problem has already been reported. If it has **and the issue is still open**, add a comment to the existing issue instead of opening a new one.
+- **Check the [QucikStart Guide](/atomic-calendar-revive/quickstart).** You may have miss-configured the plugin and this is resulting in the issue you see
+- **Check the [FAQs](/atomic-calendar-revive/faq)** for a list of common questions and problems.
+- **Perform a [cursory search](https://github.com/marksie1988/atomic-calendar-revive/issues?q=is%3Aissue)** to see if the problem has already been reported. If it has **and the issue is still open**, add a comment to the existing issue instead of opening a new one.
 
 ## How Do I Submit A (Good) Bug Report?
 
 Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). After you've determined this is not a configuration issue, create an issue on github and provide the following information by filling in [the template](https://github.com/marksie1988/atomic-calendar-revive/issues/new?assignees=&labels=bug&template=bug_report.md&title=%5BBUG%5D+).
 
 Explain the problem and include additional details to help maintainers reproduce the problem:
 
-* **Use a clear and descriptive title** for the issue to identify the problem.
-* **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you installed the plugin. When listing steps, **don't just say what you did, but explain how you did it**. For example, did you use the Lovelace Editor or do the change in YAML directly.
-* **Provide specific examples to demonstrate the steps**. Include screenshots, or copy/pasteable configuration snippets, which you use in those examples. If you're providing snippets in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
-* **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
-* **Explain which behavior you expected to see instead and why.**
-* **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem.
-* **If Chrome's developer tools pane is showing errors**, include these in your report
-* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
+- **Use a clear and descriptive title** for the issue to identify the problem.
+- **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you installed the plugin. When listing steps, **don't just say what you did, but explain how you did it**. For example, did you use the Lovelace Editor or do the change in YAML directly.
+- **Provide specific examples to demonstrate the steps**. Include screenshots, or copy/pasteable configuration snippets, which you use in those examples. If you're providing snippets in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
+- **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
+- **Explain which behavior you expected to see instead and why.**
+- **Include screenshots and animated GIFs** which show you following the described steps and clearly demonstrate the problem.
+- **If Chrome's developer tools pane is showing errors**, include these in your report
+- **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
 
 Provide more context by answering these questions:
 
-* **Did the problem start happening recently** (e.g. after updating to a new version of HA / Atomic Calendar Revive) or was this always a problem?
-* If the problem started happening recently, **can you reproduce the problem in an older version of Atomic Calendar Revive?** What's the most recent version in which the problem doesn't happen? You can install older versions of Atomic Calendar Revive via HACS or from the releases page on github
-* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
+- **Did the problem start happening recently** (e.g. after updating to a new version of HA / Atomic Calendar Revive) or was this always a problem?
+- If the problem started happening recently, **can you reproduce the problem in an older version of Atomic Calendar Revive?** What's the most recent version in which the problem doesn't happen? You can install older versions of Atomic Calendar Revive via HACS or from the releases page on github
+- **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.

docs/contribute/reporting-bugs.md

@@ -26,5 +26,6 @@ nav_order: 1
 | disableLocationLink  | boolean |   optional   | v0.10.0 | `false` disables links in event location.                                                                                                                |
 | linkTarget           | string  |   optional   | v0.11.0 | `_blank` Allows custom target for links, default will open new tab.                                                                                      |
 | showCalNameInEvent   | string  |   optional   |    ?    | `false` Shows the event calendar name                                                                                                                    |
+| showFullDayProgress  | string  |   optional   | v1.7.0  | `false` Enables the progress bar for full day events                                                                                                     |
 
 [googlecalcomp]: https://www.home-assistant.io/components/calendar.google/

docs/options/main-options.md

@@ -1,6 +1,6 @@
 {
   "name": "atomic-calendar-revive",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Calendar Card for Home Assistant",
   "main": "atomic-calendar-revive.js",
   "scripts": {

package.json

@@ -237,6 +237,7 @@ class AtomicCalendarRevive extends LitElement {
 			eventCalNameSize: 90,
 
 			showProgressBar: true,
+			showFullDayProgress: false,
 			progressBarColor: 'var(--primary-color)',
 
 			enableModeChange: false,
@@ -712,7 +713,7 @@ class AtomicCalendarRevive extends LitElement {
 
 				//show current event progress bar
 				var progressBar = ``
-				if (di == 0 && this._config.showProgressBar && event.isEventRunning) {
+				if (di == 0 && this._config.showProgressBar && event.isEventRunning && (this._config.showFullDayProgress && event.isFullDayEvent)) {
 					let eventDuration = event.endTime.diff(event.startTime, 'minutes');
 					let eventProgress = moment().diff(event.startTime, 'minutes');
 					let eventPercentProgress = Math.floor((eventProgress * 100) / eventDuration);
@@ -1010,7 +1011,7 @@ class AtomicCalendarRevive extends LitElement {
 		return html`
 			<div class="calDateSelector">
 				<ha-icon-button class="ha-icon-button" icon="mdi:chevron-left" @click='${e => this.handleMonthChange(-1)}' title = "left" ></ha-icon-button>
-				<a href="https://calendar.google.com/calendar/r/month/${moment(this.selectedMonth).format('YYYY')}/${moment(this.selectedMonth).format('MM')}/1" style="text-decoration: none; color: ${this._config.calDateColor};position:relative; top:3px;" target="${this._config.linkTarget}">
+				<a href="https://calendar.google.com/calendar/r/month/${moment(this.selectedMonth).format('YYYY')}/${moment(this.selectedMonth).format('MM')}/1" style="text-decoration: none; color: ${this._config.calDateColor}; position: relative; top: 4px;" target="${this._config.linkTarget}">
 					${moment(this.selectedMonth).locale(this.language).format('MMMM')}  ${moment(this.selectedMonth).format('YYYY')}
 				</a>
 				<ha-icon-button class="ha-icon-button" icon="mdi:chevron-right" @click='${e => this.handleMonthChange(1)}' title = "right" ></ha-icon-button>

src/app.js

@@ -1,7 +1,7 @@
 {
   "atomic-calendar-revive": {
     "updated_at": "2020-05-28",
-    "version": "1.6.2",
+    "version": "1.7.0",
     "remote_location": "https://github.com/marksie1988/atomic-calendar-revive/releases/latest/dist/atomic-calendar-revive.js",
     "visit_repo": "https://github.com/marksie1988/atomic-calendar-revive",
     "changelog": "https://github.com/marksie1988/atomic-calendar-revive/releases/latest"