Merge pull request #1249 from totaldebug/beta

Release
totaldebug · Oct 23, 2023 · 11bfe09 · 11bfe09
2 parents 80ef59f + ebe7a6d
commit 11bfe09
Show file tree

Hide file tree

Showing 38 changed files with 3,189 additions and 2,188 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -16,9 +16,16 @@
                 "files.eol": "\n",
                 "editor.tabSize": 4,
                 "editor.formatOnPaste": false,
-                "editor.formatOnSave": true,
+                "editor.formatOnSave": false,
                 "editor.formatOnType": true,
-                "files.trimTrailingWhitespace": true
+                "files.trimTrailingWhitespace": true,
+                "editor.codeActionsOnSave": {
+                    "source.fixAll": true
+                },
+                "eslint.validate": [
+                    "typescript"
+                ],
+                format
             },
             "extensions": [
                 "github.vscode-pull-request-github",
@@ -31,7 +38,8 @@
                 "ms-python.python",
                 "sourcery.sourcery",
                 "tabnine.tabnine-vscode",
-                "trond-snekvik.simple-rst"
+                "trond-snekvik.simple-rst",
+                "dbaeumer.vscode-eslint"
             ]
         }
     }

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -9,7 +9,53 @@ module.exports = {
         sourceType: 'module',  // Allows for the use of imports
         experimentalDecorators: true,
     },
+    plugins: ['@typescript-eslint', 'prettier'],
+    extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:prettier/recommended',
+        'plugin:import/recommended',
+        'plugin:import/typescript',
+    ],
     rules: {
-        "@typescript-eslint/camelcase": 0
-    }
+        "@typescript-eslint/camelcase": 0,
+        'import/no-unresolved': 'error',
+        'import/order': [
+            'error',
+            {
+                groups: [
+                    'builtin', // Built-in imports (come from NodeJS native) go first
+                    'external', // <- External imports
+                    'internal', // <- Absolute imports
+                    ['sibling', 'parent'], // <- Relative imports, the sibling and parent types they can be mingled together
+                    'index', // <- index imports
+                    'unknown', // <- unknown
+                ],
+                'newlines-between': 'always',
+                alphabetize: {
+                    /* sort in ascending order. Options: ["ignore", "asc", "desc"] */
+                    order: 'asc',
+                    /* ignore case. Options: [true, false] */
+                    caseInsensitive: true,
+                },
+            },
+        ],
+        'sort-imports': [
+            'error',
+            {
+                ignoreCase: false,
+                ignoreDeclarationSort: true, // don"t want to sort import lines, use eslint-plugin-import instead
+                ignoreMemberSort: false,
+                memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
+                allowSeparatedGroups: true,
+            },
+        ]
+    },
+    settings: {
+        'import/resolver': {
+            typescript: {
+                project: './tsconfig.json',
+            },
+        },
+    },
 };
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 <br />
 <div align="center">
   <a href="https://github.com/totaldebug/atomic-calendar-revive">
-    <img src=".github/img/atomic_calendar_revive.png" alt="Logo">
+    <img src="https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/master/.github/img/atomic_calendar_revive.png" alt="Logo">
   </a>
 
   <h3 align="center">Atomic Calendar Revive</h3>
@@ -76,8 +76,8 @@ Allowing for the use of both Google Calendars and CalDav, With two main viewing
 
 | Event Mode | Calendar Mode |
 | ------------- | ---------- |
-| <img src=".github/img/event-mode-example.png" width="300"/> | <img src=".github/img/calendar-mode-allday.png" width="300"/> |
-| <img src=".github/img/event-mode-no-date.png" width="300"/> | <img src=".github/img/calendar-mode-today.png" width="300"/> |
+| <img src="https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/master/.github/img/event-mode-example.png" width="300"/> | <img src="https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/master/.github/img/calendar-mode-allday.png" width="300"/> |
+| <img src="https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/master/.github/img/event-mode-no-date.png" width="300"/> | <img src="https://raw.githubusercontent.com/totaldebug/atomic-calendar-revive/master/.github/img/calendar-mode-today.png" width="300"/> |
 
 Please keep in mind, these screenshots show a basic configuration, this card allows so much more customisation!
 

diff --git a/docs/configuration/entity.rst b/docs/configuration/entity.rst
@@ -5,7 +5,7 @@ Entity Options
 ==================== ========= ======== =============================================================================================================
  Name                 Type      Since    Description
 ==================== ========= ======== =============================================================================================================
- icon                 string    v2.0.0   ``null`` Add an icon to a calendar
+ icon                 string    v2.0.0   ``null`` Add an icon to a calendar. If not set, will use the entity icon set in HA. see note below
  startTimeFilter      string    v2.0.0   Only shows events between specific times _NOTE_ must be set with ``endTimeFilter`` format: ``'10:00'``
  endTimeFilter        string    v2.0.0   Only shows events between specific times _NOTE_ must be set with ``startTimeFilter`` format: ``'17:00'``
  maxDaysToShow        integer   v5.2.0   ``7`` Maximum number of days to show. Overrides main configuration maxDaysToShow for this calendar
@@ -20,3 +20,9 @@ Entity Options
 
 .. note::
    It is not advised to use ``allowlist`` & ``blocklist`` under the same entity.
+
+.. note::
+   Set the calendar entity icon by going to ``Settings -> Entities`` search for ``calendar``
+   Click the calendar you wish to change, click the cog in the top right and set a new icon.
+
+   This is how I recommend setting up the icons now.
diff --git a/elements/formfield.js b/elements/formfield.js
@@ -1,11 +1,10 @@
 import { FormfieldBase } from '@material/mwc-formfield/mwc-formfield-base';
-import { styles as formfieldStyles } from '@material/mwc-formfield/mwc-formfield.css'
+import { styles as formfieldStyles } from '@material/mwc-formfield/mwc-formfield.css';
 
 export const formfieldDefinition = {
-    'mwc-formfield': class extends FormfieldBase {
-        static get styles() {
-            return formfieldStyles;
-        }
-    }
-}
-
+	'mwc-formfield': class extends FormfieldBase {
+		static get styles() {
+			return formfieldStyles;
+		}
+	},
+};
diff --git a/elements/select.js b/elements/select.js
@@ -1,53 +1,52 @@
-import { SelectBase } from '@material/mwc-select/mwc-select-base';
+import { styles as listItemStyles } from '@material/mwc-list//mwc-list-item.css';
 import { ListBase } from '@material/mwc-list/mwc-list-base';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
+import { styles as listStyles } from '@material/mwc-list/mwc-list.css';
 import { MenuBase } from '@material/mwc-menu/mwc-menu-base';
 import { MenuSurfaceBase } from '@material/mwc-menu/mwc-menu-surface-base';
-import { RippleBase } from '@material/mwc-ripple/mwc-ripple-base';
-import { NotchedOutlineBase } from '@material/mwc-notched-outline/mwc-notched-outline-base';
-
-import { styles as selectStyles } from '@material/mwc-select/mwc-select.css';
-import { styles as listStyles } from '@material/mwc-list/mwc-list.css';
-import { styles as listItemStyles } from '@material/mwc-list//mwc-list-item.css';
-import { styles as rippleStyles } from '@material/mwc-ripple/mwc-ripple.css';
-import { styles as menuStyles } from '@material/mwc-menu/mwc-menu.css';
 import { styles as menuSurfaceStyles } from '@material/mwc-menu/mwc-menu-surface.css';
+import { styles as menuStyles } from '@material/mwc-menu/mwc-menu.css';
+import { NotchedOutlineBase } from '@material/mwc-notched-outline/mwc-notched-outline-base';
 import { styles as notchedOutlineStyles } from '@material/mwc-notched-outline/mwc-notched-outline.css';
+import { RippleBase } from '@material/mwc-ripple/mwc-ripple-base';
+import { styles as rippleStyles } from '@material/mwc-ripple/mwc-ripple.css';
+import { SelectBase } from '@material/mwc-select/mwc-select-base';
+import { styles as selectStyles } from '@material/mwc-select/mwc-select.css';
 
 export const selectDefinition = {
-  'mwc-select': class extends SelectBase {
-    static get styles() {
-      return selectStyles;
-    }
-  },
-  'mwc-list': class extends ListBase {
-    static get styles() {
-      return listStyles;
-    }
-  },
-  'mwc-list-item': class extends ListItemBase {
-    static get styles() {
-      return listItemStyles;
-    }
-  },
-  'mwc-ripple': class extends RippleBase {
-    static get styles() {
-      return rippleStyles;
-    }
-  },
-  'mwc-menu': class extends MenuBase {
-    static get styles() {
-      return menuStyles;
-    }
-  },
-  'mwc-menu-surface': class extends MenuSurfaceBase {
-    static get styles() {
-      return menuSurfaceStyles;
-    }
-  },
-  'mwc-notched-outline': class extends NotchedOutlineBase {
-    static get styles() {
-      return notchedOutlineStyles;
-    }
-  },
+	'mwc-select': class extends SelectBase {
+		static get styles() {
+			return selectStyles;
+		}
+	},
+	'mwc-list': class extends ListBase {
+		static get styles() {
+			return listStyles;
+		}
+	},
+	'mwc-list-item': class extends ListItemBase {
+		static get styles() {
+			return listItemStyles;
+		}
+	},
+	'mwc-ripple': class extends RippleBase {
+		static get styles() {
+			return rippleStyles;
+		}
+	},
+	'mwc-menu': class extends MenuBase {
+		static get styles() {
+			return menuStyles;
+		}
+	},
+	'mwc-menu-surface': class extends MenuSurfaceBase {
+		static get styles() {
+			return menuSurfaceStyles;
+		}
+	},
+	'mwc-notched-outline': class extends NotchedOutlineBase {
+		static get styles() {
+			return notchedOutlineStyles;
+		}
+	},
 };
diff --git a/elements/switch.js b/elements/switch.js
@@ -1,18 +1,17 @@
-import { SwitchBase } from '@material/mwc-switch/deprecated/mwc-switch-base';
 import { RippleBase } from '@material/mwc-ripple/mwc-ripple-base';
-
-import { styles as switchStyles } from '@material/mwc-switch/deprecated/mwc-switch.css';
 import { styles as rippleStyles } from '@material/mwc-ripple/mwc-ripple.css';
+import { SwitchBase } from '@material/mwc-switch/deprecated/mwc-switch-base';
+import { styles as switchStyles } from '@material/mwc-switch/deprecated/mwc-switch.css';
 
 export const switchDefinition = {
-    'mwc-switch': class extends SwitchBase {
-        static get styles() {
-            return switchStyles;
-        }
-    },
-    'mwc-ripple': class extends RippleBase {
-        static get styles() {
-            return rippleStyles;
-        }
-    },
-}
+	'mwc-switch': class extends SwitchBase {
+		static get styles() {
+			return switchStyles;
+		}
+	},
+	'mwc-ripple': class extends RippleBase {
+		static get styles() {
+			return rippleStyles;
+		}
+	},
+};
diff --git a/elements/textfield.js b/elements/textfield.js
@@ -1,18 +1,17 @@
-import { TextFieldBase } from '@material/mwc-textfield/mwc-textfield-base';
 import { NotchedOutlineBase } from '@material/mwc-notched-outline/mwc-notched-outline-base';
-
-import { styles as textfieldStyles } from '@material/mwc-textfield/mwc-textfield.css';
 import { styles as notchedOutlineStyles } from '@material/mwc-notched-outline/mwc-notched-outline.css';
+import { TextFieldBase } from '@material/mwc-textfield/mwc-textfield-base';
+import { styles as textfieldStyles } from '@material/mwc-textfield/mwc-textfield.css';
 
 export const textfieldDefinition = {
-    'mwc-textfield': class extends TextFieldBase {
-        static get styles() {
-            return textfieldStyles;
-        }
-    },
-    'mwc-notched-outline': class extends NotchedOutlineBase {
-        static get styles() {
-            return notchedOutlineStyles
-        }
-    }
-}
+	'mwc-textfield': class extends TextFieldBase {
+		static get styles() {
+			return textfieldStyles;
+		}
+	},
+	'mwc-notched-outline': class extends NotchedOutlineBase {
+		static get styles() {
+			return notchedOutlineStyles;
+		}
+	},
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "atomic-calendar-revive",
-	"version": "9.1.0",
+	"version": "9.2.0-beta.3",
 	"description": "Calendar Card for Home Assistant",
 	"main": "atomic-calendar-revive.js",
 	"scripts": {
@@ -46,6 +46,8 @@
 		"cz-conventional-changelog": "^3.3.0",
 		"eslint": "^8.52.0",
 		"eslint-config-prettier": "^9.0.0",
+		"eslint-import-resolver-typescript": "^3.6.1",
+		"eslint-plugin-import": "^2.28.1",
 		"eslint-plugin-prettier": "^5.0.1",
 		"prettier": "^3.0.3",
 		"rollup": "^4.1.4",

diff --git a/src/defaults.ts b/src/defaults.ts
@@ -1,7 +1,7 @@
 import { localize } from './localize/localize';
 
 export default {
-	cardHeight: "100%",
+	cardHeight: '100%',
 
 	// text translations
 	fullDayEventText: localize('common.fullDayEventText'), // "All day" custom text
@@ -22,7 +22,7 @@ export default {
 	startDaysAhead: 0, // shows the events starting on x days from today. Default 0.
 	showLastCalendarWeek: false, // always shows last line/week in calendar mode, even if it's not the current month
 
-	sortBy: "start", // sort first by start time or milestone
+	sortBy: 'start', // sort first by start time or milestone
 	allDayBottom: false, // show all day events at the bottom of the day
 	disableEventLink: false, // disables links to event calendar
 	disableLocationLink: false, // disables links to event calendar
@@ -45,7 +45,6 @@ export default {
 	noEventsForNextDaysText: localize('common.noEventsForNextDaysText'),
 	showNoEventDays: false,
 
-
 	showHours: true, //shows the bottom line (time, duration of event)
 	showRelativeTime: true,
 
@@ -108,5 +107,5 @@ export default {
 	offsetHeaderDate: false,
 
 	titleLength: 0,
-	descLength: 0
+	descLength: 0,
 };