From db87f9e15b79827e947316c3ffba5b4ca49854b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 20 Feb 2017 08:19:36 -0300 Subject: [PATCH 01/89] init sample test case newsfeed_spec --- tests/configs/data/feed_test_newtimes.xml | 534 ++++++++++++++++++++++ tests/configs/modules/newsfeed/default.js | 38 ++ tests/e2e/modules/newsfeed_spec.js | 31 ++ 3 files changed, 603 insertions(+) create mode 100644 tests/configs/data/feed_test_newtimes.xml create mode 100644 tests/configs/modules/newsfeed/default.js create mode 100644 tests/e2e/modules/newsfeed_spec.js diff --git a/tests/configs/data/feed_test_newtimes.xml b/tests/configs/data/feed_test_newtimes.xml new file mode 100644 index 00000000..96b7dda6 --- /dev/null +++ b/tests/configs/data/feed_test_newtimes.xml @@ -0,0 +1,534 @@ + + + + NYT > Home Page + http://www.nytimes.com/pages/index.html?partner=rss&emc=rss + + + en-us + Copyright 2017 The New York Times Company + Tue, 21 Feb 2017 18:16:14 GMT + + NYT > Home Page + https://static01.nyt.com/images/misc/NYT_logo_rss_250x40.png + http://www.nytimes.com/pages/index.html?partner=rss&emc=rss + + + New Trump Deportation Rules Allow Far More Expulsions + http://www.nytimes.com/2017/02/21/us/politics/dhs-immigration-trump.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/us/politics/dhs-immigration-trump.html + + + Mexicans deported from the U.S. walked to a repatriation center in Tijuana in June 2016. + Guillermo Arias/Agence France-Presse — Getty Images + The rules authorize expelling undocumented immigrants who have committed even minor offenses, and they make it easier to deport people immediately. + RON NIXON and MICHAEL D. SHEAR + Tue, 21 Feb 2017 16:21:01 GMT + Deportation + Homeland Security Department + Immigration and Customs Enforcement (US) + Customs and Border Protection (US) + United States Politics and Government + + + Trump Speaks Out Against Anti-Semitism + http://www.nytimes.com/2017/02/21/us/politics/trump-speaks-out-against-anti-semitism.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/us/politics/trump-speaks-out-against-anti-semitism.html + + He made the comments after drawing criticism in recent days for failing to condemn the rise in anti-Jewish threats and actions. + JULIE HIRSCHFELD DAVIS + Tue, 21 Feb 2017 15:29:00 GMT + United States Politics and Government + National Museum of African American History and Culture + Anti-Semitism + Washington (DC) + + + Lawyers Take On Trump’s Travel Ban + http://www.nytimes.com/video/us/politics/100000004914792/trump-immigration-lawyer.html?partner=rss&emc=rss + http://www.nytimes.com/video/us/politics/100000004914792/trump-immigration-lawyer.html + The judiciary is the new front line: A group of lawyers scramble to get their clients into the country, while preparing a legal challenge to Trump’s immigration ban. + + Tue, 21 Feb 2017 06:57:04 GMT + Immigration and Emigration + Trump, Donald J + Executive Orders and Memorandums + Refugees and Displaced Persons + + + Riots Break Out in Stockholm Suburb, Drawing Attention to Trump’s Remarks + http://www.nytimes.com/2017/02/21/world/europe/stockholm-sweden-riots-trump.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/world/europe/stockholm-sweden-riots-trump.html + + + Burned cars on Tuesday in Rinkeby, a northwestern Stockholm suburb predominantly inhabited by immigrants. About 20 to 30 masked men threw stones and other objects at police officers in Rinkeby after the police arrested a man on suspicion of dealing drugs. + TT News Agency, via Reuters + The clash between the police and residents came two days after President Trump’s provocative claims about migration and crime in the country. + CHRISTINA ANDERSON + Tue, 21 Feb 2017 18:01:23 GMT + Demonstrations, Protests and Riots + Stockholm (Sweden) + Trump, Donald J + + + White House Memo: From an Anchor’s Lips to Trump’s Ears to Sweden’s Disbelief + http://www.nytimes.com/2017/02/20/world/europe/trump-pursues-his-attack-on-sweden-with-scant-evidence.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/world/europe/trump-pursues-his-attack-on-sweden-with-scant-evidence.html + + + A group of refugees walking on a highway in Denmark toward Sweden in 2015. Statistics in Sweden found no appreciable increase in crimes from 2015, when the country processed a record 163,000 asylum applications, to 2016. + Mauricio Lima for The New York Times + A diplomatic dispute with Sweden illustrates the unusual approach the president takes to foreign policy, as well as the influence that television can have on his thinking. + PETER BAKER and SEWELL CHAN + Tue, 21 Feb 2017 14:35:13 GMT + Immigration and Emigration + Trump, Donald J + Sweden + United States International Relations + United States Politics and Government + Fox News Channel + Carlson, Tucker + Horowitz, Ami + + + Europe Combats a New Foe of Political Stability: Fake News + http://www.nytimes.com/2017/02/20/world/europe/europe-combats-a-new-foe-of-political-stability-fake-news.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/world/europe/europe-combats-a-new-foe-of-political-stability-fake-news.html + + + Emmanuel Macron, center, a French presidential candidate, in southern France on Friday. The head of his party said Mr. Macron had been targeted by Russian news channels. + Franck Pennant/Agence France-Presse — Getty Images + The rise of sophisticated hacks and a torrent of fake news coincide with angry populist movements across the Continent, and officials are nervous. + MARK SCOTT and MELISSA EDDY + Mon, 20 Feb 2017 22:10:11 GMT + Rumors and Misinformation + News and News Media + European Union + Europe + + + Town Hall Briefing: Congressional Town Hall: Of Tums, Death Panels and ‘Shut Your Hole’ + http://www.nytimes.com/2017/02/21/us/politics/town-hall-protests-obamacare.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/us/politics/town-hall-protests-obamacare.html + + + Senator Charles E. Grassley at a town hall meeting in Iowa Falls, Iowa, on Tuesday. He addressed a standing-room-only crowd. + Scott Morgan for The New York Times + Several Republicans will be hearing from constituents on Tuesday, and reporters for The New York Times will be there to gauge the sentiment. + THOMAS KAPLAN, TRIP GABRIEL and LIZETTE ALVAREZ + Tue, 21 Feb 2017 18:10:24 GMT + Trump, Donald J + United States Politics and Government + Patient Protection and Affordable Care Act (2010) + Demonstrations, Protests and Riots + Blackburn, Marsha + Grassley, Charles E + Ross, Dennis A + Cassidy, Bill (1957- ) + + + For-Profit Schools, an Obama Target, See New Day Under Trump + http://www.nytimes.com/2017/02/20/business/for-profit-education-trump-devos.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/business/for-profit-education-trump-devos.html + + + Donald J. Trump at the announcement of the establishment of Trump University in 2005. As president-elect, he paid $25 million to settle three lawsuits against the now-defunct institution. + Bebeto Matthews/Associated Press + The Education Department, whose scrutiny has led hundreds of campuses to close, is now led by Betsy DeVos, who has investments in the industry. + PATRICIA COHEN + Tue, 21 Feb 2017 00:03:48 GMT + For-Profit Schools + Colleges and Universities + United States Politics and Government + Regulation and Deregulation of Industry + DeVos, Elizabeth (1958- ) + Trump, Donald J + + + Protesters Ready for Trump’s First Visit to New York as President + http://www.nytimes.com/2017/02/21/nyregion/protesters-ready-for-trumps-first-visit-to-new-york-as-president.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/nyregion/protesters-ready-for-trumps-first-visit-to-new-york-as-president.html + + + Congregation Beth Elohim in Brooklyn was filled on Feb. 6 for an evening of strategizing against President Trump. + Demetrius Freeman for The New York Times + The president has not set foot in the city since his inauguration, puzzling and emboldening some protesters in his hometown. + SARAH MASLIN NIR + Tue, 21 Feb 2017 14:12:26 GMT + Executive Orders and Memorandums + Immigration and Emigration + United States Politics and Government + Demonstrations, Protests and Riots + Trump Tower (Manhattan, NY) + Trump, Donald J + Fifth Avenue (Manhattan, NY) + New York City + + + Milo Yiannopoulos’s Pedophilia Comments Cost Him CPAC Role and Book Deal + http://www.nytimes.com/2017/02/20/us/politics/cpac-milo-yiannopoulos.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/us/politics/cpac-milo-yiannopoulos.html + + + Milo Yiannopoulos last month in Boulder, Colo. The Conservative Political Action Conference rescinded its invitation for him to speak to the group after his comments about pedophilia. + Jeremy Papasso/Daily Camera, via Associated Press + The publication of a video in which the contentious Breitbart News editor condoned sexual relations with boys seemed to be more than conference organizers could tolerate. + JEREMY W. PETERS, ALEXANDRA ALTER and MICHAEL M. GRYNBAUM + Tue, 21 Feb 2017 01:47:20 GMT + Yiannopoulos, Milo + Sex Crimes + Child Abuse and Neglect + United States Politics and Government + Conservative Political Action Conference + Simon & Schuster Inc + Dangerous (Book) + + + Unease Spreads in Atlanta as a City Contracting Scandal Brews + http://www.nytimes.com/2017/02/21/us/unease-spreads-in-atlanta-as-a-city-contracting-scandal-brews.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/us/unease-spreads-in-atlanta-as-a-city-contracting-scandal-brews.html + + + Mayor Kasim Reed of Atlanta delivering his State of the City address this month. An investigation into charges of bribery involving city contracts has prompted the mayor to defend his legacy. + Branden Camp/Atlanta Journal-Constitution, via Associated Press + A brick thrown through a window, dead rodents left on steps and a threat to a contractor have become symbols of a federal inquiry into bribery charges. + RICHARD FAUSSET + Tue, 21 Feb 2017 10:00:17 GMT + Politics and Government + Government Contracts and Procurement + Bribery and Kickbacks + Atlanta (Ga) + Kasim Reed + Elvin R. Mitchell Jr. + + + A Surprising Salve for New York’s Beleaguered Cities: Refugees + http://www.nytimes.com/2017/02/20/nyregion/a-surprising-salve-for-new-yorks-beleaguered-cities-refugees.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/nyregion/a-surprising-salve-for-new-yorks-beleaguered-cities-refugees.html + + + In early February a man wearing a keffiyeh walked past a mural that recalls a less diverse past in Buffalo. The self-described “City of Good Neighbors” has received more than 10,000 refugees over the last decade. + Nathaniel Brooks for The New York Times + Communities across upstate New York say an influx of refugees has helped alleviate decades-long struggles with dwindling populations and opportunities. + JESSE McKINLEY + Mon, 20 Feb 2017 20:54:01 GMT + Refugees and Displaced Persons + Immigration and Emigration + Trump, Donald J + Buffalo (NY) + United States Politics and Government + + + Firsthand Account: The Assassination of Malcolm X + http://www.nytimes.com/video/us/100000004817791/malcolm-x-death-new-york-assassination-360.html?partner=rss&emc=rss + http://www.nytimes.com/video/us/100000004817791/malcolm-x-death-new-york-assassination-360.html + The civil rights leader Malcolm X was killed Feb. 21, 1965, at a rally in New York City. Hear from a witness and visit the site of the assassination — in the past, present and in 360 video. + + Tue, 21 Feb 2017 10:00:29 GMT + Civil Rights Movement (1954-68) + Assassinations and Attempted Assassinations + Malcolm X + + + California Today: California Today: Lawmakers With Little in Common, Except a Name + http://www.nytimes.com/2017/02/21/us/california-today-kevin-mccarthy-kevin-mccarty.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/us/california-today-kevin-mccarthy-kevin-mccarty.html + + + Representative Kevin McCarthy of California, the majority leader, at his office in the U.S. Capitol. + Al Drago/The New York Times + Tuesday: Name confusion vexes a California representative and assemblyman, a Whittier police officer is killed, and clam digging in Humboldt Bay. + MIKE McPHATE + Tue, 21 Feb 2017 13:12:08 GMT + California Today + California + + + Your Daily Mini Crossword + http://www.nytimes.com/crosswords/game/mini?partner=rss&emc=rss + http://www.nytimes.com/crosswords/game/mini + + Solve a bite-size crossword in just a few minutes. + + Thu, 25 Feb 2016 08:18:20 GMT + + + Travel Tips: How to Have a Better Flight + http://www.nytimes.com/2016/12/29/travel/how-to-have-a-better-flight.html?partner=rss&emc=rss + http://www.nytimes.com/2016/12/29/travel/how-to-have-a-better-flight.html + + + + Lars Leetaru + A longtime flight attendant says that politeness helps improve a trip, as does bringing your own food for the ride. + SHIVANI VORA + Thu, 29 Dec 2016 11:00:03 GMT + Airlines and Airplanes + Travel and Vacations + Flight Attendants + + + Trying to Stanch Trinidad’s Flow of Young Recruits to ISIS + http://www.nytimes.com/2017/02/21/world/americas/trying-to-stanch-trinidads-flow-of-young-recruits-to-isis.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/world/americas/trying-to-stanch-trinidads-flow-of-young-recruits-to-isis.html + + + Yasin Abu Bakr, second from right, speaking with other Muslims at his mosque in Port of Spain, Trinidad and Tobago. + Federico Rios Escobar for The New York Times + Officials in Trinidad and Tobago are scrambling to close a pipeline that has sent a steady stream of Muslims to Syria to take up arms for the Islamic State. + FRANCES ROBLES + Tue, 21 Feb 2017 10:00:16 GMT + Terrorism + Politics and Government + Muslims and Islam + United States International Relations + Syria + Trinidad and Tobago + + + Goalie Eats Pie and Loses His Job, While Bettors’ Wallets Fatten + http://www.nytimes.com/2017/02/21/sports/soccer/wayne-shaw-sutton-soccer-pie.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/sports/soccer/wayne-shaw-sutton-soccer-pie.html + + + Sutton’s backup goalkeeper, Wayne Shaw, eats a pie during the match against Arsenal on Monday. + Andrew Couldridge/Reuters + The backup goalkeeper for Sutton, Wayne Shaw, said he knew about a bet on whether he’d have a pie during the match and had eaten because of it. + VICTOR MATHER + Tue, 21 Feb 2017 17:24:00 GMT + Soccer + Gambling + Sutton (Soccer Team) + + + Out There: Cosmos Controversy: The Universe Is Expanding, but How Fast? + http://www.nytimes.com/2017/02/20/science/hubble-constant-universe-expanding-speed.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/science/hubble-constant-universe-expanding-speed.html + + + A Hubble Space Telescope image of a group of interacting galaxies called Arp 273. + NASA + A small discrepancy in the value of a long-sought number has fostered a debate about just how well we know the cosmos. + DENNIS OVERBYE + Mon, 20 Feb 2017 20:47:03 GMT + Space and Astronomy + Hubble Constant + Dark Energy (Astronomy) + Dark Matter (Astronomy) + Riess, Adam Guy + Freedman, Wendy L + + + Afghanistan Police Surround Vice President’s House + http://www.nytimes.com/2017/02/21/world/asia/abdul-rashid-dostum-afghanistan.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/world/asia/abdul-rashid-dostum-afghanistan.html + + + Abdul Rashid Dostum, an Afghan vice president, in 2014. On Tuesday, over 100 police officers and soldiers surrounded his Kabul compound in an apparent effort to arrest nine of of his aides. + Shah Marai/Agence France-Presse — Getty Images + Soldiers and police officers appeared to be trying to arrest nine aides to Vice President Abdul Rashid Dostum accused of kidnapping a political rival. + ROD NORDLAND and JAWAD SUKHANYAR + Tue, 21 Feb 2017 15:02:32 GMT + Dostum, Abdul Rashid + Afghanistan + Kidnapping and Hostages + Sex Crimes + Politics and Government + Ishchi, Ahmad + + + Bodies of 74 Migrants Wash Up on Libyan Coast + http://www.nytimes.com/2017/02/21/world/middleeast/migrants-libya-beach.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/world/middleeast/migrants-libya-beach.html + + + Red Crescent workers collected the bodies of migrants on Monday from a beach near the town of Zawiya, Libya. + Libyan Red Crescent + The victims were believed to have come from a shipwrecked boat that was found along the shore, an ominous sign before the high season for crossings to Europe. + DECLAN WALSH + Tue, 21 Feb 2017 12:34:42 GMT + Refugees and Displaced Persons + Middle East and Africa Migrant Crisis + Deaths (Fatalities) + Illegal Immigration + Europe + Libya + Mediterranean Sea + + + Elor Azaria, Israeli Soldier Who Killed Wounded Assailant, Gets 18 Months in Prison + http://www.nytimes.com/2017/02/21/world/middleeast/elor-azaria-israel-sentence.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/world/middleeast/elor-azaria-israel-sentence.html + + + Sgt. Elor Azaria, center, with his mother in a military courtroom in Tel Aviv on Tuesday before he received an 18-month sentence for manslaughter. + Pool photo by Jim Hollander + The sergeant shot an incapacitated Palestinian lying on his back, a case that has divided Israelis and prompted calls for a pardon. + IAN FISHER + Tue, 21 Feb 2017 15:46:07 GMT + Defense and Military Forces + Azaria, Elor + Israel + Palestinians + Heller, Maya + + + The Interpreter + http://www.nytimes.com/newsletters/the-interpreter?partner=rss&emc=rss + http://www.nytimes.com/newsletters/the-interpreter + + The Interpreter brings sharp insight and context to the major news stories of the week. Sign up to get it by email. + + Fri, 03 Feb 2017 22:38:47 GMT + + + Vatican and Rome’s Jewish Museum Team Up for Menorah Exhibit + http://www.nytimes.com/2017/02/20/world/europe/vatican-rome-menorah-exhibit-jewish-museum.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/world/europe/vatican-rome-menorah-exhibit-jewish-museum.html + + + A bas-relief showing a menorah was displayed at a news conference on Monday announcing a joint exhibition by the Vatican Museums and Rome’s Jewish Museum. + Alessandra Tarantino/Associated Press + The collaboration, centered on a famous candelabrum that has been missing for centuries, is being hailed as “a historic event.” + ELISABETTA POVOLEDO + Tue, 21 Feb 2017 00:12:55 GMT + Jews and Judaism + Arts and Antiquities Looting + Roman Catholic Church + Vatican Museums + Rome (Italy) + Vatican City + + + The Businessman Behind Cool British Fashion Brands + http://www.nytimes.com/2017/02/21/fashion/london-fashion-week-alexa-chung-oakley-capital.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/fashion/london-fashion-week-alexa-chung-oakley-capital.html + + Peter Dubens, the co-founder and managing partner of Oakley Capital Private Equity, is the investor behind Alexa Chung’s fashion label. + Glenn Copus/Evening Standard, via REX/Shutterstock + Peter Dubens, co-founder of Oakley Capital, has financed both Alexa Chung and Bella Freud. + LAUREN INDVIK + Tue, 21 Feb 2017 05:01:21 GMT + Fashion and Apparel + Dubens, Peter + Chung, Alexa + Freud, Bella + + + A.S. Monaco: From Billionaire’s Plaything to Soccer Prodigies’ Hub + http://www.nytimes.com/2017/02/21/sports/soccer/as-monaco-vadim-vasilyev-.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/sports/soccer/as-monaco-vadim-vasilyev-.html + + + Vadim Vasilyev, the vice president of A.S. Monaco, remembers the “tough” night in 2015 when he explained to fans the club’s shift away from signing star players. + France Keyser for The New York Times + Financial fair-play rules forced a change in club strategy, one that has had some unexpectedly happy results. + RORY SMITH + Tue, 21 Feb 2017 05:01:22 GMT + Soccer + A.S. Monaco + UEFA Champions League (Soccer) + Rybolovlev, Dmitry Evgenevich + Rodriguez, James (1991- ) + Mendes, Jorge (1966- ) + Martial, Anthony (1995- ) + + + Sinosphere: Scammers in China Fake Road Injuries, but Cameras Capture the Truth + http://www.nytimes.com/2017/02/21/world/asia/china-traffic-scam-fraud.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/world/asia/china-traffic-scam-fraud.html + + Fraudsters are throwing themselves in front of cars or buses to extort money from motorists, but the results are often unconvincing. + DIDI KIRSTEN TATLOW + Tue, 21 Feb 2017 11:58:34 GMT + China + scams + + + Eleven Madison Park Plans a Makeover and a Summer Pop-Up + http://www.nytimes.com/2017/02/21/dining/eleven-madison-park-renovation-hamptons.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/21/dining/eleven-madison-park-renovation-hamptons.html + + + Like many New Yorkers, the staff and operations of Eleven Madison Park will spend this summer in the Hamptons. They will take over the restaurant Moby’s, opening it in late June as EMP Summer House. + Daniel Gonzalez for The New York Times + The top-rated Manhattan restaurant will close for three months of renovation and open a more casual version in the Hamptons. + FLORENCE FABRICANT + Tue, 21 Feb 2017 11:00:13 GMT + Restaurants + Relocation of Business + Eleven Madison Park (Manhattan, NY, Restaurant) + Guidara, Will + Humm, Daniel + Cloepfil, Brad + East Hampton (NY) + Manhattan (NYC) + + + Dick Bruna, Author of Miffy Books, Is Dead at 89 + http://www.nytimes.com/2017/02/20/books/dick-bruna-dead-miffy-creator.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/books/dick-bruna-dead-miffy-creator.html + + + Dick Bruna in 2005 at the opening of an exhibition devoted to his Miffy books in The Hague. + Inge Van Mill/Agence France-Presse — Getty Images + The Dutch writer and illustrator was known for children’s books depicting a sparely drawn round white rabbit who gained a worldwide following. + NINA SIEGAL + Tue, 21 Feb 2017 00:57:49 GMT + Bruna, Dick (1927-2017) + Writing and Writers + Books and Literature + Deaths (Obituaries) + Miffy + + + Shared: A Balm When You’re Expecting: Sometimes Pot Does the Trick + http://www.nytimes.com/2017/02/20/health/marijuana-pregnancy-mothers.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/health/marijuana-pregnancy-mothers.html + + + Jane, who used pot to quell her nausea during her third pregnancy, with her daughter in New York + Nancie Battaglia for The New York Times + Five women describe why they used marijuana while pregnant, and how they assessed the risks and benefits before making that choice. + CATHERINE SAINT LOUIS + Mon, 20 Feb 2017 20:35:02 GMT + Marijuana + Pregnancy and Childbirth + Women and Girls + Morning Sickness + + + The Fix: The Convertible, Tiny Apartment + http://www.nytimes.com/2017/02/19/realestate/the-convertible-tiny-apartment.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/19/realestate/the-convertible-tiny-apartment.html + + + A Murphy bed and flanking closets disappear into the living room walls when not in use. + Linda Jaquez for The New York Times + A 400-square-foot studio is remade into a space that can be constantly transformed. + MICHELLE HIGGINS + Sun, 19 Feb 2017 10:05:01 GMT + Interior Design and Furnishings + Real Estate and Housing (Residential) + Architecture + Restoration and Renovation + + + Personal Health: The Worst That Could Happen? Going Blind, People Say + http://www.nytimes.com/2017/02/20/well/the-worst-that-could-happen-going-blind-people-say.html?partner=rss&emc=rss + http://www.nytimes.com/2017/02/20/well/the-worst-that-could-happen-going-blind-people-say.html + + + + Paul Rogers + When eyesight fails, some people become socially disengaged, leading to isolation and loneliness. + JANE E. BRODY + Mon, 20 Feb 2017 11:00:23 GMT + Eyes and Eyesight + Blindness + Cataracts + Macular Degeneration + Glaucoma + + + diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js new file mode 100644 index 00000000..071f39a1 --- /dev/null +++ b/tests/configs/modules/newsfeed/default.js @@ -0,0 +1,38 @@ +/* Magic Mirror Test config newsfeed module + * + * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com + * MIT Licensed. + */ + +var config = { + port: 8080, + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], + + language: "en", + timeFormat: 12, + units: "metric", + electronOptions: { + webPreferences: { + nodeIntegration: true, + }, + }, + + modules: [ + { + + module: "newsfeed", + position: "bottom_bar", + config: { + feeds: [ + { + title: "New York Times", + url: "http://localhost:8080/tests/configs/data/feed_test_newtimes.xml" + }, + ] + } + } + ] +}; + +/*************** DO NOT EDIT THE LINE BELOW ***************/ +if (typeof module !== "undefined") {module.exports = config;} diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js new file mode 100644 index 00000000..4b0b4ea8 --- /dev/null +++ b/tests/e2e/modules/newsfeed_spec.js @@ -0,0 +1,31 @@ +const globalSetup = require("../global-setup"); +const app = globalSetup.app; +const chai = require("chai"); +const expect = chai.expect; + +describe("Newsfeed module", function () { + + this.timeout(20000); + + beforeEach(function (done) { + app.start().then(function() { done(); } ); + }); + + afterEach(function (done) { + app.stop().then(function() { done(); }); + }); + + describe("Default configuration", function() { + + before(function() { + // Set config sample for use in test + process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/default.js"; + }); + + it("Check here", function () { + return app.client.waitUntilTextExists(".newsfeed .small", "New York Times, in day:", 10000); + }); + + }); + +}); From ccf612f536173665f66c433f22f4e7284ebfa04e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Fri, 10 Mar 2017 20:38:18 -0300 Subject: [PATCH 02/89] Add sample xml rss feed from Blog's RodrigoRamirez.com --- tests/configs/data/feed_test_newtimes.xml | 534 ------------------ .../configs/data/feed_test_rodrigoramirez.xml | 410 ++++++++++++++ tests/configs/modules/newsfeed/default.js | 4 +- 3 files changed, 412 insertions(+), 536 deletions(-) delete mode 100644 tests/configs/data/feed_test_newtimes.xml create mode 100644 tests/configs/data/feed_test_rodrigoramirez.xml diff --git a/tests/configs/data/feed_test_newtimes.xml b/tests/configs/data/feed_test_newtimes.xml deleted file mode 100644 index 96b7dda6..00000000 --- a/tests/configs/data/feed_test_newtimes.xml +++ /dev/null @@ -1,534 +0,0 @@ - - - - NYT > Home Page - http://www.nytimes.com/pages/index.html?partner=rss&emc=rss - - - en-us - Copyright 2017 The New York Times Company - Tue, 21 Feb 2017 18:16:14 GMT - - NYT > Home Page - https://static01.nyt.com/images/misc/NYT_logo_rss_250x40.png - http://www.nytimes.com/pages/index.html?partner=rss&emc=rss - - - New Trump Deportation Rules Allow Far More Expulsions - http://www.nytimes.com/2017/02/21/us/politics/dhs-immigration-trump.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/us/politics/dhs-immigration-trump.html - - - Mexicans deported from the U.S. walked to a repatriation center in Tijuana in June 2016. - Guillermo Arias/Agence France-Presse — Getty Images - The rules authorize expelling undocumented immigrants who have committed even minor offenses, and they make it easier to deport people immediately. - RON NIXON and MICHAEL D. SHEAR - Tue, 21 Feb 2017 16:21:01 GMT - Deportation - Homeland Security Department - Immigration and Customs Enforcement (US) - Customs and Border Protection (US) - United States Politics and Government - - - Trump Speaks Out Against Anti-Semitism - http://www.nytimes.com/2017/02/21/us/politics/trump-speaks-out-against-anti-semitism.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/us/politics/trump-speaks-out-against-anti-semitism.html - - He made the comments after drawing criticism in recent days for failing to condemn the rise in anti-Jewish threats and actions. - JULIE HIRSCHFELD DAVIS - Tue, 21 Feb 2017 15:29:00 GMT - United States Politics and Government - National Museum of African American History and Culture - Anti-Semitism - Washington (DC) - - - Lawyers Take On Trump’s Travel Ban - http://www.nytimes.com/video/us/politics/100000004914792/trump-immigration-lawyer.html?partner=rss&emc=rss - http://www.nytimes.com/video/us/politics/100000004914792/trump-immigration-lawyer.html - The judiciary is the new front line: A group of lawyers scramble to get their clients into the country, while preparing a legal challenge to Trump’s immigration ban. - - Tue, 21 Feb 2017 06:57:04 GMT - Immigration and Emigration - Trump, Donald J - Executive Orders and Memorandums - Refugees and Displaced Persons - - - Riots Break Out in Stockholm Suburb, Drawing Attention to Trump’s Remarks - http://www.nytimes.com/2017/02/21/world/europe/stockholm-sweden-riots-trump.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/world/europe/stockholm-sweden-riots-trump.html - - - Burned cars on Tuesday in Rinkeby, a northwestern Stockholm suburb predominantly inhabited by immigrants. About 20 to 30 masked men threw stones and other objects at police officers in Rinkeby after the police arrested a man on suspicion of dealing drugs. - TT News Agency, via Reuters - The clash between the police and residents came two days after President Trump’s provocative claims about migration and crime in the country. - CHRISTINA ANDERSON - Tue, 21 Feb 2017 18:01:23 GMT - Demonstrations, Protests and Riots - Stockholm (Sweden) - Trump, Donald J - - - White House Memo: From an Anchor’s Lips to Trump’s Ears to Sweden’s Disbelief - http://www.nytimes.com/2017/02/20/world/europe/trump-pursues-his-attack-on-sweden-with-scant-evidence.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/world/europe/trump-pursues-his-attack-on-sweden-with-scant-evidence.html - - - A group of refugees walking on a highway in Denmark toward Sweden in 2015. Statistics in Sweden found no appreciable increase in crimes from 2015, when the country processed a record 163,000 asylum applications, to 2016. - Mauricio Lima for The New York Times - A diplomatic dispute with Sweden illustrates the unusual approach the president takes to foreign policy, as well as the influence that television can have on his thinking. - PETER BAKER and SEWELL CHAN - Tue, 21 Feb 2017 14:35:13 GMT - Immigration and Emigration - Trump, Donald J - Sweden - United States International Relations - United States Politics and Government - Fox News Channel - Carlson, Tucker - Horowitz, Ami - - - Europe Combats a New Foe of Political Stability: Fake News - http://www.nytimes.com/2017/02/20/world/europe/europe-combats-a-new-foe-of-political-stability-fake-news.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/world/europe/europe-combats-a-new-foe-of-political-stability-fake-news.html - - - Emmanuel Macron, center, a French presidential candidate, in southern France on Friday. The head of his party said Mr. Macron had been targeted by Russian news channels. - Franck Pennant/Agence France-Presse — Getty Images - The rise of sophisticated hacks and a torrent of fake news coincide with angry populist movements across the Continent, and officials are nervous. - MARK SCOTT and MELISSA EDDY - Mon, 20 Feb 2017 22:10:11 GMT - Rumors and Misinformation - News and News Media - European Union - Europe - - - Town Hall Briefing: Congressional Town Hall: Of Tums, Death Panels and ‘Shut Your Hole’ - http://www.nytimes.com/2017/02/21/us/politics/town-hall-protests-obamacare.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/us/politics/town-hall-protests-obamacare.html - - - Senator Charles E. Grassley at a town hall meeting in Iowa Falls, Iowa, on Tuesday. He addressed a standing-room-only crowd. - Scott Morgan for The New York Times - Several Republicans will be hearing from constituents on Tuesday, and reporters for The New York Times will be there to gauge the sentiment. - THOMAS KAPLAN, TRIP GABRIEL and LIZETTE ALVAREZ - Tue, 21 Feb 2017 18:10:24 GMT - Trump, Donald J - United States Politics and Government - Patient Protection and Affordable Care Act (2010) - Demonstrations, Protests and Riots - Blackburn, Marsha - Grassley, Charles E - Ross, Dennis A - Cassidy, Bill (1957- ) - - - For-Profit Schools, an Obama Target, See New Day Under Trump - http://www.nytimes.com/2017/02/20/business/for-profit-education-trump-devos.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/business/for-profit-education-trump-devos.html - - - Donald J. Trump at the announcement of the establishment of Trump University in 2005. As president-elect, he paid $25 million to settle three lawsuits against the now-defunct institution. - Bebeto Matthews/Associated Press - The Education Department, whose scrutiny has led hundreds of campuses to close, is now led by Betsy DeVos, who has investments in the industry. - PATRICIA COHEN - Tue, 21 Feb 2017 00:03:48 GMT - For-Profit Schools - Colleges and Universities - United States Politics and Government - Regulation and Deregulation of Industry - DeVos, Elizabeth (1958- ) - Trump, Donald J - - - Protesters Ready for Trump’s First Visit to New York as President - http://www.nytimes.com/2017/02/21/nyregion/protesters-ready-for-trumps-first-visit-to-new-york-as-president.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/nyregion/protesters-ready-for-trumps-first-visit-to-new-york-as-president.html - - - Congregation Beth Elohim in Brooklyn was filled on Feb. 6 for an evening of strategizing against President Trump. - Demetrius Freeman for The New York Times - The president has not set foot in the city since his inauguration, puzzling and emboldening some protesters in his hometown. - SARAH MASLIN NIR - Tue, 21 Feb 2017 14:12:26 GMT - Executive Orders and Memorandums - Immigration and Emigration - United States Politics and Government - Demonstrations, Protests and Riots - Trump Tower (Manhattan, NY) - Trump, Donald J - Fifth Avenue (Manhattan, NY) - New York City - - - Milo Yiannopoulos’s Pedophilia Comments Cost Him CPAC Role and Book Deal - http://www.nytimes.com/2017/02/20/us/politics/cpac-milo-yiannopoulos.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/us/politics/cpac-milo-yiannopoulos.html - - - Milo Yiannopoulos last month in Boulder, Colo. The Conservative Political Action Conference rescinded its invitation for him to speak to the group after his comments about pedophilia. - Jeremy Papasso/Daily Camera, via Associated Press - The publication of a video in which the contentious Breitbart News editor condoned sexual relations with boys seemed to be more than conference organizers could tolerate. - JEREMY W. PETERS, ALEXANDRA ALTER and MICHAEL M. GRYNBAUM - Tue, 21 Feb 2017 01:47:20 GMT - Yiannopoulos, Milo - Sex Crimes - Child Abuse and Neglect - United States Politics and Government - Conservative Political Action Conference - Simon & Schuster Inc - Dangerous (Book) - - - Unease Spreads in Atlanta as a City Contracting Scandal Brews - http://www.nytimes.com/2017/02/21/us/unease-spreads-in-atlanta-as-a-city-contracting-scandal-brews.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/us/unease-spreads-in-atlanta-as-a-city-contracting-scandal-brews.html - - - Mayor Kasim Reed of Atlanta delivering his State of the City address this month. An investigation into charges of bribery involving city contracts has prompted the mayor to defend his legacy. - Branden Camp/Atlanta Journal-Constitution, via Associated Press - A brick thrown through a window, dead rodents left on steps and a threat to a contractor have become symbols of a federal inquiry into bribery charges. - RICHARD FAUSSET - Tue, 21 Feb 2017 10:00:17 GMT - Politics and Government - Government Contracts and Procurement - Bribery and Kickbacks - Atlanta (Ga) - Kasim Reed - Elvin R. Mitchell Jr. - - - A Surprising Salve for New York’s Beleaguered Cities: Refugees - http://www.nytimes.com/2017/02/20/nyregion/a-surprising-salve-for-new-yorks-beleaguered-cities-refugees.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/nyregion/a-surprising-salve-for-new-yorks-beleaguered-cities-refugees.html - - - In early February a man wearing a keffiyeh walked past a mural that recalls a less diverse past in Buffalo. The self-described “City of Good Neighbors” has received more than 10,000 refugees over the last decade. - Nathaniel Brooks for The New York Times - Communities across upstate New York say an influx of refugees has helped alleviate decades-long struggles with dwindling populations and opportunities. - JESSE McKINLEY - Mon, 20 Feb 2017 20:54:01 GMT - Refugees and Displaced Persons - Immigration and Emigration - Trump, Donald J - Buffalo (NY) - United States Politics and Government - - - Firsthand Account: The Assassination of Malcolm X - http://www.nytimes.com/video/us/100000004817791/malcolm-x-death-new-york-assassination-360.html?partner=rss&emc=rss - http://www.nytimes.com/video/us/100000004817791/malcolm-x-death-new-york-assassination-360.html - The civil rights leader Malcolm X was killed Feb. 21, 1965, at a rally in New York City. Hear from a witness and visit the site of the assassination — in the past, present and in 360 video. - - Tue, 21 Feb 2017 10:00:29 GMT - Civil Rights Movement (1954-68) - Assassinations and Attempted Assassinations - Malcolm X - - - California Today: California Today: Lawmakers With Little in Common, Except a Name - http://www.nytimes.com/2017/02/21/us/california-today-kevin-mccarthy-kevin-mccarty.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/us/california-today-kevin-mccarthy-kevin-mccarty.html - - - Representative Kevin McCarthy of California, the majority leader, at his office in the U.S. Capitol. - Al Drago/The New York Times - Tuesday: Name confusion vexes a California representative and assemblyman, a Whittier police officer is killed, and clam digging in Humboldt Bay. - MIKE McPHATE - Tue, 21 Feb 2017 13:12:08 GMT - California Today - California - - - Your Daily Mini Crossword - http://www.nytimes.com/crosswords/game/mini?partner=rss&emc=rss - http://www.nytimes.com/crosswords/game/mini - - Solve a bite-size crossword in just a few minutes. - - Thu, 25 Feb 2016 08:18:20 GMT - - - Travel Tips: How to Have a Better Flight - http://www.nytimes.com/2016/12/29/travel/how-to-have-a-better-flight.html?partner=rss&emc=rss - http://www.nytimes.com/2016/12/29/travel/how-to-have-a-better-flight.html - - - - Lars Leetaru - A longtime flight attendant says that politeness helps improve a trip, as does bringing your own food for the ride. - SHIVANI VORA - Thu, 29 Dec 2016 11:00:03 GMT - Airlines and Airplanes - Travel and Vacations - Flight Attendants - - - Trying to Stanch Trinidad’s Flow of Young Recruits to ISIS - http://www.nytimes.com/2017/02/21/world/americas/trying-to-stanch-trinidads-flow-of-young-recruits-to-isis.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/world/americas/trying-to-stanch-trinidads-flow-of-young-recruits-to-isis.html - - - Yasin Abu Bakr, second from right, speaking with other Muslims at his mosque in Port of Spain, Trinidad and Tobago. - Federico Rios Escobar for The New York Times - Officials in Trinidad and Tobago are scrambling to close a pipeline that has sent a steady stream of Muslims to Syria to take up arms for the Islamic State. - FRANCES ROBLES - Tue, 21 Feb 2017 10:00:16 GMT - Terrorism - Politics and Government - Muslims and Islam - United States International Relations - Syria - Trinidad and Tobago - - - Goalie Eats Pie and Loses His Job, While Bettors’ Wallets Fatten - http://www.nytimes.com/2017/02/21/sports/soccer/wayne-shaw-sutton-soccer-pie.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/sports/soccer/wayne-shaw-sutton-soccer-pie.html - - - Sutton’s backup goalkeeper, Wayne Shaw, eats a pie during the match against Arsenal on Monday. - Andrew Couldridge/Reuters - The backup goalkeeper for Sutton, Wayne Shaw, said he knew about a bet on whether he’d have a pie during the match and had eaten because of it. - VICTOR MATHER - Tue, 21 Feb 2017 17:24:00 GMT - Soccer - Gambling - Sutton (Soccer Team) - - - Out There: Cosmos Controversy: The Universe Is Expanding, but How Fast? - http://www.nytimes.com/2017/02/20/science/hubble-constant-universe-expanding-speed.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/science/hubble-constant-universe-expanding-speed.html - - - A Hubble Space Telescope image of a group of interacting galaxies called Arp 273. - NASA - A small discrepancy in the value of a long-sought number has fostered a debate about just how well we know the cosmos. - DENNIS OVERBYE - Mon, 20 Feb 2017 20:47:03 GMT - Space and Astronomy - Hubble Constant - Dark Energy (Astronomy) - Dark Matter (Astronomy) - Riess, Adam Guy - Freedman, Wendy L - - - Afghanistan Police Surround Vice President’s House - http://www.nytimes.com/2017/02/21/world/asia/abdul-rashid-dostum-afghanistan.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/world/asia/abdul-rashid-dostum-afghanistan.html - - - Abdul Rashid Dostum, an Afghan vice president, in 2014. On Tuesday, over 100 police officers and soldiers surrounded his Kabul compound in an apparent effort to arrest nine of of his aides. - Shah Marai/Agence France-Presse — Getty Images - Soldiers and police officers appeared to be trying to arrest nine aides to Vice President Abdul Rashid Dostum accused of kidnapping a political rival. - ROD NORDLAND and JAWAD SUKHANYAR - Tue, 21 Feb 2017 15:02:32 GMT - Dostum, Abdul Rashid - Afghanistan - Kidnapping and Hostages - Sex Crimes - Politics and Government - Ishchi, Ahmad - - - Bodies of 74 Migrants Wash Up on Libyan Coast - http://www.nytimes.com/2017/02/21/world/middleeast/migrants-libya-beach.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/world/middleeast/migrants-libya-beach.html - - - Red Crescent workers collected the bodies of migrants on Monday from a beach near the town of Zawiya, Libya. - Libyan Red Crescent - The victims were believed to have come from a shipwrecked boat that was found along the shore, an ominous sign before the high season for crossings to Europe. - DECLAN WALSH - Tue, 21 Feb 2017 12:34:42 GMT - Refugees and Displaced Persons - Middle East and Africa Migrant Crisis - Deaths (Fatalities) - Illegal Immigration - Europe - Libya - Mediterranean Sea - - - Elor Azaria, Israeli Soldier Who Killed Wounded Assailant, Gets 18 Months in Prison - http://www.nytimes.com/2017/02/21/world/middleeast/elor-azaria-israel-sentence.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/world/middleeast/elor-azaria-israel-sentence.html - - - Sgt. Elor Azaria, center, with his mother in a military courtroom in Tel Aviv on Tuesday before he received an 18-month sentence for manslaughter. - Pool photo by Jim Hollander - The sergeant shot an incapacitated Palestinian lying on his back, a case that has divided Israelis and prompted calls for a pardon. - IAN FISHER - Tue, 21 Feb 2017 15:46:07 GMT - Defense and Military Forces - Azaria, Elor - Israel - Palestinians - Heller, Maya - - - The Interpreter - http://www.nytimes.com/newsletters/the-interpreter?partner=rss&emc=rss - http://www.nytimes.com/newsletters/the-interpreter - - The Interpreter brings sharp insight and context to the major news stories of the week. Sign up to get it by email. - - Fri, 03 Feb 2017 22:38:47 GMT - - - Vatican and Rome’s Jewish Museum Team Up for Menorah Exhibit - http://www.nytimes.com/2017/02/20/world/europe/vatican-rome-menorah-exhibit-jewish-museum.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/world/europe/vatican-rome-menorah-exhibit-jewish-museum.html - - - A bas-relief showing a menorah was displayed at a news conference on Monday announcing a joint exhibition by the Vatican Museums and Rome’s Jewish Museum. - Alessandra Tarantino/Associated Press - The collaboration, centered on a famous candelabrum that has been missing for centuries, is being hailed as “a historic event.” - ELISABETTA POVOLEDO - Tue, 21 Feb 2017 00:12:55 GMT - Jews and Judaism - Arts and Antiquities Looting - Roman Catholic Church - Vatican Museums - Rome (Italy) - Vatican City - - - The Businessman Behind Cool British Fashion Brands - http://www.nytimes.com/2017/02/21/fashion/london-fashion-week-alexa-chung-oakley-capital.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/fashion/london-fashion-week-alexa-chung-oakley-capital.html - - Peter Dubens, the co-founder and managing partner of Oakley Capital Private Equity, is the investor behind Alexa Chung’s fashion label. - Glenn Copus/Evening Standard, via REX/Shutterstock - Peter Dubens, co-founder of Oakley Capital, has financed both Alexa Chung and Bella Freud. - LAUREN INDVIK - Tue, 21 Feb 2017 05:01:21 GMT - Fashion and Apparel - Dubens, Peter - Chung, Alexa - Freud, Bella - - - A.S. Monaco: From Billionaire’s Plaything to Soccer Prodigies’ Hub - http://www.nytimes.com/2017/02/21/sports/soccer/as-monaco-vadim-vasilyev-.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/sports/soccer/as-monaco-vadim-vasilyev-.html - - - Vadim Vasilyev, the vice president of A.S. Monaco, remembers the “tough” night in 2015 when he explained to fans the club’s shift away from signing star players. - France Keyser for The New York Times - Financial fair-play rules forced a change in club strategy, one that has had some unexpectedly happy results. - RORY SMITH - Tue, 21 Feb 2017 05:01:22 GMT - Soccer - A.S. Monaco - UEFA Champions League (Soccer) - Rybolovlev, Dmitry Evgenevich - Rodriguez, James (1991- ) - Mendes, Jorge (1966- ) - Martial, Anthony (1995- ) - - - Sinosphere: Scammers in China Fake Road Injuries, but Cameras Capture the Truth - http://www.nytimes.com/2017/02/21/world/asia/china-traffic-scam-fraud.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/world/asia/china-traffic-scam-fraud.html - - Fraudsters are throwing themselves in front of cars or buses to extort money from motorists, but the results are often unconvincing. - DIDI KIRSTEN TATLOW - Tue, 21 Feb 2017 11:58:34 GMT - China - scams - - - Eleven Madison Park Plans a Makeover and a Summer Pop-Up - http://www.nytimes.com/2017/02/21/dining/eleven-madison-park-renovation-hamptons.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/21/dining/eleven-madison-park-renovation-hamptons.html - - - Like many New Yorkers, the staff and operations of Eleven Madison Park will spend this summer in the Hamptons. They will take over the restaurant Moby’s, opening it in late June as EMP Summer House. - Daniel Gonzalez for The New York Times - The top-rated Manhattan restaurant will close for three months of renovation and open a more casual version in the Hamptons. - FLORENCE FABRICANT - Tue, 21 Feb 2017 11:00:13 GMT - Restaurants - Relocation of Business - Eleven Madison Park (Manhattan, NY, Restaurant) - Guidara, Will - Humm, Daniel - Cloepfil, Brad - East Hampton (NY) - Manhattan (NYC) - - - Dick Bruna, Author of Miffy Books, Is Dead at 89 - http://www.nytimes.com/2017/02/20/books/dick-bruna-dead-miffy-creator.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/books/dick-bruna-dead-miffy-creator.html - - - Dick Bruna in 2005 at the opening of an exhibition devoted to his Miffy books in The Hague. - Inge Van Mill/Agence France-Presse — Getty Images - The Dutch writer and illustrator was known for children’s books depicting a sparely drawn round white rabbit who gained a worldwide following. - NINA SIEGAL - Tue, 21 Feb 2017 00:57:49 GMT - Bruna, Dick (1927-2017) - Writing and Writers - Books and Literature - Deaths (Obituaries) - Miffy - - - Shared: A Balm When You’re Expecting: Sometimes Pot Does the Trick - http://www.nytimes.com/2017/02/20/health/marijuana-pregnancy-mothers.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/health/marijuana-pregnancy-mothers.html - - - Jane, who used pot to quell her nausea during her third pregnancy, with her daughter in New York - Nancie Battaglia for The New York Times - Five women describe why they used marijuana while pregnant, and how they assessed the risks and benefits before making that choice. - CATHERINE SAINT LOUIS - Mon, 20 Feb 2017 20:35:02 GMT - Marijuana - Pregnancy and Childbirth - Women and Girls - Morning Sickness - - - The Fix: The Convertible, Tiny Apartment - http://www.nytimes.com/2017/02/19/realestate/the-convertible-tiny-apartment.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/19/realestate/the-convertible-tiny-apartment.html - - - A Murphy bed and flanking closets disappear into the living room walls when not in use. - Linda Jaquez for The New York Times - A 400-square-foot studio is remade into a space that can be constantly transformed. - MICHELLE HIGGINS - Sun, 19 Feb 2017 10:05:01 GMT - Interior Design and Furnishings - Real Estate and Housing (Residential) - Architecture - Restoration and Renovation - - - Personal Health: The Worst That Could Happen? Going Blind, People Say - http://www.nytimes.com/2017/02/20/well/the-worst-that-could-happen-going-blind-people-say.html?partner=rss&emc=rss - http://www.nytimes.com/2017/02/20/well/the-worst-that-could-happen-going-blind-people-say.html - - - - Paul Rogers - When eyesight fails, some people become socially disengaged, leading to isolation and loneliness. - JANE E. BRODY - Mon, 20 Feb 2017 11:00:23 GMT - Eyes and Eyesight - Blindness - Cataracts - Macular Degeneration - Glaucoma - - - diff --git a/tests/configs/data/feed_test_rodrigoramirez.xml b/tests/configs/data/feed_test_rodrigoramirez.xml new file mode 100644 index 00000000..e4d3730f --- /dev/null +++ b/tests/configs/data/feed_test_rodrigoramirez.xml @@ -0,0 +1,410 @@ + + + + Rodrigo Ramírez Norambuena + + https://rodrigoramirez.com + Temas sobre Linux, VoIP, Open Source, tecnología y lo relacionado. + Fri, 21 Oct 2016 21:30:22 +0000 + es-ES + hourly + 1 + https://wordpress.org/?v=4.7.3 + + QPanel 0.13.0 + https://rodrigoramirez.com/qpanel-0-13-0/ + https://rodrigoramirez.com/qpanel-0-13-0/#comments + Tue, 20 Sep 2016 11:16:08 +0000 + + + + + + + + + + + + + https://rodrigoramirez.com/?p=1299 + Ya está disponible la versión 0.13.0 de QPanel Para instalar esta nueva versión, la debes descargar de https://github.com/roramirez/qpanel/tree/0.13.0 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: Se establece un limite para el reciclado del tiempo de conexión a la base […]

+

La entrada QPanel 0.13.0 aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Panel monitor callcenter | Qpanel Monitor ColasYa 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:

+
    +
  • Se establece un limite para el reciclado del tiempo de conexión a la base de datos que contenga QueueLog. Esto evita problemas en bases de datos como MySQL que finaliza o da timeout a las conexiones.
  • +
  • Ahora la py-asterisk va dentro del archivo requirements.txt y no como submodulo del proyecto.
  • +
  • Se remueven la mayoría de las libs externas para Javascript y CSS para manejarlos desde ahora con Bower.
  • +
  • Se incluye un script para WSGI que permite su utilización con Apache.
  • +
  • Actualización para los idiomas Ruso y Portugues.
  • +
+

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.

+]]>
+ https://rodrigoramirez.com/qpanel-0-13-0/feed/ + 3 +
+ + Problema VirtualBox “starting virtual machine” … + https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/ + https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/#respond + Sat, 10 Sep 2016 22:50:13 +0000 + + + + + + + https://rodrigoramirez.com/?p=1284 + Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox.  La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje “starting virtual machine”, como el de la imagen de a continuación. […]

+

La entrada Problema VirtualBox “starting virtual machine” … aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Después de una actualización de Debian, de la rama stretch/sid, tuve un problema con VirtualBox.  La versión que se actualizó fue a la virtualbox 5.1.4-dfsg-1+b1. El gran problema era que ninguna maquina virtual quería arrancar, se quedaba en un largo limbo con el mensaje “starting virtual machine”, como el de la imagen de a continuación.

+

Starting virtual machine ... VirtualBox

+

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.

+]]>
+ https://rodrigoramirez.com/problema-virtualbox-starting-virtual-machine/feed/ + 0 +
+ + Mejorando la consola interactiva de Python + https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/ + https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/#comments + Tue, 06 Sep 2016 04:24:43 +0000 + + + + + + https://rodrigoramirez.com/?p=1247 + Cuando estás desarrollando en Python es muy cool estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente. 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 […]

+

La entrada Mejorando la consola interactiva de Python aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Cuando estás desarrollando en Python es muy cool estar utilizando la consola interactiva para ir probando cosas antes de ponerlas dentro del archivo de código fuente.

+

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.

+

Truco a)

+

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 rlcompleterreadline.

+

 

+

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 🙂

+

+

 

+

Truco b)

+

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.

+]]>
+ https://rodrigoramirez.com/mejorando-la-consola-interactiva-python/feed/ + 4 +
+ + QPanel 0.12.0 con estadísticas + https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/ + https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/#respond + Mon, 22 Aug 2016 04:19:03 +0000 + + + + + + + + + + + + + https://rodrigoramirez.com/?p=1268 + 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 https://github.com/roramirez/qpanel/tree/0.12.0 En esta nueva versión las funcionalidades agregadas son: Permite remover los agentes de las cola Posibilidad de cancelar llamadas que están en espera de atención Estadísticas por rango de fecha obtenidas desde […]

+

La entrada QPanel 0.12.0 con estadísticas aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Panel monitor callcenter | Qpanel Monitor ColasYa 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:

+
    +
  • Permite remover los agentes de las cola
  • +
  • Posibilidad de cancelar llamadas que están en espera de atención
  • +
  • Estadísticas por rango de fecha obtenidas desde el queue_log de Asterisk
  • +
  • Se actualiza a Flask 0.11
  • +
+

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.

+]]>
+ https://rodrigoramirez.com/qpanel-0-12-0-estadisticas/feed/ + 0 +
+ + QPanel 0.11.0 con Spy, Whisper y mas + https://rodrigoramirez.com/qpanel-spy-supervisor/ + https://rodrigoramirez.com/qpanel-spy-supervisor/#comments + Thu, 21 Jul 2016 01:53:21 +0000 + + + + + + + + + + + + + https://rodrigoramirez.com/?p=1245 + 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 https://github.com/roramirez/qpanel/tree/0.11.0 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 […]

+

La entrada QPanel 0.11.0 con Spy, Whisper y mas aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Panel monitor callcenter | Qpanel Monitor ColasYa 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.

+]]>
+ https://rodrigoramirez.com/qpanel-spy-supervisor/feed/ + 4 +
+ + Añadir Swap a un sistema + https://rodrigoramirez.com/crear-swap/ + https://rodrigoramirez.com/crear-swap/#respond + Fri, 15 Jul 2016 05:07:43 +0000 + + + + https://rodrigoramirez.com/?p=1234 + Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap. 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 […]

+

La entrada Añadir Swap a un sistema aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Algo que me toma generalmente hacer es cuando trabajo con maquina virtuales es asignar una cantidad determinada de Swap.

+

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 /swapfile
+

Comprobamos que ha sido creado

+
$ ls -lh /swapfile
+-rw-r--r-- 1 root root 3.0G Jul 11 13:10 /swapfile
+
+

Habilitación del archivo Swap

+

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.

+]]>
+ https://rodrigoramirez.com/crear-swap/feed/ + 0 +
+ + QPanel 0.10.0 con vista consolidada + https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/ + https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/#respond + Mon, 20 Jun 2016 19:32:55 +0000 + + + + + + + + + https://rodrigoramirez.com/?p=1227 + 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 https://github.com/roramirez/qpanel/tree/0.10.0 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 entrada QPanel 0.10.0 con vista consolidada aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Panel monitor callcenter | Qpanel Monitor ColasYa 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.

+]]>
+ https://rodrigoramirez.com/qpanel-0-10-0-vista-consolidada/feed/ + 0 +
+ + Nerdearla 2016, WebRTC Glue + https://rodrigoramirez.com/nerdearla-2016/ + https://rodrigoramirez.com/nerdearla-2016/#respond + Wed, 15 Jun 2016 17:55:41 +0000 + + + + + + + + + + + https://rodrigoramirez.com/?p=1218 + Días atrás estuve participando en el evento llamado Nerdearla en Buenos Aires.  El ambiente era genial si eres de esas personas que desde niño sintio curiosidad por ver como funcionan las cosas, donde desarmabas para volver armar lo juguetes. Habían muchas cosas interesantes tanto en las presentaciones, co-working y workshop que se hubieron. Si te […]

+

La entrada Nerdearla 2016, WebRTC Glue aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Días atrás estuve participando en el evento llamado Nerdearla en Buenos Aires.  El ambiente era genial si eres de esas personas que desde niño sintio curiosidad por ver como funcionan las cosas, donde desarmabas para volver armar lo juguetes.

+

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 estaKaypro II

+

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í

+

 

+

WebRTC Glue

+

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.

+]]>
+ https://rodrigoramirez.com/nerdearla-2016/feed/ + 0 +
+ + QPanel 0.9.0 + https://rodrigoramirez.com/qpanel-0-9-0/ + https://rodrigoramirez.com/qpanel-0-9-0/#respond + Mon, 09 May 2016 18:40:23 +0000 + + + + + + + + + + + + http://rodrigoramirez.com/?p=1206 + 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 https://github.com/roramirez/qpanel/tree/0.9.0 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 […]

+

La entrada QPanel 0.9.0 aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Panel monitor callcenter | Qpanel Monitor ColasEl 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:

+
    +
  •  Actualización del repositorio y versión de py-asterisk, biblioteca para trabajar con Asterisk. Acá la ocupamos principalmente para uso del Manager.
  • +
  • Portación de parche de funcionalidades como pausa, tiempo, razón de una pausa para Asterisk 11.
  • +
  • Cambio del comportamiento en el conteo cuando el participante en una cola está ocupado (busy)
  • +
+

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.

+]]>
+ https://rodrigoramirez.com/qpanel-0-9-0/feed/ + 0 +
+ + Mandar un email desde la shell + https://rodrigoramirez.com/mandar-un-email-desde-la-shell/ + https://rodrigoramirez.com/mandar-un-email-desde-la-shell/#comments + Wed, 13 Apr 2016 13:05:13 +0000 + + + + + + + + + + + http://rodrigoramirez.com/?p=1172 + Dejo esto por acá ya que es algo que siempre me olvido como es. El tema es enviar un email mediante el comando mail en un servidor con Linux. 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 […]

+

La entrada Mandar un email desde la shell aparece primero en Rodrigo Ramírez Norambuena.

+]]>
+ Dejo esto por acá ya que es algo que siempre me olvido como es. El tema es enviar un email mediante el comando mail en un servidor con Linux.

+

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.

+]]>
+ https://rodrigoramirez.com/mandar-un-email-desde-la-shell/feed/ + 4 +
+
+
diff --git a/tests/configs/modules/newsfeed/default.js b/tests/configs/modules/newsfeed/default.js index 071f39a1..5cb9d311 100644 --- a/tests/configs/modules/newsfeed/default.js +++ b/tests/configs/modules/newsfeed/default.js @@ -25,8 +25,8 @@ var config = { config: { feeds: [ { - title: "New York Times", - url: "http://localhost:8080/tests/configs/data/feed_test_newtimes.xml" + title: "Rodrigo Ramirez Blog", + url: "http://localhost:8080/tests/configs/data/feed_test_rodrigoramirez.xml" }, ] } From 2a94ee55ccb8fa06f4d07c2a67307b5ed0a659a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Fri, 10 Mar 2017 21:02:33 -0300 Subject: [PATCH 03/89] Add first test for newsfeed module. This test case check if set newsfeed title --- tests/e2e/modules/newsfeed_spec.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js index 4b0b4ea8..049d1a2a 100644 --- a/tests/e2e/modules/newsfeed_spec.js +++ b/tests/e2e/modules/newsfeed_spec.js @@ -18,14 +18,11 @@ describe("Newsfeed module", function () { describe("Default configuration", function() { before(function() { - // Set config sample for use in test process.env.MM_CONFIG_FILE = "tests/configs/modules/newsfeed/default.js"; }); - it("Check here", function () { - return app.client.waitUntilTextExists(".newsfeed .small", "New York Times, in day:", 10000); + it("show title newsfeed", function () { + return app.client.waitUntilTextExists(".newsfeed .small", "Rodrigo Ramirez Blog", 10000).should.be.fulfilled; }); - }); - }); From f89f704a69bc414cb8231fa7a0a1f8b42b4b34f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 18 Mar 2017 09:33:03 -0300 Subject: [PATCH 04/89] Add task to check configuration file syntax. --- CHANGELOG.md | 1 + README.md | 5 +++ js/utils.js | 3 +- package.json | 8 +++-- tests/configs/check_config.js | 66 +++++++++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 tests/configs/check_config.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 564564cb..3c6850d6 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Korean Translation. - Added console warning on startup when deprecated config options are used - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION`, `UPDATE_NOTIFICATION_MODULE`, `UPDATE_INFO` to Norwegian translations (`nn` and `nb`). +- Add task to check configuration file ### Fixed - Update .gitignore to not ignore default modules folder. diff --git a/README.md b/README.md index 9cadb364..2be4b1f3 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,11 @@ Type `git status` to see your changes, if there are any, you can reset them with 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** | diff --git a/js/utils.js b/js/utils.js index 76eb2703..3f623499 100644 --- a/js/utils.js +++ b/js/utils.js @@ -11,7 +11,8 @@ var colors = require("colors/safe"); var Utils = { colors: { warn: colors.yellow, - error: colors.red + error: colors.red, + info: colors.blue } }; diff --git a/package.json b/package.json index 704f8394..d2cf4f36 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,10 @@ "scripts": { "start": "sh run-start.sh", "postinstall": "sh installers/postinstall/postinstall.sh", - "test": "./node_modules/mocha/bin/mocha tests --recursive", - "test:unit": "./node_modules/mocha/bin/mocha tests/unit --recursive", - "test:e2e": "./node_modules/mocha/bin/mocha tests/e2e --recursive" + "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", + "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", + "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", + "config:check": "node tests/configs/check_config.js" }, "repository": { "type": "git", @@ -38,6 +39,7 @@ "grunt-markdownlint": "^1.0.13", "grunt-stylelint": "latest", "grunt-yamllint": "latest", + "jshint": "^2.9.4", "mocha": "^3.2.0", "spectron": "^3.4.1", "stylelint-config-standard": "latest", diff --git a/tests/configs/check_config.js b/tests/configs/check_config.js new file mode 100644 index 00000000..fa294761 --- /dev/null +++ b/tests/configs/check_config.js @@ -0,0 +1,66 @@ +/* Magic Mirror + * + * Checker configuration file + * + * By Rodrigo Ramírez Norambuena + * https://rodrigoramirez.com + * + * MIT Licensed. + * + */ + +var v = require("jshint"); +var path = require("path"); +var fs = require("fs"); +var Utils = require(__dirname + "/../../js/utils.js"); + +if (process.env.NODE_ENV == "test") {return 0}; + +/* getConfigFile() + * Return string with path of configuration file + * Check if set by enviroment variable MM_CONFIG_FILE + */ +function getConfigFile() { + // FIXME: This function should be in core. Do you want refactor me ;) ?, be good! + rootPath = path.resolve(__dirname + "/../../"); + var configFileName = path.resolve(rootPath + "/config/config.js"); + if (process.env.MM_CONFIG_FILE) { + configFileName = path.resolve(process.env.MM_CONFIG_FILE); + } + return configFileName; +} + +var configFileName = getConfigFile(); +// Check if file is present +if (fs.existsSync(configFileName) === false) { + console.error(Utils.colors.error("File not found: "), configFileName); + return; +} +// check permision +try { + fs.accessSync(configFileName, fs.F_OK); +} catch (e) { + console.log(Utils.colors.error(e)); + return; +} + +// Validate syntax of the configuration file. +// In case the there errors show messages and +// return +console.info(Utils.colors.info("Checking file... ", configFileName)); + // I'm not sure if all ever is utf-8 +fs.readFile(configFileName, "utf-8", function(err, data) { + if (err) {throw err;} + v.JSHINT(data); // Parser by jshint + + if (v.JSHINT.errors.length == 0) { + console.log("Your configuration file don't containt syntax error :)"); + return true; + } else { + errors = v.JSHINT.data().errors; + for (idx in errors) { + error = errors[idx]; + console.log("Line", error.line, "col", error.character, error.reason); + } + } +}); From 7918448be267f62f3ef8358a05eb88ac216bf822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 18 Mar 2017 12:40:07 -0300 Subject: [PATCH 05/89] Add test for vendor This test get all vendor defined. Create a get request http each vendor and expect the 200 HTTP code. --- tests/e2e/vendor_spec.js | 36 ++++++++++++++++++++++++++++++++++++ vendor/vendor.js | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 tests/e2e/vendor_spec.js diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js new file mode 100644 index 00000000..39abf906 --- /dev/null +++ b/tests/e2e/vendor_spec.js @@ -0,0 +1,36 @@ +const globalSetup = require("./global-setup"); +const app = globalSetup.app; +const request = require("request"); +const chai = require("chai"); +const expect = chai.expect; + + +describe("Vendors", function () { + + this.timeout(20000); + + beforeEach(function (done) { + app.start().then(function() { done(); } ); + }); + + afterEach(function (done) { + app.stop().then(function() { done(); }); + }); + + describe("Get list vendors", function () { + + before(function() { + process.env.MM_CONFIG_FILE = "tests/configs/env.js"; + }); + + var vendors = require(__dirname + "/../../vendor/vendor.js"); + Object.keys(vendors).forEach(vendor => { + it(`should return 200 HTTP code for vendor "${vendor}"`, function() { + urlVendor = "http://localhost:8080/vendor/" + vendors[vendor]; + request.get(urlVendor, function (err, res, body) { + expect(res.statusCode).to.equal(200); + }); + }); + }); + }); +}); diff --git a/vendor/vendor.js b/vendor/vendor.js index 7076cc45..82535b7a 100644 --- a/vendor/vendor.js +++ b/vendor/vendor.js @@ -14,3 +14,5 @@ var vendor = { "weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css", "font-awesome.css": "node_modules/font-awesome/css/font-awesome.min.css" }; + +if (typeof module !== "undefined"){module.exports = vendor;} From fd2b070a6a155db6e6dd9208696c295f53d86eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 25 Mar 2017 00:26:47 -0300 Subject: [PATCH 06/89] Change website in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a1e7641..0d4ad2b7 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "bugs": { "url": "https://github.com/MichMich/MagicMirror/issues" }, - "homepage": "https://github.com/MichMich/MagicMirror#readme", + "homepage": "https://magicmirror.builders", "devDependencies": { "chai": "^3.5.0", "chai-as-promised": "^6.0.0", From 5d7cfc1c1087ee8faebbc171a8f775ce731dfe74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 25 Mar 2017 19:00:36 -0300 Subject: [PATCH 07/89] test for modules set in modules/default/defaultmodules.js --- .../unit/global_vars/defaults_modules_spec.js | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/unit/global_vars/defaults_modules_spec.js diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js new file mode 100644 index 00000000..f3ef7fcb --- /dev/null +++ b/tests/unit/global_vars/defaults_modules_spec.js @@ -0,0 +1,60 @@ +var fs = require("fs"); +var path = require("path"); +var chai = require("chai"); +var expect = chai.expect; +var vm = require("vm"); + +before(function() { + var basedir = path.join(__dirname, "../../.."); + + var fileName = "js/app.js"; + var filePath = path.join(basedir, fileName); + var code = fs.readFileSync(filePath); + + this.sandbox = { + module: {}, + __dirname: path.dirname(filePath), + global: {}, + console: { + log: function() { /*console.log("console.log(", arguments, ")");*/ } + }, + process: { + on: function() { /*console.log("process.on called with: ", arguments);*/ }, + env: {} + } + }; + + this.sandbox.require = function(filename) { + // This modifies the global slightly, + // but supplies vm with essential code + return require(filename); + }; + + vm.runInNewContext(code, this.sandbox, fileName); +}); + +after(function() { + //console.log(global); +}); + +describe("Default modules set in modules/default/defaultmodules.js", function() { + + var expectedDefaultModules = [ + "alert", + "calendar", + "clock", + "compliments", + "currentweather", + "helloworld", + "newsfeed", + "weatherforecast", + "updatenotification" + ]; + + expectedDefaultModules.forEach(defaultModule => { + it(`contains default module "${defaultModule}"`, function() { + expect(this.sandbox.defaultModules).to.include(defaultModule); + }); + }); + +}); From 0c884c26699327adeedb169e0f93c6f922a0c1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 25 Mar 2017 23:52:18 -0300 Subject: [PATCH 08/89] Test for default module directories --- tests/unit/global_vars/defaults_modules_spec.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js index f3ef7fcb..8df0d073 100644 --- a/tests/unit/global_vars/defaults_modules_spec.js +++ b/tests/unit/global_vars/defaults_modules_spec.js @@ -57,4 +57,10 @@ describe("Default modules set in modules/default/defaultmodules.js", function() }); }); + expectedDefaultModules.forEach(defaultModule => { + it(`contains a folder for modules/default/${defaultModule}"`, function() { + expect(fs.existsSync(path.join(this.sandbox.global.root_path, "modules/default", defaultModule))).to.equal(true); + }); + }); + }); From de4d0989e939380ca5eb3d9e8bce398a7c1fe954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sun, 26 Mar 2017 00:49:00 -0300 Subject: [PATCH 09/89] Add unit test function capFist calendar module --- tests/unit/functions/calendar_spec.js | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 tests/unit/functions/calendar_spec.js diff --git a/tests/unit/functions/calendar_spec.js b/tests/unit/functions/calendar_spec.js new file mode 100644 index 00000000..435e2e4d --- /dev/null +++ b/tests/unit/functions/calendar_spec.js @@ -0,0 +1,36 @@ +var fs = require("fs"); +var path = require("path"); +var chai = require("chai"); +var expect = chai.expect; +var vm = require("vm"); + + +describe("Functions into modules/default/calendar/calendar.js", function() { + + // Fake for use by calendar.js + Module = {} + Module.definitions = {}; + Module.register = function (name, moduleDefinition) { + Module.definitions[name] = moduleDefinition; + }; + + // load calendar.js + require("../../../modules/default/calendar/calendar.js"); + + describe("capFirst", function() { + words = { + 'rodrigo': 'Rodrigo', + '123m': '123m', + 'magic mirror': 'Magic mirror', + ',a': ',a', + "ñandú": "Ñandú" + }; + + Object.keys(words).forEach(word => { + it(`for ${word} should return ${words[word]}`, function() { + expect(Module.definitions.calendar.capFirst(word)).to.equal(words[word]); + }); + }); + }); +}); + From f4408aa72c93509404d0beb024fa78b2316efce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sun, 26 Mar 2017 16:31:57 -0300 Subject: [PATCH 10/89] Add link for information about Beaufort Wind Scale for ms2Beaufort function in currentweather and weatherforecast module --- modules/default/currentweather/currentweather.js | 4 ++++ modules/default/weatherforecast/weatherforecast.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 1b55e255..5496010b 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -386,6 +386,10 @@ Module.register("currentweather",{ /* ms2Beaufort(ms) * Converts m2 to beaufort (windspeed). * + * see: + * http://www.spc.noaa.gov/faq/tornado/beaufort.html + * https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale + * * argument ms number - Windspeed in m/s. * * return number - Windspeed in beaufort. diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index b269a44a..698c5651 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -335,6 +335,10 @@ Module.register("weatherforecast",{ /* ms2Beaufort(ms) * Converts m2 to beaufort (windspeed). * + * see: + * http://www.spc.noaa.gov/faq/tornado/beaufort.html + * https://en.wikipedia.org/wiki/Beaufort_scale#Modern_scale + * * argument ms number - Windspeed in m/s. * * return number - Windspeed in beaufort. From 29f68d218dc00775349738fb8ecf3da54d7573e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sun, 26 Mar 2017 18:06:34 -0300 Subject: [PATCH 11/89] Fix spelling mistake --- installers/raspberry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/raspberry.sh b/installers/raspberry.sh index 2df89a5f..a76c1a9e 100644 --- a/installers/raspberry.sh +++ b/installers/raspberry.sh @@ -65,7 +65,7 @@ if command_exists node; then fi else - echo -e "\e[92mNo Node.js upgrade nessecery.\e[0m" + echo -e "\e[92mNo Node.js upgrade necessary.\e[0m" fi else From 5a6f5133af50b285ab5ccdfa434f62ad775a157e Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Apr 2017 22:05:21 +0200 Subject: [PATCH 12/89] Prepare setup for 2.1.2 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccf6eba1..f55c6ed6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2.1.2] - Unreleased + +### Changed + +### Added + +### Updated ## [2.1.1] - 2017-04-01 diff --git a/package.json b/package.json index a190f12d..3f1bde8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.1.1", + "version": "2.1.2-dev", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { From 5ccf053cba9adbc24a93fd76e95c99a460a037d0 Mon Sep 17 00:00:00 2001 From: Doug Kline Date: Sat, 1 Apr 2017 17:23:24 -0400 Subject: [PATCH 13/89] TL;RL cheat notes for IPv4 ipWhitelist Hopefully save a google or support request -- while still using IPv4 addresses on MagicMirror network, need to set full address by using ::ffff: as prefix to IP in config. e.g. ::ffff:192.168.5.1 and not 192.168.5.1 --- config/config.js.sample | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/config.js.sample b/config/config.js.sample index 53677cfa..e07c2c75 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -6,7 +6,12 @@ var config = { port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses. + 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", timeFormat: 24, From 4a70e3cd319143c15efccea6bf40a83a8b1d5969 Mon Sep 17 00:00:00 2001 From: Doug Kline Date: Sat, 1 Apr 2017 18:54:28 -0400 Subject: [PATCH 14/89] Update config.js.sample --- config/config.js.sample | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/config.js.sample b/config/config.js.sample index e07c2c75..9b8787bb 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -6,12 +6,11 @@ var config = { port: 8080, - ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses + 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", timeFormat: 24, From 63ae2b8095aa7505407f7399a2b01c4073cc98a2 Mon Sep 17 00:00:00 2001 From: Andrew McOlash Date: Sun, 2 Apr 2017 15:06:58 -0500 Subject: [PATCH 15/89] Add in ability to wrap calendar events to multiple lines --- CHANGELOG.md | 1 + modules/default/calendar/README.md | 1 + modules/default/calendar/calendar.css | 1 + modules/default/calendar/calendar.js | 38 ++++++++++++++++++++++----- 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f55c6ed6..a3e23c6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed ### Added +- Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option ### Updated diff --git a/modules/default/calendar/README.md b/modules/default/calendar/README.md index 470560ba..003c13e1 100644 --- a/modules/default/calendar/README.md +++ b/modules/default/calendar/README.md @@ -31,6 +31,7 @@ The following properties can be configured: | `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](http://fontawesome.io/icons/) website.
**Default value:** `calendar` | `maxTitleLength` | The maximum title length.

**Possible values:** `10` - `50`
**Default value:** `25` +| `wrapEvents` | Wrap event titles to multiple lines. Breaks lines at the length defined by `maxTitleLength`.

**Possible values:** `true` or `false`
**Default value:** `false` | `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` diff --git a/modules/default/calendar/calendar.css b/modules/default/calendar/calendar.css index 26b1e93d..123ab084 100644 --- a/modules/default/calendar/calendar.css +++ b/modules/default/calendar/calendar.css @@ -2,6 +2,7 @@ padding-left: 0; padding-right: 10px; font-size: 80%; + vertical-align: top; } .calendar .symbol span { diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 12ce290f..fa77c94a 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -18,6 +18,7 @@ Module.register("calendar", { displayRepeatingCountTitle: false, defaultRepeatingCountTitle: "", maxTitleLength: 25, + wrapEvents: false, // wrap events to multiple lines breaking at maxTitleLength fetchInterval: 5 * 60 * 1000, // Update every 5 minutes. animationSpeed: 2000, fade: true, @@ -414,15 +415,38 @@ Module.register("calendar", { * * argument string string - The string to shorten. * argument maxLength number - The max length of the string. + * argument wrapEvents - Wrap the text after the line has reached maxLength * * return string - The shortened string. */ - shorten: function (string, maxLength) { - if (string.length > maxLength) { - return string.slice(0, maxLength) + "…"; - } + shorten: function (string, maxLength, wrapEvents) { + if (wrapEvents) { + var temp = ""; + var currentLine = ""; + var words = string.split(" "); - return string; + for (var i = 0; i < words.length; i++) { + var word = words[i]; + if (currentLine.length + word.length < 25 - 1) { // max - 1 to account for a space + currentLine += (word + " "); + } else { + if (currentLine.length > 0) { + temp += (currentLine + "
" + word + " "); + } else { + temp += (word + "
"); + } + currentLine = ""; + } + } + + return temp + currentLine; + } else { + if (string.length > maxLength) { + return string.slice(0, maxLength) + "…"; + } else { + return string; + } + } }, /* capFirst(string) @@ -437,7 +461,7 @@ Module.register("calendar", { /* titleTransform(title) * Transforms the title of an event for usage. * Replaces parts of the text as defined in config.titleReplace. - * Shortens title based on config.maxTitleLength + * Shortens title based on config.maxTitleLength and config.wrapEvents * * argument title string - The title to transform. * @@ -456,7 +480,7 @@ Module.register("calendar", { title = title.replace(needle, replacement); } - title = this.shorten(title, this.config.maxTitleLength); + title = this.shorten(title, this.config.maxTitleLength, this.config.wrapEvents); return title; }, From 154e33a2c3652c1f0538d13b4893eacb06305771 Mon Sep 17 00:00:00 2001 From: Andrew McOlash Date: Sun, 2 Apr 2017 15:10:00 -0500 Subject: [PATCH 16/89] Make times align to the top of the cell --- modules/default/calendar/calendar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default/calendar/calendar.css b/modules/default/calendar/calendar.css index 123ab084..6bc5762d 100644 --- a/modules/default/calendar/calendar.css +++ b/modules/default/calendar/calendar.css @@ -20,4 +20,5 @@ .calendar .time { padding-left: 30px; text-align: right; + vertical-align: top; } From 64f2a6757345c23e277b58d365161fd3ea7da089 Mon Sep 17 00:00:00 2001 From: Greg Dev Date: Sun, 2 Apr 2017 22:29:54 +0200 Subject: [PATCH 17/89] Add Polish translation for week and day after tomorrow --- translations/pl.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/translations/pl.json b/translations/pl.json index 0c79835f..1d30e395 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -3,9 +3,12 @@ "TODAY": "Dziś", "TOMORROW": "Jutro", + "DAYAFTERTOMORROW": "Pojutrze", "RUNNING": "Koniec za", "EMPTY": "Brak wydarzeń.", + "WEEK": "Tydzień", + "N": "N", "NNE": "NNE", "NE": "NE", From fb90574d44a0ea86f678b637614b161282f52e10 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sun, 2 Apr 2017 23:10:32 +0200 Subject: [PATCH 18/89] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3e23c6d..49c5543c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Changed ### Added -- Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option +- Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option. ### Updated +- Added missing keys to Polish translation. ## [2.1.1] - 2017-04-01 From 3e1eb035178ca21c7acad4ad970b1aedc9d49ec4 Mon Sep 17 00:00:00 2001 From: fewieden Date: Mon, 3 Apr 2017 10:06:57 +0200 Subject: [PATCH 19/89] added german translation key --- CHANGELOG.md | 1 + translations/de.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49c5543c..8d883b16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Updated - Added missing keys to Polish translation. +- Added missing key to German translation. ## [2.1.1] - 2017-04-01 diff --git a/translations/de.json b/translations/de.json index eb67d41a..2723bf86 100644 --- a/translations/de.json +++ b/translations/de.json @@ -7,6 +7,8 @@ "RUNNING": "noch", "EMPTY": "Keine Termine.", + "WEEK": "Woche", + "N": "N", "NNE": "NNO", "NE": "NO", From a74efd285c92b0657a4b46c80ea6fd6eb5d0e596 Mon Sep 17 00:00:00 2001 From: fewieden Date: Mon, 3 Apr 2017 10:37:23 +0200 Subject: [PATCH 20/89] fix typo + eslint --- Gruntfile.js | 30 ++++++++++++++++------- modules/node_modules/node_helper/index.js | 11 +++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 06fed2d5..4951f5c7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,12 +6,12 @@ module.exports = function(grunt) { options: { configFile: ".eslintrc.json" }, - target: ["js/*.js", "modules/default/*.js", "modules/default/*/*.js", + target: [ + "js/*.js", "modules/default/*.js", "modules/default/*/*.js", "serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js", "!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js", - "config/*", - "translations/translations.js", "vendor/vendor.js" - + "config/*", "translations/translations.js", "vendor/vendor.js", + "modules/node_modules/node_helper/index.js" ] }, stylelint: { @@ -19,14 +19,21 @@ module.exports = function(grunt) { options: { configFile: ".stylelintrc" }, - src: ["css/main.css", "modules/default/calendar/calendar.css", "modules/default/clock/clock_styles.css", "modules/default/currentweather/currentweather.css", "modules/default/weatherforcast/weatherforcast.css"] + src: [ + "css/main.css", "modules/default/calendar/calendar.css", + "modules/default/clock/clock_styles.css", + "modules/default/currentweather/currentweather.css", + "modules/default/weatherforcast/weatherforcast.css" + ] } }, jsonlint: { main: { - src: ["package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json", + src: [ + "package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json", "modules/default/*/translations/*.json", "installers/pm2_MagicMirror.json", - "vendor/package.js"], + "vendor/package.js" + ], options: { reporter: "jshint" } @@ -58,11 +65,16 @@ module.exports = function(grunt) { "MD038": false } }, - src: ["README.md", "CHANGELOG.md", "LICENSE.md", "modules/README.md", "modules/default/**/*.md", "!modules/default/calendar/vendor/ical.js/readme.md"] + src: [ + "README.md", "CHANGELOG.md", "LICENSE.md", "modules/README.md", + "modules/default/**/*.md", "!modules/default/calendar/vendor/ical.js/readme.md" + ] } }, yamllint: { - all: [".travis.yml"] + all: [ + ".travis.yml" + ] } }); grunt.loadNpmTasks("grunt-eslint"); diff --git a/modules/node_modules/node_helper/index.js b/modules/node_modules/node_helper/index.js index 8d0372bd..37c3e2cb 100644 --- a/modules/node_modules/node_helper/index.js +++ b/modules/node_modules/node_helper/index.js @@ -20,7 +20,7 @@ NodeHelper = Class.extend({ }, start: function() { - console.log("Staring module helper: " + this.name); + console.log("Starting module helper: " + this.name); }, /* socketNotificationReceived(notification, payload) @@ -45,7 +45,7 @@ NodeHelper = Class.extend({ /* setPath(path) * Set the module path. * - * argument name string - Module name. + * argument path string - Module path. */ setPath: function(path) { this.path = path; @@ -98,9 +98,10 @@ NodeHelper = Class.extend({ // register catch all. socket.on("*", function(notification, payload) { - if (notification !== "*") - //console.log('received message in namespace: ' + namespace); - self.socketNotificationReceived(notification, payload); + if (notification !== "*") { + //console.log('received message in namespace: ' + namespace); + self.socketNotificationReceived(notification, payload); + } }); }); From ab28d0e09fb7cb861b30706330968a9cf589cb16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 11:28:46 -0300 Subject: [PATCH 21/89] Add note about how configurate the file into config.js.sample --- config/config.js.sample | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/config.js.sample b/config/config.js.sample index 9b8787bb..0c0df06b 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -2,6 +2,10 @@ * * 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 = { From 636dbe5b95110cc2f9c86e3262915b2984fbeb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 11:47:22 -0300 Subject: [PATCH 22/89] Globing pattern test grunt (#1) * Fix Matching patterns tests directories Grunt task of eslint * Fix eslint errors in testsuite. * Format one line per file in src section in Gruntfile.js --- Gruntfile.js | 35 ++++++++++++++----- .../compliments/compliments_parts_day.js | 2 +- tests/configs/modules/positions.js | 4 +-- tests/unit/global_vars/root_path_spec.js | 4 +-- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4951f5c7..8d069c82 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,10 +7,18 @@ module.exports = function(grunt) { configFile: ".eslintrc.json" }, target: [ - "js/*.js", "modules/default/*.js", "modules/default/*/*.js", - "serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js", - "!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js", - "config/*", "translations/translations.js", "vendor/vendor.js", + "js/*.js", + "modules/default/*.js", + "modules/default/*/*.js", + "serveronly/*.js", + "*.js", + "tests/**/*.js", + "!modules/default/alert/notificationFx.js", + "!modules/default/alert/modernizr.custom.js", + "!modules/default/alert/classie.js", + "config/*", + "translations/translations.js", + "vendor/vendor.js", "modules/node_modules/node_helper/index.js" ] }, @@ -20,7 +28,8 @@ module.exports = function(grunt) { configFile: ".stylelintrc" }, src: [ - "css/main.css", "modules/default/calendar/calendar.css", + "css/main.css", + "modules/default/calendar/calendar.css", "modules/default/clock/clock_styles.css", "modules/default/currentweather/currentweather.css", "modules/default/weatherforcast/weatherforcast.css" @@ -30,8 +39,12 @@ module.exports = function(grunt) { jsonlint: { main: { src: [ - "package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json", - "modules/default/*/translations/*.json", "installers/pm2_MagicMirror.json", + "package.json", + ".eslintrc.json", + ".stylelintrc", + "translations/*.json", + "modules/default/*/translations/*.json", + "installers/pm2_MagicMirror.json", "vendor/package.js" ], options: { @@ -66,8 +79,12 @@ module.exports = function(grunt) { } }, src: [ - "README.md", "CHANGELOG.md", "LICENSE.md", "modules/README.md", - "modules/default/**/*.md", "!modules/default/calendar/vendor/ical.js/readme.md" + "README.md", + "CHANGELOG.md", + "LICENSE.md", + "modules/README.md", + "modules/default/**/*.md", + "!modules/default/calendar/vendor/ical.js/readme.md" ] } }, diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index 8d47fe22..b4443567 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default compliments +/* Magic Mirror Test config for default compliments * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index 7d0188c2..60e6dd04 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -24,8 +24,8 @@ var config = { // Using exotic content. This is why dont accept go to JSON configuration file (function() { var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third", - "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", - "bottom_bar", "fullscreen_above", "fullscreen_below"]; + "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", + "bottom_bar", "fullscreen_above", "fullscreen_below"]; var modules = Array(); for (idx in positions) { modules.push({ diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js index 197ee6a7..ef7ce3e9 100644 --- a/tests/unit/global_vars/root_path_spec.js +++ b/tests/unit/global_vars/root_path_spec.js @@ -63,8 +63,8 @@ describe("'global.root_path' set in js/app.js", function() { }); it("should expect the global.version equals package.json file", function() { - version_package = JSON.parse(fs.readFileSync("package.json", "utf8")).version; - expect(this.sandbox.global.version).to.equal(version_package); + versionPackage = JSON.parse(fs.readFileSync("package.json", "utf8")).version; + expect(this.sandbox.global.version).to.equal(versionPackage); }); }); From c798913fd230d919c5333b021c554838f10a2be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 15:18:20 -0300 Subject: [PATCH 23/89] Fix extra tabs added in config.js.sample --- config/config.js.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.js.sample b/config/config.js.sample index 9b8787bb..6d933453 100644 --- a/config/config.js.sample +++ b/config/config.js.sample @@ -8,9 +8,9 @@ var config = { port: 8080, 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"], + // ["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", timeFormat: 24, From d903fe400f39717c7bbc5e23182c6f9a32ac39cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 15:21:52 -0300 Subject: [PATCH 24/89] Add entry in Changelog for newsfeed_test_case --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d883b16..9ba0af26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Added - Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option. +- Add test e2e `show title newsfeed` for newsfeed module. ### Updated - Added missing keys to Polish translation. From f2c3fc20deb72aa4a3baef7c55fada3cd897acf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 15:50:25 -0300 Subject: [PATCH 25/89] ignore git file for vim and patch --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index e130a22e..ecb483e8 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,13 @@ Temporary Items # Ignore changes to the custom css files. /css/custom.css + +# Vim +## swap +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] + +## diff patch +*.orig +*.rej +*.bak From 6e33e063da3c83fd9bcffc89b72595933dc61d79 Mon Sep 17 00:00:00 2001 From: Javier Sigler Date: Tue, 4 Apr 2017 18:30:24 +0200 Subject: [PATCH 26/89] Remove layers and fix npm install of vendor --- Dockerfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddf6d9d6..32939f95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,22 @@ FROM node:latest -RUN apt-get update && apt-get -y install dos2unix - +ENV NODE_ENV production +ENV MM_PORT 8080 WORKDIR /opt/magic_mirror + COPY . . COPY /modules unmount_modules COPY /config unmount_config -ENV NODE_ENV production -ENV MM_PORT 8080 - -RUN npm install - -RUN ["dos2unix", "docker-entrypoint.sh"] -RUN ["chmod", "+x", "docker-entrypoint.sh"] +RUN apt-get update \ + && apt-get -qy install tofrodos dos2unix \ + && chmod -R 777 vendor \ + && npm install \ + && cd vendor \ + && npm install \ + && cd .. \ + && dos2unix docker-entrypoint.sh \ + && chmod +x docker-entrypoint.sh EXPOSE $MM_PORT ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"] From fa64ecf5130a6121c476626b7101555c1293fc1d Mon Sep 17 00:00:00 2001 From: Javier Sigler Date: Tue, 4 Apr 2017 18:34:19 +0200 Subject: [PATCH 27/89] Remove layers and fix npm install of vendor --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d883b16..144c5af6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [2.1.2] - Unreleased ### Changed +- Fix the dockerfile to have it running from the first time. ### Added - Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option. From 95278a78ff02ade1c5cc2a3003dd20dd51a10289 Mon Sep 17 00:00:00 2001 From: Greg Dev Date: Wed, 5 Apr 2017 23:39:39 +0200 Subject: [PATCH 28/89] Add Russian translation for week --- translations/ru.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/translations/ru.json b/translations/ru.json index 48c49fd9..c919af50 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -7,6 +7,8 @@ "RUNNING": "Заканчивается через", "EMPTY": "Нет предстоящих событий", + "WEEK": "Неделя", + "N": "С", "NNE": "ССВ", "NE": "СВ", From c53a20a577bf41e69ab979150758644a2092a5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Wed, 5 Apr 2017 22:01:49 -0300 Subject: [PATCH 29/89] Add changelog entry fix instruction_installer --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d883b16..e249999e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added missing keys to Polish translation. - Added missing key to German translation. +### Fixed +- Fix instruction in README for using automatically installer script. + ## [2.1.1] - 2017-04-01 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install` From 033d3c92abcd148ad7a1f5ab783c57e096d24046 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 6 Apr 2017 16:28:48 +0200 Subject: [PATCH 30/89] Add missing dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 83d4c083..f8f5d1e3 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "time-grunt": "latest" }, "dependencies": { + "body-parser": "^1.17.1", "colors": "^1.1.2", "electron": "^1.4.7", "express": "^4.14.0", From b9749bad61f1888b696c4df8e470d29c42763e02 Mon Sep 17 00:00:00 2001 From: Javier Sigler Date: Thu, 6 Apr 2017 16:43:53 +0200 Subject: [PATCH 31/89] Do not replace configuration --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9d91492f..5d37b4a6 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -5,7 +5,7 @@ if [ ! -f /opt/magic_mirror/modules ]; then fi if [ ! -f /opt/magic_mirror/config ]; then - cp -R /opt/magic_mirror/unmount_config/. /opt/magic_mirror/config + cp -Rn /opt/magic_mirror/unmount_config/. /opt/magic_mirror/config fi node serveronly From d68d4c2c76bad5e44f8d0dafa9ee456b582966d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Fri, 7 Apr 2017 10:08:42 -0300 Subject: [PATCH 32/89] Add Changelog vendor_spec --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22aa51ad..3ece1e37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option. - Add test e2e `show title newsfeed` for newsfeed module. - Add task to check configuration file. +- Add test check URLs of vendors. ### Updated - Added missing keys to Polish translation. From d5e902679b45e64c88b18cd23f227c83e141410c Mon Sep 17 00:00:00 2001 From: Sebastian Limbach Date: Wed, 12 Apr 2017 20:19:24 +0200 Subject: [PATCH 33/89] Change linux distribution I changed the linux distribution from node, which used Debian, to an arm based linux distribution so the application can be used on an arm based system (e.g. Raspberry) --- Dockerfile | 31 ++++++++++++++++++------------- README.md | 2 +- docker-entrypoint.sh | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32939f95..4ee863fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,27 @@ -FROM node:latest +FROM izone/arm:node +# Set env variables ENV NODE_ENV production ENV MM_PORT 8080 + WORKDIR /opt/magic_mirror -COPY . . -COPY /modules unmount_modules -COPY /config unmount_config +# Cache node_modules +COPY package.json /opt/magic_mirror +RUN npm install -RUN apt-get update \ - && apt-get -qy install tofrodos dos2unix \ - && chmod -R 777 vendor \ - && npm install \ - && cd vendor \ - && npm install \ - && cd .. \ - && dos2unix docker-entrypoint.sh \ - && chmod +x docker-entrypoint.sh +# Copy all needed files +COPY . /opt/magic_mirror + +# Save/Cache config and modules folder for docker-entrypoint +COPY /modules /opt/magic_mirror/unmount_modules +COPY /config /opt/magic_mirror/unmount_config + +# Convert docker-entrypoint.sh to unix format and grant execution privileges +RUN apk update \ + && apk add dos2unix --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ + && dos2unix docker-entrypoint.sh \ + && chmod +x docker-entrypoint.sh EXPOSE $MM_PORT ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"] diff --git a/README.md b/README.md index 4fd480bf..29e5b65f 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ docker run -d \ --volume ~/magic_mirror/config:/opt/magic_mirror/config \ --volume ~/magic_mirror/modules:/opt/magic_mirror/modules \ --name magic_mirror \ - MichMich/MagicMirror + michmich/magicmirror ``` | **Volumes** | **Description** | diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5d37b4a6..91d7ebc7 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh if [ ! -f /opt/magic_mirror/modules ]; then cp -R /opt/magic_mirror/unmount_modules/. /opt/magic_mirror/modules From b688dcd4ba75d2d93d757b82a4c787fd2c8801de Mon Sep 17 00:00:00 2001 From: Sebastian Limbach Date: Wed, 12 Apr 2017 20:20:30 +0200 Subject: [PATCH 34/89] Add changes to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ece1e37..675db645 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [2.1.2] - Unreleased ### Changed +- Change Docker base image (Debian + Node) to an arm based distro (AlpineARM + Node) ([#846](https://github.com/MichMich/MagicMirror/pull/846)) - Fix the dockerfile to have it running from the first time. ### Added From 4f844abc0c795d9ebf280010743b7d0c39a17a91 Mon Sep 17 00:00:00 2001 From: Sebastian Limbach Date: Wed, 12 Apr 2017 20:21:51 +0200 Subject: [PATCH 35/89] Change copy flag to not replace existing modules --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 91d7ebc7..3ab97502 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/sh if [ ! -f /opt/magic_mirror/modules ]; then - cp -R /opt/magic_mirror/unmount_modules/. /opt/magic_mirror/modules + cp -Rn /opt/magic_mirror/unmount_modules/. /opt/magic_mirror/modules fi if [ ! -f /opt/magic_mirror/config ]; then From 467b1ad4f16131a67e878c6782b40773c5d0f9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Wed, 12 Apr 2017 22:29:20 -0300 Subject: [PATCH 36/89] Add test match week number with clock module with configuration showWeek --- CHANGELOG.md | 1 + package.json | 1 + tests/e2e/modules/clock_spec.js | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 675db645..3060c6c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test e2e `show title newsfeed` for newsfeed module. - Add task to check configuration file. - Add test check URLs of vendors. +- Add test of match current week number on clock module with showWeek configuration. ### Updated - Added missing keys to Polish translation. diff --git a/package.json b/package.json index c3bdae63..1af96f22 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "devDependencies": { "chai": "^3.5.0", "chai-as-promised": "^6.0.0", + "current-week-number": "^1.0.7", "grunt": "latest", "grunt-eslint": "latest", "grunt-jsonlint": "latest", diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js index a24b38d6..948b1c31 100644 --- a/tests/e2e/modules/clock_spec.js +++ b/tests/e2e/modules/clock_spec.js @@ -119,6 +119,14 @@ describe("Clock module", function () { return app.client.waitUntilWindowLoaded() .getText(".clock .week").should.eventually.match(weekRegex); }); + + it("shows week with correct number of week of year", function() { + const currentWeekNumber = require('current-week-number')(); + const weekToShow = "Week " + currentWeekNumber; + return app.client.waitUntilWindowLoaded() + .getText(".clock .week").should.eventually.equal(weekToShow); + }); + }); }); From 7e9c4848fb7100a26e52c36276c2b862db16301e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 13 Apr 2017 08:40:37 -0300 Subject: [PATCH 37/89] Sort dependencies in the file package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3bdae63..8157fed8 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,8 @@ "grunt-markdownlint": "^1.0.13", "grunt-stylelint": "latest", "grunt-yamllint": "latest", - "jshint": "^2.9.4", "http-auth": "^3.1.3", + "jshint": "^2.9.4", "mocha": "^3.2.0", "spectron": "^3.4.1", "stylelint-config-standard": "latest", From 93965fd98b91eb753f7da9baf101506a8b3254b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 13 Apr 2017 23:44:37 -0300 Subject: [PATCH 38/89] Add changelog test modules/default/defaultmodules.js --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ece1e37..f6685ea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test e2e `show title newsfeed` for newsfeed module. - Add task to check configuration file. - Add test check URLs of vendors. +- Add test default modules present modules/default/defaultmodules.js. ### Updated - Added missing keys to Polish translation. From 9ebee8c03e79eadfca183bfee9e4fe1c4e5b7ab5 Mon Sep 17 00:00:00 2001 From: Sebastian Limbach Date: Sun, 16 Apr 2017 21:17:07 +0200 Subject: [PATCH 39/89] Delete all Docker related files The Docker images are outsourced to https://github.com/bastilimbach/docker-MagicMirror --- .dockerignore | 72 -------------------------------------------- Dockerfile | 27 ----------------- docker-entrypoint.sh | 11 ------- 3 files changed, 110 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 docker-entrypoint.sh diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 3b406630..00000000 --- a/.dockerignore +++ /dev/null @@ -1,72 +0,0 @@ -# Various Node ignoramuses. - -logs -*.log -npm-debug.log* -pids -*.pid -*.seed -lib-cov -coverage -.grunt -.lock-wscript -build/Release -node_modules -jspm_modules -.npm -.node_repl_history - -# Various Windows ignoramuses. -Thumbs.db -ehthumbs.db -Desktop.ini -$RECYCLE.BIN/ -*.cab -*.msi -*.msm -*.msp -*.lnk - -# Various OSX ignoramuses. -.DS_Store -.AppleDouble -.LSOverride -Icon -._* -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# Various Linux ignoramuses. - -.fuse_hidden* -.directory -.Trash-* - -# Various Magic Mirror ignoramuses and anti-ignoramuses. - -# Don't ignore the node_helper core module. -!/modules/node_helper -!/modules/node_helper/** - -# Ignore all modules except the default modules. -/modules/** -!/modules/default/** - -# Ignore changes to the custom css files. -/css/custom.css - -# Ignore unnecessary files for docker -CHANGELOG.md -LICENSE.md -README.md -Gruntfile.js -.* diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 4ee863fb..00000000 --- a/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM izone/arm:node - -# Set env variables -ENV NODE_ENV production -ENV MM_PORT 8080 - -WORKDIR /opt/magic_mirror - -# Cache node_modules -COPY package.json /opt/magic_mirror -RUN npm install - -# Copy all needed files -COPY . /opt/magic_mirror - -# Save/Cache config and modules folder for docker-entrypoint -COPY /modules /opt/magic_mirror/unmount_modules -COPY /config /opt/magic_mirror/unmount_config - -# Convert docker-entrypoint.sh to unix format and grant execution privileges -RUN apk update \ - && apk add dos2unix --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted \ - && dos2unix docker-entrypoint.sh \ - && chmod +x docker-entrypoint.sh - -EXPOSE $MM_PORT -ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"] diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100644 index 3ab97502..00000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ ! -f /opt/magic_mirror/modules ]; then - cp -Rn /opt/magic_mirror/unmount_modules/. /opt/magic_mirror/modules -fi - -if [ ! -f /opt/magic_mirror/config ]; then - cp -Rn /opt/magic_mirror/unmount_config/. /opt/magic_mirror/config -fi - -node serveronly From ac53d64ffc2c7767087193719df397b576131e5c Mon Sep 17 00:00:00 2001 From: Sebastian Limbach Date: Sun, 16 Apr 2017 21:17:52 +0200 Subject: [PATCH 40/89] Change docker hub url --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 29e5b65f..c19ee20f 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ docker run -d \ --volume ~/magic_mirror/config:/opt/magic_mirror/config \ --volume ~/magic_mirror/modules:/opt/magic_mirror/modules \ --name magic_mirror \ - michmich/magicmirror + bastilimbach/docker-magicmirror ``` | **Volumes** | **Description** | @@ -75,6 +75,8 @@ var config = { }; ``` +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. From 058b4bbe6cc3c037b02ced87b74996875b0dc312 Mon Sep 17 00:00:00 2001 From: Sebastian Limbach Date: Sun, 16 Apr 2017 22:48:05 +0200 Subject: [PATCH 41/89] Add changes to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 675db645..29dd6b50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [2.1.2] - Unreleased ### Changed +- Revert Docker related changes in favor of [docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror). All Docker images are outsourced. ([#856](https://github.com/MichMich/MagicMirror/pull/856)) - Change Docker base image (Debian + Node) to an arm based distro (AlpineARM + Node) ([#846](https://github.com/MichMich/MagicMirror/pull/846)) - Fix the dockerfile to have it running from the first time. From c1830aa37c20717a2923b0f581e048f29f3e38d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 18 Apr 2017 22:21:55 -0300 Subject: [PATCH 42/89] Fix message port starting server --- js/server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/server.js b/js/server.js index 36ebf740..2fc8dc6f 100644 --- a/js/server.js +++ b/js/server.js @@ -15,14 +15,13 @@ var fs = require("fs"); var helmet = require("helmet"); var Server = function(config, callback) { - console.log("Starting server on port " + config.port + " ... "); var port = config.port; if (process.env.MM_PORT) { port = process.env.MM_PORT; } - console.log("Starting server op port " + port + " ... "); + console.log("Starting server on port " + port + " ... "); server.listen(port, config.address ? config.address : null); From 2b2136867d17eaef4a8c702de67e588d817a8525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 18 Apr 2017 22:31:16 -0300 Subject: [PATCH 43/89] Add change double message port in starting server --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 675db645..a3ba0bcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Fix instruction in README for using automatically installer script. +- Fix double message about port when server is starting ## [2.1.1] - 2017-04-01 From 298e32aadae970a56b8d5679417bc0a7b92c0053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 18 Apr 2017 22:38:29 -0300 Subject: [PATCH 44/89] Fix Grunt error 124:38 error Strings must use doublequote quotes --- tests/e2e/modules/clock_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js index 948b1c31..6f776f12 100644 --- a/tests/e2e/modules/clock_spec.js +++ b/tests/e2e/modules/clock_spec.js @@ -121,7 +121,7 @@ describe("Clock module", function () { }); it("shows week with correct number of week of year", function() { - const currentWeekNumber = require('current-week-number')(); + const currentWeekNumber = require("current-week-number")(); const weekToShow = "Week " + currentWeekNumber; return app.client.waitUntilWindowLoaded() .getText(".clock .week").should.eventually.equal(weekToShow); From fd2919fd1ca90b08557d88d49cf6effa1ebe05ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 18 Apr 2017 23:14:07 -0300 Subject: [PATCH 45/89] Remove commented log not used in js/socketclient.js --- js/socketclient.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/socketclient.js b/js/socketclient.js index 8ea468a8..baead68e 100644 --- a/js/socketclient.js +++ b/js/socketclient.js @@ -22,7 +22,6 @@ var MMSocket = function(moduleName) { // register catch all. self.socket.on("*", function(notification, payload) { if (notification !== "*") { - //console.log('Received notification: ' + notification +', payload: ' + payload); notificationCallback(notification, payload); } }); From b41bda569d96a516cf1374509e51ff2ea03070ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 18 Apr 2017 23:34:14 -0300 Subject: [PATCH 46/89] Change method for check if pass dev parameter --- js/electron.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/electron.js b/js/electron.js index 1f16092b..fbbdba94 100644 --- a/js/electron.js +++ b/js/electron.js @@ -51,7 +51,7 @@ function createWindow() { mainWindow.loadURL("http://localhost:" + config.port); // Open the DevTools if run with "npm start dev" - if(process.argv[2] == "dev") { + if (process.argv.includes("dev")) { mainWindow.webContents.openDevTools(); } From 320ce372f5ca85b3e0c97b5f4eeeaf488c097337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Wed, 19 Apr 2017 00:39:18 -0300 Subject: [PATCH 47/89] Add changelog unit test capFirst function on calendar module --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0816b3e..2dfa5b2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test check URLs of vendors. - Add test of match current week number on clock module with showWeek configuration. - Add test default modules present modules/default/defaultmodules.js. +- Add unit test calendar_modules function capFirst. ### Updated - Added missing keys to Polish translation. From 4904bd53efaa67c839592f8f1c687691155bc886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Wed, 19 Apr 2017 00:45:55 -0300 Subject: [PATCH 48/89] Fix grunt double quotes unit calendar_spec --- tests/unit/functions/calendar_spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/unit/functions/calendar_spec.js b/tests/unit/functions/calendar_spec.js index 435e2e4d..2c7f62f8 100644 --- a/tests/unit/functions/calendar_spec.js +++ b/tests/unit/functions/calendar_spec.js @@ -19,10 +19,10 @@ describe("Functions into modules/default/calendar/calendar.js", function() { describe("capFirst", function() { words = { - 'rodrigo': 'Rodrigo', - '123m': '123m', - 'magic mirror': 'Magic mirror', - ',a': ',a', + "rodrigo": "Rodrigo", + "123m": "123m", + "magic mirror": "Magic mirror", + ",a": ",a", "ñandú": "Ñandú" }; From 31e63b576b193c618420dfba6339862284523fca Mon Sep 17 00:00:00 2001 From: Johan Eliasson Date: Fri, 21 Apr 2017 23:02:33 +0200 Subject: [PATCH 49/89] Indent and double-quoute --- modules/default/compliments/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/default/compliments/README.md b/modules/default/compliments/README.md index 171c86c0..ca75b475 100644 --- a/modules/default/compliments/README.md +++ b/modules/default/compliments/README.md @@ -88,7 +88,7 @@ config: { ], afternoon: [ "Hello, beauty!", - 'You look sexy!', + "You look sexy!", "Looking good today!" ], evening: [ @@ -110,9 +110,9 @@ around them ("morning", "afternoon", "evening", "snow", "rain", etc.). #### Example compliments.json file: ````json { - "anytime" : [ - "Hey there sexy!" - ], + "anytime" : [ + "Hey there sexy!" + ], "morning" : [ "Good morning, sunshine!", "Who needs coffee when you have your smile?", From 581af762f9e022f635daa0186c564691a27ad9fd Mon Sep 17 00:00:00 2001 From: fewieden Date: Sat, 22 Apr 2017 11:35:42 +0200 Subject: [PATCH 50/89] bugfix for duplicated compliments --- CHANGELOG.md | 1 + modules/default/compliments/compliments.js | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0816b3e..53257e4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Fix instruction in README for using automatically installer script. +- Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments). ## [2.1.1] - 2017-04-01 diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js index b9f2011e..6cca95fc 100644 --- a/modules/default/compliments/compliments.js +++ b/modules/default/compliments/compliments.js @@ -99,11 +99,11 @@ Module.register("compliments", { var compliments = null; if (hour >= 3 && hour < 12) { - compliments = this.config.compliments.morning; + compliments = this.config.compliments.morning.slice(0); } else if (hour >= 12 && hour < 17) { - compliments = this.config.compliments.afternoon; + compliments = this.config.compliments.afternoon.slice(0); } else { - compliments = this.config.compliments.evening; + compliments = this.config.compliments.evening.slice(0); } if (typeof compliments === "undefined") { @@ -117,7 +117,6 @@ Module.register("compliments", { compliments.push.apply(compliments, this.config.compliments.anytime); return compliments; - }, /* complimentFile(callback) From 778107aae9dd022116c2ee575ebda6efa2b778f2 Mon Sep 17 00:00:00 2001 From: fewieden Date: Sat, 22 Apr 2017 12:09:52 +0200 Subject: [PATCH 51/89] add edge case anytime only --- modules/default/compliments/compliments.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js index 6cca95fc..cd87bb78 100644 --- a/modules/default/compliments/compliments.js +++ b/modules/default/compliments/compliments.js @@ -98,11 +98,11 @@ Module.register("compliments", { var hour = moment().hour(); var compliments = null; - if (hour >= 3 && hour < 12) { + if (hour >= 3 && hour < 12 && this.config.compliments.hasOwnProperty("morning")) { compliments = this.config.compliments.morning.slice(0); - } else if (hour >= 12 && hour < 17) { + } else if (hour >= 12 && hour < 17 && this.config.compliments.hasOwnProperty("afternoon")) { compliments = this.config.compliments.afternoon.slice(0); - } else { + } else if(this.config.compliments.hasOwnProperty("evening")) { compliments = this.config.compliments.evening.slice(0); } From c4282a3593b1519d7ded4587cf3f1e056ca19c54 Mon Sep 17 00:00:00 2001 From: fewieden Date: Sat, 22 Apr 2017 12:25:51 +0200 Subject: [PATCH 52/89] null isn't typeof undefined --- modules/default/compliments/compliments.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js index cd87bb78..a0af458d 100644 --- a/modules/default/compliments/compliments.js +++ b/modules/default/compliments/compliments.js @@ -96,7 +96,7 @@ Module.register("compliments", { */ complimentArray: function() { var hour = moment().hour(); - var compliments = null; + var compliments; if (hour >= 3 && hour < 12 && this.config.compliments.hasOwnProperty("morning")) { compliments = this.config.compliments.morning.slice(0); From f730d2fc274d7727c1a6b0fcede9ff10e906efec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 22 Apr 2017 21:23:48 -0300 Subject: [PATCH 53/89] Add changelog test directories for default modules --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de0802f4..e44d591c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test of match current week number on clock module with showWeek configuration. - Add test default modules present modules/default/defaultmodules.js. - Add unit test calendar_modules function capFirst. +- Add test for check if exits the directories present in defaults modules. ### Updated - Added missing keys to Polish translation. From 0e486b45e18ec49c195d2219721266173f55ffcb Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Mon, 24 Apr 2017 23:54:32 +0300 Subject: [PATCH 54/89] Support showing wind direction with an arrow As described in https://github.com/MichMich/MagicMirror/issues/871 this feature lets user use arrow instead of an abbreviation for wind directions. This can be especially helpful on languages like Finnish that do not have all the compass directions English has. --- modules/default/currentweather/currentweather.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 6e23cdcf..f0cb82b5 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -94,6 +94,7 @@ Module.register("currentweather",{ this.windSpeed = null; this.windDirection = null; + this.windDeg = null; this.sunriseSunsetTime = null; this.sunriseSunsetIcon = null; this.temperature = null; @@ -122,7 +123,13 @@ Module.register("currentweather",{ if (this.config.showWindDirection) { var windDirection = document.createElement("sup"); - windDirection.innerHTML = " " + this.translate(this.windDirection); + if (this.config.showWindDirectionAsArrow) { + if(this.windDeg !== null) { + windDirection.innerHTML = "   "; + } + } else { + windDirection.innerHTML = " " + this.translate(this.windDirection); + } small.appendChild(windDirection); } var spacer = document.createElement("span"); @@ -329,6 +336,7 @@ Module.register("currentweather",{ this.windDirection = this.deg2Cardinal(data.wind.deg); + this.windDeg = data.wind.deg; this.weatherType = this.config.iconTable[data.weather[0].icon]; var now = new Date(); From b26f9e316d0fa1f006fb7510146f4a103d432f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 24 Apr 2017 22:49:15 -0300 Subject: [PATCH 55/89] ADD fixme wanted where the day if sunday for test number of week --- tests/e2e/modules/clock_spec.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js index 6f776f12..89d7e9e9 100644 --- a/tests/e2e/modules/clock_spec.js +++ b/tests/e2e/modules/clock_spec.js @@ -121,10 +121,12 @@ describe("Clock module", function () { }); it("shows week with correct number of week of year", function() { - const currentWeekNumber = require("current-week-number")(); - const weekToShow = "Week " + currentWeekNumber; - return app.client.waitUntilWindowLoaded() - .getText(".clock .week").should.eventually.equal(weekToShow); + + it("FIXME: if the day is a sunday this not match"); + // const currentWeekNumber = require("current-week-number")(); + // const weekToShow = "Week " + currentWeekNumber; + // return app.client.waitUntilWindowLoaded() + // .getText(".clock .week").should.eventually.equal(weekToShow); }); }); From ee88897b1824f3bfc585b639f60fd25ca6c38ac9 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Tue, 25 Apr 2017 23:15:34 +0300 Subject: [PATCH 56/89] Add better support for translations with backwards compatibility --- js/module.js | 16 ++++++++++------ js/translator.js | 27 +++++++++++++++++++++------ modules/default/calendar/calendar.js | 7 ++++++- translations/fi.json | 2 +- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/js/module.js b/js/module.js index 457b9772..0d51e559 100644 --- a/js/module.js +++ b/js/module.js @@ -272,14 +272,18 @@ var Module = Class.extend({ } }, - /* translate(key, defaultValue) - * Request the translation for a given key. + /* translate(key, defaultValueOrVariables, defaultValue) + * Request the translation for a given key with optional variables and default value. * - * argument key string - The key of the string to translage - * argument defaultValue string - The default value if no translation was found. (Optional) + * argument key string - The key of the string to translate + * argument defaultValueOrVariables string/object - The default value or variables for translating. (Optional) + * argument defaultValue string - The default value with variables. (Optional) */ - translate: function (key, defaultValue) { - return Translator.translate(this, key) || defaultValue || ""; + translate: function (key, defaultValueOrVariables, defaultValue) { + if(typeof defaultValueOrVariables === "object") { + return Translator.translate(this, key, defaultValueOrVariables) || defaultValue || ""; + } + return Translator.translate(this, key) || defaultValueOrVariables || ""; }, /* updateDom(speed) diff --git a/js/translator.js b/js/translator.js index d715b383..b82a739e 100644 --- a/js/translator.js +++ b/js/translator.js @@ -111,32 +111,47 @@ var Translator = (function() { translations: {}, translationsFallback: {}, - /* translate(module, key) + /* translate(module, key, variables) * Load a translation for a given key for a given module. * * argument module Module - The module to load the translation for. * argument key string - The key of the text to translate. + * argument variables - The variables to use within the translation template (optional) */ - translate: function(module, key) { + translate: function(module, key, variables) { + variables = variables || {}; //Empty object by default + + // Combines template and variables like: + // template: "Please wait for {timeToWait} before continuing with {work}." + // variables: {timeToWait: "2 hours", work: "painting"} + // to: "Please wait for 2 hours before continuing with painting." + function createStringFromTemplate(template, variables) { + if(variables.fallback && !template.match(new RegExp("\{.+\}"))) { + template = variables.fallback; + } + return template.replace(new RegExp("\{([^\}]+)\}", "g"), function(_unused, varName){ + return variables[varName] || "{"+varName+"}"; + }); + } if(this.translations[module.name] && key in this.translations[module.name]) { // Log.log("Got translation for " + key + " from module translation: "); - return this.translations[module.name][key]; + return createStringFromTemplate(this.translations[module.name][key], variables); } if (key in this.coreTranslations) { // Log.log("Got translation for " + key + " from core translation."); - return this.coreTranslations[key]; + return createStringFromTemplate(this.coreTranslations[key], variables); } if (this.translationsFallback[module.name] && key in this.translationsFallback[module.name]) { // Log.log("Got translation for " + key + " from module translation fallback."); - return this.translationsFallback[module.name][key]; + return createStringFromTemplate(this.translationsFallback[module.name][key], variables); } if (key in this.coreTranslationsFallback) { // Log.log("Got translation for " + key + " from core translation fallback."); - return this.coreTranslationsFallback[key]; + return createStringFromTemplate(this.coreTranslationsFallback[key], variables); } return key; diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index fa77c94a..9657ece4 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -265,7 +265,12 @@ Module.register("calendar", { } } } else { - timeWrapper.innerHTML = this.capFirst(this.translate("RUNNING")) + " " + moment(event.endDate, "x").fromNow(true); + timeWrapper.innerHTML = this.capFirst( + this.translate("RUNNING", { + fallback: this.translate("RUNNING") + " {timeUntilEnd}", + timeUntilEnd: moment(event.endDate, "x").fromNow(true) + }) + ); } } //timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll'); diff --git a/translations/fi.json b/translations/fi.json index 08bc4060..c013e310 100644 --- a/translations/fi.json +++ b/translations/fi.json @@ -4,7 +4,7 @@ "TODAY": "Tänään", "TOMORROW": "Huomenna", "DAYAFTERTOMORROW": "Ylihuomenna", - "RUNNING": "Meneillään", + "RUNNING": "Päättyy {timeUntilEnd} päästä", "EMPTY": "Ei tulevia tapahtumia.", "N": "P", From f58787bb50fd9b34e0279b62eb3d474c750591f3 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Fri, 28 Apr 2017 13:58:52 +0300 Subject: [PATCH 57/89] Add documentation for showWindDirectionAsArrow --- modules/default/currentweather/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default/currentweather/README.md b/modules/default/currentweather/README.md index d70ec297..bc3d2f3d 100644 --- a/modules/default/currentweather/README.md +++ b/modules/default/currentweather/README.md @@ -40,6 +40,7 @@ The following properties can be configured: | `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` +| `showWindDirectionAsArrow` | Show the wind direction as an arrow instead of abbreviation

**Possible values:** `true` or `false`
**Default value:** `false` | `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` From 2bc5253725226a76db2e73856d81b2685769f7f5 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Fri, 28 Apr 2017 13:59:07 +0300 Subject: [PATCH 58/89] Set default value for showWindDirectionAsArrow --- modules/default/currentweather/currentweather.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index f0cb82b5..0e149982 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -21,6 +21,7 @@ Module.register("currentweather",{ showPeriod: true, showPeriodUpper: false, showWindDirection: true, + showWindDirectionAsArrow: false, useBeaufort: true, lang: config.language, showHumidity: false, From 7e5186c3c73f3867005e1265d3ee32eb780e3732 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Fri, 28 Apr 2017 15:24:41 +0300 Subject: [PATCH 59/89] Add documentation for new translate features --- modules/README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/modules/README.md b/modules/README.md index 03664b15..66b4ba66 100644 --- a/modules/README.md +++ b/modules/README.md @@ -429,6 +429,51 @@ this.translate("INFO") //Will return a translated string for the identifier INFO **Note:** although comments are officially not supported in JSON files, MagicMirror allows it by stripping the comments before parsing the JSON file. Comments in translation files could help other translators. +#####`this.translate(identifier, variables)` +***identifier* String** - Identifier of the string that should be translated. +***variables* Object** - Object of variables to be used in translation. + +This improved and backwards compatible way to handle translations behaves like the normal translation function and follows the rules described above. It's recommended to use this new format for translating everywhere. It allows translator to change the word order in the sentence to be translated. + + +**Example:** +````javascript +var timeUntilEnd = moment(event.endDate, "x").fromNow(true); +this.translate("RUNNING", { "timeUntilEnd": timeUntilEnd) }); // Will return a translated string for the identifier RUNNING, replacing `{timeUntilEnd}` with the contents of the variable `timeUntilEnd` in the order that translator intended. +```` + +**Example English .json file:** +````javascript +{ + "RUNNING": "Ends in {timeUntilEnd}", +} +```` + +**Example Finnish .json file:** +````javascript +{ + "RUNNING": "Päättyy {timeUntilEnd} päästä", +} +```` + +**Note:** The *variables* Object has an special case called `fallback`. It's used to support old translations in translation files that do not have the variables in them. If you are upgrading an old module that had translations that did not support the word order, it is recommended to have the fallback layout. + +**Example:** +````javascript +var timeUntilEnd = moment(event.endDate, "x").fromNow(true); +this.translate("RUNNING", { + "fallback": this.translate("RUNNING") + " {timeUntilEnd}" + "timeUntilEnd": timeUntilEnd +)}); // Will return a translated string for the identifier RUNNING, replacing `{timeUntilEnd}` with the contents of the variable `timeUntilEnd` in the order that translator intended. (has a fallback) +```` + +**Example swedish .json file that does not have the variable in it:** +````javascript +{ + "RUNNING": "Slutar", +} + +In this case the `translate`-function will not find any variables in the translation, will look for `fallback` variable and use that if possible to create the translation. ## The Node Helper: node_helper.js From 826fdbf34214d2735a5673ddf69c225c0f4145fe Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Fri, 28 Apr 2017 15:31:07 +0300 Subject: [PATCH 60/89] Add flexible word order translations to CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de0802f4..baf586f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,10 +17,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test of match current week number on clock module with showWeek configuration. - Add test default modules present modules/default/defaultmodules.js. - Add unit test calendar_modules function capFirst. +- Add support for writing translation fucntions to support flexible word order ### Updated - Added missing keys to Polish translation. - Added missing key to German translation. +- Added better translation with flexible word order to Finnish translation ### Fixed - Fix instruction in README for using automatically installer script. From 5f80deb5b78eea86be91d9d25c91ee5a5f17bf70 Mon Sep 17 00:00:00 2001 From: Mikko Tapionlinna Date: Fri, 28 Apr 2017 15:33:32 +0300 Subject: [PATCH 61/89] Added direction as an arrow feature to CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index de0802f4..1bff7e57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test of match current week number on clock module with showWeek configuration. - Add test default modules present modules/default/defaultmodules.js. - Add unit test calendar_modules function capFirst. +- Add support for showing wind direction as an arrow instead of abbreviation in currentWeather module. ### Updated - Added missing keys to Polish translation. From ba63a44ec89f74ffe82f5a0c79d84ea88b58cdce Mon Sep 17 00:00:00 2001 From: retroflex Date: Fri, 28 Apr 2017 23:31:07 +0200 Subject: [PATCH 62/89] Added option to set a separate date format for full day events. --- modules/default/calendar/README.md | 1 + modules/default/calendar/calendar.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/default/calendar/README.md b/modules/default/calendar/README.md index 003c13e1..8ce9608b 100644 --- a/modules/default/calendar/README.md +++ b/modules/default/calendar/README.md @@ -40,6 +40,7 @@ The following properties can be configured: | `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:** `{'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](http://momentjs.com/docs/#/parsing/string-format/)
**Default value:** `MMM Do` (e.g. Jan 18th) +| `fullDayEventDateFormat` | Format to use for the date of full day events (when using absolute dates)

**Possible values:** See [Moment.js formats](http://momentjs.com/docs/#/parsing/string-format/)
**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` diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index fa77c94a..19555baf 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -25,6 +25,7 @@ Module.register("calendar", { urgency: 7, timeFormat: "relative", dateFormat: "MMM Do", + fullDayEventDateFormat: "MMM Do", getRelative: 6, fadePoint: 0.25, // Start on 1/4th of the list. hidePrivate: false, @@ -228,7 +229,7 @@ Module.register("calendar", { // This event falls within the config.urgency period that the user has set timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); } else { - timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.dateFormat)); + timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").format(this.config.fullDayEventDateFormat)); } } else { timeWrapper.innerHTML = this.capFirst(moment(event.startDate, "x").fromNow()); From af48af508534c0e7d2823f0802fb7c016e9cd5e6 Mon Sep 17 00:00:00 2001 From: retroflex Date: Fri, 28 Apr 2017 23:56:05 +0200 Subject: [PATCH 63/89] Updated changelog: Added option to set a separate date format for full day events. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e44d591c..8fde6318 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test default modules present modules/default/defaultmodules.js. - Add unit test calendar_modules function capFirst. - Add test for check if exits the directories present in defaults modules. +- Add calendar option to set a separate date format for full day events. ### Updated - Added missing keys to Polish translation. From 98dc69893efe2d7c8383aae94149ee8fe36efbd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 29 Apr 2017 23:25:57 -0300 Subject: [PATCH 64/89] Fix spelling Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e44d591c..d772fd61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test of match current week number on clock module with showWeek configuration. - Add test default modules present modules/default/defaultmodules.js. - Add unit test calendar_modules function capFirst. -- Add test for check if exits the directories present in defaults modules. +- Add test for check if exists the directories present in defaults modules. ### Updated - Added missing keys to Polish translation. From 0036ec2214b665777f8040f680c9b0dd8e9f3da9 Mon Sep 17 00:00:00 2001 From: Jason York Date: Sun, 30 Apr 2017 17:51:10 -0500 Subject: [PATCH 65/89] Update currentweather to support indoor temperature --- CHANGELOG.md | 1 + modules/default/currentweather/README.md | 1 + .../default/currentweather/currentweather.css | 3 ++- .../default/currentweather/currentweather.js | 17 +++++++++++++++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e44d591c..fcd75ab3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test default modules present modules/default/defaultmodules.js. - Add unit test calendar_modules function capFirst. - Add test for check if exits the directories present in defaults modules. +- Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification ### Updated - Added missing keys to Polish translation. diff --git a/modules/default/currentweather/README.md b/modules/default/currentweather/README.md index d70ec297..a01d6d86 100644 --- a/modules/default/currentweather/README.md +++ b/modules/default/currentweather/README.md @@ -41,6 +41,7 @@ The following properties can be configured: | `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` +| `showIndoorTemperature` | If you have another module that emits the INDOOR_TEMPERATURE notification, the indoor temperature will be displayed
**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_ diff --git a/modules/default/currentweather/currentweather.css b/modules/default/currentweather/currentweather.css index a40be878..b7669bda 100644 --- a/modules/default/currentweather/currentweather.css +++ b/modules/default/currentweather/currentweather.css @@ -1,4 +1,5 @@ -.currentweather .weathericon { +.currentweather .weathericon, +.currentweather .fa-home { font-size: 75%; line-height: 65px; display: inline-block; diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index 6e23cdcf..4a73dc51 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -25,6 +25,7 @@ Module.register("currentweather",{ lang: config.language, showHumidity: false, degreeLabel: false, + showIndoorTemperature: false, initialLoadDelay: 0, // 0 seconds delay retryDelay: 2500, @@ -97,6 +98,7 @@ Module.register("currentweather",{ this.sunriseSunsetTime = null; this.sunriseSunsetIcon = null; this.temperature = null; + this.indoorTemperature = null; this.weatherType = null; this.loaded = false; @@ -203,6 +205,17 @@ Module.register("currentweather",{ temperature.innerHTML = " " + this.temperature + "°" + degreeLabel; large.appendChild(temperature); + if (this.config.showIndoorTemperature && this.indoorTemperature) { + var indoorIcon = document.createElement("span"); + indoorIcon.className = "fa fa-home"; + large.appendChild(indoorIcon); + + var indoorTemperatureElem = document.createElement("span"); + indoorTemperatureElem.className = "bright"; + indoorTemperatureElem.innerHTML = " " + this.indoorTemperature + "°" + degreeLabel; + large.appendChild(indoorTemperatureElem); + } + wrapper.appendChild(large); return wrapper; }, @@ -239,6 +252,10 @@ Module.register("currentweather",{ } } } + if (notification === "INDOOR_TEMPERATURE") { + this.indoorTemperature = this.roundValue(payload); + this.updateDom(self.config.animationSpeed); + } }, /* updateWeather(compliments) From 07c50c20b6cdc20692e11c3e454d455e29de379c Mon Sep 17 00:00:00 2001 From: retroflex Date: Tue, 2 May 2017 21:20:35 +0200 Subject: [PATCH 66/89] Spaces -> tabs. --- modules/default/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 19555baf..0808ab08 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -25,7 +25,7 @@ Module.register("calendar", { urgency: 7, timeFormat: "relative", dateFormat: "MMM Do", - fullDayEventDateFormat: "MMM Do", + fullDayEventDateFormat: "MMM Do", getRelative: 6, fadePoint: 0.25, // Start on 1/4th of the list. hidePrivate: false, From a60f4e3bada7b02e31c1fad1d0e69556d0eeacc5 Mon Sep 17 00:00:00 2001 From: Vladimir Filimonov Date: Sat, 6 May 2017 21:42:02 +0300 Subject: [PATCH 67/89] fixing issue https://github.com/MichMich/MagicMirror/issues/884 --- installers/raspberry.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/installers/raspberry.sh b/installers/raspberry.sh index a76c1a9e..ecdcc842 100644 --- a/installers/raspberry.sh +++ b/installers/raspberry.sh @@ -150,8 +150,7 @@ fi # Use pm2 control like a service MagicMirror read -p "Do you want use pm2 for auto starting of your MagicMirror (y/n)?" choice -if [[ $choice =~ ^[Yy]$ ]] -then +if [[ $choice =~ ^[Yy]$ ]]; then sudo npm install -g pm2 sudo su -c "env PATH=$PATH:/usr/bin pm2 startup linux -u pi --hp /home/pi" pm2 start ~/MagicMirror/installers/pm2_MagicMirror.json From 0de65d9c0f00258673f19a760f29e12d2a27889f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 11 May 2017 02:30:25 -0300 Subject: [PATCH 68/89] Fix spelling comment js/loader.js --- js/loader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/loader.js b/js/loader.js index 42b42952..2dc260ad 100644 --- a/js/loader.js +++ b/js/loader.js @@ -32,8 +32,8 @@ var Loader = (function() { }); } else { // All modules loaded. Load custom.css - // This is done after all the moduels so we can - // overwrite all the defined styls. + // This is done after all the modules so we can + // overwrite all the defined styles. loadFile("css/custom.css", function() { // custom.css loaded. Start all modules. From be05f1a71f8a3fb9f057ec217411fea55e4db36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 11 May 2017 02:44:52 -0300 Subject: [PATCH 69/89] Remove warnings npm WARN grunt-stylelint@0.8.0 requires a peer of stylelint@^7.8.0 but none was installed. npm WARN stylelint-config-standard@16.0.0 requires a peer of stylelint@^7.8.0 but none was installed. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 49a22cbe..8c3dcccc 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "rrule-alt": "^2.2.3", "simple-git": "^1.62.0", "socket.io": "^1.7.3", + "stylelint": "^7.10.1", "valid-url": "latest", "walk": "latest" } From c953936798f981173d497c08c84db06fb751e94c Mon Sep 17 00:00:00 2001 From: markuzSchmidt Date: Wed, 17 May 2017 22:00:55 +0200 Subject: [PATCH 70/89] Update README.md --- modules/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/README.md b/modules/README.md index 03664b15..74f63569 100644 --- a/modules/README.md +++ b/modules/README.md @@ -257,7 +257,7 @@ socketNotificationReceived: function(notification, payload) { When a module is hidden (using the `module.hide()` method), the `suspend()` method will be called. By subclassing this method you can perform tasks like halting the update timers. ####`resume()` -When a module will be shown after it was previously hidden (using the `module.show()` method), the `resume()` method will be called. By subclassing this method you can perform tasks restarting the update timers. +When a module is requested to be shown (using the `module.show()` method), the `resume()` method will be called. By subclassing this method you can perform tasks restarting the update timers. ### Module instance methods From 34361ccd1c16bea5d85869eb25e0694aad0d2de3 Mon Sep 17 00:00:00 2001 From: xuanyou Date: Thu, 18 May 2017 18:14:43 +0800 Subject: [PATCH 71/89] Update documentation for compliments module Added documentation for the config variable "classes" that allows the user to override the css classes of the compliments module display. Fixed the erroneous "a default calendar is shown" to "default compliments". --- modules/default/compliments/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/default/compliments/README.md b/modules/default/compliments/README.md index 171c86c0..835fbe1e 100644 --- a/modules/default/compliments/README.md +++ b/modules/default/compliments/README.md @@ -13,7 +13,7 @@ modules: [ // Best results in one of the middle regions like: lower_third config: { // The config property is optional. - // If no config is set, an example calendar is shown. + // If no config is set, the default compliments are shown. // See 'Configuration options' for more information. } } @@ -31,6 +31,7 @@ The following properties can be configured: | `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 four arrays: `morning`, `afternoon`, `evening` and `anytime`. 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 four arrays: `morning`, `afternoon`, `evening` and `anytime`. - `compliments.json`
**Default value:** `null` (Do not load from file) +| `classes` | Override the CSS classes of the div showing the compliments ### Compliment configuration From cbb6e4d6f3fe5e722f8385279294ae498634c82a Mon Sep 17 00:00:00 2001 From: xuanyou Date: Thu, 18 May 2017 18:25:17 +0800 Subject: [PATCH 72/89] Update docs: classes config variable default value --- modules/default/compliments/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/compliments/README.md b/modules/default/compliments/README.md index 835fbe1e..13063a3b 100644 --- a/modules/default/compliments/README.md +++ b/modules/default/compliments/README.md @@ -31,7 +31,7 @@ The following properties can be configured: | `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 four arrays: `morning`, `afternoon`, `evening` and `anytime`. 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 four arrays: `morning`, `afternoon`, `evening` and `anytime`. - `compliments.json`
**Default value:** `null` (Do not load from file) -| `classes` | Override the CSS classes of the div showing the compliments +| `classes` | Override the CSS classes of the div showing the compliments

**Default value:** `thin xlarge bright` ### Compliment configuration From 0bb52a605825b36ed79a28115fab353f04690023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20L=C3=B6bel?= Date: Fri, 19 May 2017 19:54:43 +0200 Subject: [PATCH 73/89] #891 Added ability to change the custom.css path. --- CHANGELOG.md | 1 + README.md | 2 +- js/defaults.js | 1 + js/loader.js | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3626334a..882c4390 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test for check if exits the directories present in defaults modules. - Add calendar option to set a separate date format for full day events. - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification +- Add ability to change the path of the `custom.css`. ### Updated - Added missing keys to Polish translation. diff --git a/README.md b/README.md index c19ee20f..8b0c66be 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ The following properties can be configured: | `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 (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/js/defaults.js b/js/defaults.js index 66926de7..eada87a4 100644 --- a/js/defaults.js +++ b/js/defaults.js @@ -21,6 +21,7 @@ var defaults = { timeFormat: 24, units: "metric", zoom: 1, + customCss: "css/custom.css", modules: [ { diff --git a/js/loader.js b/js/loader.js index 42b42952..a753df52 100644 --- a/js/loader.js +++ b/js/loader.js @@ -35,7 +35,7 @@ var Loader = (function() { // This is done after all the moduels so we can // overwrite all the defined styls. - loadFile("css/custom.css", function() { + loadFile(config.customCss, function() { // custom.css loaded. Start all modules. startModules(); }); From 5f539b133b307b2ec3a9e8aee5ea67ca6ef0e926 Mon Sep 17 00:00:00 2001 From: Veeck Date: Sun, 21 May 2017 19:16:09 +0200 Subject: [PATCH 74/89] Update dependencies, add stylelint too --- package.json | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 49a22cbe..08ff28e5 100644 --- a/package.json +++ b/package.json @@ -38,30 +38,31 @@ "grunt": "latest", "grunt-eslint": "latest", "grunt-jsonlint": "latest", - "grunt-markdownlint": "^1.0.13", + "grunt-markdownlint": "^1.0.37", "grunt-stylelint": "latest", "grunt-yamllint": "latest", "http-auth": "^3.1.3", "jshint": "^2.9.4", - "mocha": "^3.2.0", - "spectron": "^3.4.1", + "mocha": "^3.4.1", + "spectron": "^3.6.4", + "stylelint": "^7.10.1", "stylelint-config-standard": "latest", "time-grunt": "latest" }, "dependencies": { - "body-parser": "^1.17.1", + "body-parser": "^1.17.2", "colors": "^1.1.2", - "electron": "^1.4.7", - "express": "^4.14.0", + "electron": "^1.6.8", + "express": "^4.15.3", "express-ipfilter": "latest", "feedme": "latest", - "helmet": "^3.1.0", + "helmet": "^3.6.0", "iconv-lite": "latest", "moment": "latest", - "request": "^2.78.0", - "rrule-alt": "^2.2.3", - "simple-git": "^1.62.0", - "socket.io": "^1.7.3", + "request": "^2.81.0", + "rrule-alt": "^2.2.5", + "simple-git": "^1.73.0", + "socket.io": "^2.0.1", "valid-url": "latest", "walk": "latest" } From 9f61256e5e4961fdcd301a8359573b48e5f2341e Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Fri, 26 May 2017 14:43:44 +0200 Subject: [PATCH 75/89] Move stylelint to devDep. --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 269ed484..08ff28e5 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "rrule-alt": "^2.2.5", "simple-git": "^1.73.0", "socket.io": "^2.0.1", - "stylelint": "^7.10.1", "valid-url": "latest", "walk": "latest" } From e5e49e43474f7d6c3075c708c849937c7f516592 Mon Sep 17 00:00:00 2001 From: retroflex Date: Mon, 29 May 2017 22:55:42 +0200 Subject: [PATCH 76/89] Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW. --- CHANGELOG.md | 1 + translations/sv.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be0e4fd5..94140274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fix instruction in README for using automatically installer script. - Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments). - Fix double message about port when server is starting +- Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW. ## [2.1.1] - 2017-04-01 diff --git a/translations/sv.json b/translations/sv.json index 8025e51e..13288ec3 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -1,9 +1,9 @@ { "LOADING": "Laddar …", - "TODAY": "Idag", - "TOMORROW": "Imorgon", - "DAYAFTERTOMORROW": "Iövermorgon", + "TODAY": "I dag", + "TOMORROW": "I morgon", + "DAYAFTERTOMORROW": "I övermorgon", "RUNNING": "Slutar", "EMPTY": "Inga kommande händelser.", From 12a34f0b097ec6b4c26090c1f5a2c24a50e2773b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Wed, 31 May 2017 13:50:04 -0400 Subject: [PATCH 77/89] Run test unit for failed in Travis of e2e --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5f6f2821..cbf1dfa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_script: - sleep 5 script: - grunt -- npm test +- npm run test:unit cache: directories: - node_modules From 20687d915a165224e2a88c7d0f19fdc49e35f8fc Mon Sep 17 00:00:00 2001 From: Veeck Date: Fri, 2 Jun 2017 19:35:10 +0200 Subject: [PATCH 78/89] Remove unused vars and whitelines, cleanups --- modules/default/clock/clock.js | 1 - modules/default/currentweather/currentweather.js | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js index 761f3948..c25c3897 100644 --- a/modules/default/clock/clock.js +++ b/modules/default/clock/clock.js @@ -127,7 +127,6 @@ Module.register("clock",{ hour = ((now.hours() % 12) / 12) * 360 + 90 + minute / 12; // Create wrappers - var wrapper = document.createElement("div"); var clockCircle = document.createElement("div"); clockCircle.className = "clockCircle"; clockCircle.style.width = this.config.analogSize; diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js index d7c51162..f56dbde1 100644 --- a/modules/default/currentweather/currentweather.js +++ b/modules/default/currentweather/currentweather.js @@ -115,7 +115,6 @@ Module.register("currentweather",{ var small = document.createElement("div"); small.className = "normal medium"; - var windIcon = document.createElement("span"); windIcon.className = "wi wi-strong-wind dimmed"; small.appendChild(windIcon); @@ -247,10 +246,9 @@ Module.register("currentweather",{ if (notification === "CALENDAR_EVENTS") { var senderClasses = sender.data.classes.toLowerCase().split(" "); if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) { - var lastEvent = this.firstEvent; this.firstEvent = false; - for (e in payload) { + for (var e in payload) { var event = payload[e]; if (event.location || event.geo) { this.firstEvent = event; @@ -348,11 +346,10 @@ Module.register("currentweather",{ if (this.config.useBeaufort){ this.windSpeed = this.ms2Beaufort(this.roundValue(data.wind.speed)); - }else { + } else { this.windSpeed = parseFloat(data.wind.speed).toFixed(0); } - this.windDirection = this.deg2Cardinal(data.wind.deg); this.windDeg = data.wind.deg; this.weatherType = this.config.iconTable[data.weather[0].icon]; @@ -385,7 +382,6 @@ Module.register("currentweather",{ this.sunriseSunsetTime = timeString; this.sunriseSunsetIcon = (sunrise < now && sunset > now) ? "wi-sunset" : "wi-sunrise"; - this.show(this.config.animationSpeed, {lockString:this.identifier}); this.loaded = true; this.updateDom(this.config.animationSpeed); From a2464dce73a57866ff3342e370000b8cb1afe13d Mon Sep 17 00:00:00 2001 From: Veeck Date: Sun, 11 Jun 2017 11:36:17 +0200 Subject: [PATCH 79/89] Udpate dependencies --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 08ff28e5..31759870 100644 --- a/package.json +++ b/package.json @@ -38,31 +38,31 @@ "grunt": "latest", "grunt-eslint": "latest", "grunt-jsonlint": "latest", - "grunt-markdownlint": "^1.0.37", + "grunt-markdownlint": "^1.0.39", "grunt-stylelint": "latest", "grunt-yamllint": "latest", "http-auth": "^3.1.3", "jshint": "^2.9.4", - "mocha": "^3.4.1", + "mocha": "^3.4.2", "spectron": "^3.6.4", - "stylelint": "^7.10.1", + "stylelint": "^7.11.0", "stylelint-config-standard": "latest", "time-grunt": "latest" }, "dependencies": { "body-parser": "^1.17.2", "colors": "^1.1.2", - "electron": "^1.6.8", + "electron": "^1.6.10", "express": "^4.15.3", "express-ipfilter": "latest", "feedme": "latest", - "helmet": "^3.6.0", + "helmet": "^3.6.1", "iconv-lite": "latest", "moment": "latest", "request": "^2.81.0", "rrule-alt": "^2.2.5", "simple-git": "^1.73.0", - "socket.io": "^2.0.1", + "socket.io": "^2.0.2", "valid-url": "latest", "walk": "latest" } From 96c338859b8a33a27e53ae13b632f4ae1cae6d9c Mon Sep 17 00:00:00 2001 From: Veeck Date: Sun, 11 Jun 2017 11:53:55 +0200 Subject: [PATCH 80/89] More lazy sunday cleanups of missing semicolons, unused vars and other small thins --- js/electron.js | 2 +- js/main.js | 4 +--- js/server.js | 2 +- modules/default/calendar/calendar.js | 7 +++---- modules/default/weatherforecast/weatherforecast.js | 10 ++++------ 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/js/electron.js b/js/electron.js index fbbdba94..20b6475f 100644 --- a/js/electron.js +++ b/js/electron.js @@ -30,7 +30,7 @@ function createWindow() { zoomFactor: config.zoom }, backgroundColor: "#000000" - } + }; // DEPRECATED: "kioskmode" backwards compatibility, to be removed // settings these options directly instead provides cleaner interface diff --git a/js/main.js b/js/main.js index 5c8a6737..f499da62 100644 --- a/js/main.js +++ b/js/main.js @@ -165,8 +165,6 @@ var MM = (function() { if( headerWrapper.length > 0 && newHeader) { headerWrapper[0].innerHTML = newHeader; } - - }; /* hideModule(module, speed, callback) @@ -219,7 +217,7 @@ var MM = (function() { // remove lockString if set in options. if (options.lockString) { - var index = module.lockStrings.indexOf(options.lockString) + var index = module.lockStrings.indexOf(options.lockString); if ( index !== -1) { module.lockStrings.splice(index, 1); } diff --git a/js/server.js b/js/server.js index 2fc8dc6f..002c2031 100644 --- a/js/server.js +++ b/js/server.js @@ -43,7 +43,7 @@ var Server = function(config, callback) { app.use("/js", express.static(__dirname)); var directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests/configs"]; var directory; - for (i in directories) { + for (var i in directories) { directory = directories[i]; app.use(directory, express.static(path.resolve(global.root_path + directory))); } diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 71efb00f..848d163c 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -174,7 +174,6 @@ Module.register("calendar", { var titleWrapper = document.createElement("td"), repeatingCountTitle = ""; - if (this.config.displayRepeatingCountTitle) { repeatingCountTitle = this.countTitleForUrl(event.url); @@ -421,7 +420,7 @@ Module.register("calendar", { * * argument string string - The string to shorten. * argument maxLength number - The max length of the string. - * argument wrapEvents - Wrap the text after the line has reached maxLength + * argument wrapEvents - Wrap the text after the line has reached maxLength * * return string - The shortened string. */ @@ -496,9 +495,9 @@ Module.register("calendar", { */ broadcastEvents: function () { var eventList = []; - for (url in this.calendarData) { + for (var url in this.calendarData) { var calendar = this.calendarData[url]; - for (e in calendar) { + for (var e in calendar) { var event = cloneObject(calendar[e]); delete event.url; eventList.push(event); diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js index 38661e74..aab3aa15 100644 --- a/modules/default/weatherforecast/weatherforecast.js +++ b/modules/default/weatherforecast/weatherforecast.js @@ -63,7 +63,7 @@ Module.register("weatherforecast",{ firstEvent: false, // create a variable to hold the location name based on the API result. - fetchedLocatioName: "", + fetchedLocationName: "", // Define required scripts. getScripts: function() { @@ -175,7 +175,6 @@ Module.register("weatherforecast",{ row.style.opacity = 1 - (1 / steps * currentStep); } } - } return table; @@ -184,7 +183,7 @@ Module.register("weatherforecast",{ // Override getHeader method. getHeader: function() { if (this.config.appendLocationNameToHeader) { - return this.data.header + " " + this.fetchedLocatioName; + return this.data.header + " " + this.fetchedLocationName; } return this.data.header; @@ -200,10 +199,9 @@ Module.register("weatherforecast",{ if (notification === "CALENDAR_EVENTS") { var senderClasses = sender.data.classes.toLowerCase().split(" "); if (senderClasses.indexOf(this.config.calendarClass.toLowerCase()) !== -1) { - var lastEvent = this.firstEvent; this.firstEvent = false; - for (e in payload) { + for (var e in payload) { var event = payload[e]; if (event.location || event.geo) { this.firstEvent = event; @@ -291,7 +289,7 @@ Module.register("weatherforecast",{ * argument data object - Weather information received form openweather.org. */ processWeather: function(data) { - this.fetchedLocatioName = data.city.name + ", " + data.city.country; + this.fetchedLocationName = data.city.name + ", " + data.city.country; this.forecast = []; for (var i = 0, count = data.list.length; i < count; i++) { From 9f822c0991da27337275569bc379cacf4d8066ab Mon Sep 17 00:00:00 2001 From: Paul-Vincent Roll Date: Sun, 11 Jun 2017 23:44:43 +0200 Subject: [PATCH 81/89] Markdown header fixes --- modules/README.md | 84 +++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/modules/README.md b/modules/README.md index 8d7201f6..4a0a1da5 100644 --- a/modules/README.md +++ b/modules/README.md @@ -44,27 +44,27 @@ As you can see, the `Module.register()` method takes two arguments: the name of ### Available module instance properties After the module is initialized, the module instance has a few available module properties: -####`this.name` +#### `this.name` **String** The name of the module. -####`this.identifier` +#### `this.identifier` **String** This is a unique identifier for the module instance. -####`this.hidden` +#### `this.hidden` **Boolean** This represents if the module is currently hidden (faded away). -####`this.config` +#### `this.config` **Boolean** The configuration of the module instance as set in the user's config.js file. This config will also contain the module's defaults if these properties are not over written by the user config. -####`this.data` +#### `this.data` **Object** The data object contains additional metadata about the module instance: @@ -75,10 +75,10 @@ The data object contains additional metadata about the module instance: - `data.position` - The position in which the instance will be shown. -####`defaults: {}` +#### `defaults: {}` Any properties defined in the defaults object, will be merged with the module config as defined in the user's config.js file. This is the best place to set your modules's configuration defaults. Any of the module configuration properties can be accessed using `this.config.propertyName`, but more about that later. -####'requiresVersion:' +#### `requiresVersion:` *Introduced in version: 2.1.0.* @@ -93,10 +93,10 @@ requiresVersion: "2.1.0", ### Subclassable module methods -####`init()` +#### `init()` This method is called when a module gets instantiated. In most cases you do not need to subclass this method. -####`loaded(callback)` +#### `loaded(callback)` *Introduced in version: 2.1.1.* @@ -111,7 +111,7 @@ loaded: function(callback) { } ```` -####`start()` +#### `start()` This method is called when all modules are loaded an the system is ready to boot up. Keep in mind that the dom object for the module is not yet created. The start method is a perfect place to define any additional module properties: **Example:** @@ -122,7 +122,7 @@ start: function() { } ```` -####`getScripts()` +#### `getScripts()` **Should return: Array** The getScripts method is called to request any additional scripts that need to be loaded. This method should therefore return an array with strings. If you want to return a full path to a file in the module folder, use the `this.file('filename.js')` method. In all cases the loader will only load a file once. It even checks if the file is available in the default vendor folder. @@ -142,7 +142,7 @@ getScripts: function() { **Note:** If a file can not be loaded, the boot up of the mirror will stall. Therefore it's advised not to use any external urls. -####`getStyles()` +#### `getStyles()` **Should return: Array** The getStyles method is called to request any additional stylesheets that need to be loaded. This method should therefore return an array with strings. If you want to return a full path to a file in the module folder, use the `this.file('filename.css')` method. In all cases the loader will only load a file once. It even checks if the file is available in the default vendor folder. @@ -161,7 +161,7 @@ getStyles: function() { ```` **Note:** If a file can not be loaded, the boot up of the mirror will stall. Therefore it's advised not to use any external urls. -####`getTranslations()` +#### `getTranslations()` **Should return: Dictionary** The getTranslations method is called to request translation files that need to be loaded. This method should therefore return a dictionary with the files to load, identified by the country's short name. @@ -179,7 +179,7 @@ getTranslations: function() { ```` -####`getDom()` +#### `getDom()` **Should return:** Dom Object Whenever the MagicMirror needs to update the information on screen (because it starts, or because your module asked a refresh using `this.updateDom()`), the system calls the getDom method. This method should therefore return a dom object. @@ -194,7 +194,7 @@ getDom: function() { ```` -####`getHeader()` +#### `getHeader()` **Should return:** String Whenever the MagicMirror needs to update the information on screen (because it starts, or because your module asked a refresh using `this.updateDom()`), the system calls the getHeader method to retrieve the module's header. This method should therefor return a string. If this method is not subclassed, this function will return the user's configured header. @@ -211,7 +211,7 @@ getHeader: function() { ```` -####`notificationReceived(notification, payload, sender)` +#### `notificationReceived(notification, payload, sender)` That MagicMirror core has the ability to send notifications to modules. Or even better: the modules have the possibility to send notifications to other modules. When this module is called, it has 3 arguments: @@ -237,7 +237,7 @@ notificationReceived: function(notification, payload, sender) { - `DOM_OBJECTS_CREATED` - All dom objects are created. The system is now ready to perform visual changes. -####`socketNotificationReceived: function(notification, payload)` +#### `socketNotificationReceived: function(notification, payload)` When using a node_helper, the node helper can send your module notifications. When this module is called, it has 2 arguments: - `notification` - String - The notification identifier. @@ -253,10 +253,10 @@ socketNotificationReceived: function(notification, payload) { }, ```` -####`suspend()` +#### `suspend()` When a module is hidden (using the `module.hide()` method), the `suspend()` method will be called. By subclassing this method you can perform tasks like halting the update timers. -####`resume()` +#### `resume()` When a module is requested to be shown (using the `module.show()` method), the `resume()` method will be called. By subclassing this method you can perform tasks restarting the update timers. @@ -265,13 +265,13 @@ When a module is requested to be shown (using the `module.show()` method), the ` Each module instance has some handy methods which can be helpful building your module. -####`this.file(filename)` +#### `this.file(filename)` ***filename* String** - The name of the file you want to create the path for.
**Returns String** If you want to create a path to a file in your module folder, use the `file()` method. It returns the path to the filename given as the attribute. Is method comes in handy when configuring the [getScripts](#getscripts) and [getStyles](#getstyles) methods. -####`this.updateDom(speed)` +#### `this.updateDom(speed)` ***speed* Number** - Optional. Animation speed in milliseconds.
Whenever your module need to be updated, call the `updateDom(speed)` method. It requests the MagicMirror core to update its dom object. If you define the speed, the content update will be animated, but only if the content will really change. @@ -289,7 +289,7 @@ start: function() { ... ```` -####`this.sendNotification(notification, payload)` +#### `this.sendNotification(notification, payload)` ***notification* String** - The notification identifier.
***payload* AnyType** - Optional. A notification payload.
@@ -300,7 +300,7 @@ If you want to send a notification to all other modules, use the `sendNotificati this.sendNotification('MYMODULE_READY_FOR_ACTION', {foo:bar}); ```` -####`this.sendSocketNotification(notification, payload)` +#### `this.sendSocketNotification(notification, payload)` ***notification* String** - The notification identifier.
***payload* AnyType** - Optional. A notification payload.
@@ -311,7 +311,7 @@ If you want to send a notification to the node_helper, use the `sendSocketNotifi this.sendSocketNotification('SET_CONFIG', this.config); ```` -####`this.hide(speed, callback, options)` +#### `this.hide(speed, callback, options)` ***speed* Number** - Optional (Required when setting callback or options), The speed of the hide animation in milliseconds. ***callback* Function** - Optional, The callback after the hide animation is finished. ***options* Function** - Optional, Object with additional options for the hide action (see below). (*Introduced in version: 2.1.0.*) @@ -328,7 +328,7 @@ Possible configurable options: **Note 3:** If the dom is not yet created, the hide method won't work. Wait for the `DOM_OBJECTS_CREATED` [notification](#notificationreceivednotification-payload-sender). -####`this.show(speed, callback, options)` +#### `this.show(speed, callback, options)` ***speed* Number** - Optional (Required when setting callback or options), The speed of the show animation in milliseconds. ***callback* Function** - Optional, The callback after the show animation is finished. ***options* Function** - Optional, Object with additional options for the show action (see below). (*Introduced in version: 2.1.0.*) @@ -344,7 +344,7 @@ Possible configurable options: **Note 2:** If the show animation is hijacked (an other method calls show on the same module), the callback will not be called.
**Note 3:** If the dom is not yet created, the show method won't work. Wait for the `DOM_OBJECTS_CREATED` [notification](#notificationreceivednotification-payload-sender). -####Visibility locking +#### Visibility locking (*Introduced in version: 2.1.0.*) @@ -401,7 +401,7 @@ Use this `force` method with caution. See `show()` method for more information. -####`this.translate(identifier)` +#### `this.translate(identifier)` ***identifier* String** - Identifier of the string that should be translated. The Magic Mirror contains a convenience wrapper for `l18n`. You can use this to automatically serve different translations for your modules based on the user's `language` configuration. @@ -429,7 +429,7 @@ this.translate("INFO") //Will return a translated string for the identifier INFO **Note:** although comments are officially not supported in JSON files, MagicMirror allows it by stripping the comments before parsing the JSON file. Comments in translation files could help other translators. -#####`this.translate(identifier, variables)` +##### `this.translate(identifier, variables)` ***identifier* String** - Identifier of the string that should be translated. ***variables* Object** - Object of variables to be used in translation. @@ -492,17 +492,17 @@ Of course, the above helper would not do anything useful. So with the informatio ### Available module instance properties -####`this.name` +#### `this.name` **String** The name of the module -####`this.path` +#### `this.path` **String** The path of the module -####`this.expressApp` +#### `this.expressApp` **Express App Instance** This is a link to the express instance. It will allow you to define extra routes. @@ -521,13 +521,13 @@ start: function() { this.expressApp.use("/" + this.name, express.static(this.path + "/public")); ```` -####`this.io` +#### `this.io` **Socket IO Instance** This is a link to the IO instance. It will allow you to do some Socket.IO magic. In most cases you won't need this, since the Node Helper has a few convenience methods to make this simple. -####'requiresVersion:' +#### `requiresVersion:` *Introduced in version: 2.1.0.* A string that defines the minimum version of the MagicMirror framework. If it is set, the system compares the required version with the users version. If the version of the user is out of date, it won't run the module. @@ -541,10 +541,10 @@ requiresVersion: "2.1.0", ### Subclassable module methods -####`init()` +#### `init()` This method is called when a node helper gets instantiated. In most cases you do not need to subclass this method. -####`start()` +#### `start()` This method is called when all node helpers are loaded and the system is ready to boot up. The start method is a perfect place to define any additional module properties: **Example:** @@ -555,7 +555,7 @@ start: function() { } ```` -####`socketNotificationReceived: function(notification, payload)` +#### `socketNotificationReceived: function(notification, payload)` With this method, your node helper can receive notifications from your modules. When this method is called, it has 2 arguments: - `notification` - String - The notification identifier. @@ -574,7 +574,7 @@ socketNotificationReceived: function(notification, payload) { Each node helper has some handy methods which can be helpful building your module. -####`this.sendSocketNotification(notification, payload)` +#### `this.sendSocketNotification(notification, payload)` ***notification* String** - The notification identifier.
***payload* AnyType** - Optional. A notification payload.
@@ -594,7 +594,7 @@ The core Magic Mirror object: `MM` has some handy method that will help you in c ### Module selection The only additional method available for your module, is the feature to retrieve references to other modules. This can be used to hide and show other modules. -####`MM.getModules()` +#### `MM.getModules()` **Returns Array** - An array with module instances.
To make a selection of all currently loaded module instances, run the `MM.getModules()` method. It will return an array with all currently loaded module instances. The returned array has a lot of filtering methods. See below for more info. @@ -602,7 +602,7 @@ To make a selection of all currently loaded module instances, run the `MM.getMod **Note:** This method returns an empty array if not all modules are started yet. Wait for the `ALL_MODULES_STARTED` [notification](#notificationreceivednotification-payload-sender). -#####`.withClass(classnames)` +##### `.withClass(classnames)` ***classnames* String or Array** - The class names on which you want to filter. **Returns Array** - An array with module instances.
@@ -615,7 +615,7 @@ var modules = MM.getModules().withClass('classname1 classname2'); var modules = MM.getModules().withClass(['classname1','classname2']); ```` -#####`.exceptWithClass(classnames)` +##### `.exceptWithClass(classnames)` ***classnames* String or Array** - The class names of the modules you want to remove from the results. **Returns Array** - An array with module instances.
@@ -628,7 +628,7 @@ var modules = MM.getModules().exceptWithClass('classname1 classname2'); var modules = MM.getModules().exceptWithClass(['classname1','classname2']); ```` -#####`.exceptModule(module)` +##### `.exceptModule(module)` ***module* Module Object** - The reference to a module you want to remove from the results. **Returns Array** - An array with module instances.
@@ -646,7 +646,7 @@ Of course, you can combine all of the above filters: var modules = MM.getModules().withClass('classname1').exceptwithClass('classname2').exceptModule(aModule); ```` -#####`.enumerate(callback)` +##### `.enumerate(callback)` ***callback* Function(module)** - The callback run on every instance. If you want to perform an action on all selected modules, you can use the `enumerate` function: From 12d20c35be2433a423bb3bbaabce07e3bd107626 Mon Sep 17 00:00:00 2001 From: Fredrik Mandal Date: Tue, 13 Jun 2017 01:52:13 +0200 Subject: [PATCH 82/89] Added week translation --- translations/nb.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translations/nb.json b/translations/nb.json index 9a3060be..3aad4263 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -7,6 +7,8 @@ "RUNNING": "Slutter om", "EMPTY": "Ingen kommende arrangementer.", + "WEEK": "Uke", + "N": "N", "NNE": "NNØ", "NE": "NØ", @@ -24,7 +26,7 @@ "NW": "NV", "NNW": "NNV", - "UPDATE_NOTIFICATION": "MagicMirror² oppdatering er tilgjengelig.", + "UPDATE_NOTIFICATION": "MagicMirror²-oppdatering er tilgjengelig.", "UPDATE_NOTIFICATION_MODULE": "Oppdatering tilgjengelig for modulen MODULE_NAME.", "UPDATE_INFO": "Nåværende installasjon er COMMIT_COUNT bak BRANCH_NAME grenen." } From 94169800968eb944c7ff7995600e0a282c89dcae Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 13 Jun 2017 20:28:24 +0200 Subject: [PATCH 83/89] Added Dutch translation Added Dutch translation to Alert module --- CHANGELOG.md | 1 + modules/default/alert/alert.js | 3 ++- modules/default/alert/translations/nl.json | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 modules/default/alert/translations/nl.json diff --git a/CHANGELOG.md b/CHANGELOG.md index c442f3a7..da543183 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add calendar option to set a separate date format for full day events. - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification - Add ability to change the path of the `custom.css`. +- Add translation Dutch to Alert module. ### Updated - Added missing keys to Polish translation. diff --git a/modules/default/alert/alert.js b/modules/default/alert/alert.js index 787a0b4a..c5d3e650 100644 --- a/modules/default/alert/alert.js +++ b/modules/default/alert/alert.js @@ -30,7 +30,8 @@ Module.register("alert",{ getTranslations: function() { return { en: "translations/en.json", - de: "translations/de.json" + de: "translations/de.json", + nl: "translations/nl.json", }; }, show_notification: function(message) { diff --git a/modules/default/alert/translations/nl.json b/modules/default/alert/translations/nl.json new file mode 100644 index 00000000..9cda9089 --- /dev/null +++ b/modules/default/alert/translations/nl.json @@ -0,0 +1,4 @@ +{ + "sysTitle": "MagicMirror Notificatie", + "welcome": "Welkom, Succesvol gestart!" +} From 98bcfbef7e45ce4124e46b3f5d7539644e92e74b Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 18 Jun 2017 19:14:32 +0200 Subject: [PATCH 84/89] Removed unused import Removed unused import from js/electron.js --- CHANGELOG.md | 1 + js/electron.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c442f3a7..65291349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Bug of duplicated compliments as described in [here](https://forum.magicmirror.builders/topic/2381/compliments-module-stops-cycling-compliments). - Fix double message about port when server is starting - Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW. +- Removed unused import from js/electron.js ## [2.1.1] - 2017-04-01 diff --git a/js/electron.js b/js/electron.js index 20b6475f..334a3593 100644 --- a/js/electron.js +++ b/js/electron.js @@ -2,7 +2,6 @@ "use strict"; -const Server = require(__dirname + "/server.js"); const electron = require("electron"); const core = require(__dirname + "/app.js"); From 3404ebbbb8bca36d9c2c2cc465345389c1700e1b Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Jun 2017 13:03:03 +0200 Subject: [PATCH 85/89] Calender respects timeformat In reference to issue #776, made changes to calendar.js to respect timeformat config option if it is used --- CHANGELOG.md | 1 + modules/default/calendar/calendar.js | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 709bd73e..ca1c5f29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fix double message about port when server is starting - Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW. - Removed unused import from js/electron.js +- Made calendar.js respect config.timeFormat irrespecive of locale setting ## [2.1.1] - 2017-04-01 diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js index 848d163c..9ab864b9 100644 --- a/modules/default/calendar/calendar.js +++ b/modules/default/calendar/calendar.js @@ -69,6 +69,29 @@ Module.register("calendar", { // Set locale. moment.locale(config.language); + switch (config.timeFormat) { + case 12: { + moment.updateLocale(config.language, { + longDateFormat: { + LT: "h:mm A" + } + }); + break; + } + case 24: { + moment.updateLocale(config.language, { + longDateFormat: { + LT: "hh:mm" + } + }); + break; + } + // If config.timeFormat was not given (or has invalid format) default to locale default + default: { + break; + } + } + for (var c in this.config.calendars) { var calendar = this.config.calendars[c]; calendar.url = calendar.url.replace("webcal://", "http://"); From c15148fc07119ed772438442fae6fa9d47b51946 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Jun 2017 14:33:18 +0200 Subject: [PATCH 86/89] Issue with date aligment in clock.js In reference to issue #927. Made changes to clock.js and clock_styles.css to prevent aligment problem when displaying analog clock and large calendar entries --- CHANGELOG.md | 1 + modules/default/clock/clock.js | 1 - modules/default/clock/clock_styles.css | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 709bd73e..fee15829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fix double message about port when server is starting - Corrected Swedish translations for TODAY/TOMORROW/DAYAFTERTOMORROW. - Removed unused import from js/electron.js +- Fixed alignment of analog clock when a large calendar is displayed in the same side bar ## [2.1.1] - 2017-04-01 diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js index c25c3897..9a0f57d7 100644 --- a/modules/default/clock/clock.js +++ b/modules/default/clock/clock.js @@ -180,7 +180,6 @@ Module.register("clock",{ wrapper.appendChild(weekWrapper); } else if (this.config.displayType === "analog") { // Display only an analog clock - dateWrapper.style.textAlign = "center"; if (this.config.showWeek) { weekWrapper.style.paddingBottom = "15px"; diff --git a/modules/default/clock/clock_styles.css b/modules/default/clock/clock_styles.css index 1df9bf83..dd9eb0f8 100644 --- a/modules/default/clock/clock_styles.css +++ b/modules/default/clock/clock_styles.css @@ -1,5 +1,5 @@ .clockCircle { - margin: 0 auto; + margin: 0; position: relative; border-radius: 50%; background-size: 100%; From 8814ce05a9c1ecdeb73d2325de1f8888393c22ea Mon Sep 17 00:00:00 2001 From: Cosmin Date: Thu, 29 Jun 2017 10:00:25 +0300 Subject: [PATCH 87/89] Add translations for ro. --- CHANGELOG.md | 1 + translations/ro.json | 32 ++++++++++++++++++++++++++++++++ translations/translations.js | 1 + 3 files changed, 34 insertions(+) create mode 100644 translations/ro.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 709bd73e..a6967d60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add ability for `currentweather` module to display indoor temperature via INDOOR_TEMPERATURE notification - Add ability to change the path of the `custom.css`. - Add translation Dutch to Alert module. +- Added Romanian translation. ### Updated - Added missing keys to Polish translation. diff --git a/translations/ro.json b/translations/ro.json new file mode 100644 index 00000000..4105763e --- /dev/null +++ b/translations/ro.json @@ -0,0 +1,32 @@ +{ + "LOADING": "Se încarcă …", + + "TODAY": "Astăzi", + "TOMORROW": "Mâine", + "DAYAFTERTOMORROW": "Poimâine", + "RUNNING": "Se termină în", + "EMPTY": "Nici un eveniment.", + + "WEEK": "Săptămâna", + + "N": "N", + "NNE": "NNE", + "NE": "NE", + "ENE": "ENE", + "E": "E", + "ESE": "ESE", + "SE": "SE", + "SSE": "SSE", + "S": "S", + "SSW": "SSW", + "SW": "SW", + "WSW": "WSW", + "W": "W", + "WNW": "WNW", + "NW": "NW", + "NNW": "NNW", + + "UPDATE_NOTIFICATION": "Un update este disponibil pentru MagicMirror².", + "UPDATE_NOTIFICATION_MODULE": "Un update este disponibil pentru modulul MODULE_NAME.", + "UPDATE_INFO": "Există COMMIT_COUNT commit-uri noi pe branch-ul BRANCH_NAME." +} diff --git a/translations/translations.js b/translations/translations.js index 61701ab9..ad40652c 100644 --- a/translations/translations.js +++ b/translations/translations.js @@ -33,6 +33,7 @@ var translations = { "is" : "translations/is.json", // Icelandic "et" : "translations/et.json", // Estonian "kr" : "translations/kr.json", // Korean + "ro" : "translations/ro.json", // Romanian }; if (typeof module !== "undefined") {module.exports = translations;} From 402dea3c8b5c0af78f03c4036ae6b40a30e187be Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Jul 2017 20:03:17 +0200 Subject: [PATCH 88/89] Prepare for release. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63f925a0..e14576f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [2.1.2] - Unreleased +## [2.1.2] - 2017-07-01 ### Changed - Revert Docker related changes in favor of [docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror). All Docker images are outsourced. ([#856](https://github.com/MichMich/MagicMirror/pull/856)) From ce98d0184d190fc4fdfa3c29cd0c5f7a70472065 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Sat, 1 Jul 2017 20:07:08 +0200 Subject: [PATCH 89/89] Update Version Number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 31759870..58f27427 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.1.2-dev", + "version": "2.1.2", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": {