-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from edfungus/master
Pulling in edfungus new merges
- Loading branch information
Showing
16 changed files
with
198 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,61 @@ | ||
| { | ||
| "name": "Crouton", | ||
| "version": "1.0.0", | ||
| "name": "crouton", | ||
| "description": "MQTT IOT Dashboard", | ||
| "main": "app.js", | ||
| "authors": [ | ||
| "Edmund Fung <[email protected]>" | ||
| ], | ||
| "description": "MQTT IOT Dashboard", | ||
| "license": "MIT", | ||
| "ignore": [ | ||
| "**/.*", | ||
| "node_modules", | ||
| "bower_components", | ||
| "public/common/bower", | ||
| "test", | ||
| "tests" | ||
| ], | ||
| "dependencies": { | ||
| "font-awesome": "~4.4.0", | ||
| "polymer": "Polymer/polymer#^1.2.0", | ||
| "paper-card": "PolymerElements/paper-card#~1.0.6", | ||
| "paper-drawer-panel": "PolymerElements/paper-drawer-panel#~1.0.3", | ||
| "Materialize": "materialize#~0.97.1", | ||
| "paper-icon-button": "PolymerElements/paper-icon-button#~1.0.3", | ||
| "paper-header-panel": "PolymerElements/paper-header-panel#~1.0.5", | ||
| "paper-input": "PolymerElements/paper-input#~1.0.15", | ||
| "paper-button": "PolymerElements/paper-button#~1.0.8", | ||
| "paper-styles": "PolymerElements/paper-styles#~1.1.4", | ||
| "iron-form": "PolymerElements/iron-form#~1.0.9", | ||
| "paper-toast": "PolymerElements/paper-toast#~1.0.0", | ||
| "packery": "~1.4.3", | ||
| "draggabilly": "~1.2.4", | ||
| "paper-toggle-button": "PolymerElements/paper-toggle-button#~1.0.11", | ||
| "paper-fab": "PolymerElements/paper-fab#~1.1.0", | ||
| "fontawesome-iconset": "diego-d5000/fontawesome-iconset#~4.3.0", | ||
| "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#~1.1.0", | ||
| "paper-item": "PolymerElements/paper-item#~1.1.2", | ||
| "paper-listbox": "polymerelements/paper-listbox#~1.0.0", | ||
| "paper-menu": "PolymerElements/paper-menu#~1.2.0", | ||
| "web-animations-js": "~2.1.3", | ||
| "paper-slider": "PolymerElements/paper-slider#~1.0.8", | ||
| "chartist": "~0.9.5", | ||
| "paper-checkbox": "PolymerElements/paper-checkbox#~1.1.0" | ||
| }, | ||
| "resolutions": { | ||
| "polymer": "^1.2.0", | ||
| "webcomponentsjs": "^0.7.2", | ||
| "web-animations-js": "~2.1.3" | ||
| "chartist": "*", | ||
| "ev-emitter": "~1.0.0", | ||
| "desandro-matches-selector": "~2.0.0", | ||
| "draggabilly": "*", | ||
| "fizzy-ui-utils": "~2.0.0", | ||
| "fontawesome-iconset": "edfungus/fontawesome-iconset", | ||
| "font-roboto": "PolymerElements/font-roboto#^1.0.1", | ||
| "font-awesome": "*", | ||
| "iron-a11y-announcer": "PolymerElements/iron-a11y-announcer#^1.0.0", | ||
| "iron-a11y-keys-behavior": "polymerelements/iron-a11y-keys-behavior#^1.0.0", | ||
| "iron-autogrow-textarea": "PolymerElements/iron-autogrow-textarea#^1.0.0", | ||
| "iron-ajax": "PolymerElements/iron-ajax#^1.0.0", | ||
| "iron-checked-element-behavior": "PolymerElements/iron-checked-element-behavior#^1.0.0", | ||
| "iron-collapse": "PolymerElements/iron-collapse#^1.0.0", | ||
| "iron-dropdown": "PolymerElements/iron-dropdown#^1.0.0", | ||
| "iron-form": "PolymerElements/iron-form", | ||
| "iron-image": "PolymerElements/iron-image#^1.2.0", | ||
| "iron-media-query": "PolymerElements/iron-media-query#^1.0.0", | ||
| "iron-input": "PolymerElements/iron-input#^1.0.0", | ||
| "iron-menu-behavior": "PolymerElements/iron-menu-behavior#^1.0.0", | ||
| "iron-range-behavior": "PolymerElements/iron-range-behavior#^1.0.0", | ||
| "jquery": ">=2.1.1", | ||
| "Materialize": "materialize#*", | ||
| "outlayer": "~2.0.0", | ||
| "packery": "*", | ||
| "paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0", | ||
| "paper-button": "PolymerElements/paper-button", | ||
| "paper-card": "PolymerElements/paper-card", | ||
| "paper-checkbox": "PolymerElements/paper-checkbox", | ||
| "paper-drawer-panel": "PolymerElements/paper-drawer-panel", | ||
| "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu", | ||
| "paper-header-panel": "PolymerElements/paper-header-panel", | ||
| "paper-fab": "PolymerElements/paper-fab", | ||
| "paper-icon-button": "PolymerElements/paper-icon-button", | ||
| "paper-item": "PolymerElements/paper-item", | ||
| "paper-listbox": "polymerelements/paper-listbox", | ||
| "paper-menu": "PolymerElements/paper-menu", | ||
| "paper-progress": "PolymerElements/paper-progress#^1.0.0", | ||
| "paper-slider": "PolymerElements/paper-slider", | ||
| "paper-toast": "PolymerElements/paper-toast", | ||
| "paper-toggle-button": "PolymerElements/paper-toggle-button", | ||
| "polymer": "Polymer/polymer#~1.4.0" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
public/app/dashboard-elements/crouton-simple-toggle/crouton-simple-toggle.css
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
public/app/dashboard-elements/crouton-video-youtube/crouton-video-youtube.css
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
public/app/dashboard-elements/crouton-video-youtube/crouton-video-youtube.jade
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| link(rel="import", href="/static/common/bower/polymer/polymer.html") | ||
| link(rel="import", href="/app-render/framework/crouton-card/crouton-card.jade") | ||
|
|
||
|
|
||
| dom-module(id="crouton-video-youtube") | ||
| template | ||
| link(rel="stylesheet", href="crouton-video-youtube.css") | ||
| crouton-card | ||
| div.dragger | ||
| div.expand | ||
| iframe(src="{{youtubeURL}}" title="YouTube video player" allowfullscreen="1", class="style-scope google-youtube", id="player", frameborder="0", height="100%", width="100%") | ||
| div.titleDisplay {{displayStatusText}} | ||
|
|
||
| script. | ||
| (function() { | ||
| Polymer({ | ||
| is: "crouton-video-youtube", | ||
| ready: function() { | ||
| }, | ||
| properties: { | ||
| endPointJson: { | ||
| type: Object, | ||
| notify: true | ||
| } | ||
| }, | ||
| attached: function(){ | ||
| this.displayStatusText = this.endPointJson.title; | ||
| this.youtubeURL = "https://www.youtube.com/embed/" + this.endPointJson.values.youtubeID + "?playsinline=1&controls=0&autohide=0&autoplay=1&video-id=GZnb3jQ2YZo"; | ||
| } | ||
| }); | ||
| }()); |
37 changes: 37 additions & 0 deletions
37
public/app/dashboard-elements/crouton-video-youtube/crouton-video-youtube.less
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| @import "./public/common/css/style.less"; | ||
|
|
||
| crouton-video-youtube{ | ||
| width: @db-min-size; | ||
| min-width: @db-min-size; | ||
| height: @db-min-size; | ||
| min-height: @db-min-size; | ||
| display: table-row-group; | ||
|
|
||
| crouton-card { | ||
| text-align: center; | ||
| color: @fc-regular; | ||
|
|
||
| .expand { | ||
| margin: @dashboard-card-padding; | ||
| padding-top: @db-card-top-spacing; | ||
| } | ||
| } | ||
|
|
||
| .textDisplay { | ||
| font-size: @db-main-font-size; | ||
| margin-bottom: @db-space-under-main-text; | ||
| } | ||
|
|
||
| .unitDisplay { | ||
| font-size: @db-sub-font-size; | ||
| color: @fc-gray; | ||
| } | ||
|
|
||
| .titleDisplay { | ||
| font-size: @db-title-font-size; | ||
| bottom: @db-title-bottom; | ||
| left: 0px; | ||
| width: 100%; | ||
| position: absolute; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.