Merge branch 'master' of https://github.com/foundations-design/WhiteLight into develop

2025-08-21 12:55:22 +00:00 · 2021-04-03 11:15:33 -05:00
parent 9e2eef7818 3e8bd022e2
commit 162dcec331
7 changed files with 5734 additions and 227 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.env
+
 # Various Node ignoramuses.
 logs
 *.log
--- a/README.md
+++ b/README.md
@@ -1,51 +1,9 @@
-![MagicMirror²: The open source modular smart mirror platform. ](.github/header.png)
+WhiteLight is a MagicMirror fork that focuses on the aesthetics of the dashboard.

-<p style="text-align: center">
-	<a href="https://david-dm.org/MichMich/MagicMirror"><img src="https://david-dm.org/MichMich/MagicMirror.svg" alt="Dependency Status"></a>
-	<a href="https://david-dm.org/MichMich/MagicMirror?type=dev"><img src="https://david-dm.org/MichMich/MagicMirror/dev-status.svg" alt="devDependency Status"></a>
-	<a href="https://bestpractices.coreinfrastructure.org/projects/347"><img src="https://bestpractices.coreinfrastructure.org/projects/347/badge" alt="CLI Best Practices"></a>
-	<a href="https://codecov.io/gh/MichMich/MagicMirror"><img src="https://codecov.io/gh/MichMich/MagicMirror/branch/master/graph/badge.svg?token=LEG1KitZR6" alt="CodeCov Status"/></a>
-	<a href="https://choosealicense.com/licenses/mit"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License"></a>
-	<a href="https://github.com/MichMich/MagicMirror/actions?query=workflow%3A%22Automated+Tests%22"><img src="https://github.com/MichMich/MagicMirror/workflows/Automated%20Tests/badge.svg" alt="Tests"></a>
-  <a href="https://codecov.io/gh/MichMich/MagicMirror"><img src="https://codecov.io/gh/MichMich/MagicMirror/branch/master/graph/badge.svg" /></a>
-</p>
+### MagicMirror^2 Docs:

-**MagicMirror²** is an open source modular smart mirror platform. With a growing list of installable modules, the **MagicMirror²** allows you to convert your hallway or bathroom mirror into your personal assistant. **MagicMirror²** is built by the creator of [the original MagicMirror](https://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
+https://docs.magicmirror.builders/

-MagicMirror² focuses on a modular plugin system and uses [Electron](https://www.electronjs.org/) as an application wrapper. So no more web server or browser installs necessary!
+### NP Dash Docs:

-## Documentation
-
-For the full documentation including **[installation instructions](https://docs.magicmirror.builders/getting-started/installation.html)**, please visit our dedicated documentation website: [https://docs.magicmirror.builders](https://docs.magicmirror.builders).
-
-## Links
-
- Website: [https://magicmirror.builders](https://magicmirror.builders)
- Documentation: [https://docs.magicmirror.builders](https://docs.magicmirror.builders)
- Forum: [https://forum.magicmirror.builders](https://forum.magicmirror.builders)
- Discord: [https://discord.gg/J5BAtvx](https://discord.gg/J5BAtvx)
- Blog: [https://michaelteeuw.nl/tagged/magicmirror](https://michaelteeuw.nl/tagged/magicmirror)
- Donations: [https://magicmirror.builders/#donate](https://magicmirror.builders/#donate)
-
-## Contributing Guidelines
-
-Contributions of all kinds are welcome, not only in the form of code but also with regards to
-
- bug reports
- documentation
- translations
-
-For the full contribution guidelines, check out: [https://docs.magicmirror.builders/getting-started/contributing.html](https://docs.magicmirror.builders/getting-started/contributing.html)
-
-## Enjoying MagicMirror? Consider a donation!
-
-MagicMirror² is opensource and free. That doesn't mean we don't need any money.
-
-Please consider a donation to help us cover the ongoing costs like webservers and email services.
-If we receive enough donations we might even be able to free up some working hours and spend some extra time improving the MagicMirror² core.
-
-To donate, please follow [this](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G5D8E9MR5DTD2&source=url) link.
-
-<p style="text-align: center">
-	<a href="https://forum.magicmirror.builders/topic/728/magicmirror-is-voted-number-1-in-the-magpi-top-50"><img src="https://magicmirror.builders/img/magpi-best-watermark-custom.png" width="150" alt="MagPi Top 50"></a>
-</p>
+https://www.notion.so/earlman/NP-Dash-Documentation-b37f07eb4dd648fb8d06b9479b9e8e66
--- a/css/main.css
+++ b/css/main.css
@@ -1,8 +1,24 @@
+@import url("https://fonts.googleapis.com/css?family=Quicksand:300,400,500,700&display=swap");
+:root {
+  --text-xs: 0.667rem;
+  --text-sm: 1rem;
+  --text-md: 1.5rem;
+  --text-lg: 2.25rem;
+  --text-xl: 3.375rem;
+  --text-xxl: 5.063rem;
+  --text-lh: 1.5;
+
+  --grid-gap: 2rem;
+  --color-text-body: #aaa;
+  --color-text-bright: #fff;
+  --color-text-normal: #999;
+  --color-text-dimmed: #666;
+  --color-background: #000;
+}
+
 html {
  cursor: none;
-  overflow: hidden;
-  background: #000;
-  user-select: none;
+  font-size: 24px;
 }

 ::-webkit-scrollbar {
@@ -10,13 +26,14 @@ html {
 }

 body {
-  margin: 60px;
-  position: absolute;
-  height: calc(100% - 120px);
-  width: calc(100% - 120px);
-  background: #000;
-  color: #aaa;
-  font-family: "Roboto Condensed", sans-serif;
+  background-color: var(--color-background);
+  box-sizing: border-box;
+  margin: 0;
+  padding: 6vh 4vw 4vh;
+  height: 100vh;
+  width: 100vw;
+  color: var(--color-text-body);
+  font-family: "Quicksand", sans-serif;
  font-weight: 400;
  font-size: 2em;
  line-height: 1.5em;
@@ -28,41 +45,40 @@ body {
 */

 .dimmed {
-  color: #666;
+  color: var(--color-text-dimmed);
 }

 .normal {
-  color: #999;
+  color: var(--color-text-normal);
 }

 .bright {
-  color: #fff;
+  color: var(--color-text-bright);
 }

 .xsmall {
-  font-size: 15px;
-  line-height: 20px;
+  font-size: var(--text-xs);
+  line-height: var(--text-lh);
 }
-
 .small {
-  font-size: 20px;
-  line-height: 25px;
+  font-size: var(--text-sm);
+  line-height: var(--text-lh);
 }
-
 .medium {
-  font-size: 30px;
-  line-height: 35px;
+  font-size: var(--text-md);
+  line-height: var(--text-lh);
 }
-
 .large {
-  font-size: 65px;
-  line-height: 65px;
+  font-size: var(--text-lg);
+  line-height: var(--text-lh);
 }
-
 .xlarge {
-  font-size: 75px;
-  line-height: 75px;
-  letter-spacing: -3px;
+  font-size: var(--text-xl);
+  line-height: var(--text-lh);
+}
+.xxlarge {
+  font-size: var(--text-xxl);
+  line-height: var(--text-lh);
 }

 .thin {
@@ -71,17 +87,17 @@ body {
 }

 .light {
-  font-family: "Roboto Condensed", sans-serif;
+  font-family: "Quicksand", sans-serif;
  font-weight: 300;
 }

 .regular {
-  font-family: "Roboto Condensed", sans-serif;
+  font-family: "Quicksand", sans-serif;
  font-weight: 400;
 }

 .bold {
-  font-family: "Roboto Condensed", sans-serif;
+  font-family: "Quicksand", sans-serif;
  font-weight: 700;
 }

@@ -96,7 +112,7 @@ body {
 header {
  text-transform: uppercase;
  font-size: 15px;
-  font-family: "Roboto Condensed", Arial, Helvetica, sans-serif;
+  font-family: "Quicksand", Arial, Helvetica, sans-serif;
  font-weight: 400;
  border-bottom: 1px solid #666;
  line-height: 15px;
@@ -134,103 +150,55 @@ sup {
 }

 /**
- * Region Definitions.
+ *
+ * LAYOUT STUFF
+ *
 */

-.region {
-  position: absolute;
-}
-
 .region.fullscreen {
  position: absolute;
-  top: -60px;
-  left: -60px;
-  right: -60px;
-  bottom: -60px;
+  height: 100vh;
+  width: 100vw;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: -1;
  pointer-events: none;
 }
-
 .region.fullscreen * {
  pointer-events: auto;
 }

-.region.right {
-  right: 0;
-  text-align: right;
-}
-
-.region.top {
-  top: 0;
-}
-
-.region.top .container {
-  margin-bottom: 25px;
-}
-
-.region.bottom .container {
-  margin-top: 25px;
-}
-
-.region.top .container:empty {
-  margin-bottom: 0;
-}
-
-.region.top.center,
-.region.bottom.center {
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.region.top.right,
-.region.top.left,
-.region.top.center {
-  top: 100%;
-}
-
-.region.bottom {
-  bottom: 0;
-}
-
-.region.bottom .container:empty {
-  margin-top: 0;
-}
-
-.region.bottom.right,
-.region.bottom.center,
-.region.bottom.left {
-  bottom: 100%;
-}
-
-.region.bar {
-  width: 100%;
-  text-align: center;
-}
-
-.region.third,
-.region.middle.center {
-  width: 100%;
-  text-align: center;
-  transform: translateY(-50%);
-}
-
-.region.upper.third {
-  top: 33%;
-}
-
-.region.middle.center {
-  top: 50%;
-}
-
-.region.lower.third {
-  top: 66%;
-}
-
-.region.left {
-  text-align: left;
-}
-
 .region table {
  width: 100%;
  border-spacing: 0;
  border-collapse: separate;
 }
+
+body {
+  display: grid;
+  grid-gap: var(--grid-gap);
+  grid-template-rows: repeat(5, 1fr);
+}
+
+.top.bar {
+  display: grid;
+  grid-gap: var(--grid-gap);
+  grid-template-columns: repeat(3, 1fr);
+}
+
+.top.bar > .container {
+  grid-column: 1 / -1;
+}
+
+.bottom.bar {
+  display: grid;
+  grid-gap: var(--grid-gap);
+  grid-template-columns: repeat(3, 1fr);
+}
+
+.region {
+  /* for testing */
+  /* border: 1px solid white;  */
+}
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
 	"description": "The open source modular smart mirror platform.",
 	"main": "js/electron.js",
 	"scripts": {
-		"start": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js",
-		"start:dev": "DISPLAY=\"${DISPLAY:=:0}\" ./node_modules/.bin/electron js/electron.js dev",
+		"start": "./node_modules/.bin/electron js/electron.js",
+		"start:dev": "./node_modules/.bin/electron js/electron.js dev",
 		"server": "node ./serveronly",
 		"install": "echo \"Installing vendor files ...\n\" && cd vendor && npm install --loglevel=error",
 		"install-fonts": "echo \"Installing fonts ...\n\" && cd fonts && npm install --loglevel=error",
@@ -85,7 +85,8 @@
 		"rrule": "^2.6.8",
 		"rrule-alt": "^2.2.8",
 		"simple-git": "^2.37.0",
-		"socket.io": "^4.0.0"
+		"socket.io": "^4.0.0",
+		"valid-url": "^1.0.9"
 	},
 	"_moduleAliases": {
 		"node_helper": "js/node_helper.js",
--- a/vendor/package-lock.json
+++ b/vendor/package-lock.json
@@ -1,60 +0,0 @@
-{
-  "name": "magicmirror-vendors",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@fortawesome/fontawesome-free": {
-      "version": "5.15.3",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz",
-      "integrity": "sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w=="
-    },
-    "a-sync-waterfall": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
-      "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-    },
-    "commander": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
-    },
-    "moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
-      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
-    },
-    "moment-timezone": {
-      "version": "0.5.33",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
-      "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
-      "requires": {
-        "moment": ">= 2.9.0"
-      }
-    },
-    "nunjucks": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz",
-      "integrity": "sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==",
-      "requires": {
-        "a-sync-waterfall": "^1.0.0",
-        "asap": "^2.0.3",
-        "commander": "^5.1.0"
-      }
-    },
-    "suncalc": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/suncalc/-/suncalc-1.8.0.tgz",
-      "integrity": "sha1-HZiYEJVjB4dQ9JlKlZ5lTYdqy/U="
-    },
-    "weathericons": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/weathericons/-/weathericons-2.1.0.tgz",
-      "integrity": "sha1-dFOho14gAkXjiftQd9Un7/MLc7Q="
-    }
-  }
-}
--- a/vendor/yarn.lock
+++ b/vendor/yarn.lock
@@ -0,0 +1,54 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@fortawesome/fontawesome-free@^5.15.3":
+  version "5.15.3"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz#c36ffa64a2a239bf948541a97b6ae8d729e09a9a"
+  integrity sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==
+
+a-sync-waterfall@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz#75b6b6aa72598b497a125e7a2770f14f4c8a1fa7"
+  integrity sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==
+
+asap@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
+commander@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
+moment-timezone@^0.5.33:
+  version "0.5.33"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c"
+  integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==
+  dependencies:
+    moment ">= 2.9.0"
+
+"moment@>= 2.9.0", moment@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
+nunjucks@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.3.tgz#1b33615247290e94e28263b5d855ece765648a31"
+  integrity sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==
+  dependencies:
+    a-sync-waterfall "^1.0.0"
+    asap "^2.0.3"
+    commander "^5.1.0"
+
+suncalc@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/suncalc/-/suncalc-1.8.0.tgz#1d9898109563078750f4994a959e654d876acbf5"
+  integrity sha1-HZiYEJVjB4dQ9JlKlZ5lTYdqy/U=
+
+weathericons@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/weathericons/-/weathericons-2.1.0.tgz#7453a1a35e200245e389fb5077d527eff30b73b4"
+  integrity sha1-dFOho14gAkXjiftQd9Un7/MLc7Q=
--- a/yarn.lock
+++ b/yarn.lock