Jonathan Starck 3 лет назад
Родитель
Сommit
b720b39d08
3 измененных файлов с 49 добавлено и 46 удалено
  1. 21 46
      config/config.js
  2. 13 0
      css/custom.css
  3. 15 0
      css/custom.less

+ 21 - 46
config/config.js

@@ -8,39 +8,20 @@
  * and https://docs.magicmirror.builders/modules/configuration.html
  */
 let config = {
-	address: "0.0.0.0", 	// Address to listen on, can be:
-	// - "localhost", "127.0.0.1", "::1" to listen on loopback interface
-	// - another specific IPv4/6 to listen on a specific interface
-	// - "0.0.0.0", "::" to listen on any interface
-	// Default, when address config is left out or empty, is "localhost"
-	port: 8080,
-	basePath: "/", 	// The URL path where MagicMirror is hosted. If you are using a Reverse proxy
-	// you must set the sub path here. basePath must end with a /
-	ipWhitelist: [], 	// Set [] to allow all IP addresses
-	// or add a specific IPv4 of 192.168.1.5 :
-	// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.5"],
-	// or IPv4 range of 192.168.3.0 --> 192.168.3.15 use CIDR format :
-	// ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.3.0/28"],
-
-	useHttps: false, 		// Support HTTPS or not, default "false" will use HTTP
-	httpsPrivateKey: "", 	// HTTPS private key path, only require when useHttps is true
-	httpsCertificate: "", 	// HTTPS Certificate path, only require when useHttps is true
-
+	address: "0.0.0.0",
+	port: 80,
+	basePath: "/",
+	ipWhitelist: [],
+	useHttps: false,
 	language: "de",
 	locale: "de-DE",
-	logLevel: ["INFO", "LOG", "WARN", "ERROR"], // Add "DEBUG" for even more logging
+	logLevel: ["INFO", "LOG", "WARN", "ERROR"],
 	timeFormat: 24,
 	units: "metric",
-	// serverOnly:  true/false/"local" ,
-	// local for armv6l processors, default
-	//   starts serveronly and then starts chrome browser
-	// false, default for all NON-armv6l devices
-	// true, force serveronly mode, because you want to.. no UI on this device
-
 	modules: [
 		{
 			module: 'MMM-Carousel',
-			position: 'bottom_bar', // Required only for navigation controls
+			position: 'bottom_bar',
 			config: {
 				transitionInterval: 30000,
 				showPageIndicators: true,
@@ -48,7 +29,7 @@ let config = {
 				ignoreModules: ['clock', 'alert', 'MMM-BurnIn'],
 				mode: 'slides',
 				slides: {
-					/*main: ['weather', 'MMM-DWD-WarnWeather', 'MMM-ImageSlideshow', 'MMM-SimpleLogo','MMM-CalendarExt2', 'newsfeed', 'MMM-WiFiPassword'],
+					/*main: ['weather', 'MMM-DWD-WarnWeather', 'MMM-ImageSlideshow', 'MMM-SimpleLogo','MMM-CalendarExt2', 'newsfeed'],
 					"Slide 2": ['MMM-SimpleLogo', 'calendar'],
 					"Slide 3": ['MMM-EasyPix'],
 					"Slide 4": ['compliments', 'MMM-SimpleLogo']*/
@@ -134,7 +115,7 @@ let config = {
 				weatherProvider: "openweathermap",
 				type: "current",
 				location: "Nierstein",
-				locationID: "2862485", //ID from http://bulk.openweathermap.org/sample/city.list.json.gz; unzip the gz file and find your city
+				locationID: "2862485",
 				apiKey: "e3185c8094b5cbc1d4291d0dcf64e113"
 			}
 		},
@@ -146,7 +127,7 @@ let config = {
 				weatherProvider: "openweathermap",
 				type: "forecast",
 				location: "Nierstein",
-				locationID: "2862485", //ID from http://bulk.openweathermap.org/sample/city.list.json.gz; unzip the gz file and find your city
+				locationID: "2862485",
 				apiKey: "e3185c8094b5cbc1d4291d0dcf64e113"
 			}
 		},
@@ -160,7 +141,7 @@ let config = {
 				minutes: false,
 				displayRegionName: true,
 				displayInnerHeader: true,
-				interval: 10 * 60 * 1000, // every 10 minutes
+				interval: 10 * 60 * 1000,
 				loadingText: 'Warnungen werden geladen...',
 				noWarningText: 'Keine Warnungen',
 				severityThreshold: 2
@@ -177,20 +158,6 @@ let config = {
 				refreshInterval: "refresh"
 			}
 		},
-
-		{
-			module: 'MMM-WiFiPassword',
-			position: "bottom_right",
-			disabled: true,
-			config: {
-				//See 'Configuration options' for more information.
-				header: "Wachen-WLAN",
-				network: "RW21 MA-WLAN",
-				password: "Elefant17#",
-				showAuthType: false,
-				qrSize: "250",
-			}
-		},
 		{
 			module: "newsfeed",
 			position: "bottom_bar",
@@ -240,19 +207,27 @@ let config = {
 				timeFormat: 'absolute',
 				calendars: [
 					{
-						url: 'webcal://nc.x0p.it/remote.php/dav/public-calendars/ZMGgBLGn52oATzDw/?export',
+						url: 'https://nc.x0p.it/remote.php/dav/public-calendars/ZMGgBLGn52oATzDw/?export',
 						symbolClass: 'todo_symbol',
 						titleClass: 'todo_title',
 						timeClass: 'todo_time',
 						symbol: 'clipboard-list-check'
 					},
 					{
-						url: 'webcal://nc.x0p.it/remote.php/dav/public-calendars/WW49cKGiiZyy95q8/?export',
+						url: 'https://nc.x0p.it/remote.php/dav/public-calendars/WW49cKGiiZyy95q8/?export',
 						symbolClass: 'clean_symbol',
 						titleClass: 'clean_title',
 						timeClass: 'clean_time',
 						symbol: 'vacuum',
 					},
+					{
+						url: 'https://nc.x0p.it/remote.php/dav/public-calendars/eMQW6HmyjfgS8bXq?export',
+						symbolClass: 'info_symbol',
+						titleClass: 'info_title',
+						timeClass: 'info_time',
+						symbol: 'circle-info',
+					},
+					
 				],
 			}
 		},

+ 13 - 0
css/custom.css

@@ -60,3 +60,16 @@ table.wachenaufgaben tr td.clean_title:before {
   line-height: 1;
   text-rendering: auto;
 }
+table.wachenaufgaben tr td.info_title:before {
+  font-family: 'Font Awesome 6 Pro';
+  font-weight: 400;
+  padding-right: 10px;
+  content: "\f05a";
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  display: var(--fa-display, inline-block);
+  font-style: normal;
+  font-variant: normal;
+  line-height: 1;
+  text-rendering: auto;
+}

+ 15 - 0
css/custom.less

@@ -70,6 +70,21 @@ table.wachenaufgaben {
                     text-rendering: auto;
                 }
             }
+            &.info_title {
+                &:before {
+                    font-family: 'Font Awesome 6 Pro';
+                    font-weight: 400;
+                    padding-right: 10px;
+                    content: "\f05a";
+                    -moz-osx-font-smoothing: grayscale;
+                    -webkit-font-smoothing: antialiased;
+                    display: var(--fa-display, inline-block);
+                    font-style: normal;
+                    font-variant: normal;
+                    line-height: 1;
+                    text-rendering: auto;
+                }
+            }
         }
     }
 }