✨ Add new autochange feature & quickfixes

FlexiBoii · Jan 24, 2022 · 7d23293 · 7d23293
1 parent efab538
commit 7d23293
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/assets/js/cards.js b/assets/js/cards.js
@@ -5,7 +5,6 @@
 // Print cards
 const printCards = () => {
   for (const card of CONFIG.cards) {
-
     // Card Item
     let item = `
         <a

diff --git a/assets/js/greeting.js b/assets/js/greeting.js
@@ -19,12 +19,9 @@ const gree4 = `${CONFIG.greetingEvening}\xa0`;
 if (hour >= 23 || hour < 5) {
   document.getElementById('greetings').innerText = gree1 + name;
 } else if (hour >= 6 && hour < 12) {
-  document.getElementById('greetings').innerText =
-    gree2 + name;
+  document.getElementById('greetings').innerText = gree2 + name;
 } else if (hour >= 12 && hour < 17) {
-  document.getElementById('greetings').innerText =
-    gree3 + name;
+  document.getElementById('greetings').innerText = gree3 + name;
 } else {
-  document.getElementById('greetings').innerText =
-    gree4 + name;
+  document.getElementById('greetings').innerText = gree4 + name;
 }
diff --git a/assets/js/theme.js b/assets/js/theme.js
@@ -47,20 +47,29 @@ if (CONFIG.imageBackground) {
   document.body.classList.add('withImageBackground');
 }
 
-if(CONFIG.changeThemeByOS && CONFIG.autoChangeTheme) {
-  if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+if (CONFIG.changeThemeByOS && CONFIG.autoChangeTheme) {
+  if (
+    window.matchMedia &&
+    window.matchMedia('(prefers-color-scheme: dark)').matches
+  ) {
     enableDark();
   } else {
     disableDark();
   }
 }
 
-if(CONFIG.changeThemeByHour && CONFIG.autoChangeTheme) {
+if (CONFIG.changeThemeByHour && CONFIG.autoChangeTheme && !CONFIG.changeThemeByOS) {
   const date = new Date();
-  const hours = date.getHours() < 10 ? '0' + date.getHours().toString() : date.getHours().toString(); 
-  const minutes = date.getMinutes() < 10 ? '0' + date.getMinutes().toString() : date.getMinutes().toString(); 
+  const hours =
+    date.getHours() < 10
+      ? '0' + date.getHours().toString()
+      : date.getHours().toString();
+  const minutes =
+    date.getMinutes() < 10
+      ? '0' + date.getMinutes().toString()
+      : date.getMinutes().toString();
   const currentTime = hours + ':' + minutes;
-  if(currentTime >= CONFIG.hourDarkThemeActive) {
+  if (currentTime >= CONFIG.hourDarkThemeActive) {
     enableDark();
   } else if (currentTime >= CONFIG.hourDarkThemeInactive) {
     disableDark();

diff --git a/assets/js/weather.js b/assets/js/weather.js
@@ -3,12 +3,8 @@
 // └┴┘└─┘┴ ┴ ┴ ┴ ┴└─┘┴└─
 
 const iconElement = document.querySelector('.weatherIcon');
-const tempElement = document.querySelector(
-  '.weatherValue p'
-);
-const descElement = document.querySelector(
-  '.weatherDescription p'
-);
+const tempElement = document.querySelector('.weatherValue p');
+const descElement = document.querySelector('.weatherDescription p');
 
 // App data
 const weather = {};
@@ -73,6 +69,8 @@ function getWeather(latitude, longitude) {
 // Display Weather info
 function displayWeather() {
   iconElement.innerHTML = `<img src="assets/icons/${CONFIG.weatherIcons}/${weather.iconId}.png"/>`;
-  tempElement.innerHTML = `${weather.temperature.value.toFixed(0)}°<span class="darkfg">${tempUnit}</span>`;
+  tempElement.innerHTML = `${weather.temperature.value.toFixed(
+    0
+  )}°<span class="darkfg">${tempUnit}</span>`;
   descElement.innerHTML = weather.description;
 }