From 7af2e80ec1af98de0797891030565be342e1b798 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Mon, 3 Oct 2016 13:00:27 +0200 Subject: [PATCH 01/39] Removed Polymer 0.5, started implementing Polymer 1.0 --- rpg-docs/.meteor/packages | 2 +- rpg-docs/.meteor/versions | 2 +- rpg-docs/bower.json | 8 +- rpg-docs/client/views/layout/head.html | 1 - .../client/views/layout/polymer.imports.html | 43 ----- .../{ => private}/GeneralCSS/globalDetail.css | 0 .../{ => private}/GeneralCSS/typography.css | 0 .../attacks/attackEdit/attackEdit.html | 0 .../attacks/attackEdit/attackEdit.js | 0 .../attackEditList/attackEditList.html | 0 .../attacks/attackEditList/attackEditList.js | 0 .../attacks/attackView/attackView.html | 0 .../attacksViewList/attacksViewList.html | 0 .../attacksViewList/attacksViewList.js | 0 .../buffs/buffDialog/buffDialog.html | 0 .../character/buffs/buffDialog/buffDialog.js | 0 .../characterSettings/characterSettings.html | 0 .../characterSettings/characterSettings.js | 0 .../deleteCharacterConfirmation.html | 0 .../deleteCharacterConfirmation.js | 0 .../characterSettings/shareDialog.html | 0 .../characterSettings/shareDialog.js | 0 .../character/characterSheet.css | 0 .../character/characterSheet.html | 0 .../{ => private}/character/characterSheet.js | 0 .../effects/effectEdit/effectEdit.css | 0 .../effects/effectEdit/effectEdit.html | 0 .../effects/effectEdit/effectEdit.js | 0 .../effects/effectView/effectView.css | 0 .../effects/effectView/effectView.html | 0 .../effects/effectView/effectView.js | 0 .../effectsEditList/effectsEditList.html | 0 .../effectsEditList/effectsEditList.js | 0 .../effectsViewList/effectsViewList.html | 0 .../effectsViewList/effectsViewList.js | 0 .../features/featureDialog/featureDialog.html | 0 .../features/featureDialog/featureDialog.js | 0 .../character/features/features.css | 0 .../character/features/features.html | 0 .../character/features/features.js | 0 .../carryCapacityBar/carryCapacityBar.html | 0 .../carryCapacityBar/carryCapacityBar.js | 0 .../carryCapacityBar/carryCapacityBar.scss | 0 .../inventory/carryDialog/carryDialog.html | 0 .../inventory/carryDialog/carryDialog.js | 0 .../containerDialog/containerDialog.html | 0 .../containerDialog/containerDialog.js | 0 .../character/inventory/inventory.html | 0 .../character/inventory/inventory.js | 0 .../inventory/itemDialog/itemDialog.css | 0 .../inventory/itemDialog/itemDialog.html | 0 .../inventory/itemDialog/itemDialog.js | 0 .../moveItemDialog/moveItemDialog.css | 0 .../moveItemDialog/moveItemDialog.html | 0 .../moveItemDialog/moveItemDialog.js | 0 .../splitStackDialog/splitStackDialog.html | 0 .../splitStackDialog/splitStackDialog.js | 0 .../journal/classDialog/classDialog.html | 0 .../journal/classDialog/classDialog.js | 0 .../experienceDialog/experienceDialog.css | 0 .../experienceDialog/experienceDialog.html | 0 .../experienceDialog/experienceDialog.js | 0 .../character/journal/journal.css | 0 .../character/journal/journal.html | 0 .../character/journal/journal.js | 0 .../journal/noteDialog/noteDialog.css | 0 .../journal/noteDialog/noteDialog.html | 0 .../journal/noteDialog/noteDialog.js | 0 .../journal/raceDialog/raceDialog.html | 0 .../journal/raceDialog/raceDialog.js | 0 .../newCharacterDialog.html | 0 .../newCharacterDialog/newCharacterDialog.js | 0 .../backgroundDialog/backgroundDialog.html | 0 .../backgroundDialog/backgroundDialog.js | 0 .../personaDetailsDialog.html | 0 .../personaDetailsDialog.js | 0 .../character/persona/persona.html | 0 .../character/persona/persona.js | 0 .../persona/textDialog/textDialog.html | 0 .../persona/textDialog/textDialog.js | 0 .../proficiencyEdit/proficiencyEdit.html | 0 .../proficiencyEdit/proficiencyEdit.js | 0 .../proficiencyEditList.html | 0 .../proficiencyEditList.js | 0 .../proficiencyListItem.html | 0 .../proficiencyListItem.js | 0 .../proficiencyView/proficiencyView.html | 0 .../proficiencyView/proficiencyView.js | 0 .../proficiencyViewList.html | 0 .../proficiencyViewList.js | 0 .../spells/spellDialog/spellDialog.css | 0 .../spells/spellDialog/spellDialog.html | 0 .../spells/spellDialog/spellDialog.js | 0 .../spellListDialog/spellListDialog.css | 0 .../spellListDialog/spellListDialog.html | 0 .../spells/spellListDialog/spellListDialog.js | 0 .../{ => private}/character/spells/spells.css | 0 .../character/spells/spells.html | 0 .../{ => private}/character/spells/spells.js | 0 .../stats/abilityCards/abilityCards.html | 0 .../stats/abilityCards/abilityCards.js | 0 .../stats/addTHPDialog/addTHPDialog.html | 0 .../stats/addTHPDialog/addTHPDialog.js | 0 .../attributeDialog/attributeDialog.html | 0 .../stats/attributeDialog/attributeDialog.js | 0 .../strengthDialog/strengthDialog.html | 0 .../strengthDialog/strengthDialog.js | 0 .../carryCapacityTable.html | 0 .../character/stats/healthCard/healthCard.css | 0 .../stats/healthCard/healthCard.html | 0 .../character/stats/healthCard/healthCard.js | 0 .../character/stats/hitDice/hitDice.html | 0 .../character/stats/hitDice/hitDice.js | 0 .../stats/skillDialog/skillDialog.css | 0 .../stats/skillDialog/skillDialog.html | 0 .../stats/skillDialog/skillDialog.js | 0 .../character/stats/skillRow/skillRow.html | 0 .../character/stats/skillRow/skillRow.js | 0 .../character/stats/skillRow/skillRow.scss | 0 .../{ => private}/character/stats/stats.css | 0 .../{ => private}/character/stats/stats.html | 0 .../{ => private}/character/stats/stats.js | 0 .../characterList/characterList.css | 0 .../characterList/characterList.html | 0 .../characterList/characterList.js | 0 .../characterList/characterSideList.css | 0 .../characterList/characterSideList.html | 0 .../characterList/characterSideList.js | 0 .../{ => private}/feedback/feedback.html | 0 .../views/{ => private}/feedback/feedback.js | 0 .../views/{ => private}/guide/guide.css | 0 .../views/{ => private}/guide/guide.html | 0 .../client/views/{ => private}/home/home.html | 0 .../client/views/{ => private}/home/home.js | 0 .../views/{ => private}/home/intro/intro.html | 0 .../views/{ => private}/home/intro/intro.js | 0 .../views/{ => private}/home/intro/intro.scss | 0 .../views/{ => private}/loading/loading.css | 0 .../views/{ => private}/loading/loading.html | 0 .../views/{ => private}/loading/loading.js | 0 .../meta/changeLog/changeLog.html | 0 .../{ => private}/notFound/notFound.html | 0 .../paperTemplates/baseDialog/baseDialog.html | 0 .../paperTemplates/baseDialog/baseDialog.js | 0 .../colorDropdown/colorDropdown.css | 0 .../colorDropdown/colorDropdown.html | 0 .../colorDropdown/colorDropdown.js | 0 .../paperTemplates/fabMenu/fabMenu.html | 0 .../paperTemplates/fabMenu/fabMenu.js | 0 .../paperTemplates/fabMenu/fabMenu.scss | 0 .../gridPadding/gridPadding.html | 0 .../paperTemplates/gridPadding/gridPadding.js | 0 .../paperTemplates/ripple/ripple.css | 0 .../paperTemplates/ripple/ripple.html | 0 .../paperTemplates/undoToast/undoToast.html | 0 .../paperTemplates/undoToast/undoToast.js | 0 .../{ => private}/user/profile/profile.html | 0 .../{ => private}/user/profile/profile.js | 0 .../user/profile/usernameDialog.html | 0 .../user/profile/usernameDialog.js | 0 .../{ => private}/user/signIn/signIn.html | 0 .../views/{ => private}/user/signIn/signIn.js | 0 .../user/titledAtForm/titledAtForm.html | 0 rpg-docs/config.vulcanize | 29 ++-- rpg-docs/packages/meteor-vulcanize/.gitignore | 2 +- .../.npm/plugin/vulcanize/README | 7 + .../.npm/plugin/vulcanize/npm-shrinkwrap.json | 89 ++++++++++ rpg-docs/packages/meteor-vulcanize/.versions | 2 +- rpg-docs/packages/meteor-vulcanize/README.md | 34 ++-- rpg-docs/packages/meteor-vulcanize/package.js | 13 +- .../packages/meteor-vulcanize/vulcanize.js | 157 +++++++++++++----- 171 files changed, 259 insertions(+), 130 deletions(-) delete mode 100644 rpg-docs/client/views/layout/polymer.imports.html rename rpg-docs/client/views/{ => private}/GeneralCSS/globalDetail.css (100%) rename rpg-docs/client/views/{ => private}/GeneralCSS/typography.css (100%) rename rpg-docs/client/views/{ => private}/character/attacks/attackEdit/attackEdit.html (100%) rename rpg-docs/client/views/{ => private}/character/attacks/attackEdit/attackEdit.js (100%) rename rpg-docs/client/views/{ => private}/character/attacks/attackEditList/attackEditList.html (100%) rename rpg-docs/client/views/{ => private}/character/attacks/attackEditList/attackEditList.js (100%) rename rpg-docs/client/views/{ => private}/character/attacks/attackView/attackView.html (100%) rename rpg-docs/client/views/{ => private}/character/attacks/attacksViewList/attacksViewList.html (100%) rename rpg-docs/client/views/{ => private}/character/attacks/attacksViewList/attacksViewList.js (100%) rename rpg-docs/client/views/{ => private}/character/buffs/buffDialog/buffDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/buffs/buffDialog/buffDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/characterSettings/characterSettings.html (100%) rename rpg-docs/client/views/{ => private}/character/characterSettings/characterSettings.js (100%) rename rpg-docs/client/views/{ => private}/character/characterSettings/deleteCharacterConfirmation.html (100%) rename rpg-docs/client/views/{ => private}/character/characterSettings/deleteCharacterConfirmation.js (100%) rename rpg-docs/client/views/{ => private}/character/characterSettings/shareDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/characterSettings/shareDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/characterSheet.css (100%) rename rpg-docs/client/views/{ => private}/character/characterSheet.html (100%) rename rpg-docs/client/views/{ => private}/character/characterSheet.js (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectEdit/effectEdit.css (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectEdit/effectEdit.html (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectEdit/effectEdit.js (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectView/effectView.css (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectView/effectView.html (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectView/effectView.js (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectsEditList/effectsEditList.html (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectsEditList/effectsEditList.js (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectsViewList/effectsViewList.html (100%) rename rpg-docs/client/views/{ => private}/character/effects/effectsViewList/effectsViewList.js (100%) rename rpg-docs/client/views/{ => private}/character/features/featureDialog/featureDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/features/featureDialog/featureDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/features/features.css (100%) rename rpg-docs/client/views/{ => private}/character/features/features.html (100%) rename rpg-docs/client/views/{ => private}/character/features/features.js (100%) rename rpg-docs/client/views/{ => private}/character/inventory/carryCapacityBar/carryCapacityBar.html (100%) rename rpg-docs/client/views/{ => private}/character/inventory/carryCapacityBar/carryCapacityBar.js (100%) rename rpg-docs/client/views/{ => private}/character/inventory/carryCapacityBar/carryCapacityBar.scss (100%) rename rpg-docs/client/views/{ => private}/character/inventory/carryDialog/carryDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/inventory/carryDialog/carryDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/inventory/containerDialog/containerDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/inventory/containerDialog/containerDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/inventory/inventory.html (100%) rename rpg-docs/client/views/{ => private}/character/inventory/inventory.js (100%) rename rpg-docs/client/views/{ => private}/character/inventory/itemDialog/itemDialog.css (100%) rename rpg-docs/client/views/{ => private}/character/inventory/itemDialog/itemDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/inventory/itemDialog/itemDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/inventory/moveItemDialog/moveItemDialog.css (100%) rename rpg-docs/client/views/{ => private}/character/inventory/moveItemDialog/moveItemDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/inventory/moveItemDialog/moveItemDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/inventory/splitStackDialog/splitStackDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/inventory/splitStackDialog/splitStackDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/journal/classDialog/classDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/journal/classDialog/classDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/journal/experienceDialog/experienceDialog.css (100%) rename rpg-docs/client/views/{ => private}/character/journal/experienceDialog/experienceDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/journal/experienceDialog/experienceDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/journal/journal.css (100%) rename rpg-docs/client/views/{ => private}/character/journal/journal.html (100%) rename rpg-docs/client/views/{ => private}/character/journal/journal.js (100%) rename rpg-docs/client/views/{ => private}/character/journal/noteDialog/noteDialog.css (100%) rename rpg-docs/client/views/{ => private}/character/journal/noteDialog/noteDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/journal/noteDialog/noteDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/journal/raceDialog/raceDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/journal/raceDialog/raceDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/newCharacterDialog/newCharacterDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/newCharacterDialog/newCharacterDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/persona/backgroundDialog/backgroundDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/persona/backgroundDialog/backgroundDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/persona/peronaDetailsDialog/personaDetailsDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/persona/peronaDetailsDialog/personaDetailsDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/persona/persona.html (100%) rename rpg-docs/client/views/{ => private}/character/persona/persona.js (100%) rename rpg-docs/client/views/{ => private}/character/persona/textDialog/textDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/persona/textDialog/textDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyEdit/proficiencyEdit.html (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyEdit/proficiencyEdit.js (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyEditList/proficiencyEditList.html (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyEditList/proficiencyEditList.js (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyListItem/proficiencyListItem.html (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyListItem/proficiencyListItem.js (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyView/proficiencyView.html (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyView/proficiencyView.js (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyViewList/proficiencyViewList.html (100%) rename rpg-docs/client/views/{ => private}/character/proficiencies/proficiencyViewList/proficiencyViewList.js (100%) rename rpg-docs/client/views/{ => private}/character/spells/spellDialog/spellDialog.css (100%) rename rpg-docs/client/views/{ => private}/character/spells/spellDialog/spellDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/spells/spellDialog/spellDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/spells/spellListDialog/spellListDialog.css (100%) rename rpg-docs/client/views/{ => private}/character/spells/spellListDialog/spellListDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/spells/spellListDialog/spellListDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/spells/spells.css (100%) rename rpg-docs/client/views/{ => private}/character/spells/spells.html (100%) rename rpg-docs/client/views/{ => private}/character/spells/spells.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/abilityCards/abilityCards.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/abilityCards/abilityCards.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/addTHPDialog/addTHPDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/addTHPDialog/addTHPDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/attributeDialog/attributeDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/attributeDialog/attributeDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/attributeDialog/strengthDialog/strengthDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/attributeDialog/strengthDialog/strengthDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/carryCapacityTable/carryCapacityTable.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/healthCard/healthCard.css (100%) rename rpg-docs/client/views/{ => private}/character/stats/healthCard/healthCard.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/healthCard/healthCard.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/hitDice/hitDice.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/hitDice/hitDice.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/skillDialog/skillDialog.css (100%) rename rpg-docs/client/views/{ => private}/character/stats/skillDialog/skillDialog.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/skillDialog/skillDialog.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/skillRow/skillRow.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/skillRow/skillRow.js (100%) rename rpg-docs/client/views/{ => private}/character/stats/skillRow/skillRow.scss (100%) rename rpg-docs/client/views/{ => private}/character/stats/stats.css (100%) rename rpg-docs/client/views/{ => private}/character/stats/stats.html (100%) rename rpg-docs/client/views/{ => private}/character/stats/stats.js (100%) rename rpg-docs/client/views/{ => private}/characterList/characterList.css (100%) rename rpg-docs/client/views/{ => private}/characterList/characterList.html (100%) rename rpg-docs/client/views/{ => private}/characterList/characterList.js (100%) rename rpg-docs/client/views/{ => private}/characterList/characterSideList.css (100%) rename rpg-docs/client/views/{ => private}/characterList/characterSideList.html (100%) rename rpg-docs/client/views/{ => private}/characterList/characterSideList.js (100%) rename rpg-docs/client/views/{ => private}/feedback/feedback.html (100%) rename rpg-docs/client/views/{ => private}/feedback/feedback.js (100%) rename rpg-docs/client/views/{ => private}/guide/guide.css (100%) rename rpg-docs/client/views/{ => private}/guide/guide.html (100%) rename rpg-docs/client/views/{ => private}/home/home.html (100%) rename rpg-docs/client/views/{ => private}/home/home.js (100%) rename rpg-docs/client/views/{ => private}/home/intro/intro.html (100%) rename rpg-docs/client/views/{ => private}/home/intro/intro.js (100%) rename rpg-docs/client/views/{ => private}/home/intro/intro.scss (100%) rename rpg-docs/client/views/{ => private}/loading/loading.css (100%) rename rpg-docs/client/views/{ => private}/loading/loading.html (100%) rename rpg-docs/client/views/{ => private}/loading/loading.js (100%) rename rpg-docs/client/views/{ => private}/meta/changeLog/changeLog.html (100%) rename rpg-docs/client/views/{ => private}/notFound/notFound.html (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/baseDialog/baseDialog.html (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/baseDialog/baseDialog.js (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/colorDropdown/colorDropdown.css (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/colorDropdown/colorDropdown.html (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/colorDropdown/colorDropdown.js (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/fabMenu/fabMenu.html (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/fabMenu/fabMenu.js (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/fabMenu/fabMenu.scss (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/gridPadding/gridPadding.html (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/gridPadding/gridPadding.js (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/ripple/ripple.css (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/ripple/ripple.html (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/undoToast/undoToast.html (100%) rename rpg-docs/client/views/{ => private}/paperTemplates/undoToast/undoToast.js (100%) rename rpg-docs/client/views/{ => private}/user/profile/profile.html (100%) rename rpg-docs/client/views/{ => private}/user/profile/profile.js (100%) rename rpg-docs/client/views/{ => private}/user/profile/usernameDialog.html (100%) rename rpg-docs/client/views/{ => private}/user/profile/usernameDialog.js (100%) rename rpg-docs/client/views/{ => private}/user/signIn/signIn.html (100%) rename rpg-docs/client/views/{ => private}/user/signIn/signIn.js (100%) rename rpg-docs/client/views/{ => private}/user/titledAtForm/titledAtForm.html (100%) create mode 100644 rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README create mode 100644 rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index f2991bd6..26c3e4bf 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -3,7 +3,7 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -thaum:vulcanize@0.0.5 +thaum:vulcanize iron:router accounts-password accounts-ui diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index e405ebba..95763ae3 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -115,7 +115,7 @@ standard-minifier-css@1.0.6 standard-minifier-js@1.0.6 templating@1.1.9 templating-tools@1.0.4 -thaum:vulcanize@0.0.5 +thaum:vulcanize@2.2.0 tracker@1.0.13 ui@1.0.11 underscore@1.0.8 diff --git a/rpg-docs/bower.json b/rpg-docs/bower.json index 763d7bfa..426d3a1b 100644 --- a/rpg-docs/bower.json +++ b/rpg-docs/bower.json @@ -15,10 +15,10 @@ "tests" ], "dependencies": { - "polymer": "Polymer/polymer#~0.5.5", - "core-elements": "Polymer/core-elements#~0.5.5", - "paper-elements": "Polymer/paper-elements#~0.5.5", - "paper-fab-menu": "cwdoh/paper-fab-menu#~0.4.0" + "paper-elements": "PolymerElements/paper-elements#~1.0.7", + "iron-elements": "PolymerElements/iron-elements#~1.0.10", + "marked-element": "PolymerElements/marked-element#~1.2.0", + "app-layout": "PolymerElements/app-layout#~0.10.4" }, "resolutions": { "core-component-page": "^0.5.0", diff --git a/rpg-docs/client/views/layout/head.html b/rpg-docs/client/views/layout/head.html index 35b0c237..5927c8c2 100644 --- a/rpg-docs/client/views/layout/head.html +++ b/rpg-docs/client/views/layout/head.html @@ -2,7 +2,6 @@ - diff --git a/rpg-docs/client/views/layout/polymer.imports.html b/rpg-docs/client/views/layout/polymer.imports.html deleted file mode 100644 index 8cef4c15..00000000 --- a/rpg-docs/client/views/layout/polymer.imports.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rpg-docs/client/views/GeneralCSS/globalDetail.css b/rpg-docs/client/views/private/GeneralCSS/globalDetail.css similarity index 100% rename from rpg-docs/client/views/GeneralCSS/globalDetail.css rename to rpg-docs/client/views/private/GeneralCSS/globalDetail.css diff --git a/rpg-docs/client/views/GeneralCSS/typography.css b/rpg-docs/client/views/private/GeneralCSS/typography.css similarity index 100% rename from rpg-docs/client/views/GeneralCSS/typography.css rename to rpg-docs/client/views/private/GeneralCSS/typography.css diff --git a/rpg-docs/client/views/character/attacks/attackEdit/attackEdit.html b/rpg-docs/client/views/private/character/attacks/attackEdit/attackEdit.html similarity index 100% rename from rpg-docs/client/views/character/attacks/attackEdit/attackEdit.html rename to rpg-docs/client/views/private/character/attacks/attackEdit/attackEdit.html diff --git a/rpg-docs/client/views/character/attacks/attackEdit/attackEdit.js b/rpg-docs/client/views/private/character/attacks/attackEdit/attackEdit.js similarity index 100% rename from rpg-docs/client/views/character/attacks/attackEdit/attackEdit.js rename to rpg-docs/client/views/private/character/attacks/attackEdit/attackEdit.js diff --git a/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.html b/rpg-docs/client/views/private/character/attacks/attackEditList/attackEditList.html similarity index 100% rename from rpg-docs/client/views/character/attacks/attackEditList/attackEditList.html rename to rpg-docs/client/views/private/character/attacks/attackEditList/attackEditList.html diff --git a/rpg-docs/client/views/character/attacks/attackEditList/attackEditList.js b/rpg-docs/client/views/private/character/attacks/attackEditList/attackEditList.js similarity index 100% rename from rpg-docs/client/views/character/attacks/attackEditList/attackEditList.js rename to rpg-docs/client/views/private/character/attacks/attackEditList/attackEditList.js diff --git a/rpg-docs/client/views/character/attacks/attackView/attackView.html b/rpg-docs/client/views/private/character/attacks/attackView/attackView.html similarity index 100% rename from rpg-docs/client/views/character/attacks/attackView/attackView.html rename to rpg-docs/client/views/private/character/attacks/attackView/attackView.html diff --git a/rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.html b/rpg-docs/client/views/private/character/attacks/attacksViewList/attacksViewList.html similarity index 100% rename from rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.html rename to rpg-docs/client/views/private/character/attacks/attacksViewList/attacksViewList.html diff --git a/rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.js b/rpg-docs/client/views/private/character/attacks/attacksViewList/attacksViewList.js similarity index 100% rename from rpg-docs/client/views/character/attacks/attacksViewList/attacksViewList.js rename to rpg-docs/client/views/private/character/attacks/attacksViewList/attacksViewList.js diff --git a/rpg-docs/client/views/character/buffs/buffDialog/buffDialog.html b/rpg-docs/client/views/private/character/buffs/buffDialog/buffDialog.html similarity index 100% rename from rpg-docs/client/views/character/buffs/buffDialog/buffDialog.html rename to rpg-docs/client/views/private/character/buffs/buffDialog/buffDialog.html diff --git a/rpg-docs/client/views/character/buffs/buffDialog/buffDialog.js b/rpg-docs/client/views/private/character/buffs/buffDialog/buffDialog.js similarity index 100% rename from rpg-docs/client/views/character/buffs/buffDialog/buffDialog.js rename to rpg-docs/client/views/private/character/buffs/buffDialog/buffDialog.js diff --git a/rpg-docs/client/views/character/characterSettings/characterSettings.html b/rpg-docs/client/views/private/character/characterSettings/characterSettings.html similarity index 100% rename from rpg-docs/client/views/character/characterSettings/characterSettings.html rename to rpg-docs/client/views/private/character/characterSettings/characterSettings.html diff --git a/rpg-docs/client/views/character/characterSettings/characterSettings.js b/rpg-docs/client/views/private/character/characterSettings/characterSettings.js similarity index 100% rename from rpg-docs/client/views/character/characterSettings/characterSettings.js rename to rpg-docs/client/views/private/character/characterSettings/characterSettings.js diff --git a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.html b/rpg-docs/client/views/private/character/characterSettings/deleteCharacterConfirmation.html similarity index 100% rename from rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.html rename to rpg-docs/client/views/private/character/characterSettings/deleteCharacterConfirmation.html diff --git a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js b/rpg-docs/client/views/private/character/characterSettings/deleteCharacterConfirmation.js similarity index 100% rename from rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js rename to rpg-docs/client/views/private/character/characterSettings/deleteCharacterConfirmation.js diff --git a/rpg-docs/client/views/character/characterSettings/shareDialog.html b/rpg-docs/client/views/private/character/characterSettings/shareDialog.html similarity index 100% rename from rpg-docs/client/views/character/characterSettings/shareDialog.html rename to rpg-docs/client/views/private/character/characterSettings/shareDialog.html diff --git a/rpg-docs/client/views/character/characterSettings/shareDialog.js b/rpg-docs/client/views/private/character/characterSettings/shareDialog.js similarity index 100% rename from rpg-docs/client/views/character/characterSettings/shareDialog.js rename to rpg-docs/client/views/private/character/characterSettings/shareDialog.js diff --git a/rpg-docs/client/views/character/characterSheet.css b/rpg-docs/client/views/private/character/characterSheet.css similarity index 100% rename from rpg-docs/client/views/character/characterSheet.css rename to rpg-docs/client/views/private/character/characterSheet.css diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/private/character/characterSheet.html similarity index 100% rename from rpg-docs/client/views/character/characterSheet.html rename to rpg-docs/client/views/private/character/characterSheet.html diff --git a/rpg-docs/client/views/character/characterSheet.js b/rpg-docs/client/views/private/character/characterSheet.js similarity index 100% rename from rpg-docs/client/views/character/characterSheet.js rename to rpg-docs/client/views/private/character/characterSheet.js diff --git a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.css b/rpg-docs/client/views/private/character/effects/effectEdit/effectEdit.css similarity index 100% rename from rpg-docs/client/views/character/effects/effectEdit/effectEdit.css rename to rpg-docs/client/views/private/character/effects/effectEdit/effectEdit.css diff --git a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.html b/rpg-docs/client/views/private/character/effects/effectEdit/effectEdit.html similarity index 100% rename from rpg-docs/client/views/character/effects/effectEdit/effectEdit.html rename to rpg-docs/client/views/private/character/effects/effectEdit/effectEdit.html diff --git a/rpg-docs/client/views/character/effects/effectEdit/effectEdit.js b/rpg-docs/client/views/private/character/effects/effectEdit/effectEdit.js similarity index 100% rename from rpg-docs/client/views/character/effects/effectEdit/effectEdit.js rename to rpg-docs/client/views/private/character/effects/effectEdit/effectEdit.js diff --git a/rpg-docs/client/views/character/effects/effectView/effectView.css b/rpg-docs/client/views/private/character/effects/effectView/effectView.css similarity index 100% rename from rpg-docs/client/views/character/effects/effectView/effectView.css rename to rpg-docs/client/views/private/character/effects/effectView/effectView.css diff --git a/rpg-docs/client/views/character/effects/effectView/effectView.html b/rpg-docs/client/views/private/character/effects/effectView/effectView.html similarity index 100% rename from rpg-docs/client/views/character/effects/effectView/effectView.html rename to rpg-docs/client/views/private/character/effects/effectView/effectView.html diff --git a/rpg-docs/client/views/character/effects/effectView/effectView.js b/rpg-docs/client/views/private/character/effects/effectView/effectView.js similarity index 100% rename from rpg-docs/client/views/character/effects/effectView/effectView.js rename to rpg-docs/client/views/private/character/effects/effectView/effectView.js diff --git a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html b/rpg-docs/client/views/private/character/effects/effectsEditList/effectsEditList.html similarity index 100% rename from rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.html rename to rpg-docs/client/views/private/character/effects/effectsEditList/effectsEditList.html diff --git a/rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js b/rpg-docs/client/views/private/character/effects/effectsEditList/effectsEditList.js similarity index 100% rename from rpg-docs/client/views/character/effects/effectsEditList/effectsEditList.js rename to rpg-docs/client/views/private/character/effects/effectsEditList/effectsEditList.js diff --git a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html b/rpg-docs/client/views/private/character/effects/effectsViewList/effectsViewList.html similarity index 100% rename from rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.html rename to rpg-docs/client/views/private/character/effects/effectsViewList/effectsViewList.html diff --git a/rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.js b/rpg-docs/client/views/private/character/effects/effectsViewList/effectsViewList.js similarity index 100% rename from rpg-docs/client/views/character/effects/effectsViewList/effectsViewList.js rename to rpg-docs/client/views/private/character/effects/effectsViewList/effectsViewList.js diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.html b/rpg-docs/client/views/private/character/features/featureDialog/featureDialog.html similarity index 100% rename from rpg-docs/client/views/character/features/featureDialog/featureDialog.html rename to rpg-docs/client/views/private/character/features/featureDialog/featureDialog.html diff --git a/rpg-docs/client/views/character/features/featureDialog/featureDialog.js b/rpg-docs/client/views/private/character/features/featureDialog/featureDialog.js similarity index 100% rename from rpg-docs/client/views/character/features/featureDialog/featureDialog.js rename to rpg-docs/client/views/private/character/features/featureDialog/featureDialog.js diff --git a/rpg-docs/client/views/character/features/features.css b/rpg-docs/client/views/private/character/features/features.css similarity index 100% rename from rpg-docs/client/views/character/features/features.css rename to rpg-docs/client/views/private/character/features/features.css diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/private/character/features/features.html similarity index 100% rename from rpg-docs/client/views/character/features/features.html rename to rpg-docs/client/views/private/character/features/features.html diff --git a/rpg-docs/client/views/character/features/features.js b/rpg-docs/client/views/private/character/features/features.js similarity index 100% rename from rpg-docs/client/views/character/features/features.js rename to rpg-docs/client/views/private/character/features/features.js diff --git a/rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.html b/rpg-docs/client/views/private/character/inventory/carryCapacityBar/carryCapacityBar.html similarity index 100% rename from rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.html rename to rpg-docs/client/views/private/character/inventory/carryCapacityBar/carryCapacityBar.html diff --git a/rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.js b/rpg-docs/client/views/private/character/inventory/carryCapacityBar/carryCapacityBar.js similarity index 100% rename from rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.js rename to rpg-docs/client/views/private/character/inventory/carryCapacityBar/carryCapacityBar.js diff --git a/rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.scss b/rpg-docs/client/views/private/character/inventory/carryCapacityBar/carryCapacityBar.scss similarity index 100% rename from rpg-docs/client/views/character/inventory/carryCapacityBar/carryCapacityBar.scss rename to rpg-docs/client/views/private/character/inventory/carryCapacityBar/carryCapacityBar.scss diff --git a/rpg-docs/client/views/character/inventory/carryDialog/carryDialog.html b/rpg-docs/client/views/private/character/inventory/carryDialog/carryDialog.html similarity index 100% rename from rpg-docs/client/views/character/inventory/carryDialog/carryDialog.html rename to rpg-docs/client/views/private/character/inventory/carryDialog/carryDialog.html diff --git a/rpg-docs/client/views/character/inventory/carryDialog/carryDialog.js b/rpg-docs/client/views/private/character/inventory/carryDialog/carryDialog.js similarity index 100% rename from rpg-docs/client/views/character/inventory/carryDialog/carryDialog.js rename to rpg-docs/client/views/private/character/inventory/carryDialog/carryDialog.js diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html b/rpg-docs/client/views/private/character/inventory/containerDialog/containerDialog.html similarity index 100% rename from rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html rename to rpg-docs/client/views/private/character/inventory/containerDialog/containerDialog.html diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.js b/rpg-docs/client/views/private/character/inventory/containerDialog/containerDialog.js similarity index 100% rename from rpg-docs/client/views/character/inventory/containerDialog/containerDialog.js rename to rpg-docs/client/views/private/character/inventory/containerDialog/containerDialog.js diff --git a/rpg-docs/client/views/character/inventory/inventory.html b/rpg-docs/client/views/private/character/inventory/inventory.html similarity index 100% rename from rpg-docs/client/views/character/inventory/inventory.html rename to rpg-docs/client/views/private/character/inventory/inventory.html diff --git a/rpg-docs/client/views/character/inventory/inventory.js b/rpg-docs/client/views/private/character/inventory/inventory.js similarity index 100% rename from rpg-docs/client/views/character/inventory/inventory.js rename to rpg-docs/client/views/private/character/inventory/inventory.js diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.css b/rpg-docs/client/views/private/character/inventory/itemDialog/itemDialog.css similarity index 100% rename from rpg-docs/client/views/character/inventory/itemDialog/itemDialog.css rename to rpg-docs/client/views/private/character/inventory/itemDialog/itemDialog.css diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html b/rpg-docs/client/views/private/character/inventory/itemDialog/itemDialog.html similarity index 100% rename from rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html rename to rpg-docs/client/views/private/character/inventory/itemDialog/itemDialog.html diff --git a/rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js b/rpg-docs/client/views/private/character/inventory/itemDialog/itemDialog.js similarity index 100% rename from rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js rename to rpg-docs/client/views/private/character/inventory/itemDialog/itemDialog.js diff --git a/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.css b/rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.css similarity index 100% rename from rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.css rename to rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.css diff --git a/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.html b/rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.html similarity index 100% rename from rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.html rename to rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.html diff --git a/rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.js b/rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.js similarity index 100% rename from rpg-docs/client/views/character/inventory/moveItemDialog/moveItemDialog.js rename to rpg-docs/client/views/private/character/inventory/moveItemDialog/moveItemDialog.js diff --git a/rpg-docs/client/views/character/inventory/splitStackDialog/splitStackDialog.html b/rpg-docs/client/views/private/character/inventory/splitStackDialog/splitStackDialog.html similarity index 100% rename from rpg-docs/client/views/character/inventory/splitStackDialog/splitStackDialog.html rename to rpg-docs/client/views/private/character/inventory/splitStackDialog/splitStackDialog.html diff --git a/rpg-docs/client/views/character/inventory/splitStackDialog/splitStackDialog.js b/rpg-docs/client/views/private/character/inventory/splitStackDialog/splitStackDialog.js similarity index 100% rename from rpg-docs/client/views/character/inventory/splitStackDialog/splitStackDialog.js rename to rpg-docs/client/views/private/character/inventory/splitStackDialog/splitStackDialog.js diff --git a/rpg-docs/client/views/character/journal/classDialog/classDialog.html b/rpg-docs/client/views/private/character/journal/classDialog/classDialog.html similarity index 100% rename from rpg-docs/client/views/character/journal/classDialog/classDialog.html rename to rpg-docs/client/views/private/character/journal/classDialog/classDialog.html diff --git a/rpg-docs/client/views/character/journal/classDialog/classDialog.js b/rpg-docs/client/views/private/character/journal/classDialog/classDialog.js similarity index 100% rename from rpg-docs/client/views/character/journal/classDialog/classDialog.js rename to rpg-docs/client/views/private/character/journal/classDialog/classDialog.js diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.css b/rpg-docs/client/views/private/character/journal/experienceDialog/experienceDialog.css similarity index 100% rename from rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.css rename to rpg-docs/client/views/private/character/journal/experienceDialog/experienceDialog.css diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html b/rpg-docs/client/views/private/character/journal/experienceDialog/experienceDialog.html similarity index 100% rename from rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.html rename to rpg-docs/client/views/private/character/journal/experienceDialog/experienceDialog.html diff --git a/rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js b/rpg-docs/client/views/private/character/journal/experienceDialog/experienceDialog.js similarity index 100% rename from rpg-docs/client/views/character/journal/experienceDialog/experienceDialog.js rename to rpg-docs/client/views/private/character/journal/experienceDialog/experienceDialog.js diff --git a/rpg-docs/client/views/character/journal/journal.css b/rpg-docs/client/views/private/character/journal/journal.css similarity index 100% rename from rpg-docs/client/views/character/journal/journal.css rename to rpg-docs/client/views/private/character/journal/journal.css diff --git a/rpg-docs/client/views/character/journal/journal.html b/rpg-docs/client/views/private/character/journal/journal.html similarity index 100% rename from rpg-docs/client/views/character/journal/journal.html rename to rpg-docs/client/views/private/character/journal/journal.html diff --git a/rpg-docs/client/views/character/journal/journal.js b/rpg-docs/client/views/private/character/journal/journal.js similarity index 100% rename from rpg-docs/client/views/character/journal/journal.js rename to rpg-docs/client/views/private/character/journal/journal.js diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.css b/rpg-docs/client/views/private/character/journal/noteDialog/noteDialog.css similarity index 100% rename from rpg-docs/client/views/character/journal/noteDialog/noteDialog.css rename to rpg-docs/client/views/private/character/journal/noteDialog/noteDialog.css diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.html b/rpg-docs/client/views/private/character/journal/noteDialog/noteDialog.html similarity index 100% rename from rpg-docs/client/views/character/journal/noteDialog/noteDialog.html rename to rpg-docs/client/views/private/character/journal/noteDialog/noteDialog.html diff --git a/rpg-docs/client/views/character/journal/noteDialog/noteDialog.js b/rpg-docs/client/views/private/character/journal/noteDialog/noteDialog.js similarity index 100% rename from rpg-docs/client/views/character/journal/noteDialog/noteDialog.js rename to rpg-docs/client/views/private/character/journal/noteDialog/noteDialog.js diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.html b/rpg-docs/client/views/private/character/journal/raceDialog/raceDialog.html similarity index 100% rename from rpg-docs/client/views/character/journal/raceDialog/raceDialog.html rename to rpg-docs/client/views/private/character/journal/raceDialog/raceDialog.html diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js b/rpg-docs/client/views/private/character/journal/raceDialog/raceDialog.js similarity index 100% rename from rpg-docs/client/views/character/journal/raceDialog/raceDialog.js rename to rpg-docs/client/views/private/character/journal/raceDialog/raceDialog.js diff --git a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.html b/rpg-docs/client/views/private/character/newCharacterDialog/newCharacterDialog.html similarity index 100% rename from rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.html rename to rpg-docs/client/views/private/character/newCharacterDialog/newCharacterDialog.html diff --git a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js b/rpg-docs/client/views/private/character/newCharacterDialog/newCharacterDialog.js similarity index 100% rename from rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js rename to rpg-docs/client/views/private/character/newCharacterDialog/newCharacterDialog.js diff --git a/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html b/rpg-docs/client/views/private/character/persona/backgroundDialog/backgroundDialog.html similarity index 100% rename from rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.html rename to rpg-docs/client/views/private/character/persona/backgroundDialog/backgroundDialog.html diff --git a/rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.js b/rpg-docs/client/views/private/character/persona/backgroundDialog/backgroundDialog.js similarity index 100% rename from rpg-docs/client/views/character/persona/backgroundDialog/backgroundDialog.js rename to rpg-docs/client/views/private/character/persona/backgroundDialog/backgroundDialog.js diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html b/rpg-docs/client/views/private/character/persona/peronaDetailsDialog/personaDetailsDialog.html similarity index 100% rename from rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.html rename to rpg-docs/client/views/private/character/persona/peronaDetailsDialog/personaDetailsDialog.html diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js b/rpg-docs/client/views/private/character/persona/peronaDetailsDialog/personaDetailsDialog.js similarity index 100% rename from rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js rename to rpg-docs/client/views/private/character/persona/peronaDetailsDialog/personaDetailsDialog.js diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/private/character/persona/persona.html similarity index 100% rename from rpg-docs/client/views/character/persona/persona.html rename to rpg-docs/client/views/private/character/persona/persona.html diff --git a/rpg-docs/client/views/character/persona/persona.js b/rpg-docs/client/views/private/character/persona/persona.js similarity index 100% rename from rpg-docs/client/views/character/persona/persona.js rename to rpg-docs/client/views/private/character/persona/persona.js diff --git a/rpg-docs/client/views/character/persona/textDialog/textDialog.html b/rpg-docs/client/views/private/character/persona/textDialog/textDialog.html similarity index 100% rename from rpg-docs/client/views/character/persona/textDialog/textDialog.html rename to rpg-docs/client/views/private/character/persona/textDialog/textDialog.html diff --git a/rpg-docs/client/views/character/persona/textDialog/textDialog.js b/rpg-docs/client/views/private/character/persona/textDialog/textDialog.js similarity index 100% rename from rpg-docs/client/views/character/persona/textDialog/textDialog.js rename to rpg-docs/client/views/private/character/persona/textDialog/textDialog.js diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyEdit/proficiencyEdit.html b/rpg-docs/client/views/private/character/proficiencies/proficiencyEdit/proficiencyEdit.html similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyEdit/proficiencyEdit.html rename to rpg-docs/client/views/private/character/proficiencies/proficiencyEdit/proficiencyEdit.html diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyEdit/proficiencyEdit.js b/rpg-docs/client/views/private/character/proficiencies/proficiencyEdit/proficiencyEdit.js similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyEdit/proficiencyEdit.js rename to rpg-docs/client/views/private/character/proficiencies/proficiencyEdit/proficiencyEdit.js diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.html b/rpg-docs/client/views/private/character/proficiencies/proficiencyEditList/proficiencyEditList.html similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.html rename to rpg-docs/client/views/private/character/proficiencies/proficiencyEditList/proficiencyEditList.html diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.js b/rpg-docs/client/views/private/character/proficiencies/proficiencyEditList/proficiencyEditList.js similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyEditList/proficiencyEditList.js rename to rpg-docs/client/views/private/character/proficiencies/proficiencyEditList/proficiencyEditList.js diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html b/rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.html similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.html rename to rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.html diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.js b/rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.js similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyListItem/proficiencyListItem.js rename to rpg-docs/client/views/private/character/proficiencies/proficiencyListItem/proficiencyListItem.js diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html b/rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.html similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.html rename to rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.html diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.js b/rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.js similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyView/proficiencyView.js rename to rpg-docs/client/views/private/character/proficiencies/proficiencyView/proficiencyView.js diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html b/rpg-docs/client/views/private/character/proficiencies/proficiencyViewList/proficiencyViewList.html similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.html rename to rpg-docs/client/views/private/character/proficiencies/proficiencyViewList/proficiencyViewList.html diff --git a/rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.js b/rpg-docs/client/views/private/character/proficiencies/proficiencyViewList/proficiencyViewList.js similarity index 100% rename from rpg-docs/client/views/character/proficiencies/proficiencyViewList/proficiencyViewList.js rename to rpg-docs/client/views/private/character/proficiencies/proficiencyViewList/proficiencyViewList.js diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.css b/rpg-docs/client/views/private/character/spells/spellDialog/spellDialog.css similarity index 100% rename from rpg-docs/client/views/character/spells/spellDialog/spellDialog.css rename to rpg-docs/client/views/private/character/spells/spellDialog/spellDialog.css diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.html b/rpg-docs/client/views/private/character/spells/spellDialog/spellDialog.html similarity index 100% rename from rpg-docs/client/views/character/spells/spellDialog/spellDialog.html rename to rpg-docs/client/views/private/character/spells/spellDialog/spellDialog.html diff --git a/rpg-docs/client/views/character/spells/spellDialog/spellDialog.js b/rpg-docs/client/views/private/character/spells/spellDialog/spellDialog.js similarity index 100% rename from rpg-docs/client/views/character/spells/spellDialog/spellDialog.js rename to rpg-docs/client/views/private/character/spells/spellDialog/spellDialog.js diff --git a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.css b/rpg-docs/client/views/private/character/spells/spellListDialog/spellListDialog.css similarity index 100% rename from rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.css rename to rpg-docs/client/views/private/character/spells/spellListDialog/spellListDialog.css diff --git a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html b/rpg-docs/client/views/private/character/spells/spellListDialog/spellListDialog.html similarity index 100% rename from rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.html rename to rpg-docs/client/views/private/character/spells/spellListDialog/spellListDialog.html diff --git a/rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.js b/rpg-docs/client/views/private/character/spells/spellListDialog/spellListDialog.js similarity index 100% rename from rpg-docs/client/views/character/spells/spellListDialog/spellListDialog.js rename to rpg-docs/client/views/private/character/spells/spellListDialog/spellListDialog.js diff --git a/rpg-docs/client/views/character/spells/spells.css b/rpg-docs/client/views/private/character/spells/spells.css similarity index 100% rename from rpg-docs/client/views/character/spells/spells.css rename to rpg-docs/client/views/private/character/spells/spells.css diff --git a/rpg-docs/client/views/character/spells/spells.html b/rpg-docs/client/views/private/character/spells/spells.html similarity index 100% rename from rpg-docs/client/views/character/spells/spells.html rename to rpg-docs/client/views/private/character/spells/spells.html diff --git a/rpg-docs/client/views/character/spells/spells.js b/rpg-docs/client/views/private/character/spells/spells.js similarity index 100% rename from rpg-docs/client/views/character/spells/spells.js rename to rpg-docs/client/views/private/character/spells/spells.js diff --git a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html b/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html similarity index 100% rename from rpg-docs/client/views/character/stats/abilityCards/abilityCards.html rename to rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html diff --git a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.js b/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.js similarity index 100% rename from rpg-docs/client/views/character/stats/abilityCards/abilityCards.js rename to rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.js diff --git a/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.html b/rpg-docs/client/views/private/character/stats/addTHPDialog/addTHPDialog.html similarity index 100% rename from rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.html rename to rpg-docs/client/views/private/character/stats/addTHPDialog/addTHPDialog.html diff --git a/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js b/rpg-docs/client/views/private/character/stats/addTHPDialog/addTHPDialog.js similarity index 100% rename from rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js rename to rpg-docs/client/views/private/character/stats/addTHPDialog/addTHPDialog.js diff --git a/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.html b/rpg-docs/client/views/private/character/stats/attributeDialog/attributeDialog.html similarity index 100% rename from rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.html rename to rpg-docs/client/views/private/character/stats/attributeDialog/attributeDialog.html diff --git a/rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js b/rpg-docs/client/views/private/character/stats/attributeDialog/attributeDialog.js similarity index 100% rename from rpg-docs/client/views/character/stats/attributeDialog/attributeDialog.js rename to rpg-docs/client/views/private/character/stats/attributeDialog/attributeDialog.js diff --git a/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.html b/rpg-docs/client/views/private/character/stats/attributeDialog/strengthDialog/strengthDialog.html similarity index 100% rename from rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.html rename to rpg-docs/client/views/private/character/stats/attributeDialog/strengthDialog/strengthDialog.html diff --git a/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.js b/rpg-docs/client/views/private/character/stats/attributeDialog/strengthDialog/strengthDialog.js similarity index 100% rename from rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.js rename to rpg-docs/client/views/private/character/stats/attributeDialog/strengthDialog/strengthDialog.js diff --git a/rpg-docs/client/views/character/stats/carryCapacityTable/carryCapacityTable.html b/rpg-docs/client/views/private/character/stats/carryCapacityTable/carryCapacityTable.html similarity index 100% rename from rpg-docs/client/views/character/stats/carryCapacityTable/carryCapacityTable.html rename to rpg-docs/client/views/private/character/stats/carryCapacityTable/carryCapacityTable.html diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.css b/rpg-docs/client/views/private/character/stats/healthCard/healthCard.css similarity index 100% rename from rpg-docs/client/views/character/stats/healthCard/healthCard.css rename to rpg-docs/client/views/private/character/stats/healthCard/healthCard.css diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html similarity index 100% rename from rpg-docs/client/views/character/stats/healthCard/healthCard.html rename to rpg-docs/client/views/private/character/stats/healthCard/healthCard.html diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.js b/rpg-docs/client/views/private/character/stats/healthCard/healthCard.js similarity index 100% rename from rpg-docs/client/views/character/stats/healthCard/healthCard.js rename to rpg-docs/client/views/private/character/stats/healthCard/healthCard.js diff --git a/rpg-docs/client/views/character/stats/hitDice/hitDice.html b/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html similarity index 100% rename from rpg-docs/client/views/character/stats/hitDice/hitDice.html rename to rpg-docs/client/views/private/character/stats/hitDice/hitDice.html diff --git a/rpg-docs/client/views/character/stats/hitDice/hitDice.js b/rpg-docs/client/views/private/character/stats/hitDice/hitDice.js similarity index 100% rename from rpg-docs/client/views/character/stats/hitDice/hitDice.js rename to rpg-docs/client/views/private/character/stats/hitDice/hitDice.js diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.css b/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.css similarity index 100% rename from rpg-docs/client/views/character/stats/skillDialog/skillDialog.css rename to rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.css diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html b/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html similarity index 100% rename from rpg-docs/client/views/character/stats/skillDialog/skillDialog.html rename to rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.js b/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.js similarity index 100% rename from rpg-docs/client/views/character/stats/skillDialog/skillDialog.js rename to rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.js diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.html b/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html similarity index 100% rename from rpg-docs/client/views/character/stats/skillRow/skillRow.html rename to rpg-docs/client/views/private/character/stats/skillRow/skillRow.html diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.js b/rpg-docs/client/views/private/character/stats/skillRow/skillRow.js similarity index 100% rename from rpg-docs/client/views/character/stats/skillRow/skillRow.js rename to rpg-docs/client/views/private/character/stats/skillRow/skillRow.js diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.scss b/rpg-docs/client/views/private/character/stats/skillRow/skillRow.scss similarity index 100% rename from rpg-docs/client/views/character/stats/skillRow/skillRow.scss rename to rpg-docs/client/views/private/character/stats/skillRow/skillRow.scss diff --git a/rpg-docs/client/views/character/stats/stats.css b/rpg-docs/client/views/private/character/stats/stats.css similarity index 100% rename from rpg-docs/client/views/character/stats/stats.css rename to rpg-docs/client/views/private/character/stats/stats.css diff --git a/rpg-docs/client/views/character/stats/stats.html b/rpg-docs/client/views/private/character/stats/stats.html similarity index 100% rename from rpg-docs/client/views/character/stats/stats.html rename to rpg-docs/client/views/private/character/stats/stats.html diff --git a/rpg-docs/client/views/character/stats/stats.js b/rpg-docs/client/views/private/character/stats/stats.js similarity index 100% rename from rpg-docs/client/views/character/stats/stats.js rename to rpg-docs/client/views/private/character/stats/stats.js diff --git a/rpg-docs/client/views/characterList/characterList.css b/rpg-docs/client/views/private/characterList/characterList.css similarity index 100% rename from rpg-docs/client/views/characterList/characterList.css rename to rpg-docs/client/views/private/characterList/characterList.css diff --git a/rpg-docs/client/views/characterList/characterList.html b/rpg-docs/client/views/private/characterList/characterList.html similarity index 100% rename from rpg-docs/client/views/characterList/characterList.html rename to rpg-docs/client/views/private/characterList/characterList.html diff --git a/rpg-docs/client/views/characterList/characterList.js b/rpg-docs/client/views/private/characterList/characterList.js similarity index 100% rename from rpg-docs/client/views/characterList/characterList.js rename to rpg-docs/client/views/private/characterList/characterList.js diff --git a/rpg-docs/client/views/characterList/characterSideList.css b/rpg-docs/client/views/private/characterList/characterSideList.css similarity index 100% rename from rpg-docs/client/views/characterList/characterSideList.css rename to rpg-docs/client/views/private/characterList/characterSideList.css diff --git a/rpg-docs/client/views/characterList/characterSideList.html b/rpg-docs/client/views/private/characterList/characterSideList.html similarity index 100% rename from rpg-docs/client/views/characterList/characterSideList.html rename to rpg-docs/client/views/private/characterList/characterSideList.html diff --git a/rpg-docs/client/views/characterList/characterSideList.js b/rpg-docs/client/views/private/characterList/characterSideList.js similarity index 100% rename from rpg-docs/client/views/characterList/characterSideList.js rename to rpg-docs/client/views/private/characterList/characterSideList.js diff --git a/rpg-docs/client/views/feedback/feedback.html b/rpg-docs/client/views/private/feedback/feedback.html similarity index 100% rename from rpg-docs/client/views/feedback/feedback.html rename to rpg-docs/client/views/private/feedback/feedback.html diff --git a/rpg-docs/client/views/feedback/feedback.js b/rpg-docs/client/views/private/feedback/feedback.js similarity index 100% rename from rpg-docs/client/views/feedback/feedback.js rename to rpg-docs/client/views/private/feedback/feedback.js diff --git a/rpg-docs/client/views/guide/guide.css b/rpg-docs/client/views/private/guide/guide.css similarity index 100% rename from rpg-docs/client/views/guide/guide.css rename to rpg-docs/client/views/private/guide/guide.css diff --git a/rpg-docs/client/views/guide/guide.html b/rpg-docs/client/views/private/guide/guide.html similarity index 100% rename from rpg-docs/client/views/guide/guide.html rename to rpg-docs/client/views/private/guide/guide.html diff --git a/rpg-docs/client/views/home/home.html b/rpg-docs/client/views/private/home/home.html similarity index 100% rename from rpg-docs/client/views/home/home.html rename to rpg-docs/client/views/private/home/home.html diff --git a/rpg-docs/client/views/home/home.js b/rpg-docs/client/views/private/home/home.js similarity index 100% rename from rpg-docs/client/views/home/home.js rename to rpg-docs/client/views/private/home/home.js diff --git a/rpg-docs/client/views/home/intro/intro.html b/rpg-docs/client/views/private/home/intro/intro.html similarity index 100% rename from rpg-docs/client/views/home/intro/intro.html rename to rpg-docs/client/views/private/home/intro/intro.html diff --git a/rpg-docs/client/views/home/intro/intro.js b/rpg-docs/client/views/private/home/intro/intro.js similarity index 100% rename from rpg-docs/client/views/home/intro/intro.js rename to rpg-docs/client/views/private/home/intro/intro.js diff --git a/rpg-docs/client/views/home/intro/intro.scss b/rpg-docs/client/views/private/home/intro/intro.scss similarity index 100% rename from rpg-docs/client/views/home/intro/intro.scss rename to rpg-docs/client/views/private/home/intro/intro.scss diff --git a/rpg-docs/client/views/loading/loading.css b/rpg-docs/client/views/private/loading/loading.css similarity index 100% rename from rpg-docs/client/views/loading/loading.css rename to rpg-docs/client/views/private/loading/loading.css diff --git a/rpg-docs/client/views/loading/loading.html b/rpg-docs/client/views/private/loading/loading.html similarity index 100% rename from rpg-docs/client/views/loading/loading.html rename to rpg-docs/client/views/private/loading/loading.html diff --git a/rpg-docs/client/views/loading/loading.js b/rpg-docs/client/views/private/loading/loading.js similarity index 100% rename from rpg-docs/client/views/loading/loading.js rename to rpg-docs/client/views/private/loading/loading.js diff --git a/rpg-docs/client/views/meta/changeLog/changeLog.html b/rpg-docs/client/views/private/meta/changeLog/changeLog.html similarity index 100% rename from rpg-docs/client/views/meta/changeLog/changeLog.html rename to rpg-docs/client/views/private/meta/changeLog/changeLog.html diff --git a/rpg-docs/client/views/notFound/notFound.html b/rpg-docs/client/views/private/notFound/notFound.html similarity index 100% rename from rpg-docs/client/views/notFound/notFound.html rename to rpg-docs/client/views/private/notFound/notFound.html diff --git a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html b/rpg-docs/client/views/private/paperTemplates/baseDialog/baseDialog.html similarity index 100% rename from rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.html rename to rpg-docs/client/views/private/paperTemplates/baseDialog/baseDialog.html diff --git a/rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js b/rpg-docs/client/views/private/paperTemplates/baseDialog/baseDialog.js similarity index 100% rename from rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js rename to rpg-docs/client/views/private/paperTemplates/baseDialog/baseDialog.js diff --git a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.css b/rpg-docs/client/views/private/paperTemplates/colorDropdown/colorDropdown.css similarity index 100% rename from rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.css rename to rpg-docs/client/views/private/paperTemplates/colorDropdown/colorDropdown.css diff --git a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html b/rpg-docs/client/views/private/paperTemplates/colorDropdown/colorDropdown.html similarity index 100% rename from rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html rename to rpg-docs/client/views/private/paperTemplates/colorDropdown/colorDropdown.html diff --git a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.js b/rpg-docs/client/views/private/paperTemplates/colorDropdown/colorDropdown.js similarity index 100% rename from rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.js rename to rpg-docs/client/views/private/paperTemplates/colorDropdown/colorDropdown.js diff --git a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.html b/rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.html similarity index 100% rename from rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.html rename to rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.html diff --git a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js b/rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.js similarity index 100% rename from rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js rename to rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.js diff --git a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss b/rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.scss similarity index 100% rename from rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss rename to rpg-docs/client/views/private/paperTemplates/fabMenu/fabMenu.scss diff --git a/rpg-docs/client/views/paperTemplates/gridPadding/gridPadding.html b/rpg-docs/client/views/private/paperTemplates/gridPadding/gridPadding.html similarity index 100% rename from rpg-docs/client/views/paperTemplates/gridPadding/gridPadding.html rename to rpg-docs/client/views/private/paperTemplates/gridPadding/gridPadding.html diff --git a/rpg-docs/client/views/paperTemplates/gridPadding/gridPadding.js b/rpg-docs/client/views/private/paperTemplates/gridPadding/gridPadding.js similarity index 100% rename from rpg-docs/client/views/paperTemplates/gridPadding/gridPadding.js rename to rpg-docs/client/views/private/paperTemplates/gridPadding/gridPadding.js diff --git a/rpg-docs/client/views/paperTemplates/ripple/ripple.css b/rpg-docs/client/views/private/paperTemplates/ripple/ripple.css similarity index 100% rename from rpg-docs/client/views/paperTemplates/ripple/ripple.css rename to rpg-docs/client/views/private/paperTemplates/ripple/ripple.css diff --git a/rpg-docs/client/views/paperTemplates/ripple/ripple.html b/rpg-docs/client/views/private/paperTemplates/ripple/ripple.html similarity index 100% rename from rpg-docs/client/views/paperTemplates/ripple/ripple.html rename to rpg-docs/client/views/private/paperTemplates/ripple/ripple.html diff --git a/rpg-docs/client/views/paperTemplates/undoToast/undoToast.html b/rpg-docs/client/views/private/paperTemplates/undoToast/undoToast.html similarity index 100% rename from rpg-docs/client/views/paperTemplates/undoToast/undoToast.html rename to rpg-docs/client/views/private/paperTemplates/undoToast/undoToast.html diff --git a/rpg-docs/client/views/paperTemplates/undoToast/undoToast.js b/rpg-docs/client/views/private/paperTemplates/undoToast/undoToast.js similarity index 100% rename from rpg-docs/client/views/paperTemplates/undoToast/undoToast.js rename to rpg-docs/client/views/private/paperTemplates/undoToast/undoToast.js diff --git a/rpg-docs/client/views/user/profile/profile.html b/rpg-docs/client/views/private/user/profile/profile.html similarity index 100% rename from rpg-docs/client/views/user/profile/profile.html rename to rpg-docs/client/views/private/user/profile/profile.html diff --git a/rpg-docs/client/views/user/profile/profile.js b/rpg-docs/client/views/private/user/profile/profile.js similarity index 100% rename from rpg-docs/client/views/user/profile/profile.js rename to rpg-docs/client/views/private/user/profile/profile.js diff --git a/rpg-docs/client/views/user/profile/usernameDialog.html b/rpg-docs/client/views/private/user/profile/usernameDialog.html similarity index 100% rename from rpg-docs/client/views/user/profile/usernameDialog.html rename to rpg-docs/client/views/private/user/profile/usernameDialog.html diff --git a/rpg-docs/client/views/user/profile/usernameDialog.js b/rpg-docs/client/views/private/user/profile/usernameDialog.js similarity index 100% rename from rpg-docs/client/views/user/profile/usernameDialog.js rename to rpg-docs/client/views/private/user/profile/usernameDialog.js diff --git a/rpg-docs/client/views/user/signIn/signIn.html b/rpg-docs/client/views/private/user/signIn/signIn.html similarity index 100% rename from rpg-docs/client/views/user/signIn/signIn.html rename to rpg-docs/client/views/private/user/signIn/signIn.html diff --git a/rpg-docs/client/views/user/signIn/signIn.js b/rpg-docs/client/views/private/user/signIn/signIn.js similarity index 100% rename from rpg-docs/client/views/user/signIn/signIn.js rename to rpg-docs/client/views/private/user/signIn/signIn.js diff --git a/rpg-docs/client/views/user/titledAtForm/titledAtForm.html b/rpg-docs/client/views/private/user/titledAtForm/titledAtForm.html similarity index 100% rename from rpg-docs/client/views/user/titledAtForm/titledAtForm.html rename to rpg-docs/client/views/private/user/titledAtForm/titledAtForm.html diff --git a/rpg-docs/config.vulcanize b/rpg-docs/config.vulcanize index 71045711..c16a3df3 100644 --- a/rpg-docs/config.vulcanize +++ b/rpg-docs/config.vulcanize @@ -1,19 +1,20 @@ { + "polyfill": "/components/webcomponentsjs/webcomponents.min.js", + "useShadowDom": true, "imports": [ - "/components/core-animated-pages/core-animated-pages.html", - "/components/core-animated-pages/transitions/cross-fade.html", - "/components/core-animated-pages/transitions/hero-transition.html", - "/components/core-animated-pages/transitions/slide-from-right.html", - "/components/core-icons/av-icons.html", - "/components/core-icons/core-icons.html", - "/components/core-icons/editor-icons.html", - "/components/core-icons/image-icons.html", - "/components/core-icons/social-icons.html", - "/components/core-image/core-image.html", - "/components/core-item/core-item.html", - "/components/core-menu/core-menu.html", - "/components/core-scaffold/core-scaffold.html", - "/components/core-transition/core-transition.html", + "/components/neon-animated-pages/neon-animated-pages.html", + "/components/neon-animated-pages/animations/cross-fade.html", + "/components/neon-animated-pages/animations/hero-animation.html", + "/components/neon-animated-pages/animations/slide-from-right-animation.html", + "/components/iron-icons/av-icons.html", + "/components/iron-icons/iron-icons.html", + "/components/iron-icons/editor-icons.html", + "/components/iron-icons/image-icons.html", + "/components/iron-icons/social-icons.html", + "/components/iron-image/iron-image.html", + "/components/iron-item/iron-item.html", + "/components/iron-menu/iron-menu.html", + "/components/app-layout/app-layout.html", "/components/paper-button/paper-button.html", "/components/paper-checkbox/paper-checkbox.html", diff --git a/rpg-docs/packages/meteor-vulcanize/.gitignore b/rpg-docs/packages/meteor-vulcanize/.gitignore index 918ef5d7..677a6fc2 100644 --- a/rpg-docs/packages/meteor-vulcanize/.gitignore +++ b/rpg-docs/packages/meteor-vulcanize/.gitignore @@ -1 +1 @@ -.npm +.build* diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README new file mode 100644 index 00000000..3d492553 --- /dev/null +++ b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README @@ -0,0 +1,7 @@ +This directory and the files immediately inside it are automatically generated +when you change this package's NPM dependencies. Commit the files in this +directory (npm-shrinkwrap.json, .gitignore, and this README) to source control +so that others run the same versions of sub-dependencies. + +You should NOT check in the node_modules directory that Meteor automatically +creates; if you are using git, the .gitignore file tells git to ignore it. diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json new file mode 100644 index 00000000..867a2f3d --- /dev/null +++ b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json @@ -0,0 +1,89 @@ +{ + "dependencies": { + "vulcanize": { + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.7.tgz", + "from": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.7.tgz", + "dependencies": { + "dom5": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/dom5/-/dom5-1.3.1.tgz", + "from": "https://registry.npmjs.org/dom5/-/dom5-1.3.1.tgz", + "dependencies": { + "clone": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz" + }, + "parse5": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", + "from": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz" + } + } + }, + "es6-promise": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz", + "from": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz" + }, + "hydrolysis": { + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.22.0.tgz", + "from": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.22.0.tgz", + "dependencies": { + "doctrine": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", + "from": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", + "dependencies": { + "esutils": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz", + "from": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz" + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + } + } + }, + "espree": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz", + "from": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz" + }, + "estraverse": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz", + "from": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz" + }, + "path-is-absolute": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", + "from": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz" + } + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "from": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "dependencies": { + "abbrev": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz", + "from": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz" + } + } + }, + "path-posix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz", + "from": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz" + } + } + } + } +} diff --git a/rpg-docs/packages/meteor-vulcanize/.versions b/rpg-docs/packages/meteor-vulcanize/.versions index 26911b9d..0deddad4 100644 --- a/rpg-docs/packages/meteor-vulcanize/.versions +++ b/rpg-docs/packages/meteor-vulcanize/.versions @@ -1,3 +1,3 @@ -differential:vulcanize@0.0.5 +differential:vulcanize@2.0.0 meteor@1.1.6 underscore@1.0.3 diff --git a/rpg-docs/packages/meteor-vulcanize/README.md b/rpg-docs/packages/meteor-vulcanize/README.md index b4149d18..a469b5de 100644 --- a/rpg-docs/packages/meteor-vulcanize/README.md +++ b/rpg-docs/packages/meteor-vulcanize/README.md @@ -1,29 +1,29 @@ Vulcanize ============================================================================== +Warning: API Change for version 1.0.0. + This package a meteor build plugin that wraps the [vulcanize](https://www.npmjs.com/package/vulcanize) npm package, which is used to process web components into a single output file. ### Usage -1. Ensure all your components are located somewhere under your public directory. -2. Include an `imports.html` file anywhere available to the client, that contains the html imports that would normally go inside your `` tag. +1. Ensure all your components are located somewhere under your public directory. (via bower, zip, etc) +2. Include a `config.vulcanize` file in the root of your project. This file will optionally define a path to the polyfill and paths to html imports for your components. For Example: ```` - - - - - - -... - - - - - -... +{ + "polyfill": "/bower_components/webcomponentsjs/webcomponents.min.js", + "useShadowDom": true, // optional, defaults to shady dom (polymer default) + "imports": [ + "/bower_components/paper-button/paper-button.html", + "/bower_components/paper-checkbox/paper-checkbox.html" + ] +} ```` +- By specifying a path to the polyfill we can ensure that it is injected into the bundle before any imports. -- Running your app in development as usual will result in the contents of `imports.html` being added to your `` tag, resulting in multiple subsequent HTTP requests (good in development - debugging). +- By setting `useShadowDom` to true, we configure polymer to opt out of shady dom and use full shadow dom. This is pretty much required at the moment unless you only use polymer elements as leaf nodes. Any light dom (child elements) that gets rendered by blaze, react, etc will not be accounted for otherwise. -- Running `meteor`, `meteor build`, `modulus deploy`, etc with the `VULCANIZE=true` environment variable set will result in all your html imports being vulcanized or concatenated into a single html import (good in production). The resulting file will be called `vulcanized.html`, which will be automatically added to your `` tag. For example, `VULCANIZE=true meteor`, `VULCANIZE=true modulus deploy`. +- Running your app in development as usual will result in individual imports being added to your `` tag, resulting in multiple subsequent HTTP requests (good in development - debugging). + +- Running `meteor`, `meteor build`, `modulus deploy`, etc with the `VULCANIZE=true` environment variable set will result in all your html imports being vulcanized or concatenated into a single html import (good in production). The resulting file will be called `vulcanized-{md5}.html`, which will be automatically added to your `` tag. For example, `VULCANIZE=true meteor`, `VULCANIZE=true modulus deploy`. - Setting the `CDN_PREFIX` environment variable will prepend the string to the beginning of the file path that is inserted into your HTML's `` tag. diff --git a/rpg-docs/packages/meteor-vulcanize/package.js b/rpg-docs/packages/meteor-vulcanize/package.js index 464b3682..aebe44ac 100644 --- a/rpg-docs/packages/meteor-vulcanize/package.js +++ b/rpg-docs/packages/meteor-vulcanize/package.js @@ -1,15 +1,22 @@ Package.describe({ name: 'thaum:vulcanize', summary: 'Vulcanize', - version: '0.0.5', + version: '2.2.0', git: 'https://github.com/Differential/meteor-vulcanize' }); Package.registerBuildPlugin({ name: 'vulcanize', - use: [], + use: [ + "underscore@1.0.3" + ], sources: [ 'vulcanize.js' ], - npmDependencies: {'vulcanize': '0.7.11'} + npmDependencies: {'vulcanize': '1.14.7'} +}); + +Package.onUse(function (api) { + api.use('underscore'); + api.use('isobuild:compiler-plugin@1.0.0'); }); diff --git a/rpg-docs/packages/meteor-vulcanize/vulcanize.js b/rpg-docs/packages/meteor-vulcanize/vulcanize.js index ce452788..0ae4a8c1 100644 --- a/rpg-docs/packages/meteor-vulcanize/vulcanize.js +++ b/rpg-docs/packages/meteor-vulcanize/vulcanize.js @@ -1,70 +1,139 @@ var vulcan = Npm.require('vulcanize'); var crypto = Npm.require('crypto'); var url = Npm.require('url'); +var fs = Npm.require('fs'); -var _ = Npm.require('underscore'); +/** + * Vulcanize now requires a target input file. + * We need to create a temp file located within the same + * 'abspath' as the actual imports. Otherwise, vulcanize + * gets confused during the process. + */ +var tmpFile = '_imports.html'; +var tmpDir = 'public'; +var tmpPath = tmpDir + '/' + tmpFile; -var handler = function(compileStep) { - var importsHtml = compileStep.read().toString('utf8'); +/** + * Log + */ +function log() { + args = _.values(arguments); + args.unshift("=> Vulcanize:"); + console.log.apply(this, args); +} - if (process.env.VULCANIZE) { - log('Vulcanizing imports...'); - vulcanize(compileStep, importsHtml); - } else { - log('Adding all imports...'); - addImports(compileStep, importsHtml); - } +/** + * Get script tag with specified path. + */ +function scriptTag(path) { + return ''; +} -}; +/** + * Get link tag with specified path. + */ +function linkTag(path) { + return ''; +} -var vulcanize = function(compileStep, importsHtml) { +/** + * Add config for dom mode to head. + */ +function addShadowDomConfig(file) { + file.addHtml({ + section: 'head', + data: '' + }); +} - var vulcanOutputHandler = function(filename, data) { +/** + * Add webcomponentsjs script to head. + * @todo read first line and check for script tag + */ +function addPolyfillTag(file, path) { + file.addHtml({ + section: 'head', + data: scriptTag(path) + }); +} - var filenameHash = crypto.createHash('md5').update(data).digest('hex'); +/** + * Add imports to head. + */ + +function addImportTag(file, path) { + file.addHtml({ + section: 'head', + data: linkTag(path) + }); +} + +/** + * Vulcanize all files and add output file to head. + */ +function vulcanizeImports(file, imports) { + var tags = _.map(imports, function(path) { + return linkTag(path); + }); + + fs.writeFileSync(tmpPath, tags.join("\n")); + + vulcan.setOptions({ abspath: tmpDir }); + + vulcan.process(tmpFile, function(err, html) { + fs.unlinkSync(tmpPath); + var filenameHash = crypto.createHash('md5').update(html).digest('hex'); var filePath = '/vulcanized-' + filenameHash + '.html'; - compileStep.addAsset({ + file.addAsset({ path: filePath, - data: data + data: html }); if (_.isString(process.env.CDN_PREFIX)) { filePath = url.resolve(process.env.CDN_PREFIX, filePath); } - compileStep.addHtml({ - section: 'head', - data: '' - }); - }; + addImportTag(file, filePath); + }); +} - vulcan.setOptions({ - inputSrc: importsHtml, - outputHandler: vulcanOutputHandler, - abspath: 'public', - strip: true - }, function(error) { - if (error) { - log(error); - } else { - vulcan.processDocument(); +/** + * Add individual import tags + */ +function individualImports(file, imports) { + _.each(imports, function(path) { + addImportTag(file, path); + }); +} + +function VulcanizeCompiler() {} +VulcanizeCompiler.prototype.processFilesForTarget = function (files) { + files.forEach(function (file) { + // Get JSON file. + var json = JSON.parse(file.getContentsAsString()); + + // Add polyfill to html if defined. + if (_.isString(json.polyfill)) { + addPolyfillTag(file, json.polyfill); } - }); -}; + // Optionally opt into shadow dom, rather than shady dom. + if (json.useShadowDom) { + addShadowDomConfig(file); + } -var addImports = function(compileStep, importsHtml) { - compileStep.addHtml({ - section: 'head', - data: importsHtml + // Add imports if defined. + // log("Vulcanizing " + json.imports.length + " files"); + // vulcanizeImports(file, json.imports); + individualImports(file, json.imports); }); }; -var log = function() { - args = _.values(arguments); - args.unshift("Vulcanize:"); - console.log.apply(this, args); -}; - -Plugin.registerSourceHandler("imports.html", handler); +Plugin.registerCompiler({ + extensions: ["vulcanize"], + filenames: ["config"], + archMatching: 'web', +}, function(){ + return new VulcanizeCompiler(); +}); From c32680a15aa0460e0168d3c96e0d0631401d95db Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 8 Dec 2016 13:51:35 +0200 Subject: [PATCH 02/39] Upgraded meteor --- rpg-docs/.meteor/.finished-upgraders | 2 + rpg-docs/.meteor/packages | 41 ++-- rpg-docs/.meteor/release | 2 +- rpg-docs/.meteor/versions | 182 +++++++++--------- rpg-docs/client/style/cards.scss | 12 +- rpg-docs/client/style/main.scss | 1 - .../views/paperTemplates/fabMenu/fabMenu.scss | 24 ++- rpg-docs/package.json | 1 + rpg-docs/scss.json | 5 - 9 files changed, 131 insertions(+), 139 deletions(-) delete mode 100644 rpg-docs/scss.json diff --git a/rpg-docs/.meteor/.finished-upgraders b/rpg-docs/.meteor/.finished-upgraders index dacc2c0d..aa607041 100644 --- a/rpg-docs/.meteor/.finished-upgraders +++ b/rpg-docs/.meteor/.finished-upgraders @@ -11,3 +11,5 @@ notices-for-facebook-graph-api-2 1.2.0-cordova-changes 1.2.0-breaking-changes 1.3.0-split-minifiers-package +1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index f2991bd6..c0f222cc 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -5,12 +5,12 @@ thaum:vulcanize@0.0.5 iron:router -accounts-password -accounts-ui -random +accounts-password@1.3.3 +accounts-ui@1.1.9 +random@1.0.10 dburles:collection-helpers -reactive-var -underscore +reactive-var@1.0.11 +underscore@1.0.10 aldeed:collection2 matb33:collection-hooks zimme:collection-softremovable @@ -19,29 +19,28 @@ dburles:mongo-collection-instances percolate:migrations ecwyne:mathjs useraccounts:polymer -accounts-google +accounts-google@1.0.11 splendido:accounts-meld -email +email@1.1.18 meteorhacks:subs-manager -meteorhacks:kadira chuangbo:marked reywood:iron-router-ga -meteor-base -mobile-experience -mongo +meteor-base@1.0.4 +mobile-experience@1.0.4 +mongo@1.1.14 blaze-html-templates -session -jquery -tracker -logging -reload -ejson +session@1.1.7 +jquery@1.11.10 +tracker@1.1.1 +logging@1.1.16 +reload@1.1.11 +ejson@1.0.13 spacebars -check +check@1.2.4 useraccounts:iron-routing wizonesolutions:canonical meteorhacks:fast-render +standard-minifier-js@1.2.1 +shell-server fourseven:scss -wolves:bourbon -standard-minifier-css -standard-minifier-js +seba:minifiers-autoprefixer diff --git a/rpg-docs/.meteor/release b/rpg-docs/.meteor/release index 940e0b5d..61f6c675 100644 --- a/rpg-docs/.meteor/release +++ b/rpg-docs/.meteor/release @@ -1 +1 @@ -METEOR@1.3.2.4 +METEOR@1.4.2.3 diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index e405ebba..4815feda 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -1,131 +1,131 @@ -accounts-base@1.2.7 -accounts-google@1.0.9 -accounts-oauth@1.1.12 -accounts-password@1.1.8 +accounts-base@1.2.14 +accounts-google@1.0.11 +accounts-oauth@1.1.15 +accounts-password@1.3.3 accounts-ui@1.1.9 accounts-ui-unstyled@1.1.12 -aldeed:collection2@2.9.1 -aldeed:collection2-core@1.1.1 -aldeed:schema-deny@1.0.1 -aldeed:schema-index@1.0.1 +aldeed:collection2@2.10.0 +aldeed:collection2-core@1.2.0 +aldeed:schema-deny@1.1.0 +aldeed:schema-index@1.1.1 aldeed:simple-schema@1.5.3 -allow-deny@1.0.4 -autoupdate@1.2.9 -babel-compiler@6.6.4 -babel-runtime@0.1.8 -base64@1.0.8 -binary-heap@1.0.8 -blaze@2.1.7 -blaze-html-templates@1.0.4 -blaze-tools@1.0.8 -boilerplate-generator@1.0.8 -caching-compiler@1.0.4 -caching-html-compiler@1.0.6 -callback-hook@1.0.8 -check@1.2.1 +allow-deny@1.0.5 +autoupdate@1.2.11 +babel-compiler@6.13.0 +babel-runtime@1.0.1 +base64@1.0.10 +binary-heap@1.0.10 +blaze@2.1.9 +blaze-html-templates@1.0.5 +blaze-tools@1.0.10 +boilerplate-generator@1.0.11 +caching-compiler@1.1.9 +caching-html-compiler@1.0.7 +callback-hook@1.0.10 +check@1.2.4 chuangbo:cookie@1.1.0 chuangbo:marked@0.3.5_1 coffeescript@1.0.17 -dburles:collection-helpers@1.0.4 +dburles:collection-helpers@1.1.0 dburles:mongo-collection-instances@0.3.5 ddp@1.2.5 -ddp-client@1.2.7 -ddp-common@1.2.5 -ddp-rate-limiter@1.0.4 -ddp-server@1.2.6 +ddp-client@1.2.9 +ddp-common@1.2.8 +ddp-rate-limiter@1.0.6 +ddp-server@1.2.10 deps@1.0.12 -diff-sequence@1.0.5 -ecmascript@0.4.3 -ecmascript-runtime@0.2.10 +diff-sequence@1.0.7 +ecmascript@0.6.1 +ecmascript-runtime@0.3.15 ecwyne:mathjs@0.25.0 -ejson@1.0.11 -email@1.0.12 -fastclick@1.0.11 -fourseven:scss@3.4.3 -geojson-utils@1.0.8 -google@1.1.11 +ejson@1.0.13 +email@1.1.18 +fastclick@1.0.13 +fourseven:scss@3.13.0 +geojson-utils@1.0.10 +google@1.1.15 hot-code-push@1.0.4 -html-tools@1.0.9 -htmljs@1.0.9 -http@1.1.5 -id-map@1.0.7 +html-tools@1.0.11 +htmljs@1.0.11 +http@1.2.10 +id-map@1.0.9 iron:controller@1.0.12 iron:core@1.0.11 iron:dynamic-template@1.0.12 iron:layout@1.0.12 iron:location@1.0.11 iron:middleware-stack@1.1.0 -iron:router@1.0.12 +iron:router@1.0.13 iron:url@1.0.11 -jquery@1.11.8 +jquery@1.11.10 lai:collection-extensions@0.2.1_1 -launch-screen@1.0.11 -less@2.6.0 +launch-screen@1.0.12 +less@2.6.5 livedata@1.0.18 -localstorage@1.0.9 -logging@1.0.12 -matb33:collection-hooks@0.8.1 +localstorage@1.0.12 +logging@1.1.16 +matb33:collection-hooks@0.8.4 mdg:validation-error@0.2.0 -meteor@1.1.14 +meteor@1.6.0 meteor-base@1.0.4 -meteorhacks:fast-render@2.14.0 +meteorhacks:fast-render@2.16.0 meteorhacks:inject-data@2.0.0 -meteorhacks:kadira@2.28.7 meteorhacks:meteorx@1.4.1 meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 -minifier-css@1.1.11 -minifier-js@1.1.11 -minimongo@1.0.16 +minifier-css@1.1.13 +minifier-js@1.2.15 +minimongo@1.0.19 mobile-experience@1.0.4 -mobile-status-bar@1.0.12 -modules@0.6.1 -modules-runtime@0.6.3 -momentjs:moment@2.13.1 -mongo@1.1.7 -mongo-id@1.0.4 -mongo-livedata@1.0.12 -npm-bcrypt@0.8.5 -npm-mongo@1.4.43 -oauth@1.1.10 -oauth2@1.1.9 -observe-sequence@1.0.11 -ordered-dict@1.0.7 +mobile-status-bar@1.0.13 +modules@0.7.7 +modules-runtime@0.7.7 +momentjs:moment@2.17.1 +mongo@1.1.14 +mongo-id@1.0.6 +npm-bcrypt@0.9.2 +npm-mongo@2.2.11_2 +oauth@1.1.12 +oauth2@1.1.11 +observe-sequence@1.0.14 +ordered-dict@1.0.9 percolate:migrations@0.9.8 -promise@0.6.7 +promise@0.8.8 raix:eventemitter@0.1.3 -random@1.0.9 -rate-limit@1.0.4 -reactive-dict@1.1.7 -reactive-var@1.0.9 -reload@1.1.8 -retry@1.0.7 +random@1.0.10 +rate-limit@1.0.6 +reactive-dict@1.1.8 +reactive-var@1.0.11 +reload@1.1.11 +retry@1.0.9 reywood:iron-router-ga@0.7.1 -routepolicy@1.0.10 -service-configuration@1.0.9 -session@1.1.5 -sha@1.0.7 -softwarerero:accounts-t9n@1.3.4 -spacebars@1.0.11 -spacebars-compiler@1.0.11 +routepolicy@1.0.12 +seba:minifiers-autoprefixer@1.0.1 +service-configuration@1.0.11 +session@1.1.7 +sha@1.0.9 +shell-server@0.2.1 +softwarerero:accounts-t9n@1.3.6 +spacebars@1.0.13 +spacebars-compiler@1.0.13 splendido:accounts-emails-field@1.2.0 splendido:accounts-meld@1.3.1 -srp@1.0.8 -standard-minifier-css@1.0.6 -standard-minifier-js@1.0.6 -templating@1.1.9 -templating-tools@1.0.4 +srp@1.0.10 +standard-minifier-js@1.2.1 +templating@1.2.15 +templating-compiler@1.2.15 +templating-runtime@1.2.15 +templating-tools@1.0.5 thaum:vulcanize@0.0.5 -tracker@1.0.13 -ui@1.0.11 -underscore@1.0.8 -url@1.0.9 +tracker@1.1.1 +ui@1.0.12 +underscore@1.0.10 +url@1.0.11 useraccounts:core@1.14.2 useraccounts:iron-routing@1.14.2 useraccounts:polymer@1.12.3 -webapp@1.2.8 +webapp@1.3.12 webapp-hashing@1.0.9 wizonesolutions:canonical@0.0.5 -wolves:bourbon@3.1.0 zimme:collection-behaviours@1.1.3 zimme:collection-softremovable@1.0.5 diff --git a/rpg-docs/client/style/cards.scss b/rpg-docs/client/style/cards.scss index f0fa43b1..56e345d3 100644 --- a/rpg-docs/client/style/cards.scss +++ b/rpg-docs/client/style/cards.scss @@ -1,18 +1,16 @@ -@import "{wolves:bourbon}/bourbon"; - $thickColumnWidth: 304px; $thinColumnWidth: 240px; //Column layout .column-container { - @include column-fill(balance); - @include column-gap(0px); - @include column-width($thickColumnWidth); + column-fill: balance; + column-gap: 0px; + column-width: $thickColumnWidth; padding: 4px; &.thin-columns { - @include column-count(4); - @include column-width($thinColumnWidth); + column-count: 4; + column-width: $thinColumnWidth; } & > div { padding: 4px; diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss index 376e4eb9..45b03193 100644 --- a/rpg-docs/client/style/main.scss +++ b/rpg-docs/client/style/main.scss @@ -1,4 +1,3 @@ -@import "{wolves:bourbon}/bourbon"; @import "colors"; //apply a natural box layout model to all elements diff --git a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss index db5ee47c..fec0560a 100644 --- a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss +++ b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.scss @@ -1,5 +1,3 @@ -@import "{wolves:bourbon}/bourbon"; - .mini-holder { position: absolute; padding: 4px; @@ -9,37 +7,37 @@ pointer-events: none; flex-direction: column-reverse !important; core-tooltip{ - @include transform(scale(0)); - @include transition-property(transform); - @include transition-duration(0.3s); - @include transition-timing-function(ease-in-out); + transform: scale(0); + transition-property: transform; + transition-duration: 0.3s; + transition-timing-function: ease-in-out; margin: 4px; } &.active { pointer-events: auto; core-tooltip{ - @include transform(scale(1)); + transform: scale(1); } core-tooltip:nth-child(2){ - @include transition-delay(0.1s); + transition-delay: 0.1s; } core-tooltip:nth-child(3){ - @include transition-delay(0.2s); + transition-delay: 0.2s; } core-tooltip:nth-child(4){ - @include transition-delay(0.3s); + transition-delay: 0.3s; } core-tooltip:nth-child(5){ - @include transition-delay(0.4s); + transition-delay: 0.4s; } } } .expand-menu { &::shadow core-icon { - @include transition(transform 0.3s ease-in-out); + transition: transform 0.3s ease-in-out; } &.active::shadow core-icon{ - @include transform(rotate(405deg)); + transform: rotate(405deg); } } diff --git a/rpg-docs/package.json b/rpg-docs/package.json index a643b086..46afdeb6 100644 --- a/rpg-docs/package.json +++ b/rpg-docs/package.json @@ -11,6 +11,7 @@ }, "author": "Stefan Zermatten", "dependencies": { + "babel-runtime": "^6.18.0", "bower": "^1.7.9" } } diff --git a/rpg-docs/scss.json b/rpg-docs/scss.json deleted file mode 100644 index 71575975..00000000 --- a/rpg-docs/scss.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "includePaths": [ - ".meteor/local/build/programs/server/assets/packages/wolves_bourbon" - ] -} \ No newline at end of file From a333b0bdc829798dcb436aff8c52f0d5b636db2c Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Thu, 8 Dec 2016 13:51:54 +0200 Subject: [PATCH 03/39] Fixed broken drawer swiping --- rpg-docs/client/views/layout/layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpg-docs/client/views/layout/layout.html b/rpg-docs/client/views/layout/layout.html index 15e32fd7..d966d54a 100644 --- a/rpg-docs/client/views/layout/layout.html +++ b/rpg-docs/client/views/layout/layout.html @@ -1,5 +1,5 @@ diff --git a/rpg-docs/client/views/private/character/spells/spells.css b/rpg-docs/client/views/private/character/spells/spells.css index 4b00a80c..4fe22baa 100644 --- a/rpg-docs/client/views/private/character/spells/spells.css +++ b/rpg-docs/client/views/private/character/spells/spells.css @@ -6,7 +6,7 @@ height: 56px; } -#spells .inventoryItem core-icon{ +#spells .inventoryItem iron-icon{ width: 32px; height: 32px; } @@ -18,7 +18,7 @@ cursor: pointer !important; } -#spells .inventoryItem[disabled] core-icon{ +#spells .inventoryItem[disabled] iron-icon{ color: #ccc !important; color: rgba(0,0,0,0.26) !important; } diff --git a/rpg-docs/client/views/private/character/spells/spells.html b/rpg-docs/client/views/private/character/spells/spells.html index 4dc1a671..7ea409f8 100644 --- a/rpg-docs/client/views/private/character/spells/spells.html +++ b/rpg-docs/client/views/private/character/spells/spells.html @@ -4,7 +4,7 @@
{{#if hasSlots}} -
{{/if}}{{/each}}
- + {{/if}} {{#each spellLists}} -
- + >
{{name}}
@@ -122,7 +122,7 @@
{{/each}}
- + {{/each}}
diff --git a/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html b/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html index f82ffe0c..3a05ec9e 100644 --- a/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html +++ b/rpg-docs/client/views/private/character/stats/abilityCards/abilityCards.html @@ -1,6 +1,6 @@ diff --git a/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html index f9626b51..3a9ee647 100644 --- a/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html +++ b/rpg-docs/client/views/private/character/stats/healthCard/healthCard.html @@ -1,5 +1,5 @@ diff --git a/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html b/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html index 7e41d789..8f5489f8 100644 --- a/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html +++ b/rpg-docs/client/views/private/character/stats/hitDice/hitDice.html @@ -1,7 +1,7 @@ diff --git a/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html b/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html index 10953f17..d2ad5908 100644 --- a/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html +++ b/rpg-docs/client/views/private/character/stats/skillDialog/skillDialog.html @@ -11,7 +11,7 @@ {{characterCalculate "skillMod" charId skillName}}
- + {{#if profSource}} {{proficiencyValue}} - {{#with profSource}}{{sourceName}}{{/with}} {{else}} diff --git a/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html b/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html index c40d6460..d8f7db0c 100644 --- a/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html +++ b/rpg-docs/client/views/private/character/stats/skillRow/skillRow.html @@ -4,7 +4,7 @@ hero-id="main" {{detailHero skill ../_id}} layout horizontal center> - + {{#if failSkill}}
fail
{{else}} diff --git a/rpg-docs/client/views/private/character/stats/stats.css b/rpg-docs/client/views/private/character/stats/stats.css index 343afeb5..fe8f696e 100644 --- a/rpg-docs/client/views/private/character/stats/stats.css +++ b/rpg-docs/client/views/private/character/stats/stats.css @@ -46,6 +46,6 @@ background-color: rgba(0,0,0,0.6); } -section:not(.core-selected):not([animate]) paper-shadow[hero] { +section:not(.core-selected):not([animate]) paper-material[hero] { visibility: hidden; } \ No newline at end of file diff --git a/rpg-docs/client/views/private/character/stats/stats.html b/rpg-docs/client/views/private/character/stats/stats.html index 6aeff4c7..3f3df6ab 100644 --- a/rpg-docs/client/views/private/character/stats/stats.html +++ b/rpg-docs/client/views/private/character/stats/stats.html @@ -28,7 +28,7 @@ {{>hitDice name="d12HitDice" diceNum="12" char=this}}
- +
Saving Throws
@@ -40,11 +40,11 @@ {{> skillRow name="Wisdom" skill="wisdomSave"}} {{> skillRow name="Charisma" skill="charismaSave"}}
- +
- +
Skills
@@ -68,7 +68,7 @@ {{> skillRow name="Stealth" skill="stealth"}} {{> skillRow name="Survival" skill="survival"}}
- + @@ -76,7 +76,7 @@ diff --git a/rpg-docs/client/views/private/characterList/characterList.html b/rpg-docs/client/views/private/characterList/characterList.html index 66923574..1ceaa1d7 100644 --- a/rpg-docs/client/views/private/characterList/characterList.html +++ b/rpg-docs/client/views/private/characterList/characterList.html @@ -1,10 +1,10 @@ diff --git a/rpg-docs/client/views/private/home/intro/intro.html b/rpg-docs/client/views/private/home/intro/intro.html index 89b762a5..ce00f177 100644 --- a/rpg-docs/client/views/private/home/intro/intro.html +++ b/rpg-docs/client/views/private/home/intro/intro.html @@ -36,7 +36,7 @@ Check out the example characters
-
@@ -44,8 +44,8 @@
Lawful Good Human
- - +
@@ -53,7 +53,7 @@
Chaotic Good High Elf
- +
diff --git a/rpg-docs/client/views/private/loading/loading.html b/rpg-docs/client/views/private/loading/loading.html index cd3f21a2..7c32486a 100644 --- a/rpg-docs/client/views/private/loading/loading.html +++ b/rpg-docs/client/views/private/loading/loading.html @@ -1,7 +1,7 @@ diff --git a/rpg-docs/client/views/home/home.html b/rpg-docs/client/views/home/home.html index 31dcaa17..1ef4d03b 100644 --- a/rpg-docs/client/views/home/home.html +++ b/rpg-docs/client/views/home/home.html @@ -1,13 +1,15 @@ diff --git a/rpg-docs/client/views/home/intro/intro.html b/rpg-docs/client/views/home/intro/intro.html index 5dd01087..8433fb02 100644 --- a/rpg-docs/client/views/home/intro/intro.html +++ b/rpg-docs/client/views/home/intro/intro.html @@ -11,16 +11,20 @@ {{#unless currentUser}}
- - Sign In - - - Sign Up - + + + Sign In + + + + + Sign Up + +
{{else}}
@@ -33,24 +37,28 @@ Check out the example characters
- -
-
- Starter Set Archer + + +
+
+ Starter Set Archer +
-
-
Lawful Good Human
- - -
-
- Starter Set Wizard +
Lawful Good Human
+ + + + +
+
+ Starter Set Wizard +
-
-
Chaotic Good High Elf
- +
Chaotic Good High Elf
+ +
@@ -61,7 +69,11 @@

Learn how your class gives you features, those features have effects, and those effects determine your stats. - View Guide + + + View Guide + +

@@ -70,11 +82,11 @@

On the official subreddit - - - /r/dicecloud - - + + + /r/dicecloud + +

@@ -82,11 +94,11 @@ Get involved

Shape upcoming features and track bugs on the DiceCloud Trello board - - - Trello Roadmap - - + + + Trello Roadmap + +

diff --git a/rpg-docs/client/views/home/intro/intro.js b/rpg-docs/client/views/home/intro/intro.js deleted file mode 100644 index ecc22fa8..00000000 --- a/rpg-docs/client/views/home/intro/intro.js +++ /dev/null @@ -1,17 +0,0 @@ -Template.intro.events({ - "tap .signInButton": function() { - Router.go("/sign-in"); - }, - "tap .signUpButton": function() { - Router.go("/sign-up"); - }, - "tap .ssArcher": function() { - Router.go("/character/yBWwt5XQTTHZiRQxq"); - }, - "tap .ssWizard": function() { - Router.go("/character/KxHKskm22fS2Xogah"); - }, - "tap .guideButton": function() { - Router.go("/guide"); - }, -}); diff --git a/rpg-docs/client/views/meta/changeLog/changeLog.html b/rpg-docs/client/views/meta/changeLog/changeLog.html index 3c63ebe4..0107ccf5 100644 --- a/rpg-docs/client/views/meta/changeLog/changeLog.html +++ b/rpg-docs/client/views/meta/changeLog/changeLog.html @@ -1,27 +1,30 @@ \ No newline at end of file + + From d4bec4f5e7dd662464a5859fe9e222455f9754ff Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Mon, 16 Jan 2017 15:34:03 +0200 Subject: [PATCH 16/39] Cleaned up dialogStack --- .../paperTemplates/dialogStack/dialogStack.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js index 9126f3dc..ff22965a 100644 --- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js +++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js @@ -52,7 +52,8 @@ const heroAnimate = ({from, to, duration, useClone, callback}) => { // Get the bounding rectangles of both elements const toRect = to.getBoundingClientRect(); const fromRect = from.getBoundingClientRect(); - let originalNode, originalVis; + let originalNode; + let originalVis; if (useClone){ originalNode = to; to = originalNode.cloneNode(true); @@ -80,7 +81,7 @@ const heroAnimate = ({from, to, duration, useClone, callback}) => { //The radius is defined in pixel units, so get the radius as a number const rad = +radius.match(/\d+\.?\d*/)[0]; // Set the x and y radius of the "to" element, compensating for scale - to.style.borderRadius = `${rad/deltaWidth}px / ${rad/deltaHeight}px`; + to.style.borderRadius = `${rad / deltaWidth}px / ${rad / deltaHeight}px`; } else if (/^\d+\.?\d*%$/.test(radius)) { //The radius is defined as a percentage, so just use it as is to.style.borderRadius = radius; @@ -92,7 +93,8 @@ const heroAnimate = ({from, to, duration, useClone, callback}) => { // Next frame, undo the imitation, let "to" animate into its place _.defer(() => { - to.style.transition = `all ${duration/1000}s ease, box-shadow ${duration/1000}s linear 0.1s`; + to.style.transition = `all ${duration / 1000}s ease, ` + + `box-shadow ${duration / 1000}s linear 0.1s`; to.style.transform = ""; to.style.borderRadius = ""; to.style.background = ""; @@ -114,7 +116,7 @@ Template.dialogStack.uihooks({ ".dialog": { container: ".dialog-sizer", insert: function(node, next, tpl) { - $(node).insertBefore(next); + $(node).insertBefore(next); const data = Blaze.getData(node); if (data.element){ data.element.style.visibility = "hidden"; @@ -133,12 +135,16 @@ Template.dialogStack.uihooks({ } else { node.remove(); } - } + }, } }); Template.testDialog.events({ "click .testButton": function(event, template){ - pushDialogStack({template: "testDialog", element: event.currentTarget, data: Random.id()}); + pushDialogStack({ + template: "testDialog", + element: event.currentTarget, + data: Random.id(), + }); }, }) From bdc64dfb105464907840637f29fcf2d68143b68f Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Mon, 16 Jan 2017 15:34:23 +0200 Subject: [PATCH 17/39] Updated the new character dialog to Polymer 1 --- rpg-docs/client/style/main.scss | 14 ++--- .../newCharacterDialog.html | 59 +++++++----------- .../newCharacterDialog/newCharacterDialog.js | 60 +++++++++++++++---- .../views/characterList/characterList.html | 6 +- .../views/characterList/characterList.js | 12 +++- rpg-docs/client/views/feedback/feedback.css | 7 --- .../dialogStack/dialogStack.css | 8 +++ 7 files changed, 93 insertions(+), 73 deletions(-) delete mode 100644 rpg-docs/client/views/feedback/feedback.css diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss index 4fef1b62..e8ac388a 100644 --- a/rpg-docs/client/style/main.scss +++ b/rpg-docs/client/style/main.scss @@ -18,16 +18,6 @@ body { background-color: #E0E0E0; } -//fix tabs and core-toolbar having box shadow -core-toolbar { - box-shadow: none; -} - -//give drawer panel a shadow always -core-header-panel[drawer] { - box-shadow: 2px 0px 5px 0px rgba(0,0,0,0.2); -} - //Paragraphs p { margin-bottom: 8px; @@ -77,6 +67,10 @@ paper-icon-item::shadow #contentIcon { right: 24px; } +paper-fab { + background-color: #d13b2e; +} + //Buttons paper-button { color: #000; diff --git a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.html b/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.html index 3bacd87d..8db8bfe5 100644 --- a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.html +++ b/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.html @@ -1,40 +1,27 @@ \ No newline at end of file + diff --git a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js b/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js index dcfc96cb..9d8cf28a 100644 --- a/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js +++ b/rpg-docs/client/views/character/newCharacterDialog/newCharacterDialog.js @@ -1,13 +1,49 @@ -Template.newCharacterDialog.events({ - "tap #addButton": function(event, instance){ - Characters.insert({ - name: instance.find("#nameInput").value, - gender: instance.find("#genderInput").value, - race: instance.find("#raceInput").value, - owner: Meteor.userId(), - }, function(err, id){ - if (err) throw err; - Router.go("characterSheet", {_id: id}); - }); - } +Template.newCharacterDialog.onCreated(function(){ + this.character = {}; + this.schema = new SimpleSchema({ + //strings + name: {type: String}, + gender: {type: String, optional: true}, + race: {type: String, optional: true}, + }); + this.context = this.schema.newContext(); + this.context.runOnce = false; +}); + +Template.newCharacterDialog.helpers({ + invalid(){ + let context = Template.instance().context; + let valid = context.isValid() && context.runOnce; + return !valid; + }, + errorAtts(key){ + let error = Template.instance().context.keyErrorMessage(key); + if (error){ + return { + invalid: true, + ["error-message"]: error, + } + } + }, +}); + +changeFunction = function(field){ + return _.debounce(function(event, instance){ + instance.character[field] = event.currentTarget.value; + instance.schema.clean(instance.character); + instance.context.validate(instance.character); + if (!instance.context.runOnce) instance.context.runOnce = true; + }, 200); +}; + +Template.newCharacterDialog.events({ + "input .nameInput": changeFunction("name"), + "input .genderInput": changeFunction("gender"), + "input .raceInput": changeFunction("race"), + "click .cancelButton": function(event, instance){ + popDialogStack(); + }, + "click .addButton": function(event, instance){ + popDialogStack(instance.character); + }, }); diff --git a/rpg-docs/client/views/characterList/characterList.html b/rpg-docs/client/views/characterList/characterList.html index fd53d2d6..b7bd9d59 100644 --- a/rpg-docs/client/views/characterList/characterList.html +++ b/rpg-docs/client/views/characterList/characterList.html @@ -51,11 +51,7 @@
+ title="Add"> diff --git a/rpg-docs/client/views/characterList/characterList.js b/rpg-docs/client/views/characterList/characterList.js index 825a6fb7..c5971a03 100644 --- a/rpg-docs/client/views/characterList/characterList.js +++ b/rpg-docs/client/views/characterList/characterList.js @@ -22,9 +22,15 @@ Template.characterList.helpers({ Template.characterList.events({ "tap .addCharacter": function(event, template) { - GlobalUI.showDialog({ - heading: "New Character", + pushDialogStack({ template: "newCharacterDialog", - }); + element: event.currentTarget, + callback(character){ + if (!character) return; + character.owner = Meteor.userId(); + let _id = Characters.insert(character); + Router.go("characterSheet", {_id}); + }, + }) }, }); diff --git a/rpg-docs/client/views/feedback/feedback.css b/rpg-docs/client/views/feedback/feedback.css deleted file mode 100644 index fea6940f..00000000 --- a/rpg-docs/client/views/feedback/feedback.css +++ /dev/null @@ -1,7 +0,0 @@ -.feedback .form { - padding: 24px; -} - -.feedback .buttons { - padding: 8px 8px 8px 24px; -} diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css index ee93bc36..9f743de7 100644 --- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css +++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css @@ -50,3 +50,11 @@ background: red; border-radius: 30px; } + +.dialog-stack .dialog .form { + padding: 24px; +} + +.dialog-stack .dialog .buttons { + padding: 8px 8px 8px 24px; +} From b8fdc27df908cabefa658cffb7814223f334c3b7 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 17 Jan 2017 15:00:05 +0200 Subject: [PATCH 18/39] Rebuilt dialog animations with cross-fade effect --- .../dialogStack/dialogStack.css | 10 +- .../paperTemplates/dialogStack/dialogStack.js | 176 ++++++++++++------ 2 files changed, 121 insertions(+), 65 deletions(-) diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css index 9f743de7..d3df2419 100644 --- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css +++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css @@ -6,23 +6,23 @@ bottom: 0; left: 0; visibility: visible; - transition: visibility 0s linear; + transition: visibility 0s; } .dialog-stack.hide { visibility: hidden; - transition: visibility 0s linear 0.4s; + transition: visibility 0s linear 400ms; } .dialog-stack .backdrop { background: rgba(0,0,0,0.4); opacity: 1; - transition: opacity 0.4s linear; + transition: opacity 400ms linear; } .dialog-stack.hide .backdrop { opacity: 0; - transition: opacity 0.2s linear; + transition: opacity 200ms linear; } .dialog-stack .dialog-sizer { @@ -39,9 +39,9 @@ box-shadow: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.4); - transition: all 0.4s ease; overflow: hidden; border-radius: 2px; + transform-origin: top left; } .dialog-stack .dialog .testButton { diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js index ff22965a..332274b3 100644 --- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js +++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js @@ -1,5 +1,6 @@ dialogs = new ReactiveArray(); const offset = 16; +const duration = 400; pushDialogStack = function({template, data, element, callback}){ // Generate a new _id so that Blaze knows how to shuffle the array @@ -19,6 +20,11 @@ popDialogStack = function(result){ dialog.callback && dialog.callback(result); }; +let cloneHolder; +Template.dialogStack.onRendered(function(){ + cloneHolder = this.find(".clone-holder"); +}); + Template.dialogStack.helpers({ dialogStackClass(){ if (!dialogs.get().length) return "hide"; @@ -27,7 +33,9 @@ Template.dialogStack.helpers({ return dialogs.get(); }, dialogStyle(index){ - const num = dialogs.get().length - 1; + const length = dialogs.get().length; + if (!length) return; + const num = length - 1; const left = (num - index) * -offset; const top = (num - index) * -offset; return `left:${left}px; top:${top}px;`; @@ -45,69 +53,111 @@ Template.dialogStack.events({ }, }); -const heroAnimate = ({from, to, duration, useClone, callback}) => { - if (!from) throw "From element must be defined"; - if (!to) throw "To element must be defined"; - duration = duration || 400; - // Get the bounding rectangles of both elements - const toRect = to.getBoundingClientRect(); - const fromRect = from.getBoundingClientRect(); - let originalNode; - let originalVis; - if (useClone){ - originalNode = to; - to = originalNode.cloneNode(true); - originalNode.parentNode.insertBefore(to, originalNode); - to.style.position = "fixed"; - to.style.zIndex = "9999"; - originalVis = originalNode.style.visibility; - originalNode.style.visibility = "hidden"; - } - // Get how they have changed - const deltaLeft = fromRect.left - toRect.left; - const deltaTop = fromRect.top - toRect.top; - const deltaWidth = fromRect.width / toRect.width; - const deltaHeight = fromRect.height / toRect.height; - // Make the "to" element imitate the "from" element - to.style.transition = "none"; - to.style.transform = `translate(${deltaLeft}px, ${deltaTop}px) ` + - `scale(${deltaWidth}, ${deltaHeight})`; - to.style.background = $(from).css("background"); - to.style.boxShadow = $(from).css("box-shadow"); - // Imitate the border radius after transform - // Only supports border radius defined like "20px" or "100%" - let radius = $(from).css("border-radius"); - if (/^\d+\.?\d*px$/.test(radius)){ +// Only supports border radius defined like "20px" or "100%" +const transformedRadius = (radiusString, deltaWidth, deltaHeight) => { + if (/^\d+\.?\d*px$/.test(radiusString)){ //The radius is defined in pixel units, so get the radius as a number - const rad = +radius.match(/\d+\.?\d*/)[0]; + const rad = +radiusString.match(/\d+\.?\d*/)[0]; // Set the x and y radius of the "to" element, compensating for scale - to.style.borderRadius = `${rad / deltaWidth}px / ${rad / deltaHeight}px`; - } else if (/^\d+\.?\d*%$/.test(radius)) { + return `${rad / deltaWidth}px / ${rad / deltaHeight}px`; + } else if (/^\d+\.?\d*%$/.test(radiusString)) { //The radius is defined as a percentage, so just use it as is - to.style.borderRadius = radius; + return radiusString; } - // Don't animate to the imitation position - to.style.transition = "none"; - // We calculate everything from the top left, so use that as origin - to.style.transformOrigin = "top left"; +}; + +const imitate = ( + element, source, deltaLeft, deltaTop, deltaWidth, deltaHeight +) => { + element.style.transform = `translate(${deltaLeft}px, ${deltaTop}px) ` + + `scale(${deltaWidth}, ${deltaHeight})`; + element.style.background = $(source).css("background"); + // Imitate the border radius after transform + element.style.borderRadius = transformedRadius($(source).css("border-radius")); +} + +const dialogOpenAnimation = ({element, dialog}) => { + const dialogRect = dialog.getBoundingClientRect(); + const elementRect = element.getBoundingClientRect(); + element.style.visibility = "hidden"; + // Get how must the element change to become the dialog + const deltaLeft = elementRect.left - dialogRect.left; + const deltaTop = elementRect.top - dialogRect.top; + const deltaWidth = elementRect.width / dialogRect.width; + const deltaHeight = elementRect.height / dialogRect.height; + + // Make the dialog imitate the element, immediately + dialog.style.transition = "none"; + imitate(dialog, element, deltaLeft, deltaTop, deltaWidth, deltaHeight); - // Next frame, undo the imitation, let "to" animate into its place _.defer(() => { - to.style.transition = `all ${duration / 1000}s ease, ` + - `box-shadow ${duration / 1000}s linear 0.1s`; - to.style.transform = ""; - to.style.borderRadius = ""; - to.style.background = ""; - to.style.boxShadow = ""; + // Next frame, undo the imitation, let dialog animate back into place + dialog.style.transition = `all ${duration}ms ease`; + dialog.style.transform = ""; + dialog.style.borderRadius = ""; + dialog.style.background = ""; }); // Clean up after the animation is done and call our callback _.delay(() => { - to.style.transition = ""; - to.style.transformOrigin = ""; - if (useClone){ - originalNode.style.visibility = originalVis; - to.remove(); - } + dialog.style.transition = ""; + }, duration); +} + +const dialogCloseAnimation = ({element, dialog, callback}) => { + // Reset the dialog if it is mid-transition + dialog.style.transition = "none"; + dialog.style.transform = "none"; + dialog.style.borderRadius = ""; + dialog.style.background = ""; + dialog.style.opacity = "1"; + // Get the original bounding rectangles of both elements + const dialogRect = dialog.getBoundingClientRect(); + const elementRect = element.getBoundingClientRect(); + // Set up a clone of the original element + // This lets us have a fixed position element which isn't clipped + clone = element.cloneNode(true); + clone.style.position = "fixed"; + clone.style.top = 0; + clone.style.left = 0; + clone.style.width = elementRect.width + "px"; + clone.style.height = elementRect.height + "px"; + clone.style.visibility = ""; + clone.style.zIndex = 9999; + // Insert clone before its progenitor so it can inherit css correctly + element.parentNode.insertBefore(clone, element); + // Polymer messes up fixed positioning, measure and compensate + startingRect = clone.getBoundingClientRect(); + clone.style.top = elementRect.top - startingRect.top + "px"; + clone.style.left = elementRect.left - startingRect.left + "px"; + + // How must the original dialog change to become the element + const deltaLeft = dialogRect.left - elementRect.left; + const deltaTop = dialogRect.top - elementRect.top; + const deltaWidth = dialogRect.width / elementRect.width; + const deltaHeight = dialogRect.height / elementRect.height; + + // Make the clone imitate the dialog + clone.style.transition = "none"; + clone.style.transformOrigin = "top left" + imitate(clone, dialog, deltaLeft, deltaTop, deltaWidth, deltaHeight); + + _.defer(() => { + // Next frame, undo the imitation, let clone animate into its place + clone.style.transition = `all ${duration}ms ease`; + clone.style.transform = ""; + clone.style.borderRadius = ""; + clone.style.background = ""; + // Make the dialog follow the clone in and fade away + dialog.style.transition = `all ${duration}ms ease, ` + + `opacity ${duration * 0.75}ms ease-in`; + dialog.style.opacity = 0; + imitate(dialog, element, -deltaLeft, + -deltaTop, 1 / deltaWidth, 1 / deltaHeight); + }); + // Clean up after the animation is done and call our callback + _.delay(() => { + element.style.visibility = ""; + clone.remove(); if (callback) callback(); }, duration); }; @@ -119,19 +169,25 @@ Template.dialogStack.uihooks({ $(node).insertBefore(next); const data = Blaze.getData(node); if (data.element){ - data.element.style.visibility = "hidden"; // Store the reference to the element on the DOM node itself, // since Blaze won't keep the data around for the remove hook node["data-element"] = data.element; - heroAnimate({from: data.element, to: node}); + dialogOpenAnimation({ + element: data.element, + dialog: node, + }); } }, remove: function(node, tpl) { const element = node["data-element"]; if (element){ - element.style.visibility = ""; - heroAnimate({from: node, to: element, useClone: true}); - node.remove(); + dialogCloseAnimation({ + element, + dialog: node, + callback(){ + node.remove(); + }, + }); } else { node.remove(); } From 420de9b00518b591dfcdefbee1fd93abb816c6fb Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 17 Jan 2017 15:01:11 +0200 Subject: [PATCH 19/39] Migrated stats tab to Polymer 1.0 --- rpg-docs/client/style/cards.scss | 2 +- rpg-docs/client/style/listItem.scss | 4 +- rpg-docs/client/style/main.scss | 8 -- .../client/views/GeneralCSS/typography.css | 88 ++------------- .../views/character/characterSheet.html | 106 +++++++++--------- .../stats/abilityCards/abilityCards.css | 23 ++++ .../stats/abilityCards/abilityCards.html | 25 +++-- .../stats/healthCard/healthCard.html | 37 +++--- .../character/stats/hitDice/hitDice.html | 46 ++++---- .../views/character/stats/hitDice/hitDice.js | 10 +- .../character/stats/skillRow/skillRow.html | 7 +- .../character/stats/skillRow/skillRow.js | 2 +- .../character/stats/statCard/statCard.css | 16 +++ .../character/stats/statCard/statCard.html | 16 +++ .../character/stats/statCard/statCard.js | 9 ++ .../client/views/character/stats/stats.html | 22 +--- .../client/views/character/stats/stats.js | 34 ++---- .../client/views/layout/polymerImports.html | 4 +- .../public/custom_components/app-theme.html | 10 ++ 19 files changed, 214 insertions(+), 255 deletions(-) create mode 100644 rpg-docs/client/views/character/stats/abilityCards/abilityCards.css create mode 100644 rpg-docs/client/views/character/stats/statCard/statCard.css create mode 100644 rpg-docs/client/views/character/stats/statCard/statCard.html create mode 100644 rpg-docs/client/views/character/stats/statCard/statCard.js diff --git a/rpg-docs/client/style/cards.scss b/rpg-docs/client/style/cards.scss index 56e345d3..e6f99bf9 100644 --- a/rpg-docs/client/style/cards.scss +++ b/rpg-docs/client/style/cards.scss @@ -56,7 +56,7 @@ $thinColumnWidth: 240px; padding: 16px; border-radius: 0 0 2px 2px; &.list { - padding: 0 0 16px 0; + padding: 16px 0; .subhead { color: rgba(0,0,0,0.54); font-size: 14px; diff --git a/rpg-docs/client/style/listItem.scss b/rpg-docs/client/style/listItem.scss index 9d5f717f..7feae752 100644 --- a/rpg-docs/client/style/listItem.scss +++ b/rpg-docs/client/style/listItem.scss @@ -3,7 +3,7 @@ List items */ .item-slot { background-color: rgb(232, 232, 232); - background-color: rgba(0, 0, 0, 0.1); + background-color: rgba(0, 0, 0, 0.1); } .item { @@ -30,7 +30,7 @@ List items box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.37); z-index: 10; } - core-icon, paper-icon-button { + iron-icon, paper-icon-button { color: #747474; color: rgba(0,0,0,0.54); } diff --git a/rpg-docs/client/style/main.scss b/rpg-docs/client/style/main.scss index e8ac388a..4a94d7ff 100644 --- a/rpg-docs/client/style/main.scss +++ b/rpg-docs/client/style/main.scss @@ -35,14 +35,6 @@ hr { text-align: center; } -/* - Stop all links from formatting themselves - */ -a { - text-decoration: none; - color: inherit; -} - .avatar { display: inline-block; box-sizing: border-box; diff --git a/rpg-docs/client/views/GeneralCSS/typography.css b/rpg-docs/client/views/GeneralCSS/typography.css index f97cb577..5c770053 100644 --- a/rpg-docs/client/views/GeneralCSS/typography.css +++ b/rpg-docs/client/views/GeneralCSS/typography.css @@ -1,107 +1,35 @@ -.display2 { - font-size: 45px; - font-weight: 400; - color: #000; - color: rgba(0,0,0,0.54); - letter-spacing: 0; -} - -.white-text .display2{ +.white-text .paper-font-display2{ color: rgba(255,255,255,0.54); } -.display1 { - font-size: 34px; - font-weight: 400; - color: #000; - color: rgba(0,0,0,0.54); - letter-spacing: 0; -} - -.white-text .display1, .white-text.display1{ +.white-text .paper-font-display1, .white-text.paper-font-display1{ color: rgba(255,255,255,0.54); } -h1, .headline { - font-size: 24px; - font-weight: 400; - margin: 0; - color: #000; - color: rgba(0,0,0,0.87); - letter-spacing: 0; -} - -.white-text h1, .white-text .headline, .white-text.headline{ +.white-text h1, .white-text .paper-font-headline, .white-text.paper-font-headline{ color: rgba(255,255,255,0.87); } -h2, .title { - font-size: 20px; - font-weight: 500; - margin: 0; - color: #000; - color: rgba(0,0,0,0.87); - letter-spacing: 0.005em; -} - -.white-text h2, .white-text .title, .white-text.title{ +.white-text h2, .white-text .paper-font-title, .white-text.paper-font-title{ color: rgba(255,255,255,0.87); } -h3, .subhead { - font-size: 16px; - font-weight: 400; - margin: 0; - color: #000; - color: rgba(0,0,0,0.87); - letter-spacing: 0.010em; -} - -.white-text h3, .white-text .subhead{ +.white-text h3, .white-text .paper-font-subhead{ color: rgba(255,255,255,0.87); } -.body2 { - font-size: 14px; - font-weight: 500; - color: #000; - color: rgba(0,0,0,0.87); - letter-spacing: 0.010em; -} - -.white-text .body2{ +.white-text .paper-font-body2{ color: rgba(255,255,255,0.87); } -p, .body1, body { - font-size: 14px; - font-weight: 400; - margin: 0; - color: #000; - color: rgba(0,0,0,0.87); - letter-spacing: 0.010em; -} - -.white-text p, .white-text .body1{ +.white-text p, .white-text .paper-font-body1{ color: rgba(255,255,255,0.87); } -.caption{ - font-size: 12px; - font-weight: 400; - color: #000; - color: rgba(0,0,0,0.54); - letter-spacing: 0.020em; -} - -.white-text .caption{ +.white-text .paper-font-caption{ color: rgba(255,255,255,0.54); } -html /deep/ .white-text{ - color: #fff; -} - .black54 { color: #444; color: rgba(0,0,0,0.54); diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/character/characterSheet.html index 1f1bcedc..f0633235 100644 --- a/rpg-docs/client/views/character/characterSheet.html +++ b/rpg-docs/client/views/character/characterSheet.html @@ -1,54 +1,56 @@ diff --git a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.css b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.css new file mode 100644 index 00000000..52be38a1 --- /dev/null +++ b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.css @@ -0,0 +1,23 @@ +.ability-mini-card { + min-width: 75px; + text-align: center; + cursor: pointer; + -webkit-margin-collapse: separate; + background: #fff; +} + +.ability-mini-card .title { + padding: 16px; +} + +.ability-mini-card .numbers { + min-width: 72px; + padding: 16px; +} + +.ability-mini-card .modifier { + font-weight: 600; + font-size: 24px; + color: #747474; + color: rgba(0,0,0,0.54); +} diff --git a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html index 3a05ec9e..fb21d972 100644 --- a/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html +++ b/rpg-docs/client/views/character/stats/abilityCards/abilityCards.html @@ -1,16 +1,17 @@ diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/character/stats/healthCard/healthCard.html index 3a9ee647..26abe189 100644 --- a/rpg-docs/client/views/character/stats/healthCard/healthCard.html +++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.html @@ -1,31 +1,28 @@ diff --git a/rpg-docs/client/views/character/stats/skillRow/skillRow.js b/rpg-docs/client/views/character/stats/skillRow/skillRow.js index fae6145a..20915294 100644 --- a/rpg-docs/client/views/character/stats/skillRow/skillRow.js +++ b/rpg-docs/client/views/character/stats/skillRow/skillRow.js @@ -12,7 +12,7 @@ Template.skillRow.helpers({ if (prof > 0 && prof < 1) return "image:brightness-2"; if (prof === 1) return "image:brightness-1"; if (prof > 1) return "av:album"; - return "radio-button-off"; + return "radio-button-unchecked"; }, failSkill: function(){ var charId = Template.parentData()._id; diff --git a/rpg-docs/client/views/character/stats/statCard/statCard.css b/rpg-docs/client/views/character/stats/statCard/statCard.css new file mode 100644 index 00000000..04a9250e --- /dev/null +++ b/rpg-docs/client/views/character/stats/statCard/statCard.css @@ -0,0 +1,16 @@ +.stat-card { + min-width: 75px; + text-align: center; + cursor: pointer; + -webkit-margin-collapse: separate; + background: #fff; +} + +.stat-card .title { + padding: 16px; +} + +.stat-card .numbers { + min-width: 72px; + padding: 16px; +} diff --git a/rpg-docs/client/views/character/stats/statCard/statCard.html b/rpg-docs/client/views/character/stats/statCard/statCard.html new file mode 100644 index 00000000..997a6df5 --- /dev/null +++ b/rpg-docs/client/views/character/stats/statCard/statCard.html @@ -0,0 +1,16 @@ + diff --git a/rpg-docs/client/views/character/stats/statCard/statCard.js b/rpg-docs/client/views/character/stats/statCard/statCard.js new file mode 100644 index 00000000..32a89cad --- /dev/null +++ b/rpg-docs/client/views/character/stats/statCard/statCard.js @@ -0,0 +1,9 @@ +Template.statCard.helpers({ + skillMod: function() { + return signedString( + Characters.calculate.skillMod( + Template.parentData()._id, this.stat + ) + ); + }, +}); diff --git a/rpg-docs/client/views/character/stats/stats.html b/rpg-docs/client/views/character/stats/stats.html index 3f3df6ab..2e33a9ba 100644 --- a/rpg-docs/client/views/character/stats/stats.html +++ b/rpg-docs/client/views/character/stats/stats.html @@ -29,7 +29,7 @@
-
+
Saving Throws
@@ -45,7 +45,7 @@
-
+
Skills
@@ -73,21 +73,3 @@
- - diff --git a/rpg-docs/client/views/character/stats/stats.js b/rpg-docs/client/views/character/stats/stats.js index 0cf7b922..9d2f7e6e 100644 --- a/rpg-docs/client/views/character/stats/stats.js +++ b/rpg-docs/client/views/character/stats/stats.js @@ -1,8 +1,8 @@ Template.stats.events({ - "tap .statCard": function(event, instance){ + "click .statCard": function(event, instance){ var charId = instance.data._id; if (this.isSkill){ - GlobalUI.setDetail({ + pushDialogStack({ template: "skillDialog", data: { name: this.name, @@ -10,10 +10,10 @@ Template.stats.events({ charId: charId, color: this.color, }, - heroId: charId + this.stat, + element: event.currentTarget, }); } else { - GlobalUI.setDetail({ + pushDialogStack({ template: "attributeDialog", data: { name: this.name, @@ -21,15 +21,15 @@ Template.stats.events({ charId: charId, color: this.color, }, - heroId: charId + this.stat, + element: event.currentTarget, }); } }, - "tap .abilityMiniCard": function(event, instance){ + "click .ability-mini-card": function(event, instance){ var charId = Template.parentData()._id; var template = "attributeDialog"; if (this.ability === "strength") template = "strengthDialog"; - GlobalUI.setDetail({ + pushDialogStack({ template: template, data: { name: this.title, @@ -37,24 +37,24 @@ Template.stats.events({ charId: charId, color: this.color, }, - heroId: charId + this.ability, + element: event.currentTarget, }); }, "tap .skill-row": function(event, instance){ var skill = this.skill; var charId = instance.data._id; - GlobalUI.setDetail({ + pushDialogStack({ template: "skillDialog", data: { name: this.name, skillName: skill, charId: charId, }, - heroId: charId + skill, + element: event.currentTarget, }); }, "tap .hitPointTitle": function(event, instance) { - GlobalUI.setDetail({ + pushDialogStack({ template: "attributeDialog", data: { name: "Hit Points", @@ -62,17 +62,7 @@ Template.stats.events({ charId: this._id, color: "green", }, - heroId: this._id + "hitPoints", + element: event.currentTarget.parentElement.parentElement, }); }, }); - -Template.statCard.helpers({ - skillMod: function() { - return signedString( - Characters.calculate.skillMod( - Template.parentData()._id, this.stat - ) - ); - }, -}); diff --git a/rpg-docs/client/views/layout/polymerImports.html b/rpg-docs/client/views/layout/polymerImports.html index b751207c..37a246b6 100644 --- a/rpg-docs/client/views/layout/polymerImports.html +++ b/rpg-docs/client/views/layout/polymerImports.html @@ -11,12 +11,12 @@ - + - + diff --git a/rpg-docs/public/custom_components/app-theme.html b/rpg-docs/public/custom_components/app-theme.html index 401c579c..b2427fe7 100644 --- a/rpg-docs/public/custom_components/app-theme.html +++ b/rpg-docs/public/custom_components/app-theme.html @@ -1,6 +1,7 @@ + From 817020bea8535aa7c42bf80b5acf0c557bbe5da7 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 18 Jan 2017 11:19:03 +0200 Subject: [PATCH 20/39] Updated hitpoint / temporary hitpoint box to Polymer 1 --- .jscsrc | 2 +- .../stats/addTHPDialog/addTHPDialog.html | 32 +- .../stats/addTHPDialog/addTHPDialog.js | 12 +- .../character/stats/healthCard/healthCard.css | 24 +- .../stats/healthCard/healthCard.html | 27 +- .../character/stats/healthCard/healthCard.js | 43 +- .../client/views/layout/polymerImports.html | 2 + .../dialogStack/dialogStack.css | 2 + .../paper-diff-slider/paper-diff-slider.css | 239 ---- .../paper-diff-slider/paper-diff-slider.html | 1051 ++++++++++++----- 10 files changed, 818 insertions(+), 616 deletions(-) delete mode 100644 rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.css diff --git a/.jscsrc b/.jscsrc index a4337796..85965732 100644 --- a/.jscsrc +++ b/.jscsrc @@ -53,4 +53,4 @@ "disallowMultipleLineBreaks": true, "disallowNewlineBeforeBlockStatements": true -} \ No newline at end of file +} diff --git a/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.html b/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.html index 197e54f2..1ab42afe 100644 --- a/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.html +++ b/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.html @@ -1,14 +1,28 @@ diff --git a/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js b/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js index 030acd42..c49bd6b1 100644 --- a/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js +++ b/rpg-docs/client/views/character/stats/addTHPDialog/addTHPDialog.js @@ -1,5 +1,10 @@ +Template.addTHPDialog.onRendered(function(){ + this.find("#quantityInput").focus(); +}); + Template.addTHPDialog.events({ - "tap #addButton": function(event, instance){ + "tap .addButton": function(event, instance){ + popDialogStack(); var max = +instance.find("#quantityInput").value; if (!max || max < 0) max = 0; TemporaryHitPoints.insert({ @@ -8,5 +13,8 @@ Template.addTHPDialog.events({ maximum: max, deleteOnZero: !!instance.find("#deleteWhenZeroCheckbox").checked, }); - } + }, + "tap .cancelButton": function(event, instance){ + popDialogStack(); + }, }); diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.css b/rpg-docs/client/views/character/stats/healthCard/healthCard.css index 98280aaf..03733970 100644 --- a/rpg-docs/client/views/character/stats/healthCard/healthCard.css +++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.css @@ -3,24 +3,20 @@ margin-right: 8px; } -/*Slider knob color*/ -#hitPointSlider::shadow #sliderKnobInner { - background-color: #0f9d58; +.healthCard #stableButton { + color: #b71c1c; + transition: color 0.4s ease; + width: 100% } -/*Slider pin*/ -#hitPointSlider::shadow #sliderKnobInner::before { - background-color: #0f9d58; - height: 32px; - width: 32px; +.healthCard #stableButton:before { + content: "Unstable"; } -/*Slider pin text*/ -#hitPointSlider::shadow #sliderKnob > #sliderKnobInner::after { - font-size: 16px; +.healthCard #stableButton.stable { + color: #1b5e20; } -/*Slider bar*/ -#hitPointSlider::shadow #sliderBar::shadow #activeProgress { - background-color: #0f9d58; +.healthCard #stableButton.stable:before{ + content: "Stable"; } diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.html b/rpg-docs/client/views/character/stats/healthCard/healthCard.html index 26abe189..3309c710 100644 --- a/rpg-docs/client/views/character/stats/healthCard/healthCard.html +++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.html @@ -22,21 +22,21 @@ {{#each tempHitPoints}}
{{name}} -
- +
+
+ {{#unless left}} + + {{/unless}} +
+ - {{#unless left}} - - {{/unless}}
-
{{/each}} -
+
{{#if multipliers.immunities.length}}
Immune: {{#each multipliers.immunities}} {{name}} {{/each}} @@ -68,15 +68,12 @@
-
+
{{#if dead}} DEAD {{else}} - {{#if stable}} - Stable - {{else}} - Unstable - {{/if}} + + {{/if}}
diff --git a/rpg-docs/client/views/character/stats/healthCard/healthCard.js b/rpg-docs/client/views/character/stats/healthCard/healthCard.js index 6fe9a7c8..364b4dd5 100644 --- a/rpg-docs/client/views/character/stats/healthCard/healthCard.js +++ b/rpg-docs/client/views/character/stats/healthCard/healthCard.js @@ -10,12 +10,12 @@ Template.healthCard.helpers({ return char && char.deathSave; }, failIcon: function(num){ - if (num <= this.fail) return "radio-button-on"; - else return "radio-button-off"; + if (num <= this.fail) return "radio-button-checked"; + else return "radio-button-unchecked"; }, passIcon: function(num){ - if (num <= this.pass) return "radio-button-on"; - else return "radio-button-off"; + if (num <= this.pass) return "radio-button-checked"; + else return "radio-button-unchecked"; }, failDisabled: function(num){ return !(num === this.fail || num - 1 === this.fail); @@ -27,6 +27,7 @@ Template.healthCard.helpers({ return this.fail >= 3; }, multipliers: function(){ + // jscs:disable maximumLineLength var multipliers = [ {name: "Acid", value: Characters.calculate.attributeValue(this._id, "acidMultiplier")}, {name: "Bludgeoning", value: Characters.calculate.attributeValue(this._id, "bludgeoningMultiplier")}, @@ -42,6 +43,7 @@ Template.healthCard.helpers({ {name: "Slashing", value: Characters.calculate.attributeValue(this._id, "slashingMultiplier")}, {name: "Thunder", value: Characters.calculate.attributeValue(this._id, "thunderMultiplier")}, ]; + // jscs:enable maximumLineLength multipliers = _.groupBy(multipliers, "value"); return { "immunities": multipliers["0"] || [], @@ -54,7 +56,7 @@ Template.healthCard.helpers({ Template.healthCard.events({ "change #hitPointSlider": function(event){ var value = event.currentTarget.value; - var base = Characters.calculate.attributeBase(this._id, "hitPoints") + var base = Characters.calculate.attributeBase(this._id, "hitPoints"); var adjustment = value - base; Characters.update(this._id, {$set: {"hitPoints.adjustment": adjustment}}); //reset the death saves if we are gaining HP @@ -73,39 +75,42 @@ Template.healthCard.events({ var used = this.maximum - value; TemporaryHitPoints.update(this._id, {$set: {"used": used}}); }, - "tap .deleteTHP": function(event){ + "click .deleteTHP": function(event){ TemporaryHitPoints.remove(this._id); }, - "tap #addTempHP": function(event){ - GlobalUI.showDialog({ + "click #addTempHP": function(event){ + pushDialogStack({ template: "addTHPDialog", data: {charId: this._id}, + element: event.currentTarget.parentElement, }); }, - "tap .failBubble": function(event){ + "click .failBubble": function(event){ if (event.currentTarget.disabled) return; var char = Template.parentData(); - if (event.currentTarget.icon === "radio-button-off"){ + if (event.currentTarget.icon === "radio-button-unchecked"){ Characters.update(char._id, {$set: {"deathSave.fail": this.fail + 1}}); } else { Characters.update(char._id, {$set: {"deathSave.fail": this.fail - 1}}); } }, - "tap .passBubble": function(event){ + "click .passBubble": function(event){ if (event.currentTarget.disabled) return; var char = Template.parentData(); - if (event.currentTarget.icon === "radio-button-off"){ + if (event.currentTarget.icon === "radio-button-unchecked"){ Characters.update(char._id, {$set: {"deathSave.pass": this.pass + 1}}); } else { Characters.update(char._id, {$set: {"deathSave.pass": this.pass - 1}}); } }, - "tap #stableButton": function(event){ - var char = Template.parentData(); - Characters.update(char._id, {$set: {"deathSave.stable": false}}); - }, - "tap #unstableButton": function(event){ - var char = Template.parentData(); - Characters.update(char._id, {$set: {"deathSave.stable": true}}); + "click #stableButton": function(event){ + var char = Characters.findOne(Template.parentData()._id, { + fields: {deathSave: 1} + }); + Characters.update(char._id, { + $set: { + "deathSave.stable": !char.deathSave.stable + } + }); }, }); diff --git a/rpg-docs/client/views/layout/polymerImports.html b/rpg-docs/client/views/layout/polymerImports.html index 37a246b6..1889565d 100644 --- a/rpg-docs/client/views/layout/polymerImports.html +++ b/rpg-docs/client/views/layout/polymerImports.html @@ -28,6 +28,7 @@ + @@ -43,5 +44,6 @@ + diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css index d3df2419..6b8677bd 100644 --- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css +++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.css @@ -29,6 +29,8 @@ position: relative; height: 80%; width: 80%; + max-width: 800px; + max-height: 600px; } .dialog-stack .dialog { diff --git a/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.css b/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.css deleted file mode 100644 index 4840ee8b..00000000 --- a/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.css +++ /dev/null @@ -1,239 +0,0 @@ -/* -Copyright (c) 2014 The Polymer Project Authors. All rights reserved. -This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt -The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt -The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt -Code distributed by Google as part of the polymer project is also -subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt -*/ - -:host { - display: inline-block; - width: 200px; - cursor: default; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - -webkit-tap-highlight-color: rgba(0,0,0,0); -} - -:host(:focus) { - outline: none; -} - -#sliderContainer { - position: relative; - width: calc(100% - 32px); - height: 32px; -} - -#sliderContainer.editable { - float: left; - width: calc(100% - 72px); - margin: 12px 0; -} - -.bar-container { - position: absolute; - top: 0; - left: 16px; - height: 100%; - width: 100%; - overflow: hidden; -} - -.ring > .bar-container { - left: 20px; - width: calc(100% - 4px); - transition: left 0.18s ease, width 0.18s ease; -} - -.ring.expand:not(.pin) > .bar-container { - left: 30px; - width: calc(100% - 14px); -} - -.ring.expand.dragging > .bar-container { - transition: none; -} - -#sliderBar { - position: absolute; - top: 15px; - left: 0; - height: 2px; - width: 100%; - padding: 8px 0; - margin: -8px 0; -} - -.ring #sliderBar { - left: -4px; - width: calc(100% + 4px); -} - -.ring.expand:not(.pin) #sliderBar { - left: -14px; - width: calc(100% + 14px); -} - -.slider-markers { - position: absolute; - top: 15px; - left: 15px; - height: 2px; - width: calc(100% + 2px); - box-sizing: border-box; - pointer-events: none; -} - -.slider-markers::after, .slider-marker::after { - content: ""; - display: block; - width: 2px; - height: 2px; - border-radius: 50%; - background-color: black; -} - -#sliderBar::shadow #activeProgress { - background-color: #3f51b5; -} - -.transiting #sliderBar::shadow #activeProgress { - transition: -webkit-transform 0.08s ease; - transition: transform 0.08s ease; -} - -#sliderKnob { - position: absolute; - left: 0; - top: 0; - width: 32px; - height: 32px; -} - -.transiting > #sliderKnob { - transition: left 0.08s ease; -} - -#sliderKnob:focus { - outline: none; -} - -#sliderKnob.dragging { - transition: none; -} - -.snaps > #sliderKnob.dragging { - transition: -webkit-transform 0.08s ease; - transition: transform 0.08s ease; -} - -#sliderKnobInner { - width: 12px; - height: 12px; - box-sizing: border-box; - -moz-box-sizing: border-box; - border-radius: 50%; - background-color: #3f51b5; - /* FIXME(ffu): can't use the following. https://github.com/Polymer/platform/issues/53 */ - /* transition-property: height, width, background-color, border; - transition-duration: 0.1s; - transition-timing-function: ease; */ - transition: height 0.18s ease, width 0.18s ease; -} - -.expand:not(.pin) > #sliderKnob > #sliderKnobInner { - width: 100%; - height: 100%; - -webkit-transform: translateZ(0); - transform: translateZ(0); -} - -.ring > #sliderKnob > #sliderKnobInner { - background-color: transparent; - border: 2px solid #c8c8c8; -} - -#sliderKnobInner::before { - background-color: #3f51b5; -} - -.pin > #sliderKnob > #sliderKnobInner::before { - content: ""; - position: absolute; - top: 0; - left: 0; - width: 26px; - height: 26px; - margin-left: 3px; - border-radius: 50% 50% 50% 0; - -webkit-transform: rotate(-45deg) scale(0) translate(0); - transform: rotate(-45deg) scale(0) translate(0); -} - -#sliderKnobInner::before, #sliderKnobInner::after { - transition: -webkit-transform .2s ease, background-color .18s ease; - transition: transform .2s ease, background-color .18s ease; -} - -.pin.ring > #sliderKnob > #sliderKnobInner::before { - background-color: #c8c8c8; -} - -.pin.expand > #sliderKnob > #sliderKnobInner::before { - -webkit-transform: rotate(-45deg) scale(1) translate(17px, -17px); - transform: rotate(-45deg) scale(1) translate(17px, -17px); -} - -.pin > #sliderKnob > #sliderKnobInner::after { - content: attr(value); - position: absolute; - top: 0; - left: 0; - width: 32px; - height: 26px; - text-align: center; - color: #fff; - font-size: 10px; - -webkit-transform: scale(0) translate(0); - transform: scale(0) translate(0); -} - -.pin.expand > #sliderKnob > #sliderKnobInner::after { - -webkit-transform: scale(1) translate(0, -17px); - transform: scale(1) translate(0, -17px); -} - -/* editable: paper-input */ -.slider-input { - width: 40px; - float: right; - overflow: hidden; -} - -.slider-input::shadow input { - /* FIXME(ffu): should one be able set text-align directly on paper-input? */ - text-align: center; -} - -/* disabled state */ -#sliderContainer.disabled { - pointer-events: none; -} - -.disabled > #sliderKnob > #sliderKnobInner { - width: 8px; - height: 8px; - background-color: #c8c8c8; -} - -.disabled.ring > #sliderKnob > #sliderKnobInner { - background-color: transparent; -} - -#sliderContainer.disabled #sliderBar::shadow #activeProgress { - background-color: #c8c8c8; -} diff --git a/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.html b/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.html index 0a2e283b..e624a428 100644 --- a/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.html +++ b/rpg-docs/public/custom_components/paper-diff-slider/paper-diff-slider.html @@ -1,16 +1,29 @@ - + + + + + + + + + + - - - + + -
- -
+ +
+
+
-
- - - - - + + From 137a94f2514feeca6785c382655b0001fb0576e6 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Wed, 18 Jan 2017 15:04:09 +0200 Subject: [PATCH 21/39] Began moving character sheet and related menus to Polymer 1 --- .../client/views/GeneralCSS/typography.css | 27 ++++++++- .../characterSettings/shareDialog.html | 58 +++++++++---------- .../characterSettings/shareDialog.js | 23 +++++--- .../client/views/character/characterSheet.css | 11 ++++ .../views/character/characterSheet.html | 48 +++++++-------- .../client/views/character/characterSheet.js | 15 +++-- rpg-docs/client/views/layout/layout.html | 8 +-- .../client/views/layout/polymerImports.html | 4 +- .../colorDropdown/colorDropdown.css | 11 +--- .../colorDropdown/colorDropdown.html | 28 +++------ .../colorDropdown/colorDropdown.js | 5 +- .../server/publications/singleCharacter.js | 4 -- rpg-docs/server/publications/users.js | 7 +++ 13 files changed, 142 insertions(+), 107 deletions(-) create mode 100644 rpg-docs/server/publications/users.js diff --git a/rpg-docs/client/views/GeneralCSS/typography.css b/rpg-docs/client/views/GeneralCSS/typography.css index 5c770053..862706e2 100644 --- a/rpg-docs/client/views/GeneralCSS/typography.css +++ b/rpg-docs/client/views/GeneralCSS/typography.css @@ -1,41 +1,64 @@ +.white-text { + color: #dedede; + color: rgba(255,255,255,0.87); +} + .white-text .paper-font-display2{ + color: #8a8a8a; color: rgba(255,255,255,0.54); } .white-text .paper-font-display1, .white-text.paper-font-display1{ + color: #8a8a8a; color: rgba(255,255,255,0.54); } .white-text h1, .white-text .paper-font-headline, .white-text.paper-font-headline{ + color: #dedede; color: rgba(255,255,255,0.87); } .white-text h2, .white-text .paper-font-title, .white-text.paper-font-title{ + color: #dedede; color: rgba(255,255,255,0.87); } .white-text h3, .white-text .paper-font-subhead{ + color: #dedede; color: rgba(255,255,255,0.87); } .white-text .paper-font-body2{ + color: #dedede; color: rgba(255,255,255,0.87); } .white-text p, .white-text .paper-font-body1{ + color: #dedede; color: rgba(255,255,255,0.87); } .white-text .paper-font-caption{ + color: #8a8a8a; color: rgba(255,255,255,0.54); } .black54 { - color: #444; + color: #757575; color: rgba(0,0,0,0.54); } .white54 { - color: #eee; + color: #8a8a8a; color: rgba(255,255,255,0.54); } + +.black87 { + color: #212121; + color: rgba(0,0,0,0.87); +} + +.white87 { + color: #dedede; + color: rgba(255,255,255,0.87); +} diff --git a/rpg-docs/client/views/character/characterSettings/shareDialog.html b/rpg-docs/client/views/character/characterSettings/shareDialog.html index d788ac2e..a5203959 100644 --- a/rpg-docs/client/views/character/characterSettings/shareDialog.html +++ b/rpg-docs/client/views/character/characterSettings/shareDialog.html @@ -1,43 +1,43 @@ 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 @@ diff --git a/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.html b/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.html index 5e22564f..88a05987 100644 --- a/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.html +++ b/rpg-docs/client/views/character/stats/attributeDialog/strengthDialog/strengthDialog.html @@ -3,9 +3,9 @@ {{> attributeDialogView}}
-
Carrying
+
Carrying
{{> carryCapacityTable}} -
Jumping
+
Jumping
@@ -18,7 +18,7 @@ - - - + - - - +
Running long jump
Running high jump {{evaluate charId "3 + strengthMod"}} feet + Can reach a ledge as high as {{evaluate charId "3 + strengthMod"}} feet + 1.5× your height @@ -27,7 +27,7 @@
Standing high jump {{evaluate charId "floor((3 + strengthMod)/2)"}} feet + Can reach a ledge as high as {{evaluate charId "floor((3 + strengthMod)/2)"}} feet + 1.5× your height diff --git a/rpg-docs/client/views/character/stats/carryCapacityTable/carryCapacityTable.html b/rpg-docs/client/views/character/stats/carryCapacityTable/carryCapacityTable.html index e6f67f02..b47e29a7 100644 --- a/rpg-docs/client/views/character/stats/carryCapacityTable/carryCapacityTable.html +++ b/rpg-docs/client/views/character/stats/carryCapacityTable/carryCapacityTable.html @@ -3,26 +3,26 @@
Encumbered >{{evaluate charId "strength * 5 * carryMultiplier"}}lbsVariant rule, encumbered characters move 10 feet slowerVariant rule, encumbered characters move 10 feet slower
Heavily encumbered >{{evaluate charId "strength * 10 * carryMultiplier"}}lbs + Variant rule, heavily encumbered characters move 20 feet slower and have disadvantage on ability checks, attack rolls, and saving thows that use Strength, Dexterity, or Constitution
Over Encumbered >{{evaluate charId "strength * 15 * carryMultiplier"}}lbs + Characters that can only just lift, push or drag their current load can only move at 5 feet.
Push, drag or lift maximum {{evaluate charId "strength * 30 * carryMultiplier"}}lbs
diff --git a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html index d2ad5908..8edf4caa 100644 --- a/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html +++ b/rpg-docs/client/views/character/stats/skillDialog/skillDialog.html @@ -6,11 +6,11 @@ diff --git a/rpg-docs/client/views/character/characterSheet.js b/rpg-docs/client/views/character/characterSheet.js index 975064f3..8a46c4b7 100644 --- a/rpg-docs/client/views/character/characterSheet.js +++ b/rpg-docs/client/views/character/characterSheet.js @@ -2,7 +2,7 @@ Template.characterSheet.onRendered(function() { //default to the stats tab Session.setDefault(this.data._id + ".selectedTab", "0"); //watch this character and make sure their encumbrance is updated - trackEncumbranceConditions(this.data._id, this); + //trackEncumbranceConditions(this.data._id, this); }); var setTab = function(charId, tab){ diff --git a/rpg-docs/client/views/character/inventory/carryDialog/carryDialog.html b/rpg-docs/client/views/character/inventory/carryDialog/carryDialog.html index 5c319499..a8cabc7d 100644 --- a/rpg-docs/client/views/character/inventory/carryDialog/carryDialog.html +++ b/rpg-docs/client/views/character/inventory/carryDialog/carryDialog.html @@ -1,17 +1,17 @@ \ No newline at end of file + diff --git a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html index 2682fa5e..e072cb19 100644 --- a/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html +++ b/rpg-docs/client/views/character/inventory/containerDialog/containerDialog.html @@ -11,32 +11,26 @@ diff --git a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js index 59837c36..c9c385e8 100644 --- a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js +++ b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js @@ -2,6 +2,20 @@ Template.fabMenu.onCreated(function() { this.active = new ReactiveVar(false); }); +Template.fabMenu.onRendered(function(){ + const fab = this.find("paper-fab.expand-menu"); + // Do a spin animation to turn the + icon into a x when active + this.autorun(() => { + const active = this.active.get(); + const iconStyle = active ? + "transition: transform 0.3s ease; transform: rotate(225deg);" : + "transition: transform 0.3s ease;"; + fab.updateStyles({ + ["--paper-fab-iron-icon"]: iconStyle, + }); + }) +}); + Template.fabMenu.helpers({ active: function() { return Template.instance().active.get(); diff --git a/rpg-docs/lib/methods/conditions.js b/rpg-docs/lib/methods/conditions.js index 4e42bdcc..a89f5d8b 100644 --- a/rpg-docs/lib/methods/conditions.js +++ b/rpg-docs/lib/methods/conditions.js @@ -115,7 +115,7 @@ trackEncumbranceConditions = function(charId, templateInstance) { give("encumbered2"); remove("encumbered"); } else if (weight > strength * 5 * carryMultiplier && - character.settings.useVariantEncumbrance){ + character.settings.useVariantEncumbrance){ give("encumbered"); remove("encumbered2"); } else { @@ -128,7 +128,7 @@ trackEncumbranceConditions = function(charId, templateInstance) { give("encumbered4"); remove("encumbered3"); } else if (weight > strength * 15 * carryMultiplier && - character.settings.useStandardEncumbrance) { + character.settings.useStandardEncumbrance) { give("encumbered3"); remove("encumbered4"); } else { @@ -138,6 +138,7 @@ trackEncumbranceConditions = function(charId, templateInstance) { }); }; +// jscs:disable maximumLineLength CONDITIONS = { //Conditions blind: { diff --git a/rpg-docs/public/custom_components/app-theme.html b/rpg-docs/public/custom_components/app-theme.html index cd68cb07..4d8f7066 100644 --- a/rpg-docs/public/custom_components/app-theme.html +++ b/rpg-docs/public/custom_components/app-theme.html @@ -5,9 +5,9 @@ diff --git a/rpg-docs/public/custom_components/dicecloud-icons/dicecloud-icons.html b/rpg-docs/public/custom_components/dicecloud-icons/dicecloud-icons.html new file mode 100644 index 00000000..5a6b5ac2 --- /dev/null +++ b/rpg-docs/public/custom_components/dicecloud-icons/dicecloud-icons.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/us.stackdump b/us.stackdump new file mode 100644 index 00000000..0852c264 --- /dev/null +++ b/us.stackdump @@ -0,0 +1,24 @@ +MSYS-1.0.12 Build:2012-07-05 14:56 +Exception: STATUS_NONCONTINUABLE_EXCEPTION at eip=77C10864 +eax=0028EDB0 ebx=0028FEE0 ecx=00000000 edx=C0000008 esi=0028EE2C edi=00000000 +ebp=0028EE14 esp=0028EDA4 program=us +cs=0023 ds=002B es=002B fs=0053 gs=002B ss=002B +Stack trace: +Frame Function Args +0028EE14 77C10864 (0028EE2C, 0028EE7C, 0028EE2C, 0028EE7C) +0028F2E0 77B90133 (00320114, 00000000, 00320238, 00000000) +0028F2F8 77BB8EE2 (00320114, 0028F358, 0028F588, 6803B9F5) +0028F588 6803BA01 (00320000, 00330F38, 68037457, 00000022) +0028FC38 6803AF8F (00320000, 00660065, 006E0061, 005A002E) +0028FCD8 6803ADC4 (00320000, 0028FD20, 0028FD28, 6803B334) +0028FD28 6803B33E (00320000, 0028FD88, 00000000, 68029DE3) +0028FD48 68039AE6 (00320000, 680F7174, 00011044, 00000000) +0028FE98 68052117 (680A4C64, 00000000, 0028FEE8, 680044EA) +0028FEE8 68004709 (00000000, 00000000, 0028FF28, 0048BC00) +0028FF08 68004C5F (00401248, 00000000, 00000000, 00000000) +0028FF28 68004C98 (00000000, 00000000, 00000000, 00000000) +0028FF58 0048BB08 (00401248, 00000000, 00000000, 00000000) +0028FF88 0040103D (7EFDE000, 0028FFD4, 77BB9F72, 7EFDE000) +0028FF94 755F33AA (7EFDE000, 7D5558E1, 00000000, 00000000) +0028FFD4 77BB9F72 (00401000, 7EFDE000, 00000000, 00000000) +End of stack trace (more stack frames may be present) \ No newline at end of file From 3530eefb2ae2cfaf3740407c4520783e71114468 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Fri, 27 Jan 2017 15:34:09 +0200 Subject: [PATCH 29/39] Added custom tab pages animations --- .jscsrc | 2 +- rpg-docs/.meteor/packages | 2 + rpg-docs/.meteor/versions | 1 + rpg-docs/client/style/main.css | 3 +- .../client/views/character/characterSheet.css | 35 ++--- .../views/character/characterSheet.html | 24 +-- .../client/views/character/characterSheet.js | 147 ++++++++++++++++++ .../views/character/features/features.html | 2 +- .../views/character/inventory/inventory.html | 2 +- .../client/views/character/stats/stats.html | 2 +- .../client/views/layout/polymerImports.html | 2 +- .../public/custom_components/app-theme.html | 6 + 12 files changed, 185 insertions(+), 43 deletions(-) diff --git a/.jscsrc b/.jscsrc index 85965732..aed9e33e 100644 --- a/.jscsrc +++ b/.jscsrc @@ -13,7 +13,7 @@ "disallowMixedSpacesAndTabs": "smart", "disallowTrailingWhitespace": true, "disallowSpaceAfterPrefixUnaryOperators": true, - "disallowMultipleVarDecl": true, + "disallowMultipleVarDecl": false, "disallowNewlineBeforeBlockStatements": true, "disallowKeywordsOnNewLine": ["else"], diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index eb28a84f..edc8ae21 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -44,3 +44,5 @@ shell-server seba:minifiers-autoprefixer nikogosovd:multiple-uihooks templates:array +ecmascript +es5-shim diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 191af8e6..92a5bf99 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -40,6 +40,7 @@ ecmascript-runtime@0.3.15 ecwyne:mathjs@0.25.0 ejson@1.0.13 email@1.1.18 +es5-shim@4.6.15 fastclick@1.0.13 geojson-utils@1.0.10 google@1.1.15 diff --git a/rpg-docs/client/style/main.css b/rpg-docs/client/style/main.css index 16f04ec8..93a8d7dc 100644 --- a/rpg-docs/client/style/main.css +++ b/rpg-docs/client/style/main.css @@ -56,7 +56,8 @@ paper-icon-item::shadow #contentIcon { bottom: 24px; right: 24px; /* stop the fab from flashing during animation */ - transform: translateZ(0); + transform: scale(1) translateZ(0px); + z-index: 3; } paper-fab { diff --git a/rpg-docs/client/views/character/characterSheet.css b/rpg-docs/client/views/character/characterSheet.css index 461055e4..5ce11aa5 100644 --- a/rpg-docs/client/views/character/characterSheet.css +++ b/rpg-docs/client/views/character/characterSheet.css @@ -1,28 +1,3 @@ -paper-tabs { - box-shadow: 0px 3px 2px rgba(0, 0, 0, 0.2); -} - -app-toolbar paper-tabs { - box-shadow: none; -} - -paper-tabs[noink][nobar] paper-tab.core-selected { - color: #fff; -} - -paper-tabs /deep/ #selectionBar, #onRadio { - background-color: #d50000; -} - -paper-tabs ::shadow #ink { - color: #b22 !important; -} - -paper-tabs.transparent-brown { - background-color: transparent; - box-shadow: none; -} - app-toolbar.medium-tall { height: 108px; } @@ -37,3 +12,13 @@ app-toolbar.medium-tall { .character-menu paper-icon-item{ cursor: pointer; } + +.character-sheet app-header { + position: relative; + z-index: 1; +} + +.character-sheet iron-pages > div { + overflow-y: auto; + overflow-x: hidden; +} diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/character/characterSheet.html index c163b663..bb9ce825 100644 --- a/rpg-docs/client/views/character/characterSheet.html +++ b/rpg-docs/client/views/character/characterSheet.html @@ -1,6 +1,6 @@ diff --git a/rpg-docs/client/views/character/characterSheet.js b/rpg-docs/client/views/character/characterSheet.js index 8a46c4b7..41848cff 100644 --- a/rpg-docs/client/views/character/characterSheet.js +++ b/rpg-docs/client/views/character/characterSheet.js @@ -1,11 +1,158 @@ +let tabPages, tabSliders, tabFabs, tabFabMenus; Template.characterSheet.onRendered(function() { //default to the stats tab Session.setDefault(this.data._id + ".selectedTab", "0"); + + // Keep the header's scroll target up to date with the currently selected tab + const header = this.find("app-header"); + this.autorun(() => { + const tab = getTab(Template.currentData()._id); + Tracker.afterFlush(() => { + header.scrollTarget = this.find("#tabPages .iron-selected"); + header._scrollHandler(); + }); + }); + + // Store all the tab page components for use in animations + tabPages = _.times(6, (n) => + this.$(`.tab-page:nth-child(${n + 1})`) + ); + tabSliders = _.times(6, (n) => + tabPages[n].find(".animation-slider") + ); + tabFabs = _.times(6, (n) => + tabPages[n].find(".floatyButton") + ); + tabFabMenus = _.times(6, (n) => + tabPages[n].find(".mini-holder") + ); + //watch this character and make sure their encumbrance is updated //trackEncumbranceConditions(this.data._id, this); }); +/** + * Page change animations that suck less than neon-animated-pages + */ +const tabAnimation = ({oldTab, newTab, duration}) => { + if (newTab === oldTab) return; + duration = duration || 400; + const delay = (element, f) => { + element.on( + "transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd", + (event) => { + if (event.target == event.currentTarget){ + f(); + $(this).off(event); + } + } + ); + } + const isForward = newTab > oldTab; + const entryAnimation = { + before: { + transform: isForward ? "translateX(100%)" : "translateX(-100%)", + }, + during: { + transition: `transform ${duration}ms ease`, + transform: "", + }, + after: { + transition: "", + transform: "", + }, + } + const exitAnimation = { + before: { + transform: "translateZ(0)", + }, + during: { + transition: `transform ${duration}ms ease`, + transform: isForward ? "translateX(-100%)" : "translateX(100%)", + }, + after: { + transition: "", + transform: "", + display: "", + }, + } + const oldPage = tabPages[oldTab]; + const newPage = tabPages[newTab]; + if (oldPage.length && newPage.length){ + oldPage[0].style.setProperty("display", "initial", "important"); + oldPage.css({zIndex: "1"}); + newPage.css({zIndex: "0"}); + _.defer(() => { + oldPage.css({ + transition: `z-index ${duration}ms linear`, + zIndex: "0", + }); + newPage.css({ + transition: `z-index ${duration}ms linear`, + zIndex: "1", + }); + }); + delay(oldPage, () => oldPage.css({ + display: "", + transition: "", + zIndex: "", + })); + delay(newPage, () => newPage.css({ + transition: "", + zIndex: "", + })); + } + const oldSlider = tabSliders[oldTab]; + if (oldSlider.length){ + oldSlider.css(exitAnimation.before); + _.defer(() => oldSlider.css(exitAnimation.during)); + delay(oldSlider, () => oldSlider.css(exitAnimation.after)); + } + const newSlider = tabSliders[newTab]; + if (newSlider.length){ + newSlider.css(entryAnimation.before); + _.defer(() => newSlider.css(entryAnimation.during)); + delay(newSlider, () => newSlider.css(entryAnimation.after)); + } + slideDown = ({element, reverse}) => { + element.css({ + transform: reverse ? "translateY(80px)" : "", + }); + const fraction = duration / 4; + _.defer(() => element.css({ + transition: reverse ? + `transform ${fraction}ms ease-out ${duration - fraction}ms` : + `transform ${fraction}ms ease-in`, + transform: reverse ? "" : "translateY(80px)", + })); + delay(element, () => element.css({ + transition: "", + })); + } + + const oldFab = tabFabs[oldTab]; + const newFab = tabFabs[newTab]; + if (oldFab.length && !newFab.length){ + slideDown({element: oldFab}); + } + if (newFab.length && !oldFab.length){ + slideDown({element: newFab, reverse: true}); + } + if (newFab.length && oldFab.length){ + newFab.css({transform: ""}); + } + + const oldFabMenu = tabFabMenus[oldTab]; + if (oldFabMenu.length) { + Blaze.getView(oldFabMenu[0]).templateInstance().active.set(false); + } +} + var setTab = function(charId, tab){ + tabAnimation({ + oldTab: +Session.get(charId + ".selectedTab"), + newTab: +tab, + }); return Session.set(charId + ".selectedTab", tab); }; diff --git a/rpg-docs/client/views/character/features/features.html b/rpg-docs/client/views/character/features/features.html index 16eba8f4..0da844f0 100644 --- a/rpg-docs/client/views/character/features/features.html +++ b/rpg-docs/client/views/character/features/features.html @@ -1,6 +1,6 @@ diff --git a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js index 063eaea6..018525dc 100644 --- a/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js +++ b/rpg-docs/client/views/character/persona/peronaDetailsDialog/personaDetailsDialog.js @@ -1,7 +1,3 @@ -Template.personaDetailsEdit.onRendered(function(){ - updatePolymerInputs(this); -}); - Template.personaDetailsDialog.helpers({ char: function() { return Characters.findOne( @@ -11,25 +7,20 @@ Template.personaDetailsDialog.helpers({ } }); +inputHandler = (field) => _.debounce(function(event){ + var input = event.currentTarget.value; + Characters.update(this._id, { + $set: {[field]: input} + }, { + removeEmptyStrings: false, + trimStrings: false, + }); +}, 300); + Template.personaDetailsEdit.events({ - "change #nameInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {name: input}}); - }, - "change #alignmentInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {alignment: input}}); - }, - "change #genderInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {gender: input}}); - }, - "change #raceInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {race: input}}); - }, - "change #pictureInput": function(event){ - var input = event.currentTarget.value; - Characters.update(this._id, {$set: {picture: input}}); - }, + "input #nameInput, change #nameInput": inputHandler("name"), + "input #alignmentInput, change #alignmentInput": inputHandler("alignment"), + "input #genderInput, change #genderInput": inputHandler("gender"), + "input #raceInput, change #raceInput": inputHandler("race"), + "input #pictureInput, change #pictureInput": inputHandler("picture"), }); diff --git a/rpg-docs/client/views/character/persona/persona.html b/rpg-docs/client/views/character/persona/persona.html index 3f74e0b9..327e3053 100644 --- a/rpg-docs/client/views/character/persona/persona.html +++ b/rpg-docs/client/views/character/persona/persona.html @@ -1,74 +1,63 @@ diff --git a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js index abf9eaca..25032676 100644 --- a/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js +++ b/rpg-docs/client/views/character/journal/raceDialog/raceDialog.js @@ -1,12 +1,13 @@ -Template.raceDialog.onRendered(function(){ - updatePolymerInputs(this); -}); - Template.raceDialog.events({ - "change #raceInput": function(event){ + "input #raceInput, change #raceInput": _.debounce(function(event){ var value = event.currentTarget.value; - Characters.update(this.charId, {$set: {race: value}}); - } + Characters.update(this.charId, { + $set: {race: value} + }, { + removeEmptyStrings: false, + trimStrings: false, + }); + }, 300), }); Template.raceDialog.helpers({ From 03cb32bf34b5fb5022daee7ac5f1e36d5ec486d2 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 31 Jan 2017 13:36:15 +0200 Subject: [PATCH 34/39] Updated color dropdown to Polymer 1 paper-swatch-picker --- rpg-docs/bower.json | 3 ++- rpg-docs/client/style/colors.css | 6 ++++- .../client/views/layout/polymerImports.html | 1 + .../colorDropdown/colorDropdown.html | 10 ++------ .../colorDropdown/colorDropdown.js | 25 ++++++++++++++----- rpg-docs/lib/constants/colorOptions.js | 2 +- .../public/custom_components/app-theme.html | 7 ++++++ 7 files changed, 37 insertions(+), 17 deletions(-) diff --git a/rpg-docs/bower.json b/rpg-docs/bower.json index fa6aa300..14fe4745 100644 --- a/rpg-docs/bower.json +++ b/rpg-docs/bower.json @@ -21,7 +21,8 @@ "neon-elements": "PolymerElements/neon-elements#^1.0.0", "paper-elements": "PolymerElements/paper-elements#^1.0.7", "app-elements": "PolymerElements/app-elements#^0.10.1", - "marked-element": "PolymerElements/marked-element#^1.2.0" + "marked-element": "PolymerElements/marked-element#^1.2.0", + "paper-swatch-picker": "PolymerElements/paper-swatch-picker#~1.0.2" }, "resolutions": { "webcomponentsjs": "0.7.23" diff --git a/rpg-docs/client/style/colors.css b/rpg-docs/client/style/colors.css index 6f501aa9..04aa90a2 100644 --- a/rpg-docs/client/style/colors.css +++ b/rpg-docs/client/style/colors.css @@ -70,6 +70,10 @@ background-color: #9E9E9E; } +.blue-grey { + background-color: #607D8B; +} + .app-grey { background-color: #424242; } @@ -80,4 +84,4 @@ .black { background-color: #262626; -} \ No newline at end of file +} diff --git a/rpg-docs/client/views/layout/polymerImports.html b/rpg-docs/client/views/layout/polymerImports.html index 400d5dae..0e36303f 100644 --- a/rpg-docs/client/views/layout/polymerImports.html +++ b/rpg-docs/client/views/layout/polymerImports.html @@ -30,6 +30,7 @@ + diff --git a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html b/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html index 0358e099..a1e756f0 100644 --- a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html +++ b/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.html @@ -1,10 +1,4 @@ diff --git a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.js b/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.js index 1c3e384c..e6fa01b0 100644 --- a/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.js +++ b/rpg-docs/client/views/paperTemplates/colorDropdown/colorDropdown.js @@ -1,15 +1,28 @@ Template.colorDropdown.helpers({ colors: function(){ - return colorOptions; - } + let colors = ""; + _.each(colorOptions, (option) => { + colors += !colors ? `["${option.color}"` : `, "${option.color}"`; + }); + colors += "]"; + return colors; + }, + selectedColor: function(){ + const selected = _.find(colorOptions, (option) => option.key === this.color); + return selected && selected.color; + }, }); Template.colorDropdown.events({ - "click paper-item": function(event, instance){ - var color = event.currentTarget.getAttribute("name"); - instance.$(".colorDropdown").trigger({ + "color-picker-selected": function(event, instance){ + var color = event.originalEvent.detail.color; + var option = _.find(colorOptions, (option) => { + return option.color === color.toUpperCase()} + ); + var key = option && option.key; + instance.$("paper-swatch-picker").trigger({ type: "color-change", - color: color, + color: key, }); } }); diff --git a/rpg-docs/lib/constants/colorOptions.js b/rpg-docs/lib/constants/colorOptions.js index 8f5d3bea..e6937a44 100644 --- a/rpg-docs/lib/constants/colorOptions.js +++ b/rpg-docs/lib/constants/colorOptions.js @@ -16,7 +16,7 @@ colorOptions = [ {key: "o", className: "orange", whiteText: false, color: "#FF9800"}, {key: "p", className: "deep-orange", whiteText: true, color: "#FF5722"}, {key: "q", className: "grey", whiteText: true, color: "#9E9E9E"}, //spec says no white text - //{key: "r", className: "blue-grey", whiteText: true, color: "#607D8B"}, + {key: "r", className: "blue-grey", whiteText: true, color: "#607D8B"}, {key: "s", className: "brown", whiteText: true, color: "#795548"}, {key: "t", className: "black", whiteText: true, color: "#000000"}, ]; diff --git a/rpg-docs/public/custom_components/app-theme.html b/rpg-docs/public/custom_components/app-theme.html index 5105b1b4..1b90d2a2 100644 --- a/rpg-docs/public/custom_components/app-theme.html +++ b/rpg-docs/public/custom_components/app-theme.html @@ -53,4 +53,11 @@ --iron-icon-width: 23px; --iron-icon-height: 23px; } + paper-swatch-picker { + --paper-swatch-picker-color-size: 24px; + --paper-swatch-picker-icon: { + color: #dedede !important; + color: rgba(255,255,255,0.87) !important; + } + } From eb4336b3e91609df04695424287a8ccb929ee889 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 31 Jan 2017 15:26:05 +0200 Subject: [PATCH 35/39] Moved back to differential:vulcanize for imports --- rpg-docs/.gitignore | 1 + rpg-docs/.meteor/packages | 1 + rpg-docs/.meteor/versions | 1 + rpg-docs/bower.json | 3 - .../client/views/layout/polymerImports.html | 61 --- .../views/meta/changeLog/changeLog.html | 2 +- rpg-docs/config.vulcanize | 47 +- rpg-docs/packages/meteor-vulcanize/.gitignore | 1 - .../vulcanize-new-1rnrsz4/npm-shrinkwrap.json | 89 ---- .../plugin/vulcanize-new-1rnrsz4/package.json | 1 - .../.npm/plugin/vulcanize/README | 7 - .../.npm/plugin/vulcanize/npm-shrinkwrap.json | 446 ------------------ rpg-docs/packages/meteor-vulcanize/.versions | 3 - rpg-docs/packages/meteor-vulcanize/README.md | 29 -- rpg-docs/packages/meteor-vulcanize/package.js | 22 - .../packages/meteor-vulcanize/versions.json | 20 - .../meteor-vulcanize/vulcanize-tests.js | 5 - .../packages/meteor-vulcanize/vulcanize.js | 139 ------ 18 files changed, 50 insertions(+), 828 deletions(-) delete mode 100644 rpg-docs/client/views/layout/polymerImports.html delete mode 100644 rpg-docs/packages/meteor-vulcanize/.gitignore delete mode 100644 rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/npm-shrinkwrap.json delete mode 100644 rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/package.json delete mode 100644 rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README delete mode 100644 rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json delete mode 100644 rpg-docs/packages/meteor-vulcanize/.versions delete mode 100644 rpg-docs/packages/meteor-vulcanize/README.md delete mode 100644 rpg-docs/packages/meteor-vulcanize/package.js delete mode 100644 rpg-docs/packages/meteor-vulcanize/versions.json delete mode 100644 rpg-docs/packages/meteor-vulcanize/vulcanize-tests.js delete mode 100644 rpg-docs/packages/meteor-vulcanize/vulcanize.js diff --git a/rpg-docs/.gitignore b/rpg-docs/.gitignore index dc11d68b..88a0a828 100644 --- a/rpg-docs/.gitignore +++ b/rpg-docs/.gitignore @@ -3,6 +3,7 @@ .demeteorized settings.json public/components +public/_imports.html nohup.out node_modules dump diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index edc8ae21..a8e68031 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -46,3 +46,4 @@ nikogosovd:multiple-uihooks templates:array ecmascript es5-shim +differential:vulcanize diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 92a5bf99..40a1948a 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -35,6 +35,7 @@ ddp-rate-limiter@1.0.6 ddp-server@1.2.10 deps@1.0.12 diff-sequence@1.0.7 +differential:vulcanize@3.0.0 ecmascript@0.6.1 ecmascript-runtime@0.3.15 ecwyne:mathjs@0.25.0 diff --git a/rpg-docs/bower.json b/rpg-docs/bower.json index 14fe4745..a0d5a056 100644 --- a/rpg-docs/bower.json +++ b/rpg-docs/bower.json @@ -23,8 +23,5 @@ "app-elements": "PolymerElements/app-elements#^0.10.1", "marked-element": "PolymerElements/marked-element#^1.2.0", "paper-swatch-picker": "PolymerElements/paper-swatch-picker#~1.0.2" - }, - "resolutions": { - "webcomponentsjs": "0.7.23" } } diff --git a/rpg-docs/client/views/layout/polymerImports.html b/rpg-docs/client/views/layout/polymerImports.html deleted file mode 100644 index 0e36303f..00000000 --- a/rpg-docs/client/views/layout/polymerImports.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rpg-docs/client/views/meta/changeLog/changeLog.html b/rpg-docs/client/views/meta/changeLog/changeLog.html index 0107ccf5..63f66b9e 100644 --- a/rpg-docs/client/views/meta/changeLog/changeLog.html +++ b/rpg-docs/client/views/meta/changeLog/changeLog.html @@ -15,7 +15,7 @@ -

{{version}}

+
{{version}}
    {{#each changes}}
  • {{this}}
    • diff --git a/rpg-docs/config.vulcanize b/rpg-docs/config.vulcanize index 3dcec764..fc26f92c 100644 --- a/rpg-docs/config.vulcanize +++ b/rpg-docs/config.vulcanize @@ -2,6 +2,51 @@ "polyfill": "/components/webcomponentsjs/webcomponents.min.js", "useShadowDom": true, "imports": [ - "/components/app-layout/app-layout.html" + "/components/app-layout/app-layout.html", + "/components/app-layout/app-layout.html", + "/components/app-layout/app-scroll-effects/effects/waterfall.html", + "/components/app-layout/app-scroll-effects/effects/parallax-background.html", + "/components/app-layout/app-scroll-effects/effects/resize-title.html", + + "/components/iron-icon/iron-icon.html", + "/components/iron-icons/av-icons.html", + "/components/iron-icons/editor-icons.html", + "/components/iron-icons/image-icons.html", + "/components/iron-icons/iron-icons.html", + "/components/iron-icons/social-icons.html", + "/components/iron-image/iron-image.html", + "/components/iron-pages/iron-pages.html", + "/components/iron-selector/iron-selector.html", + + "/components/neon-animation/neon-animation.html", + + "/components/paper-button/paper-button.html", + "/components/paper-swatch-picker/paper-swatch-picker.html", + "/components/paper-dialog/paper-dialog.html", + "/components/paper-dropdown-menu/paper-dropdown-menu.html", + "/components/paper-fab/paper-fab.html", + "/components/paper-icon-button/paper-icon-button.html", + "/components/paper-input/paper-input.html", + "/components/paper-input/paper-textarea.html", + "/components/paper-item/all-imports.html", + "/components/paper-listbox/paper-listbox.html", + "/components/paper-material/paper-material.html", + "/components/paper-menu-button/paper-menu-button.html", + "/components/paper-menu/paper-menu.html", + "/components/paper-radio-button/paper-radio-button.html", + "/components/paper-radio-group/paper-radio-group.html", + "/components/paper-ripple/paper-ripple.html", + "/components/paper-slider/paper-slider.html", + "/components/paper-spinner/paper-spinner.html", + "/components/paper-tabs/paper-tabs.html", + "/components/paper-toast/paper-toast.html", + "/components/paper-toggle-button/paper-toggle-button.html", + "/components/paper-tooltip/paper-tooltip.html", + + "/custom_components/dicecloud-icons/dicecloud-icons.html", + "/custom_components/dicecloud-selector/dicecloud-selector.html", + "/custom_components/paper-checkbox/paper-checkbox.html", + "/custom_components/paper-diff-slider/paper-diff-slider.html", + "/custom_components/app-theme.html" ] } diff --git a/rpg-docs/packages/meteor-vulcanize/.gitignore b/rpg-docs/packages/meteor-vulcanize/.gitignore deleted file mode 100644 index 677a6fc2..00000000 --- a/rpg-docs/packages/meteor-vulcanize/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.build* diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/npm-shrinkwrap.json b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/npm-shrinkwrap.json deleted file mode 100644 index 907888eb..00000000 --- a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/npm-shrinkwrap.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "dependencies": { - "vulcanize": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.7.tgz", - "from": "vulcanize@1.14.7", - "dependencies": { - "dom5": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dom5/-/dom5-1.3.1.tgz", - "from": "dom5@1.3.1", - "dependencies": { - "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "from": "clone@1.0.2" - }, - "parse5": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", - "from": "parse5@1.5.1" - } - } - }, - "es6-promise": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz", - "from": "es6-promise@2.3.0" - }, - "hydrolysis": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.22.0.tgz", - "from": "hydrolysis@1.22.0", - "dependencies": { - "doctrine": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", - "from": "doctrine@0.7.2", - "dependencies": { - "esutils": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz", - "from": "esutils@1.1.6" - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "from": "isarray@0.0.1" - } - } - }, - "espree": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz", - "from": "espree@2.2.5" - }, - "estraverse": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz", - "from": "estraverse@3.1.0" - }, - "path-is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "from": "path-is-absolute@1.0.0" - } - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "from": "nopt@3.0.6", - "dependencies": { - "abbrev": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz", - "from": "abbrev@1.0.7" - } - } - }, - "path-posix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz", - "from": "path-posix@1.0.0" - } - } - } - } -} \ No newline at end of file diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/package.json b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/package.json deleted file mode 100644 index 0967ef42..00000000 --- a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize-new-1rnrsz4/package.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README deleted file mode 100644 index 3d492553..00000000 --- a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/README +++ /dev/null @@ -1,7 +0,0 @@ -This directory and the files immediately inside it are automatically generated -when you change this package's NPM dependencies. Commit the files in this -directory (npm-shrinkwrap.json, .gitignore, and this README) to source control -so that others run the same versions of sub-dependencies. - -You should NOT check in the node_modules directory that Meteor automatically -creates; if you are using git, the .gitignore file tells git to ignore it. diff --git a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json b/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json deleted file mode 100644 index f680d5df..00000000 --- a/rpg-docs/packages/meteor-vulcanize/.npm/plugin/vulcanize/npm-shrinkwrap.json +++ /dev/null @@ -1,446 +0,0 @@ -{ - "dependencies": { - "ansi-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz", - "from": "ansi-regex@>=2.0.0 <3.0.0" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "from": "ansi-styles@>=2.2.1 <3.0.0" - }, - "boxen": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz", - "from": "boxen@>=0.3.1 <0.4.0" - }, - "buffer-shims": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz", - "from": "buffer-shims@>=1.0.0 <2.0.0" - }, - "capture-stack-trace": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", - "from": "capture-stack-trace@>=1.0.0 <2.0.0" - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "from": "chalk@>=1.0.0 <2.0.0" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "from": "code-point-at@>=1.0.0 <2.0.0" - }, - "configstore": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz", - "from": "configstore@>=2.0.0 <3.0.0" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "from": "core-util-is@>=1.0.0 <1.1.0" - }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "from": "create-error-class@>=3.0.1 <4.0.0" - }, - "deep-extend": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz", - "from": "deep-extend@>=0.4.0 <0.5.0" - }, - "dot-prop": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz", - "from": "dot-prop@>=3.0.0 <4.0.0" - }, - "duplexer2": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "from": "duplexer2@>=0.1.4 <0.2.0" - }, - "error-ex": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz", - "from": "error-ex@>=1.2.0 <2.0.0" - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "from": "escape-string-regexp@>=1.0.2 <2.0.0" - }, - "filled-array": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz", - "from": "filled-array@>=1.0.0 <2.0.0" - }, - "got": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", - "from": "got@>=5.0.0 <6.0.0" - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "from": "graceful-fs@>=4.1.2 <5.0.0" - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "from": "has-ansi@>=2.0.0 <3.0.0" - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "from": "imurmurhash@>=0.1.4 <0.2.0" - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "from": "inherits@>=2.0.1 <2.1.0" - }, - "ini": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "from": "ini@>=1.3.0 <1.4.0" - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "from": "is-arrayish@>=0.2.1 <0.3.0" - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "from": "is-finite@>=1.0.0 <2.0.0" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0" - }, - "is-npm": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", - "from": "is-npm@>=1.0.0 <2.0.0" - }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "from": "is-obj@>=1.0.0 <2.0.0" - }, - "is-redirect": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", - "from": "is-redirect@>=1.0.0 <2.0.0" - }, - "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "from": "is-retry-allowed@>=1.0.0 <2.0.0" - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "from": "is-stream@>=1.0.0 <2.0.0" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "from": "isarray@>=1.0.0 <1.1.0" - }, - "latest-version": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz", - "from": "latest-version@>=2.0.0 <3.0.0" - }, - "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "from": "lowercase-keys@>=1.0.0 <2.0.0" - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "from": "minimist@0.0.8" - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "from": "mkdirp@>=0.5.0 <0.6.0" - }, - "node-status-codes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", - "from": "node-status-codes@>=1.0.0 <2.0.0" - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "from": "number-is-nan@>=1.0.0 <2.0.0" - }, - "object-assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz", - "from": "object-assign@>=4.0.1 <5.0.0" - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "from": "os-homedir@>=1.0.0 <2.0.0" - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "from": "os-tmpdir@>=1.0.0 <2.0.0" - }, - "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "from": "osenv@>=0.1.0 <0.2.0" - }, - "package-json": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz", - "from": "package-json@>=2.0.0 <3.0.0" - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "from": "parse-json@>=2.1.0 <3.0.0" - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "from": "pinkie@>=2.0.0 <3.0.0" - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "from": "pinkie-promise@>=2.0.0 <3.0.0" - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "from": "prepend-http@>=1.0.1 <2.0.0" - }, - "process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "from": "process-nextick-args@>=1.0.6 <1.1.0" - }, - "rc": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz", - "from": "rc@>=1.1.6 <2.0.0", - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "from": "minimist@>=1.2.0 <2.0.0" - } - } - }, - "read-all-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", - "from": "read-all-stream@>=3.0.0 <4.0.0" - }, - "readable-stream": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz", - "from": "readable-stream@>=2.0.5 <3.0.0" - }, - "registry-auth-token": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz", - "from": "registry-auth-token@>=3.0.1 <4.0.0" - }, - "registry-url": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", - "from": "registry-url@>=3.0.3 <4.0.0" - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "from": "repeating@>=2.0.0 <3.0.0" - }, - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "from": "semver@>=5.1.0 <6.0.0" - }, - "semver-diff": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", - "from": "semver-diff@>=2.0.0 <3.0.0" - }, - "slide": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "from": "slide@>=1.1.5 <2.0.0" - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "from": "string-width@>=1.0.1 <2.0.0" - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "from": "string_decoder@>=0.10.0 <0.11.0" - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "from": "strip-ansi@>=3.0.0 <4.0.0" - }, - "strip-json-comments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz", - "from": "strip-json-comments@>=1.0.4 <1.1.0" - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "from": "supports-color@>=2.0.0 <3.0.0" - }, - "timed-out": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.0.tgz", - "from": "timed-out@>=3.0.0 <4.0.0" - }, - "unzip-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", - "from": "unzip-response@>=1.0.2 <2.0.0" - }, - "update-notifier": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz", - "from": "update-notifier@>=0.6.0 <0.7.0" - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "from": "url-parse-lax@>=1.0.0 <2.0.0" - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "from": "util-deprecate@>=1.0.1 <1.1.0" - }, - "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "from": "uuid@>=2.0.1 <3.0.0" - }, - "vulcanize": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/vulcanize/-/vulcanize-1.14.7.tgz", - "from": "vulcanize@1.14.7", - "dependencies": { - "dom5": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dom5/-/dom5-1.3.1.tgz", - "from": "dom5@1.3.1", - "dependencies": { - "clone": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", - "from": "clone@1.0.2" - }, - "parse5": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", - "from": "parse5@1.5.1" - } - } - }, - "es6-promise": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz", - "from": "es6-promise@2.3.0" - }, - "hydrolysis": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/hydrolysis/-/hydrolysis-1.22.0.tgz", - "from": "hydrolysis@1.22.0", - "dependencies": { - "doctrine": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz", - "from": "doctrine@0.7.2", - "dependencies": { - "esutils": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz", - "from": "esutils@1.1.6" - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "from": "isarray@0.0.1" - } - } - }, - "espree": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz", - "from": "espree@2.2.5" - }, - "estraverse": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz", - "from": "estraverse@3.1.0" - }, - "path-is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz", - "from": "path-is-absolute@1.0.0" - } - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "from": "nopt@3.0.6", - "dependencies": { - "abbrev": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz", - "from": "abbrev@1.0.7" - } - } - }, - "path-posix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz", - "from": "path-posix@1.0.0" - } - } - }, - "widest-line": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz", - "from": "widest-line@>=1.0.0 <2.0.0" - }, - "write-file-atomic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.2.0.tgz", - "from": "write-file-atomic@>=1.1.2 <2.0.0" - }, - "xdg-basedir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz", - "from": "xdg-basedir@>=2.0.0 <3.0.0" - } - } -} diff --git a/rpg-docs/packages/meteor-vulcanize/.versions b/rpg-docs/packages/meteor-vulcanize/.versions deleted file mode 100644 index 0deddad4..00000000 --- a/rpg-docs/packages/meteor-vulcanize/.versions +++ /dev/null @@ -1,3 +0,0 @@ -differential:vulcanize@2.0.0 -meteor@1.1.6 -underscore@1.0.3 diff --git a/rpg-docs/packages/meteor-vulcanize/README.md b/rpg-docs/packages/meteor-vulcanize/README.md deleted file mode 100644 index a469b5de..00000000 --- a/rpg-docs/packages/meteor-vulcanize/README.md +++ /dev/null @@ -1,29 +0,0 @@ -Vulcanize -============================================================================== -Warning: API Change for version 1.0.0. - -This package a meteor build plugin that wraps the [vulcanize](https://www.npmjs.com/package/vulcanize) npm package, which is used to process web components into a single output file. - -### Usage -1. Ensure all your components are located somewhere under your public directory. (via bower, zip, etc) -2. Include a `config.vulcanize` file in the root of your project. This file will optionally define a path to the polyfill and paths to html imports for your components. For Example: - -```` -{ - "polyfill": "/bower_components/webcomponentsjs/webcomponents.min.js", - "useShadowDom": true, // optional, defaults to shady dom (polymer default) - "imports": [ - "/bower_components/paper-button/paper-button.html", - "/bower_components/paper-checkbox/paper-checkbox.html" - ] -} -```` -- By specifying a path to the polyfill we can ensure that it is injected into the bundle before any imports. - -- By setting `useShadowDom` to true, we configure polymer to opt out of shady dom and use full shadow dom. This is pretty much required at the moment unless you only use polymer elements as leaf nodes. Any light dom (child elements) that gets rendered by blaze, react, etc will not be accounted for otherwise. - -- Running your app in development as usual will result in individual imports being added to your `` tag, resulting in multiple subsequent HTTP requests (good in development - debugging). - -- Running `meteor`, `meteor build`, `modulus deploy`, etc with the `VULCANIZE=true` environment variable set will result in all your html imports being vulcanized or concatenated into a single html import (good in production). The resulting file will be called `vulcanized-{md5}.html`, which will be automatically added to your `` tag. For example, `VULCANIZE=true meteor`, `VULCANIZE=true modulus deploy`. - -- Setting the `CDN_PREFIX` environment variable will prepend the string to the beginning of the file path that is inserted into your HTML's `` tag. diff --git a/rpg-docs/packages/meteor-vulcanize/package.js b/rpg-docs/packages/meteor-vulcanize/package.js deleted file mode 100644 index aebe44ac..00000000 --- a/rpg-docs/packages/meteor-vulcanize/package.js +++ /dev/null @@ -1,22 +0,0 @@ -Package.describe({ - name: 'thaum:vulcanize', - summary: 'Vulcanize', - version: '2.2.0', - git: 'https://github.com/Differential/meteor-vulcanize' -}); - -Package.registerBuildPlugin({ - name: 'vulcanize', - use: [ - "underscore@1.0.3" - ], - sources: [ - 'vulcanize.js' - ], - npmDependencies: {'vulcanize': '1.14.7'} -}); - -Package.onUse(function (api) { - api.use('underscore'); - api.use('isobuild:compiler-plugin@1.0.0'); -}); diff --git a/rpg-docs/packages/meteor-vulcanize/versions.json b/rpg-docs/packages/meteor-vulcanize/versions.json deleted file mode 100644 index dd13098b..00000000 --- a/rpg-docs/packages/meteor-vulcanize/versions.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "dependencies": [ - [ - "meteor", - "1.1.3" - ], - [ - "underscore", - "1.0.1" - ] - ], - "pluginDependencies": [ - [ - "vulcanize", - {} - ] - ], - "toolVersion": "meteor-tool@1.0.35", - "format": "1.0" -} \ No newline at end of file diff --git a/rpg-docs/packages/meteor-vulcanize/vulcanize-tests.js b/rpg-docs/packages/meteor-vulcanize/vulcanize-tests.js deleted file mode 100644 index c5623d89..00000000 --- a/rpg-docs/packages/meteor-vulcanize/vulcanize-tests.js +++ /dev/null @@ -1,5 +0,0 @@ -// Write your tests here! -// Here is an example. -Tinytest.add('example', function (test) { - test.equal(true, true); -}); diff --git a/rpg-docs/packages/meteor-vulcanize/vulcanize.js b/rpg-docs/packages/meteor-vulcanize/vulcanize.js deleted file mode 100644 index 0ae4a8c1..00000000 --- a/rpg-docs/packages/meteor-vulcanize/vulcanize.js +++ /dev/null @@ -1,139 +0,0 @@ -var vulcan = Npm.require('vulcanize'); -var crypto = Npm.require('crypto'); -var url = Npm.require('url'); -var fs = Npm.require('fs'); - -/** - * Vulcanize now requires a target input file. - * We need to create a temp file located within the same - * 'abspath' as the actual imports. Otherwise, vulcanize - * gets confused during the process. - */ -var tmpFile = '_imports.html'; -var tmpDir = 'public'; -var tmpPath = tmpDir + '/' + tmpFile; - -/** - * Log - */ -function log() { - args = _.values(arguments); - args.unshift("=> Vulcanize:"); - console.log.apply(this, args); -} - -/** - * Get script tag with specified path. - */ -function scriptTag(path) { - return ''; -} - -/** - * Get link tag with specified path. - */ -function linkTag(path) { - return ''; -} - -/** - * Add config for dom mode to head. - */ -function addShadowDomConfig(file) { - file.addHtml({ - section: 'head', - data: '' - }); -} - -/** - * Add webcomponentsjs script to head. - * @todo read first line and check for script tag - */ -function addPolyfillTag(file, path) { - file.addHtml({ - section: 'head', - data: scriptTag(path) - }); -} - -/** - * Add imports to head. - */ - -function addImportTag(file, path) { - file.addHtml({ - section: 'head', - data: linkTag(path) - }); -} - -/** - * Vulcanize all files and add output file to head. - */ -function vulcanizeImports(file, imports) { - var tags = _.map(imports, function(path) { - return linkTag(path); - }); - - fs.writeFileSync(tmpPath, tags.join("\n")); - - vulcan.setOptions({ abspath: tmpDir }); - - vulcan.process(tmpFile, function(err, html) { - fs.unlinkSync(tmpPath); - var filenameHash = crypto.createHash('md5').update(html).digest('hex'); - var filePath = '/vulcanized-' + filenameHash + '.html'; - - file.addAsset({ - path: filePath, - data: html - }); - - if (_.isString(process.env.CDN_PREFIX)) { - filePath = url.resolve(process.env.CDN_PREFIX, filePath); - } - - addImportTag(file, filePath); - }); -} - -/** - * Add individual import tags - */ -function individualImports(file, imports) { - _.each(imports, function(path) { - addImportTag(file, path); - }); -} - -function VulcanizeCompiler() {} -VulcanizeCompiler.prototype.processFilesForTarget = function (files) { - files.forEach(function (file) { - // Get JSON file. - var json = JSON.parse(file.getContentsAsString()); - - // Add polyfill to html if defined. - if (_.isString(json.polyfill)) { - addPolyfillTag(file, json.polyfill); - } - - // Optionally opt into shadow dom, rather than shady dom. - if (json.useShadowDom) { - addShadowDomConfig(file); - } - - // Add imports if defined. - // log("Vulcanizing " + json.imports.length + " files"); - // vulcanizeImports(file, json.imports); - individualImports(file, json.imports); - }); -}; - -Plugin.registerCompiler({ - extensions: ["vulcanize"], - filenames: ["config"], - archMatching: 'web', -}, function(){ - return new VulcanizeCompiler(); -}); From 576c1f953b4b3093b15d200c14fccc5097608d4e Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Fri, 10 Feb 2017 14:01:06 +0200 Subject: [PATCH 36/39] Firefox now works... barely --- rpg-docs/.meteor/packages | 1 - rpg-docs/.meteor/versions | 47 ++++----- .../client/views/character/characterSheet.js | 35 ++++--- rpg-docs/client/views/layout/layout.html | 98 ++++++++++--------- rpg-docs/client/views/layout/layout.js | 20 +--- .../paperTemplates/dialogStack/dialogStack.js | 26 ++--- .../views/paperTemplates/fabMenu/fabMenu.js | 14 +-- 7 files changed, 119 insertions(+), 122 deletions(-) diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index a8e68031..f991e0c4 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -38,7 +38,6 @@ spacebars check@1.2.4 useraccounts:iron-routing wizonesolutions:canonical -meteorhacks:fast-render standard-minifier-js@1.2.1 shell-server seba:minifiers-autoprefixer diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 40a1948a..61cfa728 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -3,36 +3,35 @@ accounts-google@1.0.11 accounts-oauth@1.1.15 accounts-password@1.3.3 accounts-ui@1.1.9 -accounts-ui-unstyled@1.1.12 +accounts-ui-unstyled@1.1.13 aldeed:collection2@2.10.0 aldeed:collection2-core@1.2.0 aldeed:schema-deny@1.1.0 aldeed:schema-index@1.1.1 aldeed:simple-schema@1.5.3 allow-deny@1.0.5 -autoupdate@1.2.11 +autoupdate@1.3.12 babel-compiler@6.13.0 babel-runtime@1.0.1 base64@1.0.10 binary-heap@1.0.10 -blaze@2.1.9 -blaze-html-templates@1.0.5 +blaze@2.3.0 +blaze-html-templates@1.1.0 blaze-tools@1.0.10 boilerplate-generator@1.0.11 caching-compiler@1.1.9 -caching-html-compiler@1.0.7 +caching-html-compiler@1.1.0 callback-hook@1.0.10 check@1.2.4 -chuangbo:cookie@1.1.0 chuangbo:marked@0.3.5_1 -coffeescript@1.0.17 +coffeescript@1.11.1_4 dburles:collection-helpers@1.1.0 dburles:mongo-collection-instances@0.3.5 ddp@1.2.5 -ddp-client@1.2.9 +ddp-client@1.3.2 ddp-common@1.2.8 ddp-rate-limiter@1.0.6 -ddp-server@1.2.10 +ddp-server@1.3.12 deps@1.0.12 diff-sequence@1.0.7 differential:vulcanize@3.0.0 @@ -56,37 +55,33 @@ iron:dynamic-template@1.0.12 iron:layout@1.0.12 iron:location@1.0.11 iron:middleware-stack@1.1.0 -iron:router@1.0.13 +iron:router@1.1.1 iron:url@1.0.11 jquery@1.11.10 lai:collection-extensions@0.2.1_1 -launch-screen@1.0.12 -less@2.6.5 +launch-screen@1.1.0 +less@2.7.8 livedata@1.0.18 localstorage@1.0.12 logging@1.1.16 matb33:collection-hooks@0.8.4 -mdg:validation-error@0.2.0 +mdg:validation-error@0.5.1 meteor@1.6.0 meteor-base@1.0.4 -meteorhacks:fast-render@2.16.0 -meteorhacks:inject-data@2.0.0 -meteorhacks:meteorx@1.4.1 -meteorhacks:picker@1.0.3 meteorhacks:subs-manager@1.6.4 -minifier-css@1.1.13 +minifier-css@1.2.15 minifier-js@1.2.15 minimongo@1.0.19 mobile-experience@1.0.4 mobile-status-bar@1.0.13 modules@0.7.7 -modules-runtime@0.7.7 +modules-runtime@0.7.8 momentjs:moment@2.17.1 mongo@1.1.14 mongo-id@1.0.6 nikogosovd:multiple-uihooks@0.1.8 npm-bcrypt@0.9.2 -npm-mongo@2.2.11_2 +npm-mongo@2.2.16_1 oauth@1.1.12 oauth2@1.1.11 observe-sequence@1.0.14 @@ -107,18 +102,18 @@ service-configuration@1.0.11 session@1.1.7 sha@1.0.9 shell-server@0.2.1 -softwarerero:accounts-t9n@1.3.6 +softwarerero:accounts-t9n@1.3.7 spacebars@1.0.13 -spacebars-compiler@1.0.13 +spacebars-compiler@1.1.0 splendido:accounts-emails-field@1.2.0 splendido:accounts-meld@1.3.1 srp@1.0.10 standard-minifier-js@1.2.1 templates:array@1.0.3 -templating@1.2.15 -templating-compiler@1.2.15 -templating-runtime@1.2.15 -templating-tools@1.0.5 +templating@1.3.0 +templating-compiler@1.3.0 +templating-runtime@1.3.0 +templating-tools@1.1.0 tracker@1.1.1 ui@1.0.12 underscore@1.0.10 diff --git a/rpg-docs/client/views/character/characterSheet.js b/rpg-docs/client/views/character/characterSheet.js index 41848cff..006c42f4 100644 --- a/rpg-docs/client/views/character/characterSheet.js +++ b/rpg-docs/client/views/character/characterSheet.js @@ -4,28 +4,32 @@ Template.characterSheet.onRendered(function() { Session.setDefault(this.data._id + ".selectedTab", "0"); // Keep the header's scroll target up to date with the currently selected tab - const header = this.find("app-header"); + let header; this.autorun(() => { const tab = getTab(Template.currentData()._id); + header = header || this.find("app-header"); + if (!header) return; Tracker.afterFlush(() => { header.scrollTarget = this.find("#tabPages .iron-selected"); - header._scrollHandler(); + header._scrollHandler && header._scrollHandler(); }); }); - // Store all the tab page components for use in animations - tabPages = _.times(6, (n) => - this.$(`.tab-page:nth-child(${n + 1})`) - ); - tabSliders = _.times(6, (n) => - tabPages[n].find(".animation-slider") - ); - tabFabs = _.times(6, (n) => - tabPages[n].find(".floatyButton") - ); - tabFabMenus = _.times(6, (n) => - tabPages[n].find(".mini-holder") - ); + _.defer(() => { + // Store all the tab page components for use in animations + tabPages = _.times(6, (n) => + this.$(`.tab-page:nth-child(${n + 1})`) + ); + tabSliders = _.times(6, (n) => + tabPages[n].find(".animation-slider") + ); + tabFabs = _.times(6, (n) => + tabPages[n].find(".floatyButton") + ); + tabFabMenus = _.times(6, (n) => + tabPages[n].find(".mini-holder") + ); + }) //watch this character and make sure their encumbrance is updated //trackEncumbranceConditions(this.data._id, this); @@ -175,6 +179,7 @@ Template.characterSheet.events({ setTab(this._id, event.target.selected); }, "color-change": function(event, instance){ + console.log("character color change") Characters.update(this._id, {$set: {color: event.color}}); }, "click #deleteCharacter": function(event, instance){ diff --git a/rpg-docs/client/views/layout/layout.html b/rpg-docs/client/views/layout/layout.html index 279936b4..012ac36e 100644 --- a/rpg-docs/client/views/layout/layout.html +++ b/rpg-docs/client/views/layout/layout.html @@ -1,53 +1,7 @@ + + diff --git a/rpg-docs/client/views/layout/layout.js b/rpg-docs/client/views/layout/layout.js index e2852bd5..22bbf0d2 100644 --- a/rpg-docs/client/views/layout/layout.js +++ b/rpg-docs/client/views/layout/layout.js @@ -2,18 +2,7 @@ Template.layout.onCreated(function() { this.subscribe("user"); }); -Template.layout.rendered = function() { - $(window).on("popstate", GlobalUI.popStateHandler); -}; - -Template.layout.destroyed = function() { - $(window).off("popstate", GlobalUI.popStateHandler); -}; - -Template.layout.helpers({ - notSelected: function(){ - return Session.get("global.ui.detailShow") ? "not-selected" : null; - }, +Template.appDrawer.helpers({ profileLink: function() { var user = Meteor.user(); return user.profile && user.profile.username || user.username || "My Account"; @@ -22,17 +11,18 @@ Template.layout.helpers({ let drawerLayout; const closeDrawer = function(instance){ - if (!drawerLayout) drawerLayout = instance.find("app-drawer-layout"); + if (!drawerLayout) drawerLayout = $("app-drawer-layout")[0]; if (drawerLayout && drawerLayout.narrow){ drawerLayout.drawer.close(); } } -Template.layout.events({ +Template.appDrawer.events({ "click app-drawer a": function(event, instance){ closeDrawer(instance); }, - "click #feedback": function(event, instance) { + "click .feedback": function(event, instance) { + console.log("feedback clicked"); pushDialogStack({ template: "feedback", element: event.currentTarget, diff --git a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js index 059e17c1..dc8ceffb 100644 --- a/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js +++ b/rpg-docs/client/views/paperTemplates/dialogStack/dialogStack.js @@ -88,10 +88,11 @@ const shrinkAnimation = ({element, reverse}) => { const dialogOpenAnimation = ({element, returnElement, dialog}) => { // hide all floaty buttons when we open the first dialog + let fabs = $(".mini-holder paper-fab, .floatyButton").filter( + (index, el) => el !== element && el !== returnElement + ); if (dialogs._array.length === 1) { - shrinkAnimation({ - element: $(".mini-holder paper-fab, .floatyButton") - }); + shrinkAnimation({element: fabs}); } const dialogRect = dialog.getBoundingClientRect(); @@ -124,10 +125,12 @@ const dialogOpenAnimation = ({element, returnElement, dialog}) => { const dialogCloseAnimation = ({element, returnElement, dialog, callback}) => { // unhide all floaty buttons when we close the last dialog - if (!dialogs._array.length) shrinkAnimation({ - element: $(".mini-holder paper-fab, .floatyButton"), - reverse: true, - }); + let fabs = $(".mini-holder paper-fab, .floatyButton").filter( + (index, el) => el !== element && el !== returnElement + ); + if (dialogs._array.length === 1) { + shrinkAnimation({element: fabs, revese: true}); + } // We are returning to a different element // pop the original element back in and use the returnElement in its place @@ -212,10 +215,9 @@ const dialogCloseAnimation = ({element, returnElement, dialog, callback}) => { }, duration); }; -Template.dialogStack.uihooks({ - ".dialog": { - container: ".dialog-sizer", - insert: function(node, next, tpl) { +Template.dialogStack.onRendered(function(){ + $(".dialog-sizer")[0]._uihooks = { + insertElement: function(node, next) { $(node).insertBefore(next); const data = Blaze.getData(node); if (data.element){ @@ -230,7 +232,7 @@ Template.dialogStack.uihooks({ }); } }, - remove: function(node, tpl) { + removeElement: function(node) { const element = node._dialogStackElement; const returnElement = node._dialogStackReturnElement; if (element){ diff --git a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js index c9c385e8..3647787b 100644 --- a/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js +++ b/rpg-docs/client/views/paperTemplates/fabMenu/fabMenu.js @@ -7,12 +7,14 @@ Template.fabMenu.onRendered(function(){ // Do a spin animation to turn the + icon into a x when active this.autorun(() => { const active = this.active.get(); - const iconStyle = active ? - "transition: transform 0.3s ease; transform: rotate(225deg);" : - "transition: transform 0.3s ease;"; - fab.updateStyles({ - ["--paper-fab-iron-icon"]: iconStyle, - }); + if (fab && fab.updateStyles){ + const iconStyle = active ? + "transition: transform 0.3s ease; transform: rotate(225deg);" : + "transition: transform 0.3s ease;"; + fab.updateStyles({ + ["--paper-fab-iron-icon"]: iconStyle, + }); + } }) }); From cb493a9f16557637ee8d318ce775901535b36d75 Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Mon, 13 Feb 2017 09:21:55 +0200 Subject: [PATCH 37/39] Firefox now works... mostly --- rpg-docs/.meteor/packages | 6 +++--- rpg-docs/.meteor/release | 2 +- rpg-docs/.meteor/versions | 8 +++---- rpg-docs/client/views/layout/layout.css | 21 +++++++++++++++++++ rpg-docs/client/views/layout/layout.html | 4 +++- rpg-docs/config.vulcanize | 1 + .../dicecloud-wrapper/dicecloud-wrapper.html | 18 ++++++++++++++++ 7 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 rpg-docs/public/custom_components/dicecloud-wrapper/dicecloud-wrapper.html diff --git a/rpg-docs/.meteor/packages b/rpg-docs/.meteor/packages index f991e0c4..c1e8a81c 100644 --- a/rpg-docs/.meteor/packages +++ b/rpg-docs/.meteor/packages @@ -39,10 +39,10 @@ check@1.2.4 useraccounts:iron-routing wizonesolutions:canonical standard-minifier-js@1.2.1 -shell-server +shell-server@0.2.1 seba:minifiers-autoprefixer nikogosovd:multiple-uihooks templates:array -ecmascript -es5-shim +ecmascript@0.6.1 +es5-shim@4.6.15 differential:vulcanize diff --git a/rpg-docs/.meteor/release b/rpg-docs/.meteor/release index 61f6c675..b7694ea3 100644 --- a/rpg-docs/.meteor/release +++ b/rpg-docs/.meteor/release @@ -1 +1 @@ -METEOR@1.4.2.3 +METEOR@1.4.2.6 diff --git a/rpg-docs/.meteor/versions b/rpg-docs/.meteor/versions index 61cfa728..2f490285 100644 --- a/rpg-docs/.meteor/versions +++ b/rpg-docs/.meteor/versions @@ -60,7 +60,7 @@ iron:url@1.0.11 jquery@1.11.10 lai:collection-extensions@0.2.1_1 launch-screen@1.1.0 -less@2.7.8 +less@2.7.9 livedata@1.0.18 localstorage@1.0.12 logging@1.1.16 @@ -69,8 +69,8 @@ mdg:validation-error@0.5.1 meteor@1.6.0 meteor-base@1.0.4 meteorhacks:subs-manager@1.6.4 -minifier-css@1.2.15 -minifier-js@1.2.15 +minifier-css@1.2.16 +minifier-js@1.2.17 minimongo@1.0.19 mobile-experience@1.0.4 mobile-status-bar@1.0.13 @@ -108,7 +108,7 @@ spacebars-compiler@1.1.0 splendido:accounts-emails-field@1.2.0 splendido:accounts-meld@1.3.1 srp@1.0.10 -standard-minifier-js@1.2.1 +standard-minifier-js@1.2.2 templates:array@1.0.3 templating@1.3.0 templating-compiler@1.3.0 diff --git a/rpg-docs/client/views/layout/layout.css b/rpg-docs/client/views/layout/layout.css index 1b021d62..8e095709 100644 --- a/rpg-docs/client/views/layout/layout.css +++ b/rpg-docs/client/views/layout/layout.css @@ -19,3 +19,24 @@ app-drawer-layout.layout { z-index: 0; } + +#accountSummary > #background { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + overflow: hidden; +} + +#accountSummary > #background > #backgroundFrontLayer { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + height: 100%; + pointer-events: none; + background-size: cover; + background-image: url(/png/paper-dice-crown.png); +} diff --git a/rpg-docs/client/views/layout/layout.html b/rpg-docs/client/views/layout/layout.html index 012ac36e..9212d8e4 100644 --- a/rpg-docs/client/views/layout/layout.html +++ b/rpg-docs/client/views/layout/layout.html @@ -8,7 +8,9 @@ {{> Template.dynamic template=globalToastTemplate data=globalToastData }} - {{> dialogStack}} + + {{> dialogStack}} +