From c4a488a176e004efc4a4872685327682e31e0cdc Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 19 Jan 2017 15:43:48 +0200 Subject: [PATCH] Updated useraccounts, character settings to Polymer 1 --- rpg-docs/.meteor/versions | 2 +- rpg-docs/Model/Character/Characters.js | 32 +- rpg-docs/Routes/Routes.js | 8 - rpg-docs/client/style/cards.scss | 16 - rpg-docs/client/style/main.scss | 4 + .../characterSettings/characterSettings.html | 41 +- .../characterSettings/characterSettings.js | 3 + .../deleteCharacterConfirmation.html | 25 +- .../deleteCharacterConfirmation.js | 11 +- .../characterSettings/shareDialog.html | 111 +++-- .../characterSettings/shareDialog.js | 17 +- .../client/views/character/characterSheet.css | 2 +- .../views/character/characterSheet.html | 2 +- .../newCharacterDialog/newCharacterDialog.js | 7 +- rpg-docs/client/views/layout/layout.html | 2 +- .../client/views/layout/polymerImports.html | 5 +- .../colorDropdown/colorDropdown.html | 2 +- .../client/views/user/profile/profile.css | 4 + .../client/views/user/profile/profile.html | 57 ++- rpg-docs/client/views/user/profile/profile.js | 8 +- .../views/user/profile/usernameDialog.html | 26 +- .../views/user/profile/usernameDialog.js | 10 +- .../views/user/titledAtForm/titledAtForm.html | 23 +- .../lib/constants/characterAssetAllowDeny.js | 2 + rpg-docs/lib/constants/useraccountsConfig.js | 11 + rpg-docs/lib/functions/permissions.js | 4 +- .../useraccounts-polymer-1.0/.travis.yml | 8 - .../packages/useraccounts-polymer-1.0/LICENSE | 21 - .../useraccounts-polymer-1.0/README.md | 48 -- .../lib/at_error.html | 7 - .../useraccounts-polymer-1.0/lib/at_error.js | 2 - .../useraccounts-polymer-1.0/lib/at_form.html | 39 -- .../useraccounts-polymer-1.0/lib/at_form.js | 2 - .../lib/at_input.html | 81 ---- .../useraccounts-polymer-1.0/lib/at_input.js | 25 - .../lib/at_message.html | 5 - .../lib/at_message.js | 2 - .../lib/at_nav_button.html | 4 - .../lib/at_nav_button.js | 5 - .../lib/at_oauth.html | 7 - .../useraccounts-polymer-1.0/lib/at_oauth.js | 2 - .../lib/at_polymer.css | 168 ------- .../lib/at_pwd_form.html | 16 - .../lib/at_pwd_form.js | 5 - .../lib/at_pwd_form_btn.html | 8 - .../lib/at_pwd_form_btn.js | 10 - .../lib/at_pwd_link.html | 9 - .../lib/at_pwd_link.js | 5 - .../lib/at_reCaptcha.html | 3 - .../lib/at_reCaptcha.js | 5 - .../at_resend_verification_email_link.html | 8 - .../lib/at_resend_verification_email_link.js | 5 - .../lib/at_result.html | 5 - .../useraccounts-polymer-1.0/lib/at_result.js | 2 - .../useraccounts-polymer-1.0/lib/at_sep.html | 5 - .../useraccounts-polymer-1.0/lib/at_sep.js | 2 - .../lib/at_signin_link.html | 9 - .../lib/at_signin_link.js | 5 - .../lib/at_signup_link.html | 9 - .../lib/at_signup_link.js | 5 - .../lib/at_social.html | 6 - .../useraccounts-polymer-1.0/lib/at_social.js | 18 - .../lib/at_terms_link.html | 16 - .../lib/at_terms_link.js | 5 - .../lib/at_title.html | 5 - .../useraccounts-polymer-1.0/lib/at_title.js | 2 - .../lib/full_page_at_form.html | 7 - .../useraccounts-polymer-1.0/package.js | 86 ---- .../useraccounts-polymer-1.0/tests/tests.js | 2 - .../paper-checkbox/paper-checkbox.html | 311 ++++++++++++ .../paper-dropdown-menu.css | 44 -- .../paper-dropdown-menu.html | 186 ------- .../paper-dropdown/.bower.json | 29 -- .../paper-dropdown/README.md | 6 - .../paper-dropdown/bower.json | 19 - .../paper-dropdown/demo.html | 456 ------------------ .../paper-dropdown/index.html | 22 - .../paper-dropdown-transition.css | 15 - .../paper-dropdown-transition.html | 179 ------- .../paper-dropdown/paper-dropdown.html | 115 ----- .../swipe-detect/swipe-detect.html | 83 ---- 81 files changed, 570 insertions(+), 2019 deletions(-) create mode 100644 rpg-docs/client/views/user/profile/profile.css delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/.travis.yml delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/LICENSE delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/README.md delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_error.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_error.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_form.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_form.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_input.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_input.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_message.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_message.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_nav_button.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_nav_button.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_oauth.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_oauth.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_polymer.css delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_pwd_form.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_pwd_form.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_pwd_form_btn.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_pwd_form_btn.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_pwd_link.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_pwd_link.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_reCaptcha.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_reCaptcha.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_resend_verification_email_link.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_resend_verification_email_link.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_result.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_result.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_sep.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_sep.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_signin_link.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_signin_link.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_signup_link.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_signup_link.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_social.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_social.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_terms_link.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_terms_link.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_title.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/at_title.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/lib/full_page_at_form.html delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/package.js delete mode 100644 rpg-docs/packages/useraccounts-polymer-1.0/tests/tests.js create mode 100644 rpg-docs/public/custom_components/paper-checkbox/paper-checkbox.html delete mode 100644 rpg-docs/public/custom_components/paper-dropdown-menu/paper-dropdown-menu.css delete mode 100644 rpg-docs/public/custom_components/paper-dropdown-menu/paper-dropdown-menu.html delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/.bower.json delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/README.md delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/bower.json delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/demo.html delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/index.html delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/paper-dropdown-transition.css delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/paper-dropdown-transition.html delete mode 100644 rpg-docs/public/custom_components/paper-dropdown/paper-dropdown.html delete mode 100644 rpg-docs/public/custom_components/swipe-detect/swipe-detect.html diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 19a5bced..11f314e7 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -124,7 +124,7 @@ underscore@1.0.10 url@1.0.11 useraccounts:core@1.14.2 useraccounts:iron-routing@1.14.2 -useraccounts:polymer@1.12.3 +useraccounts:polymer@1.14.2 webapp@1.3.12 webapp-hashing@1.0.9 wizonesolutions:canonical@0.0.5 diff --git a/rpg-docs/Model/Character/Characters.js b/rpg-docs/Model/Character/Characters.js index cb09ce3b..20e717e1 100644 --- a/rpg-docs/Model/Character/Characters.js +++ b/rpg-docs/Model/Character/Characters.js @@ -443,13 +443,13 @@ Characters.calculate = { }), }; -var depreciated = function() { - //var err = new Error("this function has been depreciated"); +var deprecated = function() { + //var err = new Error("this function has been deprecated"); var name = ""; if (Template.instance()){ name = Template.instance().view.name; } - var logString = "this function has been depreciated \n"; + var logString = "this function has been deprecated \n"; if (name){ logString += "View: " + name + "\n\n"; } @@ -464,56 +464,56 @@ Characters.helpers({ //returns the value stored in the field requested //will set up dependencies on just that field getField : function(fieldName){ - depreciated(); + deprecated(); return Characters.calculate.getField(this._id, fieldName); }, //returns the value of a field fieldValue : function(fieldName){ - depreciated(); + deprecated(); return Characters.calculate.fieldValue(this._id, fieldName); }, attributeValue: function(attributeName){ - depreciated(); + deprecated(); return Characters.calculate.attributeValue(this._id, attributeName); }, attributeBase: function(attributeName){ - depreciated(); + deprecated(); return Characters.calculate.attributeBase(this._id, attributeName); }, skillMod: function(skillName){ - depreciated(); + deprecated(); return Characters.calculate.skillMod(this._id, skillName); }, proficiency: function(skillName){ - depreciated(); + deprecated(); return Characters.calculate.proficiency(this._id, skillName); }, passiveSkill: function(skillName){ - depreciated(); + deprecated(); return Characters.calculate.passiveSkill(this._id, skillName); }, advantage: function(skillName){ - depreciated(); + deprecated(); return Characters.calculate.advantage(this._id, skillName); }, abilityMod: function(attribute){ - depreciated(); + deprecated(); return Characters.calculate.abilityMod(this._id, attribute); }, passiveAbility: function(attribute){ - depreciated(); + deprecated(); return Characters.calculate.passiveAbility(this._id, attribute); }, xpLevel: function(){ - depreciated(); + deprecated(); return Characters.calculate.xpLevel(this._id); }, level: function(){ - depreciated(); + deprecated(); return Characters.calculate.level(this._id); }, experience: function(){ - depreciated(); + deprecated(); return Characters.calculate.experience(this._id); }, }); diff --git a/rpg-docs/Routes/Routes.js b/rpg-docs/Routes/Routes.js index 6d2b61ac..cb414b74 100644 --- a/rpg-docs/Routes/Routes.js +++ b/rpg-docs/Routes/Routes.js @@ -21,14 +21,6 @@ Router.map(function() { }, }); - this.route("testContent", { - path: "/test", - onAfterAction: function() { - document.title = appName; - }, - layoutTemplate: "testLayout", - }); - this.route("characterList", { path: "/characterList", waitOn: function(){ diff --git a/rpg-docs/client/style/cards.scss b/rpg-docs/client/style/cards.scss index e6f99bf9..ea3feb64 100644 --- a/rpg-docs/client/style/cards.scss +++ b/rpg-docs/client/style/cards.scss @@ -35,22 +35,6 @@ $thinColumnWidth: 240px; padding: 16px; border-bottom: rgba(0,0,0,0.12) solid 1px; } - paper-checkbox::shadow #ink[checked] { - color: #ffffff; - } - paper-checkbox::shadow #ink { - color: #ffffff; - } - paper-checkbox::shadow #checkbox.checked { - background-color: #ffffff; - background-color: rgba(255,255,255,0.27); - border-color: #ffffff; - border-color: rgba(255,255,255,0.27); - } - paper-checkbox::shadow #checkbox { - border-color: #ffffff; - border-color: rgba(255,255,255,0.54); - } } .bottom { padding: 16px; diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss index 4a94d7ff..2bf03434 100644 --- a/rpg-docs/client/style/main.scss +++ b/rpg-docs/client/style/main.scss @@ -63,6 +63,10 @@ paper-fab { background-color: #d13b2e; } +paper-fab.keyboard-focus { + background: #630c05; +} + //Buttons paper-button { color: #000; diff --git a/rpg-docs/client/views/character/characterSettings/characterSettings.html b/rpg-docs/client/views/character/characterSettings/characterSettings.html index 9fd9efe9..ae71b815 100644 --- a/rpg-docs/client/views/character/characterSettings/characterSettings.html +++ b/rpg-docs/client/views/character/characterSettings/characterSettings.html @@ -1,27 +1,24 @@ diff --git a/rpg-docs/client/views/character/characterSettings/characterSettings.js b/rpg-docs/client/views/character/characterSettings/characterSettings.js index 528ac718..09fe2291 100644 --- a/rpg-docs/client/views/character/characterSettings/characterSettings.js +++ b/rpg-docs/client/views/character/characterSettings/characterSettings.js @@ -23,4 +23,7 @@ Template.characterSettings.events({ ); } }, + "click .doneButton": function(event, instance){ + popDialogStack(); + }, }); diff --git a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.html b/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.html index a941445c..9ddcb7e2 100644 --- a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.html +++ b/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.html @@ -1,9 +1,20 @@ \ No newline at end of file + diff --git a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js b/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js index 68225829..af8a64c2 100644 --- a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js +++ b/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js @@ -18,11 +18,14 @@ Template.deleteCharacterConfirmation.events({ var canDel = instance.find("#nameInput").value === this.name; instance.canDelete.set(canDel); }, - "tap #deleteButton": function(event, instance) { + "click #deleteButton": function(event, instance) { if (instance.find("#nameInput").value === this.name) { - GlobalUI.closeDialog(); - Router.go("/"); + popDialogStack(); + Router.go("/characterList"); Characters.remove(this._id); } - } + }, + "click .cancelButton": function(event, instance){ + popDialogStack(); + }, }); diff --git a/rpg-docs/client/views/character/characterSettings/shareDialog.html b/rpg-docs/client/views/character/characterSettings/shareDialog.html index a5203959..3be53bba 100644 --- a/rpg-docs/client/views/character/characterSettings/shareDialog.html +++ b/rpg-docs/client/views/character/characterSettings/shareDialog.html @@ -1,54 +1,65 @@ diff --git a/rpg-docs/client/views/character/characterSettings/shareDialog.js b/rpg-docs/client/views/character/characterSettings/shareDialog.js index e2b92b11..6574fa84 100644 --- a/rpg-docs/client/views/character/characterSettings/shareDialog.js +++ b/rpg-docs/client/views/character/characterSettings/shareDialog.js @@ -9,6 +9,13 @@ Template.shareDialog.onCreated(function(){ }); }); +Template.shareDialog.onRendered(function(){ + // Polymer not mirroring selected attribute properly + this.$("paper-listbox").each(function(){ + this.selected = this.getAttribute("selected"); + }); +}); + Template.shareDialog.helpers({ viewPermission: function() { var char = Characters.findOne(this._id, {fields: {settings: 1}}); @@ -38,9 +45,8 @@ Template.shareDialog.helpers({ }); Template.shareDialog.events({ - "change .visibilityDropdown": function(event){ + "iron-select .visibilityDropdown": function(event){ var detail = event.originalEvent.detail; - if (!detail.isSelected) return; var value = detail.item.getAttribute("name"); var char = Characters.findOne(this._id, {fields: {settings: 1}}); if (value == char.settings.viewPermission) return; @@ -59,7 +65,7 @@ Template.shareDialog.events({ } }); }, - "tap #shareButton": function(event, instance){ + "click #shareButton": function(event, instance){ var self = this; var permission = instance.find("#accessLevelMenu").selected; if (!permission) throw "no permission set"; @@ -77,9 +83,12 @@ Template.shareDialog.events({ }); } }, - "tap .deleteShare": function(event, instance) { + "click .deleteShare": function(event, instance) { Characters.update(instance.data._id, { $pull: {writers: this.id, readers: this.id} }); }, + "click .doneButton": function(event, instance){ + popDialogStack(); + }, }); diff --git a/rpg-docs/client/views/character/characterSheet.css b/rpg-docs/client/views/character/characterSheet.css index 764ad2a2..461055e4 100644 --- a/rpg-docs/client/views/character/characterSheet.css +++ b/rpg-docs/client/views/character/characterSheet.css @@ -34,6 +34,6 @@ app-toolbar.medium-tall { text-overflow: ellipsis; } -.character-menu paper-item{ +.character-menu paper-icon-item{ cursor: pointer; } diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/character/characterSheet.html index 95544a86..621e1b5d 100644 --- a/rpg-docs/client/views/character/characterSheet.html +++ b/rpg-docs/client/views/character/characterSheet.html @@ -10,7 +10,7 @@ {{#if canEditCharacter _id}} {{> colorDropdown}} - + diff --git a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js b/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js index 9d8cf28a..ca690666 100644 --- a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js +++ b/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js @@ -7,13 +7,13 @@ Template.newCharacterDialog.onCreated(function(){ race: {type: String, optional: true}, }); this.context = this.schema.newContext(); - this.context.runOnce = false; + this.context.runOnce = new ReactiveVar(false); }); Template.newCharacterDialog.helpers({ invalid(){ let context = Template.instance().context; - let valid = context.isValid() && context.runOnce; + let valid = context.isValid() && context.runOnce.get(); return !valid; }, errorAtts(key){ @@ -29,10 +29,11 @@ Template.newCharacterDialog.helpers({ changeFunction = function(field){ return _.debounce(function(event, instance){ + console.log({field, event}) instance.character[field] = event.currentTarget.value; instance.schema.clean(instance.character); instance.context.validate(instance.character); - if (!instance.context.runOnce) instance.context.runOnce = true; + if (!instance.context.runOnce.get()) instance.context.runOnce.set(true); }, 200); }; diff --git a/rpg-docs/client/views/layout/layout.html b/rpg-docs/client/views/layout/layout.html index 4251d82c..e8439cc6 100644 --- a/rpg-docs/client/views/layout/layout.html +++ b/rpg-docs/client/views/layout/layout.html @@ -4,7 +4,7 @@
{{#if currentUser}} - {{profileLink}} diff --git a/rpg-docs/client/views/layout/polymerImports.html b/rpg-docs/client/views/layout/polymerImports.html index c79e791a..f91b4542 100644 --- a/rpg-docs/client/views/layout/polymerImports.html +++ b/rpg-docs/client/views/layout/polymerImports.html @@ -28,7 +28,7 @@ - + @@ -45,7 +45,10 @@ + + + diff --git a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html b/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html index 26cbbe16..0358e099 100644 --- a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html +++ b/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html @@ -1,6 +1,6 @@