From 4c31ab601cd153c26f70d2e1eb141996d8524f6c Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Thu, 28 Sep 2017 13:03:54 +0200
Subject: [PATCH] Improved new user experience and fixed errors on character
 delete

---
 rpg-docs/Model/Character/Characters.js                     | 4 +++-
 rpg-docs/client/globalHelpers/canEditCharacter.js          | 3 ++-
 .../characterSettings/deleteCharacterConfirmation.js       | 6 ++----
 rpg-docs/client/views/character/characterSheet.html        | 2 +-
 rpg-docs/client/views/character/characterSheet.js          | 6 ++++++
 .../views/character/newUserStepper/newUserStepper.css      | 2 +-
 .../client/views/character/stats/statCard/statCard.html    | 2 +-
 rpg-docs/client/views/character/stats/stats.html           | 2 +-
 rpg-docs/client/views/character/stats/stats.js             | 7 +++++--
 .../public/custom_components/paper-stepper/paper-step.html | 2 +-
 .../custom_components/paper-stepper/paper-stepper.html     | 4 ++--
 11 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/rpg-docs/Model/Character/Characters.js b/rpg-docs/Model/Character/Characters.js
index 50b7156b..7ba2ac97 100644
--- a/rpg-docs/Model/Character/Characters.js
+++ b/rpg-docs/Model/Character/Characters.js
@@ -299,6 +299,7 @@ Characters.calculate = {
 		var fieldSelector = {};
 		fieldSelector[fieldName] = 1;
 		var char = Characters.findOne(charId, {fields: fieldSelector});
+		if (!char) return;
 		var field = char[fieldName];
 		if (field === undefined){
 			throw new Meteor.Error(
@@ -332,6 +333,7 @@ Characters.calculate = {
 	},
 	attributeValue: memoize(function(charId, attributeName){
 		var attribute = Characters.calculate.getField(charId, attributeName);
+		if (!attribute) return;
 		//base value
 		var value = Characters.calculate.attributeBase(charId, attributeName);
 		//plus adjustment
@@ -343,6 +345,7 @@ Characters.calculate = {
 	}),
 	skillMod: memoize(preventLoop(function(charId, skillName){
 		var skill = Characters.calculate.getField(charId, skillName);
+		if (!skill) return;
 		//get the final value of the ability score
 		var ability = Characters.calculate.attributeValue(charId, skill.ability);
 
@@ -394,7 +397,6 @@ Characters.calculate = {
 		return prof && prof.value || 0;
 	}),
 	passiveSkill: memoize(function(charId, skillName){
-		var skill = Characters.calculate.getField(charId, skillName);
 		var mod = +Characters.calculate.skillMod(charId, skillName);
 		var value = 10 + mod;
 		Effects.find(
diff --git a/rpg-docs/client/globalHelpers/canEditCharacter.js b/rpg-docs/client/globalHelpers/canEditCharacter.js
index 2de1b6d6..57d0ce6f 100644
--- a/rpg-docs/client/globalHelpers/canEditCharacter.js
+++ b/rpg-docs/client/globalHelpers/canEditCharacter.js
@@ -3,7 +3,8 @@ Template.registerHelper("canEditCharacter", function(charId) {
 });
 
 canEditCharacter = function(charId) {
-	var char = Characters.findOne(charId)
+	var char = Characters.findOne(charId);
+	if (!char) return false;
 	var userId = Meteor.userId();
 	return char.owner === userId ||
 		_.contains(char.writers, userId);
diff --git a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js b/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js
index af8a64c2..fda5ba5c 100644
--- a/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js
+++ b/rpg-docs/client/views/character/characterSettings/deleteCharacterConfirmation.js
@@ -10,7 +10,7 @@ Template.deleteCharacterConfirmation.helpers({
 		if (Template.instance().canDelete.get()) {
 			return "background: #d23f31; color: white;";
 		}
-	}
+	},
 });
 
 Template.deleteCharacterConfirmation.events({
@@ -20,9 +20,7 @@ Template.deleteCharacterConfirmation.events({
 	},
 	"click #deleteButton": function(event, instance) {
 		if (instance.find("#nameInput").value === this.name) {
-			popDialogStack();
-			Router.go("/characterList");
-			Characters.remove(this._id);
+			popDialogStack(true);
 		}
 	},
 	"click .cancelButton": function(event, instance){
diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/character/characterSheet.html
index 3a4262a0..cc4c4d6d 100644
--- a/rpg-docs/client/views/character/characterSheet.html
+++ b/rpg-docs/client/views/character/characterSheet.html
@@ -1,7 +1,7 @@
 <template name="characterSheet">
 	<div class="fit layout vertical character-sheet">
 		<app-header fixed effects="waterfall">
-			<app-toolbar class="medium-tall {{colorClass}}">
+			<app-toolbar class="medium-tall {{colorClass}}" style="z-index: 2;">
 				<div top-item class="layout horizontal center">
 					<paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
 					<div class="flex character-name">
diff --git a/rpg-docs/client/views/character/characterSheet.js b/rpg-docs/client/views/character/characterSheet.js
index 0b3e1e75..eaf01c6b 100644
--- a/rpg-docs/client/views/character/characterSheet.js
+++ b/rpg-docs/client/views/character/characterSheet.js
@@ -199,6 +199,12 @@ Template.characterSheet.events({
 			data: this,
 			template: "deleteCharacterConfirmation",
 			element: event.currentTarget.parentElement.parentElement,
+			callback: (result) => {
+				if (result === true){
+					Router.go("/characterList");
+					Tracker.afterFlush(() => Characters.remove(this._id));
+				}
+			},
 		});
 	},
 	"click #shareCharacter": function(event, instance){
diff --git a/rpg-docs/client/views/character/newUserStepper/newUserStepper.css b/rpg-docs/client/views/character/newUserStepper/newUserStepper.css
index 6ede8537..b6e01f44 100644
--- a/rpg-docs/client/views/character/newUserStepper/newUserStepper.css
+++ b/rpg-docs/client/views/character/newUserStepper/newUserStepper.css
@@ -1,5 +1,5 @@
 .newUserStepper {
-	height: 210px !important;
+	height: 180px !important;
 }
 
 .newUserStepper paper-step .invalid-step-message {
diff --git a/rpg-docs/client/views/character/stats/statCard/statCard.html b/rpg-docs/client/views/character/stats/statCard/statCard.html
index bf3ef3f7..5ff0a1cf 100644
--- a/rpg-docs/client/views/character/stats/statCard/statCard.html
+++ b/rpg-docs/client/views/character/stats/statCard/statCard.html
@@ -1,6 +1,6 @@
 <template name="statCard">
 	<div>
-		<paper-material class="stat-card layout horizontal">
+		<paper-material class="stat-card layout horizontal {{#if bounce}}bounce{{/if}}">
 			<div class="numbers paper-font-display1">
 					{{#if isSkill}}
 						{{prefix}}{{skillMod}}
diff --git a/rpg-docs/client/views/character/stats/stats.html b/rpg-docs/client/views/character/stats/stats.html
index e9c8736e..6994f18c 100644
--- a/rpg-docs/client/views/character/stats/stats.html
+++ b/rpg-docs/client/views/character/stats/stats.html
@@ -15,7 +15,7 @@
 			<!--Armor-->
 			{{> statCard stat="armor" name="Armor Class" color="teal"}}
 			<!--Speed-->
-			{{> statCard stat="speed" name="Speed" color="teal"}}
+			{{> statCard stat="speed" name="Speed" color="teal" bounce=shouldSpeedBounce}}
 			<!--Initiative-->
 			{{> statCard stat="initiative" name="Initiative" color="indigo" isSkill="true"}}
 			<!--Proficiency Bonus-->
diff --git a/rpg-docs/client/views/character/stats/stats.js b/rpg-docs/client/views/character/stats/stats.js
index 365136b8..528575be 100644
--- a/rpg-docs/client/views/character/stats/stats.js
+++ b/rpg-docs/client/views/character/stats/stats.js
@@ -8,6 +8,10 @@ Template.stats.helpers({
 		};
 		return Buffs.find(selector);
 	},
+	// New user experience
+	shouldSpeedBounce: function(){
+		return Session.get("newUserExperienceStep") === 2;
+	},
 })
 
 Template.stats.events({
@@ -84,8 +88,7 @@ Template.stats.events({
 			callback: (result) => {
 				if (!result) {
 					return;
-				}
-				else Meteor.call("giveCondition", this._id, result)
+				} else Meteor.call("giveCondition", this._id, result)
 			},
 			//returnElement: () => $(`[data-id='${itemId}']`).get(0),
 		})
diff --git a/rpg-docs/public/custom_components/paper-stepper/paper-step.html b/rpg-docs/public/custom_components/paper-stepper/paper-step.html
index 9cdcf904..fba7e5e7 100644
--- a/rpg-docs/public/custom_components/paper-stepper/paper-step.html
+++ b/rpg-docs/public/custom_components/paper-stepper/paper-step.html
@@ -34,7 +34,7 @@ Missing Doc
       }
       #slideshowViewport {
         position: absolute;
-        bottom: 42px;
+        bottom: 0;
         left: 0;
         right: 0;
         overflow: hidden;
diff --git a/rpg-docs/public/custom_components/paper-stepper/paper-stepper.html b/rpg-docs/public/custom_components/paper-stepper/paper-stepper.html
index 889c07b8..c00c4fd7 100644
--- a/rpg-docs/public/custom_components/paper-stepper/paper-stepper.html
+++ b/rpg-docs/public/custom_components/paper-stepper/paper-stepper.html
@@ -180,14 +180,14 @@ Custom property | Description | Default
     <!-- Slideshow and buttons area for horizontal layout -->
     <template is="dom-if" if="[[!vertical]]">
       <div class="flex"></div>
+      <!--
       <div id="buttonsWrapper">
         <paper-button hidden$="[[!hasBackButton]]" disabled=[[!_hasBackStep]] on-tap="back">[[backText]]</paper-button>
         <span class="flex"></span>
         <paper-button hidden$="[[!hasSkipButton]]" disabled="[[!_canSkip]]" on-tap="progress">[[skipText]]</paper-button>
-        <!--
         <paper-button id="continueButton" on-tap="continue">{{_choosePrimaryButtonText(_attrForSelectedStepPrimaryButtonText, finishText, continueText, updateText)}}</paper-button>
-        -->
       </div>
+      -->
     </template>
 
   </template>