Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore ability to select PWS when providing an API key #63

Merged
merged 9 commits into from Jul 10, 2019
Merged

Restore ability to select PWS when providing an API key #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
64d042b
Revert commit ece05f554293be86f893b519122bfb5935c15bfc (adapt to new …
salbahra Jul 9, 2019
b283d74
Revert e6eec858b84d9cdd05db55fe81ab4077592c04a1, 252a01000edf14e37977…
salbahra Jul 9, 2019
25003ce
Allow everything to be working
salbahra Jul 9, 2019
938b7a3
Update some packages and fix lint errors
salbahra Jul 9, 2019
8db209b
Update all packages to latest version
salbahra Jul 9, 2019
80fe694
Apply `npm audit fix`
salbahra Jul 9, 2019
1184423
Fix whitespace and comments being before doctype
salbahra Jul 9, 2019
d85d7f6
Remove unused error check
salbahra Jul 9, 2019
38aec64
Remove pws input check
salbahra Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2,001 changes: 1,392 additions & 609 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Expand Up @@ -42,25 +42,25 @@
"no-edit-menu": true,
"devDependencies": {
"blanket": "^1.2.1",
"chai": "^4.1.2",
"chai": "^4.2.0",
"codecov.io": "^0.1.6",
"coveralls": "^3.0.2",
"grunt": "^1.0.3",
"coveralls": "^3.0.4",
"grunt": "^1.0.4",
"grunt-blanket-mocha": "^1.0.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-compress": "^1.4.3",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-compress": "^1.5.0",
"grunt-contrib-csslint": "^2.0.0",
"grunt-contrib-cssmin": "^2.2.1",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-uglify": "^3.3.0",
"grunt-contrib-cssmin": "^3.0.0",
"grunt-contrib-jshint": "^2.1.0",
"grunt-contrib-uglify": "^4.0.1",
"grunt-jscs": "^3.0.1",
"grunt-lib-phantomjs": "^1.1.0",
"grunt-shell": "^2.0.0",
"grunt-shell": "^3.0.1",
"grunt-text-replace": "^0.4.0",
"lcov-result-merger": "^3.1.0",
"lodash": "^4.17.10",
"mocha": "^5.2.0",
"xcode": "^1.0.0"
"lodash": "^4.17.11",
"mocha": "^6.1.4",
"xcode": "2.0.0"
},
"cordova": {
"plugins": {
Expand All @@ -82,14 +82,14 @@
"dependencies": {
"cordova-android": "^8.0.0",
"cordova-ios": "^5.0.0",
"cordova-plugin-3dtouch": "^1.3.5",
"cordova-plugin-3dtouch": "^1.3.6",
"cordova-plugin-camera": "^4.0.3",
"cordova-plugin-geolocation": "^4.0.1",
"cordova-plugin-inappbrowser": "^3.0.0",
"cordova-plugin-networkinterface": "^2.0.0",
"cordova-plugin-splashscreen": "^5.0.2",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-splashscreen": "^5.0.3",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-transport-security": "^0.1.2",
"cordova-plugin-whitelist": "^1.3.3"
"cordova-plugin-whitelist": "^1.3.4"
}
}
}
109 changes: 54 additions & 55 deletions www/index.html
View file
Open in desktop
@@ -1,3 +1,4 @@
<!DOCTYPE html>
<!--
* OpenSprinkler App
* Copyright (C) 2015 - present, Samer Albahra. All rights reserved.
Expand All @@ -11,68 +12,66 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

<!DOCTYPE html>
<html>
<head>
<title>OpenSprinkler</title>
<title>OpenSprinkler</title>
<meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta content="yes" name="apple-mobile-web-app-capable">
<meta name="apple-mobile-web-app-title" content="OpenSprinkler">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: local: blob: http: https:; script-src 'self' data: gap: blob: local: https: ms-appx-web: 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline' https: blob:; media-src *; img-src 'self' file: https: http: blob: data: ms-appdata:; connect-src 'self' blob: data: gap: local: http: https:">
<link rel="shortcut icon" href="img/favicon.ico">
<link rel="stylesheet" href="css/jqm.css">
<link rel="stylesheet" href="css/main.css">
<script src="cordova.js"></script>
<script src="js/jquery.js"></script>
<script src="js/libs.js"></script>
<script src="js/main.js"></script>
<script src="js/jqm.js"></script>
</head>
<meta content="yes" name="apple-mobile-web-app-capable">
<meta name="apple-mobile-web-app-title" content="OpenSprinkler">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: local: blob: http: https:; script-src 'self' data: gap: blob: local: https: ms-appx-web: 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline' https: blob:; media-src *; img-src 'self' file: https: http: blob: data: ms-appdata:; connect-src 'self' blob: data: gap: local: http: https:">
<link rel="shortcut icon" href="img/favicon.ico">
<link rel="stylesheet" href="css/jqm.css">
<link rel="stylesheet" href="css/main.css">
<script src="cordova.js"></script>
<script src="js/jquery.js"></script>
<script src="js/libs.js"></script>
<script src="js/main.js"></script>
<script src="js/jqm.js"></script>
</head>

<body>
<div id="header" data-theme="b" data-role="header" data-position="fixed" data-tap-toggle="false">
<h3 class="logo"></h3>
</div>
<body>
<div id="header" data-theme="b" data-role="header" data-position="fixed" data-tap-toggle="false">
<h3 class="logo"></h3>
</div>

<div data-role="page" id="loadingPage"></div>
<div data-role="page" id="loadingPage"></div>

<div data-role="panel" id="sprinklers-settings" data-position-fixed="true" data-theme="b" class="hidden">
<ul data-role="listview" data-theme="b">
<li class="multiSite">
<select data-mini="true" id="site-selector"></select>
</li>
<li class="multiSite" data-icon="gear"><a href="#site-control" data-translate="Manage Sites"></a></li>
<li data-icon="action"><a href="#" class="export_config" data-translate="Export Configuration"></a></li>
<li data-icon="back"><a href="#" class="import_config" data-translate="Import Configuration"></a></li>
<li data-icon="mail"><a href="https://openthings.freshdesk.com/widgets/feedback_widget/new?&widgetType=popup&screenshot=no&attachFile=no&formTitle=Help%20%26%20Support" target="_blank" class="iab iabNoScale" data-translate="Help & Support"></a></li>
<li data-icon="info"><a href="#about" data-translate="About"></a></li>
<li data-icon="location"><a href="#localization" data-translate="Localization"></a></li>
<li class="hidden logout-button" data-icon="power"><a id="logout" href="#" data-translate="Logout"></a></li>
<li class="hidden login-button"><a class="cloud-login" href="#" data-translate="OpenSprinkler.com Login"></a></li>
<li data-role="list-divider" data-translate="Advanced"></li>
<li data-icon="power"><a href="#" class="toggleOperation">
<span data-translate="Disable"></span>
<span> </span>
<span data-translate="Operation"></span>
</a></li>
<li data-icon="lock" class="changePassword"><a href="#" data-translate="Change Password"></a></li>
<li data-icon="alert"><a href="#" class="reboot-os" data-translate="Reboot OpenSprinkler"></a></li>
<li data-icon="alert" class="localSite hidden"><a id="downgradeui" href="#" data-translate="Downgrade UI"></a></li>
<li data-icon="info" class="weatherAdjust"><a href="#debugWU" class="squeeze" data-translate="System Diagnostics"></a></li>
</ul>
</div>
<div data-role="panel" id="sprinklers-settings" data-position-fixed="true" data-theme="b" class="hidden">
<ul data-role="listview" data-theme="b">
<li class="multiSite">
<select data-mini="true" id="site-selector"></select>
</li>
<li class="multiSite" data-icon="gear"><a href="#site-control" data-translate="Manage Sites"></a></li>
<li data-icon="action"><a href="#" class="export_config" data-translate="Export Configuration"></a></li>
<li data-icon="back"><a href="#" class="import_config" data-translate="Import Configuration"></a></li>
<li data-icon="mail"><a href="https://openthings.freshdesk.com/widgets/feedback_widget/new?&widgetType=popup&screenshot=no&attachFile=no&formTitle=Help%20%26%20Support" target="_blank" class="iab iabNoScale" data-translate="Help & Support"></a></li>
<li data-icon="info"><a href="#about" data-translate="About"></a></li>
<li data-icon="location"><a href="#localization" data-translate="Localization"></a></li>
<li class="hidden logout-button" data-icon="power"><a id="logout" href="#" data-translate="Logout"></a></li>
<li class="hidden login-button"><a class="cloud-login" href="#" data-translate="OpenSprinkler.com Login"></a></li>
<li data-role="list-divider" data-translate="Advanced"></li>
<li data-icon="power"><a href="#" class="toggleOperation">
<span data-translate="Disable"></span>
<span> </span>
<span data-translate="Operation"></span>
</a></li>
<li data-icon="lock" class="changePassword"><a href="#" data-translate="Change Password"></a></li>
<li data-icon="alert"><a href="#" class="reboot-os" data-translate="Reboot OpenSprinkler"></a></li>
<li data-icon="alert" class="localSite hidden"><a id="downgradeui" href="#" data-translate="Downgrade UI"></a></li>
<li data-icon="info" class="weatherAdjust"><a href="#debugWU" class="squeeze" data-translate="System Diagnostics"></a></li>
</ul>
</div>

<div data-role="panel" id="notificationPanel" data-position="right" data-position-fixed="true" data-theme="b">
<ul></ul>
</div>
<div data-role="panel" id="notificationPanel" data-position="right" data-position-fixed="true" data-theme="b">
<ul></ul>
</div>

<a id="footer-menu" style="display:none" class="ui-panel-animate tight ui-corner-all ui-btn ui-btn-icon-notext ui-btn-inline ui-icon-grid" href="#"></a>
<a id="footer-menu" style="display:none" class="ui-panel-animate tight ui-corner-all ui-btn ui-btn-icon-notext ui-btn-inline ui-icon-grid" href="#"></a>

<div id="footer" data-theme="b" data-role="footer" data-position="fixed" data-tap-toggle="false">
<div id="footer-running"></div>
</div>
</body>
<div id="footer" data-theme="b" data-role="footer" data-position="fixed" data-tap-toggle="false">
<div id="footer-running"></div>
</div>
</body>
</html>
46 changes: 23 additions & 23 deletions www/js/home.js
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@

function insertStyle( css ) {
var head = document.head || document.getElementsByTagName( "head" )[ 0 ],
style = document.createElement( "style" );
style = document.createElement( "style" );

style.type = "text/css";
if ( style.styleSheet ) {
Expand All @@ -45,7 +45,7 @@

function insertStyleSheet( href, rel, media ) {
var head = document.head || document.getElementsByTagName( "head" )[ 0 ],
link = document.createElement( "link" );
link = document.createElement( "link" );

rel = rel || "stylesheet";

Expand All @@ -60,7 +60,7 @@

function insertMeta( name, content ) {
var head = document.head || document.getElementsByTagName( "head" )[ 0 ],
meta = document.createElement( "meta" );
meta = document.createElement( "meta" );

content = content || "";

Expand All @@ -80,10 +80,10 @@
// Create callback if one is not provided
callback = callback || function() {};

var a = document.createElement( "script" );
a.src = src;
a.addEventListener( "load", callback, false );
document.getElementsByTagName( "head" )[ 0 ].appendChild( a );
var a = document.createElement( "script" );
a.src = src;
a.addEventListener( "load", callback, false );
document.getElementsByTagName( "head" )[ 0 ].appendChild( a );
}

// Change the viewport
Expand Down Expand Up @@ -147,23 +147,23 @@

//Insert the startup images for iOS
( function() {
var p, l, r = window.devicePixelRatio, h = window.screen.height;
if ( navigator.platform === "iPad" ) {
p = r === 2 ? "res/ios-web/screens/startup-tablet-portrait-retina.png" :
var p, l, r = window.devicePixelRatio, h = window.screen.height;
if ( navigator.platform === "iPad" ) {
p = r === 2 ? "res/ios-web/screens/startup-tablet-portrait-retina.png" :
"res/ios-web/screens/startup-tablet-portrait.png";
l = r === 2 ? "res/ios-web/screens/startup-tablet-landscape-retina.png" :
l = r === 2 ? "res/ios-web/screens/startup-tablet-landscape-retina.png" :
"res/ios-web/screens/startup-tablet-landscape.png";
insertStyleSheet( assetLocation + l, "apple-touch-startup-image",
insertStyleSheet( assetLocation + l, "apple-touch-startup-image",
"screen and (orientation: landscape)" );
insertStyleSheet( assetLocation + p, "apple-touch-startup-image",
insertStyleSheet( assetLocation + p, "apple-touch-startup-image",
"screen and (orientation: portrait)" );
} else {
p = r === 2 ?
} else {
p = r === 2 ?
( h === 568 ? "res/ios-web/screens/startup-iphone5-retina.png" :
"res/ios-web/screens/startup-retina.png" ) :
"res/ios-web/screens/startup.png";
insertStyleSheet( assetLocation + p, "apple-touch-startup-image" );
}
insertStyleSheet( assetLocation + p, "apple-touch-startup-image" );
}
} )();

if ( !document.createElementNS ||
Expand All @@ -175,8 +175,8 @@
var body = $( "body" ),
finishInit = function() {

// Start checking for script load completion and callback when done
var interval = setInterval( function() {
// Start checking for script load completion and callback when done
var interval = setInterval( function() {
if ( isReady ) {
clearInterval( interval );

Expand Down Expand Up @@ -274,13 +274,13 @@
type: "GET"
} ).then(
function( data ) {
var result = data.result;
var result = data.result;

if ( typeof result === "undefined" || result > 1 ) {
if ( typeof result === "undefined" || result > 1 ) {
callback( false );
} else {
} else {
callback( true );
}
}
},
function() {
callback( false );
Expand Down