+ 
**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](http://michaelteeuw.nl/tagged/magicmirror) with the incredible help of a [growing community of contributors](https://github.com/MichMich/MagicMirror/graphs/contributors).
@@ -19,7 +20,7 @@ MagicMirror² focuses on a modular plugin system and uses [Electron](http://elec
- [Configuration](#configuration)
- [Modules](#modules)
- [Known Issues](#known-issues)
-- [community](#community)
+- [Community](#community)
- [Contributing Guidelines](#contributing-guidelines)
## Usage
@@ -31,13 +32,13 @@ Electron, the app wrapper around MagicMirror², only supports the Raspberry Pi 2
Execute the following command on your Raspberry Pi to install MagicMirror²:
````
-curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh | bash
+bash -c "$(curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installers/raspberry.sh)"
````
### Manual Installation
1. Download and install the latest Node.js version.
-2. Clone the repository and check out the beta branch: `git clone https://github.com/MichMich/MagicMirror`
+2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror`
3. Enter the repository: `cd ~/MagicMirror`
4. Install and run the app: `npm install && npm start`
@@ -46,8 +47,48 @@ curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/master/installer
**Note:** if you want to debug on Raspberry Pi you can use `npm start dev` which will start the MagicMirror app with Dev Tools enabled.
### Server Only
+In some cases, you want to start the application without an actual app window. In this case, you can start MagicMirror² in server only mode by manually running `node serveronly` or using Docker. This will start the server, after which you can open the application in your browser of choice. Detailed description below.
-In some cases, you want to start the application without an actual app window. In this case, execute the following command from the MagicMirror folder: `node serveronly`. This will start the server, after which you can open the application in your browser of choice.
+### Client Only
+When you have a server running remotely and want to connect a standalone client to this instance, you can manually run `node clientonly --address 192.168.1.5 --port 8080`. (Specify the ip address and port number of the server)
+
+**Important:** Make sure that you whitelist the interface/ip in the server config where you want the client to connect to, otherwise it will not be allowed to connect to the server
+
+#### Docker
+
+MagicMirror² in server only mode can be deployed using [Docker](https://docker.com). After a successful [Docker installation](https://docs.docker.com/engine/installation/) you just need to execute the following command in the shell:
+
+```bash
+docker run -d \
+ --publish 80:8080 \
+ --restart always \
+ --volume ~/magic_mirror/config:/opt/magic_mirror/config \
+ --volume ~/magic_mirror/modules:/opt/magic_mirror/modules \
+ --name magic_mirror \
+ bastilimbach/docker-magicmirror
+```
+
+| **Volumes** | **Description** |
+| --- | --- |
+| `/opt/magic_mirror/config` | Mount this volume to insert your own config into the docker container. |
+| `/opt/magic_mirror/modules` | Mount this volume to add your own custom modules into the docker container. |
+
+You may need to add your Docker Host IP to your `ipWhitelist` option. If you have some issues setting up this configuration, check [this forum post](https://forum.magicmirror.builders/topic/1326/ipwhitelist-howto).
+
+```javascript
+var config = {
+ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:172.17.0.1"]
+};
+```
+
+If you want to run the server on a raspberry pi, use the `raspberry` tag. (bastilimbach/docker-magicmirror:raspberry)
+
+#### Manual
+
+1. Download and install the latest Node.js version.
+2. Clone the repository and check out the master branch: `git clone https://github.com/MichMich/MagicMirror`
+3. Enter the repository: `cd ~/MagicMirror`
+4. Install and run the app: `npm install && node serveronly`
### Raspberry Configuration & Auto Start.
@@ -68,23 +109,28 @@ Type `git status` to see your changes, if there are any, you can reset them with
## Configuration
-1. Duplicate `config/config.js.sample` to `config/config.js`.
+1. Duplicate `config/config.js.sample` to `config/config.js`. **Note:** If you used the installer script. This step is already done for you.
2. Modify your required settings.
+Note: You'll can check your configuration running the follow command:
+```bash
+npm run config:check
+```
+
The following properties can be configured:
| **Option** | **Description** |
| --- | --- |
| `port` | The port on which the MagicMirror² server will run on. The default value is `8080`. |
-| `address` | The ip address the accept connections. The default open bind `::` is IPv6 is available or `0.0.0.0` IPv4 run on. Example config: `192.168.10.100`. |
-| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1", "::1"]`. It is possible to specify IPs with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or define ip ranges (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`).|
+| `address` | The ip address the accept connections. The default open bind `localhost`. Example config: `192.168.10.100`. |
+| `ipWhitelist` | The list of IPs from which you are allowed to access the MagicMirror². The default value is `["127.0.0.1", "::ffff:127.0.0.1", "::1"]`. It is possible to specify IPs with subnet masks (`["127.0.0.1", "127.0.0.1/24"]`) or define ip ranges (`["127.0.0.1", ["192.168.0.1", "192.168.0.100"]]`). Set `[]` to allow all IP addresses. For more information about how configure this directive see the [follow post ipWhitelist HowTo](https://forum.magicmirror.builders/topic/1326/ipwhitelist-howto) |
| `zoom` | This allows to scale the mirror contents with a given zoom factor. The default value is `1.0`|
| `language` | The language of the interface. (Note: Not all elements will be localized.) Possible values are `en`, `nl`, `ru`, `fr`, etc., but the default value is `en`. |
| `timeFormat` | The form of time notation that will be used. Possible values are `12` or `24`. The default is `24`. |
| `units` | The units that will be used in the default weather modules. Possible values are `metric` or `imperial`. The default is `metric`. |
| `modules` | An array of active modules. **The array must contain objects. See the next table below for more information.** |
-| `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (defaults `.width = 800` & `.height = 600`). Kiosk mode can be enabled by setting `.kiosk = true`, `.autoHideMenuBar = false`, `.fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
-
+| `electronOptions` | An optional array of Electron (browser) options. This allows configuration of e.g. the browser screen size and position (example: `electronOptions: { fullscreen: false, width: 800, height: 600 }`). Kiosk mode can be enabled by setting `kiosk = true`, `autoHideMenuBar = false` and `fullscreen = false`. More options can be found [here](https://github.com/electron/electron/blob/master/docs/api/browser-window.md). |
+| `customCss` | The path of the `custom.css` stylesheet. The default is `css/custom.css`. |
Module configuration:
diff --git a/clientonly/index.js b/clientonly/index.js
new file mode 100644
index 00000000..72495504
--- /dev/null
+++ b/clientonly/index.js
@@ -0,0 +1,104 @@
+/* jshint esversion: 6 */
+
+"use strict";
+
+// Use seperate scope to prevent global scope pollution
+(function () {
+ var config = {};
+
+ // Helper function to get server address/hostname from either the commandline or env
+ function getServerAddress() {
+ // Helper function to get command line parameters
+ // Assumes that a cmdline parameter is defined with `--key [value]`
+ function getCommandLineParameter(key, defaultValue = undefined) {
+ var index = process.argv.indexOf(`--${key}`);
+ var value = index > -1 ? process.argv[index + 1] : undefined;
+ return value !== undefined ? String(value) : defaultValue;
+ }
+
+ // Prefer command line arguments over environment variables
+ ["address", "port"].forEach((key) => {
+ config[key] = getCommandLineParameter(key, process.env[key.toUpperCase()]);
+ })
+ }
+
+ function getServerConfig(url) {
+ // Return new pending promise
+ return new Promise((resolve, reject) => {
+ // Select http or https module, depending on reqested url
+ const lib = url.startsWith("https") ? require("https") : require("http");
+ const request = lib.get(url, (response) => {
+ var configData = "";
+
+ // Gather incomming data
+ response.on("data", function(chunk) {
+ configData += chunk;
+ });
+ // Resolve promise at the end of the HTTP/HTTPS stream
+ response.on("end", function() {
+ resolve(JSON.parse(configData));
+ });
+ });
+
+ request.on("error", function(error) {
+ reject(new Error(`Unable to read config from server (${url} (${error.message}`));
+ });
+ })
+ };
+
+ function fail(message, code = 1) {
+ if (message !== undefined && typeof message === "string") {
+ console.log(message);
+ } else {
+ console.log("Usage: 'node clientonly --address 192.168.1.10 --port 8080'");
+ }
+ process.exit(code);
+ }
+
+ getServerAddress();
+
+ (config.address && config.port) || fail();
+
+ // Only start the client if a non-local server was provided
+ if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) {
+ getServerConfig(`http://${config.address}:${config.port}/config/`)
+ .then(function (config) {
+ // Pass along the server config via an environment variable
+ var env = Object.create(process.env);
+ var options = { env: env };
+ config.address = config.address;
+ config.port = config.port;
+ env.config = JSON.stringify(config);
+
+ // Spawn electron application
+ const electron = require("electron");
+ const child = require("child_process").spawn(electron, ["js/electron.js"], options);
+
+ // Pipe all child process output to current stdout
+ child.stdout.on("data", function (buf) {
+ process.stdout.write(`Client: ${buf}`);
+ });
+
+ // Pipe all child process errors to current stderr
+ child.stderr.on("data", function (buf) {
+ process.stderr.write(`Client: ${buf}`);
+ });
+
+ child.on("error", function (err) {
+ process.stdout.write(`Client: ${err}`);
+ });
+
+ child.on('close', (code) => {
+ if (code != 0) {
+ console.log(`There something wrong. The clientonly is not running code ${code}`);
+ }
+ });
+
+ })
+ .catch(function (reason) {
+ fail(`Unable to connect to server: (${reason})`);
+ });
+ } else {
+ fail();
+ }
+}());
diff --git a/config/config.js.sample b/config/config.js.sample
index 913dbc43..a427a548 100644
--- a/config/config.js.sample
+++ b/config/config.js.sample
@@ -2,67 +2,80 @@
*
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
+ *
+ * For more information how you can configurate this file
+ * See https://github.com/MichMich/MagicMirror#configuration
+ *
*/
var config = {
+ address: "localhost", // 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, is "localhost"
port: 8080,
- ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
+ ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // 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"],
- language: 'en',
+ language: "en",
timeFormat: 24,
- units: 'metric',
+ units: "metric",
modules: [
{
- module: 'alert',
+ module: "alert",
},
{
module: "updatenotification",
position: "top_bar"
},
{
- module: 'clock',
- position: 'top_left'
+ module: "clock",
+ position: "top_left"
},
{
- module: 'calendar',
- header: 'US Holidays',
- position: 'top_left',
+ module: "calendar",
+ header: "US Holidays",
+ position: "top_left",
config: {
calendars: [
{
- symbol: 'calendar-check-o ',
- url: 'webcal://www.calendarlabs.com/templates/ical/US-Holidays.ics'
+ symbol: "calendar-check-o ",
+ url: "webcal://www.calendarlabs.com/templates/ical/US-Holidays.ics"
}
]
}
},
{
- module: 'compliments',
- position: 'lower_third'
+ module: "compliments",
+ position: "lower_third"
},
{
- module: 'currentweather',
- position: 'top_right',
+ module: "currentweather",
+ position: "top_right",
config: {
- location: 'New York',
- locationID: '', //ID from http://www.openweathermap.org
- appid: 'YOUR_OPENWEATHER_API_KEY'
+ location: "New York",
+ locationID: "", //ID from http://www.openweathermap.org/help/city_list.txt
+ appid: "YOUR_OPENWEATHER_API_KEY"
}
},
{
- module: 'weatherforecast',
- position: 'top_right',
- header: 'Weather Forecast',
+ module: "weatherforecast",
+ position: "top_right",
+ header: "Weather Forecast",
config: {
- location: 'New York',
- locationID: '5128581', //ID from http://www.openweathermap.org
- appid: 'YOUR_OPENWEATHER_API_KEY'
+ location: "New York",
+ locationID: "5128581", //ID from http://www.openweathermap.org/help/city_list.txt
+ appid: "YOUR_OPENWEATHER_API_KEY"
}
},
{
- module: 'newsfeed',
- position: 'bottom_bar',
+ module: "newsfeed",
+ position: "bottom_bar",
config: {
feeds: [
{
@@ -79,4 +92,4 @@ var config = {
};
/*************** DO NOT EDIT THE LINE BELOW ***************/
-if (typeof module !== 'undefined') {module.exports = config;}
+if (typeof module !== "undefined") {module.exports = config;}
diff --git a/css/main.css b/css/main.css
index 5e63e596..db1fb428 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,6 +1,7 @@
html {
cursor: none;
overflow: hidden;
+ background: #000;
}
::-webkit-scrollbar {
@@ -94,7 +95,7 @@ body {
header {
text-transform: uppercase;
font-size: 15px;
- font-family: "Roboto Condensed";
+ font-family: "Roboto Condensed", Arial, Helvetica, sans-serif;
font-weight: 400;
border-bottom: 1px solid #666;
line-height: 15px;
@@ -121,6 +122,12 @@ sup {
margin-bottom: 0;
}
+.no-wrap {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
/**
* Region Definitions.
*/
@@ -135,10 +142,16 @@ sup {
left: -60px;
right: -60px;
bottom: -60px;
+ pointer-events: none;
+}
+
+.region.fullscreen * {
+ pointer-events: auto;
}
.region.right {
right: 0;
+ text-align: right;
}
.region.top {
@@ -149,6 +162,10 @@ sup {
margin-bottom: 25px;
}
+.region.bottom .container {
+ margin-top: 25px;
+}
+
.region.top .container:empty {
margin-bottom: 0;
}
@@ -173,10 +190,6 @@ sup {
bottom: 0;
}
-.region.bottom .container {
- margin-top: 25px;
-}
-
.region.bottom .container:empty {
margin-top: 0;
}
@@ -219,10 +232,6 @@ sup {
text-align: left;
}
-.region.right {
- text-align: right;
-}
-
.region table {
width: 100%;
border-spacing: 0;
diff --git a/fonts/LICENSE.txt b/fonts/LICENSE.txt
deleted file mode 100644
index 75b52484..00000000
--- a/fonts/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/fonts/Roboto-Black/Roboto-Black.ttf b/fonts/Roboto-Black/Roboto-Black.ttf
deleted file mode 100644
index fbde625d..00000000
Binary files a/fonts/Roboto-Black/Roboto-Black.ttf and /dev/null differ
diff --git a/fonts/Roboto-Black/Roboto-Black.woff b/fonts/Roboto-Black/Roboto-Black.woff
deleted file mode 100644
index 94b19305..00000000
Binary files a/fonts/Roboto-Black/Roboto-Black.woff and /dev/null differ
diff --git a/fonts/Roboto-Black/Roboto-Black.woff2 b/fonts/Roboto-Black/Roboto-Black.woff2
deleted file mode 100644
index c0cb786e..00000000
Binary files a/fonts/Roboto-Black/Roboto-Black.woff2 and /dev/null differ
diff --git a/fonts/Roboto-BlackItalic/Roboto-BlackItalic.ttf b/fonts/Roboto-BlackItalic/Roboto-BlackItalic.ttf
deleted file mode 100644
index 60f7782a..00000000
Binary files a/fonts/Roboto-BlackItalic/Roboto-BlackItalic.ttf and /dev/null differ
diff --git a/fonts/Roboto-BlackItalic/Roboto-BlackItalic.woff b/fonts/Roboto-BlackItalic/Roboto-BlackItalic.woff
deleted file mode 100644
index eb07f101..00000000
Binary files a/fonts/Roboto-BlackItalic/Roboto-BlackItalic.woff and /dev/null differ
diff --git a/fonts/Roboto-BlackItalic/Roboto-BlackItalic.woff2 b/fonts/Roboto-BlackItalic/Roboto-BlackItalic.woff2
deleted file mode 100644
index 6ad4604f..00000000
Binary files a/fonts/Roboto-BlackItalic/Roboto-BlackItalic.woff2 and /dev/null differ
diff --git a/fonts/Roboto-Bold/Roboto-Bold.ttf b/fonts/Roboto-Bold/Roboto-Bold.ttf
deleted file mode 100644
index a355c27c..00000000
Binary files a/fonts/Roboto-Bold/Roboto-Bold.ttf and /dev/null differ
diff --git a/fonts/Roboto-Bold/Roboto-Bold.woff b/fonts/Roboto-Bold/Roboto-Bold.woff
deleted file mode 100644
index d1ef48b4..00000000
Binary files a/fonts/Roboto-Bold/Roboto-Bold.woff and /dev/null differ
diff --git a/fonts/Roboto-Bold/Roboto-Bold.woff2 b/fonts/Roboto-Bold/Roboto-Bold.woff2
deleted file mode 100644
index 5658e9a7..00000000
Binary files a/fonts/Roboto-Bold/Roboto-Bold.woff2 and /dev/null differ
diff --git a/fonts/Roboto-BoldItalic/Roboto-BoldItalic.ttf b/fonts/Roboto-BoldItalic/Roboto-BoldItalic.ttf
deleted file mode 100644
index 3c9a7a37..00000000
Binary files a/fonts/Roboto-BoldItalic/Roboto-BoldItalic.ttf and /dev/null differ
diff --git a/fonts/Roboto-BoldItalic/Roboto-BoldItalic.woff b/fonts/Roboto-BoldItalic/Roboto-BoldItalic.woff
deleted file mode 100644
index 291c89dd..00000000
Binary files a/fonts/Roboto-BoldItalic/Roboto-BoldItalic.woff and /dev/null differ
diff --git a/fonts/Roboto-BoldItalic/Roboto-BoldItalic.woff2 b/fonts/Roboto-BoldItalic/Roboto-BoldItalic.woff2
deleted file mode 100644
index 75123709..00000000
Binary files a/fonts/Roboto-BoldItalic/Roboto-BoldItalic.woff2 and /dev/null differ
diff --git a/fonts/Roboto-Italic/Roboto-Italic.ttf b/fonts/Roboto-Italic/Roboto-Italic.ttf
deleted file mode 100644
index ff6046d5..00000000
Binary files a/fonts/Roboto-Italic/Roboto-Italic.ttf and /dev/null differ
diff --git a/fonts/Roboto-Italic/Roboto-Italic.woff b/fonts/Roboto-Italic/Roboto-Italic.woff
deleted file mode 100644
index 3bd43138..00000000
Binary files a/fonts/Roboto-Italic/Roboto-Italic.woff and /dev/null differ
diff --git a/fonts/Roboto-Italic/Roboto-Italic.woff2 b/fonts/Roboto-Italic/Roboto-Italic.woff2
deleted file mode 100644
index 77c81227..00000000
Binary files a/fonts/Roboto-Italic/Roboto-Italic.woff2 and /dev/null differ
diff --git a/fonts/Roboto-Light/Roboto-Light.ttf b/fonts/Roboto-Light/Roboto-Light.ttf
deleted file mode 100644
index 94c6bcc6..00000000
Binary files a/fonts/Roboto-Light/Roboto-Light.ttf and /dev/null differ
diff --git a/fonts/Roboto-Light/Roboto-Light.woff b/fonts/Roboto-Light/Roboto-Light.woff
deleted file mode 100644
index 1d1ad478..00000000
Binary files a/fonts/Roboto-Light/Roboto-Light.woff and /dev/null differ
diff --git a/fonts/Roboto-Light/Roboto-Light.woff2 b/fonts/Roboto-Light/Roboto-Light.woff2
deleted file mode 100644
index 166c8218..00000000
Binary files a/fonts/Roboto-Light/Roboto-Light.woff2 and /dev/null differ
diff --git a/fonts/Roboto-LightItalic/Roboto-LightItalic.ttf b/fonts/Roboto-LightItalic/Roboto-LightItalic.ttf
deleted file mode 100644
index 04cc0023..00000000
Binary files a/fonts/Roboto-LightItalic/Roboto-LightItalic.ttf and /dev/null differ
diff --git a/fonts/Roboto-LightItalic/Roboto-LightItalic.woff b/fonts/Roboto-LightItalic/Roboto-LightItalic.woff
deleted file mode 100644
index 3662bf40..00000000
Binary files a/fonts/Roboto-LightItalic/Roboto-LightItalic.woff and /dev/null differ
diff --git a/fonts/Roboto-LightItalic/Roboto-LightItalic.woff2 b/fonts/Roboto-LightItalic/Roboto-LightItalic.woff2
deleted file mode 100644
index 9ba7fbd2..00000000
Binary files a/fonts/Roboto-LightItalic/Roboto-LightItalic.woff2 and /dev/null differ
diff --git a/fonts/Roboto-Medium/Roboto-Medium.ttf b/fonts/Roboto-Medium/Roboto-Medium.ttf
deleted file mode 100644
index 39c63d74..00000000
Binary files a/fonts/Roboto-Medium/Roboto-Medium.ttf and /dev/null differ
diff --git a/fonts/Roboto-Medium/Roboto-Medium.woff b/fonts/Roboto-Medium/Roboto-Medium.woff
deleted file mode 100644
index 487ea69b..00000000
Binary files a/fonts/Roboto-Medium/Roboto-Medium.woff and /dev/null differ
diff --git a/fonts/Roboto-Medium/Roboto-Medium.woff2 b/fonts/Roboto-Medium/Roboto-Medium.woff2
deleted file mode 100644
index 2622b475..00000000
Binary files a/fonts/Roboto-Medium/Roboto-Medium.woff2 and /dev/null differ
diff --git a/fonts/Roboto-MediumItalic/Roboto-MediumItalic.ttf b/fonts/Roboto-MediumItalic/Roboto-MediumItalic.ttf
deleted file mode 100644
index dc743f0a..00000000
Binary files a/fonts/Roboto-MediumItalic/Roboto-MediumItalic.ttf and /dev/null differ
diff --git a/fonts/Roboto-MediumItalic/Roboto-MediumItalic.woff b/fonts/Roboto-MediumItalic/Roboto-MediumItalic.woff
deleted file mode 100644
index 70dea35a..00000000
Binary files a/fonts/Roboto-MediumItalic/Roboto-MediumItalic.woff and /dev/null differ
diff --git a/fonts/Roboto-MediumItalic/Roboto-MediumItalic.woff2 b/fonts/Roboto-MediumItalic/Roboto-MediumItalic.woff2
deleted file mode 100644
index 8b111d46..00000000
Binary files a/fonts/Roboto-MediumItalic/Roboto-MediumItalic.woff2 and /dev/null differ
diff --git a/fonts/Roboto-Regular/Roboto-Regular.ttf b/fonts/Roboto-Regular/Roboto-Regular.ttf
deleted file mode 100644
index 8c082c8d..00000000
Binary files a/fonts/Roboto-Regular/Roboto-Regular.ttf and /dev/null differ
diff --git a/fonts/Roboto-Regular/Roboto-Regular.woff b/fonts/Roboto-Regular/Roboto-Regular.woff
deleted file mode 100644
index 6ea53c20..00000000
Binary files a/fonts/Roboto-Regular/Roboto-Regular.woff and /dev/null differ
diff --git a/fonts/Roboto-Regular/Roboto-Regular.woff2 b/fonts/Roboto-Regular/Roboto-Regular.woff2
deleted file mode 100644
index 10cf92b8..00000000
Binary files a/fonts/Roboto-Regular/Roboto-Regular.woff2 and /dev/null differ
diff --git a/fonts/Roboto-Thin/Roboto-Thin.ttf b/fonts/Roboto-Thin/Roboto-Thin.ttf
deleted file mode 100644
index d6955502..00000000
Binary files a/fonts/Roboto-Thin/Roboto-Thin.ttf and /dev/null differ
diff --git a/fonts/Roboto-Thin/Roboto-Thin.woff b/fonts/Roboto-Thin/Roboto-Thin.woff
deleted file mode 100644
index b0e7c557..00000000
Binary files a/fonts/Roboto-Thin/Roboto-Thin.woff and /dev/null differ
diff --git a/fonts/Roboto-Thin/Roboto-Thin.woff2 b/fonts/Roboto-Thin/Roboto-Thin.woff2
deleted file mode 100644
index 5eee3b3e..00000000
Binary files a/fonts/Roboto-Thin/Roboto-Thin.woff2 and /dev/null differ
diff --git a/fonts/Roboto-ThinItalic/Roboto-ThinItalic.ttf b/fonts/Roboto-ThinItalic/Roboto-ThinItalic.ttf
deleted file mode 100644
index 07172ff6..00000000
Binary files a/fonts/Roboto-ThinItalic/Roboto-ThinItalic.ttf and /dev/null differ
diff --git a/fonts/Roboto-ThinItalic/Roboto-ThinItalic.woff b/fonts/Roboto-ThinItalic/Roboto-ThinItalic.woff
deleted file mode 100644
index 73f10ad4..00000000
Binary files a/fonts/Roboto-ThinItalic/Roboto-ThinItalic.woff and /dev/null differ
diff --git a/fonts/Roboto-ThinItalic/Roboto-ThinItalic.woff2 b/fonts/Roboto-ThinItalic/Roboto-ThinItalic.woff2
deleted file mode 100644
index 292c86f4..00000000
Binary files a/fonts/Roboto-ThinItalic/Roboto-ThinItalic.woff2 and /dev/null differ
diff --git a/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.ttf b/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.ttf
deleted file mode 100644
index fc28868a..00000000
Binary files a/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.ttf and /dev/null differ
diff --git a/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.woff b/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.woff
deleted file mode 100644
index cf577ca5..00000000
Binary files a/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.woff and /dev/null differ
diff --git a/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.woff2 b/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.woff2
deleted file mode 100644
index 8b2e28cd..00000000
Binary files a/fonts/RobotoCondensed-Bold/RobotoCondensed-Bold.woff2 and /dev/null differ
diff --git a/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.ttf b/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.ttf
deleted file mode 100644
index e1a648ff..00000000
Binary files a/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.ttf and /dev/null differ
diff --git a/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.woff b/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.woff
deleted file mode 100644
index 0b5db116..00000000
Binary files a/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.woff and /dev/null differ
diff --git a/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.woff2 b/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.woff2
deleted file mode 100644
index 5d3f2072..00000000
Binary files a/fonts/RobotoCondensed-BoldItalic/RobotoCondensed-BoldItalic.woff2 and /dev/null differ
diff --git a/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.ttf b/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.ttf
deleted file mode 100644
index 97ff9f1e..00000000
Binary files a/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.ttf and /dev/null differ
diff --git a/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.woff b/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.woff
deleted file mode 100644
index 4548bfa9..00000000
Binary files a/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.woff and /dev/null differ
diff --git a/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.woff2 b/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.woff2
deleted file mode 100644
index 04141901..00000000
Binary files a/fonts/RobotoCondensed-Italic/RobotoCondensed-Italic.woff2 and /dev/null differ
diff --git a/fonts/RobotoCondensed-Light/RobotoCondensed-Light.ttf b/fonts/RobotoCondensed-Light/RobotoCondensed-Light.ttf
deleted file mode 100644
index 2dae31e2..00000000
Binary files a/fonts/RobotoCondensed-Light/RobotoCondensed-Light.ttf and /dev/null differ
diff --git a/fonts/RobotoCondensed-Light/RobotoCondensed-Light.woff b/fonts/RobotoCondensed-Light/RobotoCondensed-Light.woff
deleted file mode 100644
index b797af13..00000000
Binary files a/fonts/RobotoCondensed-Light/RobotoCondensed-Light.woff and /dev/null differ
diff --git a/fonts/RobotoCondensed-Light/RobotoCondensed-Light.woff2 b/fonts/RobotoCondensed-Light/RobotoCondensed-Light.woff2
deleted file mode 100644
index 1e3b487a..00000000
Binary files a/fonts/RobotoCondensed-Light/RobotoCondensed-Light.woff2 and /dev/null differ
diff --git a/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.ttf b/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.ttf
deleted file mode 100644
index da108d3a..00000000
Binary files a/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.ttf and /dev/null differ
diff --git a/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.woff b/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.woff
deleted file mode 100644
index 8eae55a8..00000000
Binary files a/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.woff and /dev/null differ
diff --git a/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.woff2 b/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.woff2
deleted file mode 100644
index 947a1358..00000000
Binary files a/fonts/RobotoCondensed-LightItalic/RobotoCondensed-LightItalic.woff2 and /dev/null differ
diff --git a/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.ttf b/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.ttf
deleted file mode 100644
index c2304c14..00000000
Binary files a/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.ttf and /dev/null differ
diff --git a/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.woff b/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.woff
deleted file mode 100644
index 3e25d65d..00000000
Binary files a/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.woff and /dev/null differ
diff --git a/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.woff2 b/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.woff2
deleted file mode 100644
index d7c42c8c..00000000
Binary files a/fonts/RobotoCondensed-Regular/RobotoCondensed-Regular.woff2 and /dev/null differ
diff --git a/fonts/package-lock.json b/fonts/package-lock.json
new file mode 100644
index 00000000..c05e7b0d
--- /dev/null
+++ b/fonts/package-lock.json
@@ -0,0 +1,12 @@
+{
+ "name": "magicmirror-fonts",
+ "requires": true,
+ "lockfileVersion": 1,
+ "dependencies": {
+ "roboto-fontface": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.8.0.tgz",
+ "integrity": "sha512-ZYzRkETgBrdEGzL5JSKimvjI2CX7ioyZCkX2BpcfyjqI+079W0wHAyj5W4rIZMcDSOHgLZtgz1IdDi/vU77KEQ=="
+ }
+ }
+}
diff --git a/fonts/package.json b/fonts/package.json
new file mode 100644
index 00000000..a4fb07de
--- /dev/null
+++ b/fonts/package.json
@@ -0,0 +1,15 @@
+{
+ "name": "magicmirror-fonts",
+ "description": "Package for fonts use by MagicMirror Core.",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/MichMich/MagicMirror.git"
+ },
+ "license": "MIT",
+ "bugs": {
+ "url": "https://github.com/MichMich/MagicMirror/issues"
+ },
+ "dependencies": {
+ "roboto-fontface": "^0.8.0"
+ }
+}
diff --git a/fonts/roboto.css b/fonts/roboto.css
index ce9099da..11d3f41d 100644
--- a/fonts/roboto.css
+++ b/fonts/roboto.css
@@ -5,9 +5,9 @@
src:
local("Roboto Thin"),
local("Roboto-Thin"),
- url("Roboto-Thin/Roboto-Thin.woff2") format("woff2"),
- url("Roboto-Thin/Roboto-Thin.woff") format("woff"),
- url("Roboto-Thin/Roboto-Thin.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Thin.ttf") format("truetype");
}
@font-face {
@@ -17,9 +17,9 @@
src:
local("Roboto Condensed Light"),
local("RobotoCondensed-Light"),
- url("RobotoCondensed-Light/RobotoCondensed-Light.woff2") format("woff2"),
- url("RobotoCondensed-Light/RobotoCondensed-Light.woff") format("woff"),
- url("RobotoCondensed-Light/RobotoCondensed-Light.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Light.ttf") format("truetype");
}
@font-face {
@@ -29,9 +29,9 @@
src:
local("Roboto Condensed"),
local("RobotoCondensed-Regular"),
- url("RobotoCondensed-Regular/RobotoCondensed-Regular.woff2") format("woff2"),
- url("RobotoCondensed-Regular/RobotoCondensed-Regular.woff") format("woff"),
- url("RobotoCondensed-Regular/RobotoCondensed-Regular.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Regular.ttf") format("truetype");
}
@font-face {
@@ -41,9 +41,9 @@
src:
local("Roboto Condensed Bold"),
local("RobotoCondensed-Bold"),
- url("RobotoCondensed-Bold/RobotoCondensed-Bold.woff2") format("woff2"),
- url("RobotoCondensed-Bold/RobotoCondensed-Bold.woff") format("woff"),
- url("RobotoCondensed-Bold/RobotoCondensed-Bold.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto-condensed/Roboto-Condensed-Bold.ttf") format("truetype");
}
@font-face {
@@ -53,9 +53,9 @@
src:
local("Roboto"),
local("Roboto-Regular"),
- url("Roboto-Regular/Roboto-Regular.woff2") format("woff2"),
- url("Roboto-Regular/Roboto-Regular.woff") format("woff"),
- url("Roboto-Regular/Roboto-Regular.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.ttf") format("truetype");
}
@font-face {
@@ -65,9 +65,9 @@
src:
local("Roboto Medium"),
local("Roboto-Medium"),
- url("Roboto-Medium/Roboto-Medium.woff2") format("woff2"),
- url("Roboto-Medium/Roboto-Medium.woff") format("woff"),
- url("Roboto-Medium/Roboto-Medium.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.ttf") format("truetype");
}
@font-face {
@@ -77,9 +77,9 @@
src:
local("Roboto Bold"),
local("Roboto-Bold"),
- url("Roboto-Bold/Roboto-Bold.woff2") format("woff2"),
- url("Roboto-Bold/Roboto-Bold.woff") format("woff"),
- url("Roboto-Bold/Roboto-Bold.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.ttf") format("truetype");
}
@font-face {
@@ -89,7 +89,7 @@
src:
local("Roboto Light"),
local("Roboto-Light"),
- url("Roboto-Light/Roboto-Light.woff2") format("woff2"),
- url("Roboto-Light/Roboto-Light.woff") format("woff"),
- url("Roboto-Light/Roboto-Light.ttf") format("truetype");
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2") format("woff2"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff") format("woff"),
+ url("node_modules/roboto-fontface/fonts/roboto/Roboto-Light.ttf") format("truetype");
}
diff --git a/index.html b/index.html
index 86a69a4a..d8604256 100644
--- a/index.html
+++ b/index.html
@@ -1,9 +1,15 @@
- | Option | -Description | -
|---|---|
effect |
- The animation effect to use for notifications. - Possible values: scale slide genie jelly flip exploader bouncyflip
- Default value: slide
- |
- alert_effect |
- The animation effect to use for alerts. - Possible values: scale slide genie jelly flip exploader bouncyflip
- Default value: jelly
- |
-
-
display_time |
- Time a notification is displayed in milliseconds. - Possible values: int
- Default value: 3500
- |
-
position |
- Position where the notifications should be displayed. - Possible values: left center right
- Default value: center
- |
-
welcome_message |
- Message shown at startup. - Possible values: string false
- Default value: false (no message at startup)
- |
-
| Option | -Description | -
|---|---|
title |
- The title of the notification. - Possible values: text or html
- |
-
message |
- The message of the notification. - Possible values: text or html
- |
-
| Option | -Description | -
|---|---|
title |
- The title of the alert. - Possible values: text or html
- |
-
message |
- The message of the alert. - Possible values: text or html
- |
-
imageUrl (optional) |
- Image to show in the alert - Possible values: url path
- Default value: none
- |
-
imageFA (optional) |
- Font Awesome icon to show in the alert - Possible values: See Font Awsome website. - Default value: none
- |
-
imageHeight (optional even with imageUrl set) |
- Height of the image - Possible values: intpx
- Default value: 80px
- |
-
timer (optional) |
- How long the alert should stay visible in ms.
- Important: If you do not use the timer, it is your duty to hide the alert by using self.sendNotification("HIDE_ALERT");!- Possible values: int float
- Default value: none
- |
-
| Option | -Description | -
|---|---|
maximumEntries |
- The maximum number of events shown. - Possible values: 0 - 100
- Default value: 10
- |
-
maximumNumberOfDays |
- The maximum number of days in the future. - Default value: 365
- |
-
displaySymbol |
- Display a symbol in front of an entry. - Possible values: true or false
- Default value: true
- |
-
defaultSymbol |
- The default symbol. - Possible values: See Font Awsome website. - Default value: calendar
- |
-
maxTitleLength |
- The maximum title length. - Possible values: 10 - 50
- Default value: 25
- |
-
fetchInterval |
- How often does the content needs to be fetched? (Milliseconds) - Possible values: 1000 - 86400000
- Default value: 300000 (5 minutes)
- |
-
animationSpeed |
- Speed of the update animation. (Milliseconds) - Possible values: 0 - 5000
- Default value: 2000 (2 seconds)
- |
-
fade |
- Fade the future events to black. (Gradient) - Possible values: true or false
- Default value: true
- |
-
fadePoint |
- Where to start fade? - Possible values: 0 (top of the list) - 1 (bottom of list)
- Default value: 0.25
- |
-
calendars |
- The list of calendars. - Possible values: An array, see calendar configuration below. - Default value: An example calendar. - |
-
titleReplace |
- An object of textual replacements applied to the tile of the event. This allow to remove or replace certains words in the title. - Example: -
- titleReplace: {'Birthday of ' : '', 'foo':'bar'}
-
- Default value: -
- {
- "De verjaardag van ": "",
- "'s birthday": ""
- }
-
- |
-
displayRepeatingCountTitle |
- Show count title for yearly repeating events (e.g. "X. Birthday", "X. Anniversary") - Possible values: true or false
- Default value: false
- |
-
dateFormat |
- Format to use for the date of events (when using absolute dates) - Possible values: See Moment.js formats - Default value: MMM Do (e.g. Jan 18th)
- |
-
timeFormat |
- Display event times as absolute dates, or relative time - Possible values: absolute or relative
- Default value: relative
- |
-
getRelative |
- How much time (in hours) should be left until calendar events start getting relative? - Possible values: 0 (events stay absolute) - 48 (48 hours before the event starts)
- Default value: 6
- |
-
urgency |
- When using a timeFormat of absolute, the urgency setting allows you to display events within a specific time frame as relative
- This allows events within a certain time frame to be displayed as relative (in xx days) while others are displayed as absolute dates- Possible values: a positive integer representing the number of days for which you want a relative date, for example 7 (for 7 days)- Default value: 7
- |
-
broadcastEvents |
- If this property is set to true, the calendar will broadcast all the events to all other modules with the notification message: CALENDAR_EVENTS. The event objects are stored in an array and contain the following fields: title, startDate, endDate, fullDayEvent, location and geo.- Possible values: true, false - Default value: true
- |
-
hidePrivate |
- Hides private calendar events. - Possible values: true or false
- Default value: false
- |
-
| Option | -Description | -
|---|---|
url |
- The url of the calendar .ical. This property is required. - Possible values: Any public accessble .ical calendar. - |
-
symbol |
- The symbol to show in front of an event. This property is optional. - Possible values: See Font Awesome website. - |
-
repeatingCountTitle |
- The count title for yearly repating events in this calendar. - Example: - 'Birthday'
- |
-
user |
- The username for HTTP Basic authentication. | -
pass |
- The password for HTTP Basic authentication. | -
| Option | -Description | -
|---|---|
timeFormat |
- Use 12 or 24 hour format. - Possible values: 12 or 24
- Default value: uses value of config.timeFormat - |
-
displaySeconds |
- Display seconds. - Possible values: true or false
- Default value: true
- |
-
showPeriod |
- Show the period (am/pm) with 12 hour format. - Possible values: true or false
- Default value: true
- |
-
showPeriodUpper |
- Show the period (AM/PM) with 12 hour format as uppercase. - Possible values: true or false
- Default value: false
- |
-
clockBold |
- Remove the colon and bold the minutes to make a more modern look. - Possible values: true or false
- Default value: false
- |
-
showDate |
- Turn off or on the Date section. - Possible values: true or false
- Default value: true
- |
-
displayType |
- Display a digital clock, analog clock, or both together. - Possible values: digital, analog, or both
- Default value: digital
- |
-
analogSize |
- Specific to the analog clock. Defines how large the analog display is. - Possible values: A positive number of pixels - Default value: 200px
- |
-
analogFace |
- Specific to the analog clock. Specifies which clock face to use. - Possible values: simple for a simple border, none for no face or border, or face-### (where ### is currently a value between 001 and 012, inclusive)
- Default value: simple
- |
-
secondsColor |
- Specific to the analog clock. Specifies what color to make the 'seconds' hand. - Possible values: any HTML RGB Color
- Default value: #888888
- |
-
analogPlacement |
- Specific to the analog clock. (requires displayType set to 'both') Specifies where the analog clock is in relation to the digital clock- Possible values: top, right, bottom, or left
- Default value: bottom
- |
-
analogShowDate |
- Specific to the analog clock. If the clock is used as a separate module and set to analog only, this configures whether a date is also displayed with the clock. - Possible values: false, top, or bottom
- Default value: top
- |
-
timezone |
- Specific a timezone to show clock. - Possible examples values: America/New_York, America/Santiago, Etc/GMT+10
- Default value: none
- |
-
| Option | -Description | -
|---|---|
updateInterval |
- How often does the compliment have to change? (Milliseconds) - Possible values: 1000 - 86400000
- Default value: 30000 (30 seconds)
- |
-
fadeSpeed |
- Speed of the update animation. (Milliseconds) - Possible values: 0 - 5000
- Default value: 4000 (4 seconds)
- |
-
compliments |
- The list of compliments. - Possible values: An object with three arrays: morning, afternoon andevening. See compliment configuration below.
- Default value: See compliment configuration below. - |
-
remoteFile |
- External file from which to load the compliments - Possible values:Path to a JSON file containing compliments, configured - as per the value of the compliments configuration (see below). An object with three arrays: - morning, afternoon and evening. - compliments.json
- Default value: null (Do not load from file)
- |
-
morning, afternoon andevening. Based on the time of the day, the compliments will be picked out of one of these arrays. The arrays contain one or multiple compliments.
+The `compliments` property contains an object with four arrays: morning, afternoon, evening and anytime. Based on the time of the day, the compliments will be picked out of one of these arrays. The arrays contain one or multiple compliments.
If use the currentweather is possible use a actual weather for set compliments. The availables properties are:
-* day_sunny
-* day_cloudy
-* cloudy
-* cloudy_windy
-* showers
-* rain
-* thunderstorm
-* snow
-* fog
-* night_clear
-* night_cloudy
-* night_showers
-* night_rain
-* night_thunderstorm
-* night_snow
-* night_alt_cloudy_windy
+* `day_sunny`
+* `day_cloudy`
+* `cloudy`
+* `cloudy_windy`
+* `showers`
+* `rain`
+* `thunderstorm`
+* `snow`
+* `fog`
+* `night_clear`
+* `night_cloudy`
+* `night_showers`
+* `night_rain`
+* `night_thunderstorm`
+* `night_snow`
+* `night_alt_cloudy_windy`
#### Example use with currentweather module
````javascript
config: {
compliments: {
day_sunny: [
- 'Today is a sunny day',
- 'It\'s a beautiful day'
+ "Today is a sunny day",
+ "It's a beautiful day"
],
snow: [
- 'Snowball battle!'
+ "Snowball battle!"
],
rain: [
- 'Don\'t forget your umbrella'
+ "Don't forget your umbrella"
]
}
}
@@ -114,20 +79,23 @@ config: {
````javascript
config: {
compliments: {
+ anytime: [
+ "Hey there sexy!"
+ ],
morning: [
- 'Good morning, handsome!',
- 'Enjoy your day!',
- 'How was your sleep?'
+ "Good morning, handsome!",
+ "Enjoy your day!",
+ "How was your sleep?"
],
afternoon: [
- 'Hello, beauty!',
- 'You look sexy!',
- 'Looking good today!'
+ "Hello, beauty!",
+ "You look sexy!",
+ "Looking good today!"
],
evening: [
- 'Wow, you look hot!',
- 'You look nice!',
- 'Hi, sexy!'
+ "Wow, you look hot!",
+ "You look nice!",
+ "Hi, sexy!"
]
}
}
@@ -143,6 +111,9 @@ around them ("morning", "afternoon", "evening", "snow", "rain", etc.).
#### Example compliments.json file:
````json
{
+ "anytime" : [
+ "Hey there sexy!"
+ ],
"morning" : [
"Good morning, sunshine!",
"Who needs coffee when you have your smile?",
diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js
index 9f514ff1..a0af458d 100644
--- a/modules/default/compliments/compliments.js
+++ b/modules/default/compliments/compliments.js
@@ -6,12 +6,14 @@
* By Michael Teeuw http://michaelteeuw.nl
* MIT Licensed.
*/
-
-Module.register("compliments",{
+Module.register("compliments", {
// Module config defaults.
defaults: {
compliments: {
+ anytime: [
+ "Hey there sexy!"
+ ],
morning: [
"Good morning, handsome!",
"Enjoy your day!",
@@ -94,21 +96,27 @@ Module.register("compliments",{
*/
complimentArray: function() {
var hour = moment().hour();
- var compliments = null;
+ var compliments;
- if (hour >= 3 && hour < 12) {
- compliments = this.config.compliments.morning;
- } else if (hour >= 12 && hour < 17) {
- compliments = this.config.compliments.afternoon;
- } else {
- compliments = this.config.compliments.evening;
+ if (hour >= 3 && hour < 12 && this.config.compliments.hasOwnProperty("morning")) {
+ compliments = this.config.compliments.morning.slice(0);
+ } else if (hour >= 12 && hour < 17 && this.config.compliments.hasOwnProperty("afternoon")) {
+ compliments = this.config.compliments.afternoon.slice(0);
+ } else if(this.config.compliments.hasOwnProperty("evening")) {
+ compliments = this.config.compliments.evening.slice(0);
}
- if ( this.currentWeatherType in this.config.compliments) {
+ if (typeof compliments === "undefined") {
+ compliments = new Array();
+ }
+
+ if (this.currentWeatherType in this.config.compliments) {
compliments.push.apply(compliments, this.config.compliments[this.currentWeatherType]);
}
- return compliments;
+ compliments.push.apply(compliments, this.config.compliments.anytime);
+
+ return compliments;
},
/* complimentFile(callback)
@@ -118,7 +126,7 @@ Module.register("compliments",{
var xobj = new XMLHttpRequest();
xobj.overrideMimeType("application/json");
xobj.open("GET", this.file(this.config.remoteFile), true);
- xobj.onreadystatechange = function () {
+ xobj.onreadystatechange = function() {
if (xobj.readyState == 4 && xobj.status == "200") {
callback(xobj.responseText);
}
@@ -184,4 +192,4 @@ Module.register("compliments",{
}
},
-});
+});
\ No newline at end of file
diff --git a/modules/default/currentweather/README.md b/modules/default/currentweather/README.md
index ccef543c..8eb633c0 100644
--- a/modules/default/currentweather/README.md
+++ b/modules/default/currentweather/README.md
@@ -8,14 +8,14 @@ To use this module, add it to the modules array in the `config/config.js` file:
````javascript
modules: [
{
- module: 'currentweather',
- position: 'top_right', // This can be any of the regions.
+ module: "currentweather",
+ position: "top_right", // This can be any of the regions.
// Best results in left or right regions.
config: {
// See 'Configuration options' for more information.
- location: 'Amsterdam,Netherlands',
- locationID: '', //Location ID from http://openweathermap.org/help/city_list.txt
- appid: 'abcde12345abcde12345abcde12345ab' //openweathermap.org API key.
+ location: "Amsterdam,Netherlands",
+ locationID: "", //Location ID from http://openweathermap.org/help/city_list.txt
+ appid: "abcde12345abcde12345abcde12345ab" //openweathermap.org API key.
}
}
]
@@ -26,189 +26,56 @@ modules: [
The following properties can be configured:
-| Option | -Description | -
|---|---|
location |
- The location used for weather information. - Example: 'Amsterdam,Netherlands'
- Default value: false- Note: When the location and locationID are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
- |
-
locationID |
- Location ID from OpenWeatherMap This will override anything you put in location. Leave blank if you want to use location. - Example: 1234567
- Default value: false- Note: When the location and locationID are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
- |
-
appid |
- The OpenWeatherMap API key, which can be obtained by creating an OpenWeatherMap account. - This value is REQUIRED - |
-
units |
- What units to use. Specified by config.js - Possible values: config.units = Specified by config.js, default = Kelvin, metric = Celsius, imperial =Fahrenheit
- Default value: config.units
- |
-
roundTemp |
- Round temperature value to nearest integer. - Possible values: true (round to integer) or false (display exact value with decimal point)
- Default value: false
- |
-
updateInterval |
- How often does the content needs to be fetched? (Milliseconds) - Possible values: 1000 - 86400000
- Default value: 600000 (10 minutes)
- |
-
animationSpeed |
- Speed of the update animation. (Milliseconds) - Possible values: 0 - 5000
- Default value: 1000 (1 second)
- |
-
timeFormat |
- Use 12 or 24 hour format. - Possible values: 12 or 24
- Default value: uses value of config.timeFormat - |
-
showPeriod |
- Show the period (am/pm) with 12 hour format - Possible values: true or false
- Default value: true
- |
-
showPeriodUpper |
- Show the period (AM/PM) with 12 hour format as uppercase - Possible values: true or false
- Default value: false
- |
-
showWindDirection |
- Show the wind direction next to the wind speed. - Possible values: true or false
- Default value: true
- |
-
showHumidity |
- Show the current humidity - Possible values: true or false
- Default value: false
- |
-
onlyTemp |
- Show only current Temperature and weather icon. - Possible values: true or false
- Default value: false
- |
-
useBeaufort |
- Pick between using the Beaufort scale for wind speed or using the default units. - Possible values: true or false
- Default value: true
- |
-
lang |
- The language of the days. - Possible values: en, nl, ru, etc ...
- Default value: uses value of config.language - |
-
initialLoadDelay |
- The initial delay before loading. If you have multiple modules that use the same API key, you might want to delay one of the requests. (Milliseconds) - Possible values: 1000 - 5000
- Default value: 0
- |
-
retryDelay |
- The delay before retrying after a request failure. (Milliseconds) - Possible values: 1000 - 60000
- Default value: 2500
- |
-
apiVersion |
- The OpenWeatherMap API version to use. - Default value: 2.5
- |
-
apiBase |
- The OpenWeatherMap base URL. - Default value: 'http://api.openweathermap.org/data/'
- |
-
weatherEndpoint |
- The OpenWeatherMap API endPoint. - Default value: 'weather'
- |
-
appendLocationNameToHeader |
- If set to true, the returned location name will be appended to the header of the module, if the header is enabled. This is mainly intresting when using calender based weather.- Default value: true
- |
-
calendarClass |
- The class for the calender module to base the event based weather information on. - Default value: 'calendar'
- |
-
iconTable |
- The conversion table to convert the weather conditions to weather-icons. - Default value: iconTable: {
- '01d':'wi-day-sunny',
- '02d':'wi-day-cloudy',
- '03d':'wi-cloudy',
- '04d':'wi-cloudy-windy',
- '09d':'wi-showers',
- '10d':'wi-rain',
- '11d':'wi-thunderstorm',
- '13d':'wi-snow',
- '50d':'wi-fog',
- '01n':'wi-night-clear',
- '02n':'wi-night-cloudy',
- '03n':'wi-night-cloudy',
- '04n':'wi-night-cloudy',
- '09n':'wi-night-showers',
- '10n':'wi-night-rain',
- '11n':'wi-night-thunderstorm',
- '13n':'wi-night-snow',
- '50n':'wi-night-alt-cloudy-windy'
- }
- |
-
| Option | -Description | -
|---|---|
text |
- The text to display. - Example: 'Hello world!'
- Default value: 'Hello world!'
- |
-
| Notification Identifier | -Description | -
|---|---|
ARTICLE_NEXT |
- Shows the next news title (hiding the summary or previously fully displayed article) | -
ARTICLE_PREVIOUS |
- Shows the previous news title (hiding the summary or previously fully displayed article) | -
ARTICLE_MORE_DETAILS |
- When received the *first time*, shows the corresponding description of the currently displayed news title. - This requires that the news page can be embedded in an IFRAME, e.g. doesn't have the HTTP response header [X-Frame-Options](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options) set to e.g. ````DENY````. |
-
ARTICLE_LESS_DETAILS |
- Hides the summary or full news article and only displays the news title of the currently viewed news item. | -
| Option | -Description | -
|---|---|
feeds |
- An array of feed urls that will be used as source. - More info about this object can be found below. - Default value: [
- {
- title: "New York Times",
- url: "http://www.nytimes.com/services/xml/rss/nyt/HomePage.xml",
- encoding: "UTF-8"
- }
- ]
- |
-
showSourceTitle |
- Display the title of the source. - Possible values: true or false
- Default value: true
- |
-
showPublishDate |
- Display the publish date of an headline. - Possible values: true or false
- Default value: true
- |
-
showDescription |
- Display the description of an item. - Possible values: true or false
- Default value: false
- |
-
reloadInterval |
- How often does the content needs to be fetched? (Milliseconds) - Possible values: 1000 - 86400000
- Default value: 300000 (5 minutes)
- |
-
updateInterval |
- How often do you want to display a new headline? (Milliseconds) - Possible values: 1000 - 60000
- Default value: 10000 (10 seconds)
- |
-
animationSpeed |
- Speed of the update animation. (Milliseconds) - Possible values: 0 - 5000
- Default value: 2500 (2.5 seconds)
- |
-
maxNewsItems |
- Total amount of news items to cycle through. (0 for unlimited) - Possible values: 0 - ...
- Default value: 0
- |
-
removeStartTags |
- Some newsfeeds feature tags at the beginning of their titles or descriptions, such as [VIDEO].
- This setting allows for the removal of specified tags from the beginning of an item's description and/or title. - Possible values: 'title', 'description', 'both'
- |
-
startTags |
- List the tags you would like to have removed at the beginning of the feed item - Possible values: ['TAG'] or ['TAG1','TAG2',...]
- |
-
removeEndTags |
- Remove specified tags from the end of an item's description and/or title. - Possible values: 'title', 'description', 'both'
- |
-
endTags |
- List the tags you would like to have removed at the end of the feed item - Possible values: ['TAG'] or ['TAG1','TAG2',...]
- |
-
| Option | -Description | -
|---|---|
title |
- The name of the feed source to be displayed above the news items. - This property is optional. - |
-
url |
- The url of the feed used for the headlines. - Example: 'http://www.nytimes.com/services/xml/rss/nyt/HomePage.xml'
- |
-
encoding |
- The encoding of the news feed. - This property is optional. - Possible values: 'UTF-8', 'ISO-8859-1', etc ...
- Default value: 'UTF-8'
- |
-
updateInterval60000 (1 minute);
- 600000 (10 minutes);
- | Option | -Description | -
|---|---|
location |
- The location used for weather information. - Example: 'Amsterdam,Netherlands'
- Default value: false- Note: When the location and locationID are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
- |
-
locationID |
- Location ID from OpenWeatherMap This will override anything you put in location. Leave blank if you want to use location. - Example: 1234567
- Default value: false- Note: When the location and locationID are both not set, the location will be based on the information provided by the calendar module. The first upcoming event with location data will be used.
- |
-
appid |
- The OpenWeatherMap API key, which can be obtained by creating an OpenWeatherMap account. - This value is REQUIRED - |
-
units |
- What units to use. Specified by config.js - Possible values: config.units = Specified by config.js, default = Kelvin, metric = Celsius, imperial =Fahrenheit
- Default value: config.units
- |
-
roundTemp |
- Round temperature values to nearest integer. - Possible values: true (round to integer) or false (display exact value with decimal point)
- Default value: false
- |
-
maxNumberOfDays |
- How many days of forecast to return. Specified by config.js - Possible values: 1 - 16
- Default value: 7 (7 days)
- This value is optional. By default the weatherforecast module will return 7 days. - |
-
showRainAmount |
- Should the predicted rain amount be displayed? - Possible values: true or false
- Default value: false
- This value is optional. By default the weatherforecast module will not display the predicted amount of rain. - |
-
updateInterval |
- How often does the content needs to be fetched? (Milliseconds) - Possible values: 1000 - 86400000
- Default value: 600000 (10 minutes)
- |
-
animationSpeed |
- Speed of the update animation. (Milliseconds) - Possible values: 0 - 5000
- Default value: 1000 (1 second)
- |
-
lang |
- The language of the days. - Possible values: en, nl, ru, etc ...
- Default value: uses value of config.language - |
-
fade |
- Fade the future events to black. (Gradient) - Possible values: true or false
- Default value: true
- |
-
fadePoint |
- Where to start fade? - Possible values: 0 (top of the list) - 1 (bottom of list)
- Default value: 0.25
- |
-
initialLoadDelay |
- The initial delay before loading. If you have multiple modules that use the same API key, you might want to delay one of the requests. (Milliseconds) - Possible values: 1000 - 5000
- Default value: 2500 (2.5 seconds delay. This delay is used to keep the OpenWeather API happy.)
- |
-
retryDelay |
- The delay before retrying after a request failure. (Milliseconds) - Possible values: 1000 - 60000
- Default value: 2500
- |
-
apiVersion |
- The OpenWeatherMap API version to use. - Default value: 2.5
- |
-
apiBase |
- The OpenWeatherMap base URL. - Default value: 'http://api.openweathermap.org/data/'
- |
-
forecastEndpoint |
- The OpenWeatherMap API endPoint. - Default value: 'forecast/daily'
- |
-
appendLocationNameToHeader |
- If set to true, the returned location name will be appended to the header of the module, if the header is enabled. This is mainly intresting when using calender based weather.- Default value: true
- |
-
calendarClass |
- The class for the calender module to base the event based weather information on. - Default value: 'calendar'
- |
-
iconTable |
- The conversion table to convert the weather conditions to weather-icons. - Default value: iconTable: {
- '01d':'wi-day-sunny',
- '02d':'wi-day-cloudy',
- '03d':'wi-cloudy',
- '04d':'wi-cloudy-windy',
- '09d':'wi-showers',
- '10d':'wi-rain',
- '11d':'wi-thunderstorm',
- '13d':'wi-snow',
- '50d':'wi-fog',
- '01n':'wi-night-clear',
- '02n':'wi-night-cloudy',
- '03n':'wi-night-cloudy',
- '04n':'wi-night-cloudy',
- '09n':'wi-night-showers',
- '10n':'wi-night-rain',
- '11n':'wi-night-thunderstorm',
- '13n':'wi-night-snow',
- '50n':'wi-night-alt-cloudy-windy'
- }
- |
-
La entrada QPanel 0.13.0 aparece primero en Rodrigo Ramírez Norambuena.
+]]>
Ya está disponible la versión 0.13.0 de QPanel
+Para instalar esta nueva versión, la debes descargar de
+ +En al README.md puedes encontrar las instrucciones para hacer que funcione en tu sistema.
+En esta nueva versión cuenta con los siguientes cambios:
+Si deseas colaborar con el proyecto puedes agregar nuevas sugerencias mediante un issue ó colaborar mediante mediante un Pull Request.
+Ahora si necesitas soporte comercial para instalaciones, personalizaciones o nuevas características lo puedes solicitar en https://boxtub.com/qpanel/
++
La entrada QPanel 0.13.0 aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada Problema VirtualBox “starting virtual machine” … aparece primero en Rodrigo Ramírez Norambuena.
+]]>
Ninguna, pero ninguna maquina arrancó, se quedaban en ese mensaje. Fue de esos instantes en que sudas helado … 
Con un poco de investigación fue a parar al archivo ~/.VirtualBox/VBoxSVC.log que indicaba
+$ tail -f ~/.VirtualBox/VBoxSVC.log + 00:08:32.932717 nspr-7 Failed to open "/dev/vboxdrvu", errno=13, rc=VERR_VM_DRIVER_NOT_ACCESSIBLE + 00:08:33.555836 nspr-6 Failed to open "/dev/vboxdrvu", errno=13, rc=VERR_VM_DRIVER_NOT_ACCESSIBLE+
+
Fui… algo de donde agarrarse. Mirando un poco mas se trataba de problemas con los permisos al vboxdrvu, mirando indicaba que tenía 0600.
++
$ ls -lh /dev/vboxdrvu + crw------- 1 root root 10, 56 Sep 10 12:47 /dev/vboxdrvu+
+
El tema es que deben estar en 0666, le cambias los permisos y eso soluciona el problema 
+$ sudo chmod 0666 /dev/vboxdrvu +$ ls -lh /dev/vboxdrvu + crw-rw-rw- 1 root root 10, 56 Sep 10 12:47 /dev/vboxdrvu+
La entrada Problema VirtualBox “starting virtual machine” … aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada Mejorando la consola interactiva de Python aparece primero en Rodrigo Ramírez Norambuena.
+]]>La consola de Python funciona y cumple su cometido. Solo al tipear python te permite entrar en modo interactivo e ir probando cosas.
+El punto es que a veces uno necesita ir un poco más allá. Como autocomentado de código o resaltado de sintaxis, para eso tengo dos truco que utilizo generalmente.
+Este permite añadirle algunos esteriodes a la consolta, en realidad uno, el autocompletado. Esto es de gran ayuda para ir conociendo los metodo que puede tener un objecto, funciones u operaciones.
+Para esto se ocupo rlcompleter y readline.
++
Lo que hace que hacer luego de tipear python es agregar lo siguiente dentro de la consola interativa
+import rlcompleter, readline
+readline.parse_and_bind(‘tab:complete’)
Ya con esto te permite autocomentar código
+
Esto es mejorar un poco más. Es utilizar embed de IPython, ya en la consola digita (copias o pegas) lo siguiente
+from IPython import embed
+embed()
Y el resultado será lo que se ve a continuación… bueno, no?
++
+
Si no quieres estar escribiendo cada vez que entras, agregas estas instrucciones en tu archivo ~/.pythonrc.py y lo hará cada vez que entras en el modo interactivo de la consola de Python. Lo que si, tu archivo pythonrc.py debe estar seteado en variable de entorno PYTHONSTARTUP
+ejemplo
+export PYTHONSTARTUP=~/.pythonrc.py
+O lo agregas a un bashrc, zshrc o la shell que ocupes.
+La entrada Mejorando la consola interactiva de Python aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada QPanel 0.12.0 con estadísticas aparece primero en Rodrigo Ramírez Norambuena.
+]]>Ya está disponible una nueva versión de QPanel, esta es la 0.12.0
+Para instalar esta nueva versión, debes visitar la siguiente URL
+ +En esta nueva versión las funcionalidades agregadas son:
+Si deseas colaborar con el proyecto puedes agregar nuevas sugerencias mediante un issue ó colaborar mediante mediante un Pull Request
+La entrada QPanel 0.12.0 con estadísticas aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada QPanel 0.11.0 con Spy, Whisper y mas aparece primero en Rodrigo Ramírez Norambuena.
+]]>Ya está disponible una nueva versión de QPanel, esta es la 0.11.0
+Para instalar esta nueva versión, debes visitar la siguiente URL
+ +Esta versión hemos agregado algunas funcionalidades que los usuarios han ido solicitando.
+Para esta versión es posible realizar Spy, Whisper o Barge a un canal para la supervisión de los miembros que están en una cola.
+También el sistema de plantillas se hecho una refactorización para eliminar exceso de codigo HTML usando uno de base.
+Se han agregado una suite de tests unitarios que al contar del avance del proyecto deberían ir incrementando.
+Se ha solucionado un bug con la actualización del color del estado del agente cuando es uno nuevo agregado a la cola.
++
El proyecto siempre está abierto a nuevas sugerencias las cuales puedes agregar mediante un issue.
+La entrada QPanel 0.11.0 con Spy, Whisper y mas aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada Añadir Swap a un sistema aparece primero en Rodrigo Ramírez Norambuena.
+]]>La memoria swap es un espacio de intercambio en disco para cuando el sistema ya no puede utilizar más memoria RAM.
+El problema para mi es que algunos sistemas de maquinas virtuales no asignan por defecto un espacio para la Swap, lo que te lleva a que el sistema pueda tener crash durante la ejecución.
+Para comprobar la asignación de memoria, al ejecutar el comando free nos debería mostrar como algo similar a lo siguiente
++
$ free -m + total used free shared buffers cached +Mem: 494 488 6 1 54 75 +-/+ buffers/cache: 357 136 +Swap: 0 0 0+
En la zona de swap indica que no asignada, valor 0.
+Para asignar swap al sistema se debe un archivo en disco para que sea utilizado como espacio de intercambio, en este caso lo vamos crear uno de 3GB en la raíz del sistema
+fallocate -l 3G /swapfileComprobamos que ha sido creado
+$ ls -lh /swapfile +-rw-r--r-- 1 root root 3.0G Jul 11 13:10 /swapfile ++
Ahora nos toca habilitar el archivo creado. Para eso le asignaremos los permisos
+chmod 600 /swapfile+
Lo siguiente es para convertir el archivo para swap
+mkswap /swapfile+
Para habilitar y asignarla eso como memoria swap al sistema usamos
+swapon /swapfile+
Ya con esto podrémos ver en nuestro sistema la memoria asignada para swap
+$ free -m + total used free shared buffers cached +Mem: 494 486 7 1 51 77 +-/+ buffers/cache: 358 136 +Swap: 3071 0 3071+
+
Para que al reiniciar el sistema esto se mantenga, debemos agregar la siguiente línea al archivo /etc/fstab
+/swapfile none swap sw 0 0
++
Podemos editar /etc/fstab con algún editor como vim, nano o podemos agregar la linea directamente en la desde la cli de la siguiente manera
+echo "/swapfile none swap sw 0 0" >> /etc/fstab+
+
+
La entrada Añadir Swap a un sistema aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada QPanel 0.10.0 con vista consolidada aparece primero en Rodrigo Ramírez Norambuena.
+]]>
Ya con la release numero 28 la nueva versión 0.10.0 de QPanel ya está disponible.
+Para instalar esta nueva versión, debes visitar la siguiente URL
+ +Esta versión versión nos preocupamos de realizar mejoras, refactorizaciones y agregamos una nueva funcionalidad.
+La nueva funcionalidad incluida es que ahora es posible contar con una vista consolidada para la información de todas las colas. Que hace tener un mejor control y visualización de lo que está pasando en las colas.
+El proyecto siempre está abierto a nuevas sugerencias las cuales puedes agregar mediante un issue.
+La entrada QPanel 0.10.0 con vista consolidada aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada Nerdearla 2016, WebRTC Glue aparece primero en Rodrigo Ramírez Norambuena.
+]]>Habían muchas cosas interesantes tanto en las presentaciones, co-working y workshop que se hubieron. Si te lo perdiste te recomiendo que estés pendiente para el proximo año.
++
Te podias encontrar con una nuestra como esta
Puedes dar un vistaso a lo registrado por algunos usuarios en Twitter
+El primer día hice un workshop denominado WebRTC Glue, donde muestra como hacer como unificar la experiencia de atención del centro de contacto directamente en la web. Es una presentación práctica donde puedes ver los ejemplos y usarlos como gustes. Están en el repositorio en Gitlab. La presentación la puedes ver aquí
++
Haber si nos vemos el próximo año.
++
Update: Puedes ver una parte sin la demostración del workshop
+
+
La entrada Nerdearla 2016, WebRTC Glue aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada QPanel 0.9.0 aparece primero en Rodrigo Ramírez Norambuena.
+]]>
El Panel monitor callcenter para colas de Asterisk ya cuenta con una nueva versión, la 0.9.0
+Para instalar esta nueva versión, debes visitar la siguiente URL
+ +Esta versión versión nos preocupamos de realizar mejoras y refactorizaciones en el codigo para dar un mejor rendimiento, como también de la compatibilidad con la versión 11 de Asterisk.
+Dentro de las cosas que podamos mencionar:
+El proyecto siempre está abierto a nuevas sugerencias las cuales puedes agregar mediante un issue.
+La entrada QPanel 0.9.0 aparece primero en Rodrigo Ramírez Norambuena.
+]]>La entrada Mandar un email desde la shell aparece primero en Rodrigo Ramírez Norambuena.
+]]>Si usas mail a secas te va pidiendo los datos para crear el correo, principalmente el body del correo. Para automatizar esto a través de un echo le pasas por pipe a mail
+echo "Cuerpo del mensaje" | mail -s Asunto a@rodrigoramirez.com+
La entrada Mandar un email desde la shell aparece primero en Rodrigo Ramírez Norambuena.
+]]>