From 015999ca499ee950fde0adc80a6e42dbe550c6d8 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Wed, 12 Sep 2018 14:37:08 -0700 Subject: [PATCH] Updated to user Polymer 2 Signed-off-by: James Ketrenos --- frontend/bower.json | 62 ++++++++--------------- frontend/index.html | 9 +++- frontend/src/ketr-photos/ketr-photos.html | 11 ++-- 3 files changed, 33 insertions(+), 49 deletions(-) diff --git a/frontend/bower.json b/frontend/bower.json index f0e7d88..48d29f0 100644 --- a/frontend/bower.json +++ b/frontend/bower.json @@ -15,52 +15,30 @@ "tests" ], "dependencies": { - "polymer": "Polymer/polymer#^1.4.0", + "datetime-picker": "fooloomanzoo/datetime-picker", + "moment": "^2.22.2", + "iron-flex-layout": "PolymerElements/iron-flex-layout#^2.0.3", + "polymer": "Polymer/polymer#^2", "paper-tabs": "PolymerElements/paper-tabs#^2.1.1", - "iron-pages": "PolymerElements/iron-pages#^1.0.7", - "paper-toast": "PolymerElements/paper-toast#^1.2.2", - "paper-material": "PolymerElements/paper-material#^1.0.6", - "paper-header-panel": "PolymerElements/paper-header-panel#^1.1.6", - "paper-toolbar": "PolymerElements/paper-toolbar#^1.1.4", - "paper-drawer-panel": "PolymerElements/paper-drawer-panel#^1.0.9", + "iron-pages": "PolymerElements/iron-pages#^2.1.1", "paper-icon-button": "PolymerElements/paper-icon-button#^2.2.0", - "iron-icons": "PolymerElements/iron-icons#^2.1.1", - "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.3.1", - "paper-dropdown-menu": "PolymerElements/paper-dropdown-menu#^1.2.1", - "paper-listbox": "polymerelements/paper-listbox#^1.1.2", - "paper-item": "PolymerElements/paper-item#^1.2.1", - "iron-fit-behavior": "PolymerElements/iron-fit-behavior#^1.2.1", - "paper-menu": "PolymerElements/paper-menu#^1.2.2", - "paper-button": "PolymerElements/paper-button#^1.0.11", - "app-route": "PolymerElements/app-route#~0.9.1", - "app-layout": "PolymerElements/app-layout#^0.9.1", - "paper-checkbox": "PolymerElements/paper-checkbox#^2.0.4", - "iron-form": "PolymerElements/iron-form#^1.0.16", - "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^2.1.1", - "paper-dialog": "PolymerElements/paper-dialog#^1.1.0", - "paper-dialog-scrollable": "PolymerElements/paper-dialog-scrollable#^1.1.5", - "iron-collapse": "PolymerElements/iron-collapse#^1.2.1", - "paper-spinner": "PolymerElements/paper-spinner#^2.0.0", - "paper-autocomplete": "^1.3.0", - "iron-accordions": "https://github.com/alijaya/iron-accordions.git#^1.1.0", - "paper-input": "PolymerElements/paper-input#^1.1.20", - "iron-location": "PolymerElements/iron-location#^1.0.0", - "iron-a11y-keys": "PolymerElements/iron-a11y-keys#^1.0.0", - "iron-a11y-keys-behavior": "PolymerElements/iron-a11y-keys-behavior#^1.0.0", - "es6-shim": "^0.35.3", - "paper-radio-group": "PolymerElements/paper-radio-group#^2.2.0", - "moment": "^2.22.2" + "iron-icon": "PolymerElements/iron-icon#^2", + "iron-icons": "PolymerElements/iron-icons#^2", + "app-layout": "PolymerElements/app-layout#^2", + "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^2", + "paper-button": "PolymerElements/paper-button#^2", + "paper-spinner": "PolymerElements/paper-spinner#^2", + "paper-toast": "PolymerElements/paper-toast#^2", + "iron-iconset": "PolymerElements/iron-iconset#^2" }, "resolutions": { - "polymer": "^1.4.0", - "iron-location": "^1.0.0", - "iron-collapse": "^1.2.1", - "paper-spinner": "^1.0.0", - "iron-resizable-behavior": "^1.0.4", - "paper-checkbox": "^1.2.0", + "polymer": "2", "webcomponentsjs": "^v1.1.0", - "paper-icon-button": "^1.1.2", - "iron-icons": "^1.1.3", - "paper-tabs": "^1.5.0" + "iron-flex-layout": "^2.0.3", + "paper-icon-button": "1 - 2", + "iron-icon": "^2", + "iron-icons": "^2", + "iron-resizable-behavior": "^2", + "iron-iconset": "^2" } } diff --git a/frontend/index.html b/frontend/index.html index 9467ecc..64ca6b0 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -18,8 +18,13 @@ - - + + diff --git a/frontend/src/ketr-photos/ketr-photos.html b/frontend/src/ketr-photos/ketr-photos.html index 03ae217..241e762 100755 --- a/frontend/src/ketr-photos/ketr-photos.html +++ b/frontend/src/ketr-photos/ketr-photos.html @@ -12,6 +12,7 @@ + @@ -28,6 +29,9 @@ + + + @@ -220,7 +224,7 @@ - + @@ -230,7 +234,7 @@
... time slider ...
-
... calendar ...
+