Merge branch 'release-0.5.6'

rpg-docs/Model/Character/Characters.js

@@ -176,6 +176,12 @@ Schemas.Character = new SimpleSchema({
 	"settings.useStandardEncumbrance": {type: Boolean, defaultValue: true},
 	//hide spellcasting
 	"settings.hideSpellcasting": {type: Boolean, defaultValue: false},
+	//show to anyone with link
+	"settings.viewPermission": {
+		type: String,
+		defaultValue: "whitelist",
+		allowedValues: ["whitelist", "public"],
+	},
 });
 
 Characters.attachSchema(Schemas.Character);

rpg-docs/Model/Meta/Reports.js

@@ -45,12 +45,25 @@ Meteor.methods({
 			metaData: Object,
 		});
 		report.owner = this.userId;
-		Reports.insert(report);
+		var id = Reports.insert(report);
+		var user = Meteor.users.findOne(this.userId);
+		var sender = user &&
+			user.emails &&
+			user.emails[0] &&
+			user.emails[0].address ||
+			user.services &&
+			user.services.google &&
+			user.services.google.email ||
+			"reports@dicecloud.com";
+		var bodyText = "Report ID: " + id +
+			"\nSeverity: " + report.severity +
+			"\nType: " + report.type +
+			"\n\n" + report.description;
 		Email.send({
-			from: "reports@dicecloud.com",
+			from: sender,
 			to: "stefan.zermatten@gmail.com",
 			subject: "DiceCloud feedback - " + report.title,
-			text: JSON.stringify(_.omit(report, "metaData"), null, '\t'),
+			text: bodyText,
 		});
 	},
 	deleteReport: function(id) {

rpg-docs/Routes/Routes.js

@@ -4,17 +4,9 @@ Router.configure({
 });
 
 Router.plugin("ensureSignedIn", {
-	except: [
+	only: [
-		"home",
+		"profile",
-		"atSignIn",
+		"characterList",
-		"atSignUp",
-		"atForgotPassword",
-		"atResetPwd",
-		"atEnrollAccount",
-		"atVerifyEmail",
-		"atResendVerificationEmail",
-		"loginButtons",
-		"notFound",
 	]
 });
 
@@ -93,4 +85,11 @@ Router.map(function() {
 			document.title = appName;
 		},
 	});
+
+	this.route("/guide", {
+		name: "guide",
+		onAfterAction: function() {
+			document.title = appName;
+		},
+	});
 });

rpg-docs/client/globalHelpers/valueString.js

@@ -1,25 +1,27 @@
 Template.registerHelper("valueString", function(value) {
+	var intValue = Math.round(value * 100);
+	var cp = intValue % 10;
+	intValue -= cp;
+	cp = Math.round(cp);
+	sp = intValue % 100;
+	intValue -= sp;
+	sp = Math.round(sp / 10)
+	gp = Math.floor(value);
+
 	var resultArray = [];
-	//sp
-	var gp = Math.floor(value);
 	if (gp > 0) {
 		resultArray.push(gp + "gp");
 	}
-	//sp
-	var sp = Math.floor(10 * (value % 1));
 	if (sp > 0) {
 		resultArray.push(sp + "sp");
 	}
-	//cp
-	var cp = 10 * ((value * 10) % 1);
-	cp = Math.round(cp * 1000) / 1000;
 	if (cp > 0) {
 		resultArray.push(cp + "cp");
 	}
 
 	//build string with correct spacing
 	var result = "";
-	for (var i = 0; i < resultArray.length; i++) {
+	for (var i = 0, l = resultArray.length; i < l; i++) {
 		//add a space between values
 		if (i !== 0) {
 			result += " ";

rpg-docs/client/style/colors.scss

@@ -70,8 +70,8 @@
 	background-color: #9E9E9E;
 }
 
-.blue-grey {
+.app-grey {
-	background-color: #607D8B;
+	background-color: #424242;
 }
 
 .white {

rpg-docs/client/style/main.scss

@@ -19,6 +19,16 @@ 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);
+}
+
 //Horizontal rule
 hr {
 	background-color: #444;

rpg-docs/client/views/character/characterSettings/shareDialog.html

@@ -1,5 +1,17 @@
 <template name="shareDialog">
 	<div style="width: 360px;">
+		<div layout horizontal center>
+			<div>Who can view this character: </div>
+			<paper-dropdown-menu class="visibilityDropdown"
+								 label="Visibility">
+				<paper-dropdown layered class="dropdown">
+					<core-menu class="menu visibilityMenu" selected={{viewPermission}}>
+						<paper-item name="whitelist">Only people I share with</paper-item>
+						<paper-item name="public">Anyone with link</paper-item>
+					</core-menu>
+				</paper-dropdown>
+			</paper-dropdown-menu>
+		</div>
 		<div>
 			{{#if readers.count}}
 				<div style="font-weight: 500;">
@@ -7,7 +19,7 @@
 				</div>
 				{{#each readers}}
 					<div layout horizontal center>
-						<div flex>{{username}}</div>
+						<div flex>{{getUserName}}</div>
 						<paper-icon-button class="deleteShare" icon="delete"></paper-icon-button>
 					</div>
 				{{/each}}

rpg-docs/client/views/character/characterSettings/shareDialog.js

@@ -3,6 +3,10 @@ Template.shareDialog.onCreated(function(){
 });
 
 Template.shareDialog.helpers({
+	viewPermission: function() {
+		var char = Characters.findOne(this._id, {fields: {settings: 1}});
+		return char.settings.viewPermission || "whitelist";
+	},
 	readers: function(){
 		var char = Characters.findOne(this._id, {fields: {readers: 1}});
 		return Meteor.users.find({_id: {$in: char.readers}});
@@ -19,9 +23,20 @@ Template.shareDialog.helpers({
 			return "User not found";
 		}
 	},
+	getUserName: function() {
+		return this.username || "user: " + this._id;
+	}
 });
 
 Template.shareDialog.events({
+	"core-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;
+		Characters.update(this._id, {$set: {"settings.viewPermission": value}});
+	},
 	"input #userNameOrEmailInput":
 	function(event, instance){
 		var userName = instance.find("#userNameOrEmailInput").value;

rpg-docs/client/views/characterList/characterList.html

@@ -1,5 +1,5 @@
 <template name="characterList">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 		<div flex>
 			Characters

rpg-docs/client/views/guide/guide.html

@@ -1,11 +1,10 @@
 <template name="guide">
+	<core-toolbar class="app-grey white-text">
+		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
+		<div flex>Guide</div>
+	</core-toolbar>
 	<div layout vertical center>
 		<paper-shadow class="wallOfText card" style="padding: 32px; max-width: 800px;">
-			<h1>Dicecloud Beta</h1>
-			<p>Welcome to the Dicecloud beta.</p>
-			<p>The beta is going to start with just the character sheet. You can play D&amp;D without minis and maps, without a pre-written adventure, you can play without a lot of things, but the character sheet is necessary. So I'm starting here and working my way outwards.</p>
-			<p>Leave any comments, feedback and suggestions on <a href="http://reddit.com/r/dicecloud">this subreddit</a>. If you've never used reddit before, all you need is a username and password to sign up. So it should be pretty accessible.</p>
-			<p>If you'd like to see a list of known issues and upcoming features, check out the <a href="https://trello.com/b/94M0SCnq/dicecloud-roadmap">DiceCloud Roadmap</a>.</p>
 			<h2>Character Sheet Philosophy</h2>
 			<p>Setting up your character on Dicecloud is going to take you a little longer than just filling it in on a paper character sheet would have. The goal of using an online sheet is to make actually playing the game more streamlined, and ultimately more fun. So putting a little extra effort into setting up your character now will pay off over and over again once you're playing.</p>
 			<p>The idea is to track where each number comes from, and allow you to easily make changes on the fly.</p>

rpg-docs/client/views/home/home.html

@@ -1,11 +1,9 @@
 <template name="home">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 		<div flex>
-			DiceCloud
+			Home
 		</div>
 	</core-toolbar>
-	<div class="scroll-y" style="padding: 16px" fit>
+	{{> intro}}
-		{{> guide}}
-	</div>
 </template>

rpg-docs/client/views/home/home.js

@@ -1,25 +1,15 @@
 Template.home.helpers({
-	characterDetails: function(){
+	selectedTab: function(){
-		var char = Characters.findOne(
+		return Session.get("homePage.selectedTab");
-			this._id,
+	},
-			{fields: {name: 1, gender: 1, alignment: 1, race:1}}
-		);
-		char.title = char.name;
-		char.field = "base";
-		char.color = "d";
-		char.class = "characterCard";
-		return char;
-	}
 });
 
 Template.home.events({
-	"tap .characterCard": function(event, instance){
+	"core-animated-pages-transition-end .tabPages": function(event) {
-		Router.go("characterSheet", {_id: this._id});
+		event.stopPropagation();
 	},
-	"tap #addCharacter": function(event, template) {
+	"tap .homeTabs paper-tab": function(event, instance){
-		Characters.insert({owner: Meteor.userId()});
+		Session.set("homePage.selectedTab",
-	},
+					event.currentTarget.getAttribute("name"));
-	"tap #deleteChar": function(event, template){
-		Characters.remove(this._id);
 	},
 });

rpg-docs/client/views/home/intro/intro.html

@@ -0,0 +1,89 @@
+<template name="intro">
+	<div class="intro">
+		<div class="section white-text" style="background: #282828">
+			<div class="display2">
+				Dice Cloud
+			</div>
+			<img style="width:130px; height:130px; background-color: #282828;"
+						src="/crown-dice-logo-cropped-transparent.png">
+			<div class="display1">
+				Unofficial Online Realtime D&amp;D 5e App
+			</div>
+			<h2>
+				Spend less time shuffling paper and more time playing the game
+			</h2>
+			{{#unless currentUser}}
+			<div layout horizontal around-justified wrap>
+				<paper-button class="red white-text signInButton"
+							  style="margin: 16px;"
+							  raised>
+					Sign In
+				</paper-button>
+				<paper-button class="red white-text signUpButton"
+							  style="margin: 16px;"
+							  raised>
+					Sign Up
+				</paper-button>
+			</div>
+			{{else}}
+			<div style="padding-bottom: 0;"></div>
+			{{/unless}}
+		</div>
+		<div class="section" style="background-color: #e9e9e9;">
+			<div>
+				<div class="display1">Character Sheet Open Beta</div>
+				<h2 style="margin-bottom: 16px;">
+					Check out the example characters
+				</h2>
+				<div layout horizontal around-justified wrap>
+					<paper-shadow class="card characterCard ssArcher clickable"
+								  z="2">
+						<div class="top subhead green white-text">
+							<div class="subhead" flex>
+								Starter Set Archer
+							</div>
+						</div>
+						<div class="bottom text">Lawful Good Human</div>
+					</paper-shadow>
+				</div>
+			</div>
+		</div>
+		<div class="section white-text" style="background: #282828">
+			<div class="columns" layout horizontal around-justified wrap>
+				<div>
+					<h1>Check out the guide</h1>
+					<p>
+						Learn how your class gives you features, those features have effects,
+						and those effects determine your stats.
+						<paper-button class="guideButton">View Guide</paper-button>
+					</p>
+				</div>
+				<div>
+					<h1>
+						Discuss
+					</h1>
+					<p>
+						On the official subreddit
+						<paper-button class="redditButton">
+							<a href="http://www.reddit.com/r/dicecloud/">
+								/r/dicecloud
+							</a>
+						</paper-button>
+					</p>
+				</div>
+				<div>
+					<h1>
+						Get involved
+					</h1>
+					<p>Shape upcoming features and track bugs on the Dice Cloud Trello board
+						<paper-button class="trelloButton">
+							<a href="https://trello.com/b/94M0SCnq/dicecloud-roadmap">
+								Trello Roadmap
+							</a>
+						</paper-button>
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>

rpg-docs/client/views/home/intro/intro.js

@@ -0,0 +1,14 @@
+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 .guideButton": function() {
+		Router.go("/guide");
+	},
+});

rpg-docs/client/views/home/intro/intro.scss

@@ -0,0 +1,33 @@
+.intro {
+	.section {
+		width: 100%;
+		min-height: 200px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding-top: 24px;
+		padding-bottom: 24px;
+		& > div, & > h2 {
+			padding: 32px;
+			.display1 {
+				margin-bottom: 16px;
+			}
+		}
+		.columns > div{
+			max-width: 300px;
+			padding: 16px;
+			text-align: center;
+			paper-button {
+				color: #FF5252;
+			}
+		}
+	}
+	paper-button {
+		min-width: 200px;
+		a {
+			color: inherit;
+			text-decoration: inherit;
+		}
+	}
+}

rpg-docs/client/views/layout/imports.html

@@ -8,6 +8,7 @@
 <link rel="import" href="/components/core-icons/editor-icons.html">
 <link rel="import" href="/components/core-icons/image-icons.html">
 <link rel="import" href="/components/core-icons/social-icons.html">
+<link rel="import" href="/components/core-image/core-image.html">
 <link rel="import" href="/components/core-item/core-item.html">
 <link rel="import" href="/components/core-menu/core-menu.html">
 <link rel="import" href="/components/core-scaffold/core-scaffold.html">

rpg-docs/client/views/layout/layout.html

@@ -3,7 +3,8 @@
 		<core-header-panel drawer navigation flex mode="seamed" class="white">
 			<div id="accountSummary">
 				{{#if currentUser}}
-					<div id="profileLink" style="text-decoration: underline; cursor: pointer;">
+					<div id="profileLink"
+						 style="text-decoration: underline; cursor: pointer; font-size: 16px;">
 						{{profileLink}}
 					</div>
 				{{else}}
@@ -13,6 +14,7 @@
 			<div id="navPanel">
 				<core-item id="homeNav" icon="home" label="Home"></core-item>
 				{{> characterSideList}}
+				<core-item id="guide" icon="social:school" label="Guide"></core-item>
 				<core-item id="feedback" icon="bug-report" label="Send Feedback"></core-item>
 				<core-item id="changeLog" icon="list" label="Change Log"></core-item>
 			</div>
@@ -23,7 +25,7 @@
 							 transitions="hero-transition cross-fade"
 							 selected={{globalDetailSelected}}>
 			<section id="mainContentSection" class={{notSelected}}>
-				<core-header-panel fit mode="seamed">
+				<core-header-panel fit mode="standard">
 					{{> yield}}
 				</core-header-panel>
 				<div>

rpg-docs/client/views/layout/layout.js

@@ -41,4 +41,8 @@ Template.layout.events({
 		Router.go("changeLog");
 		instance.find("core-drawer-panel").closeDrawer();
 	},
+	"tap #guide": function(event, instance) {
+		Router.go("guide");
+		instance.find("core-drawer-panel").closeDrawer();
+	},
 });

rpg-docs/client/views/loading/loading.css

@@ -1,4 +1,5 @@
 .bigSpinner {
 	width: 100px;
 	height: 100px;
+	margin-bottom: 16px;
 }

rpg-docs/client/views/loading/loading.html

@@ -1,5 +1,5 @@
 <template name="loading">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 	</core-toolbar>
     <div fit layout vertical center center-justified>

rpg-docs/client/views/meta/changeLog/changeLog.html

@@ -1,5 +1,5 @@
 <template name="changeLog">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 		<div flex>
 			Change Log

rpg-docs/client/views/paperTemplates/baseDialog/baseDialog.js

@@ -14,10 +14,11 @@ Template.baseDialog.helpers({
 	showEdit: function() {
 		if (this.hideEdit) return false;
 		var charId = Template.parentData().charId;
+		var userId = Meteor.userId();
+		if (!userId) return false;
 		if (charId){
 			var char = Characters.findOne(charId);
-			var userId = Meteor.userId();
+			if (char)
-			if (char && userId)
 				return char.owner === userId ||
 					_.contains(char.writers, userId);
 		}

rpg-docs/client/views/user/titledAtForm/titledAtForm.html

@@ -1,5 +1,5 @@
 <template name="titledAtForm">
-	<core-toolbar class="blue-grey white-text">
+	<core-toolbar class="app-grey white-text">
 		<core-icon-button icon="menu" core-drawer-toggle></core-icon-button>
 		<div flex>
 			

rpg-docs/private/changeLogs/changeLogs.js

@@ -135,7 +135,7 @@ ChangeLogs.insert({
 });
 
 ChangeLogs.insert({
-	version: "0.5.2",
+	version: "0.5.3",
 	changes: [
 		"Prevented a harmless error caused by effects which have no stat set",
 		"Added the ability to hide the spells tab",
@@ -144,3 +144,26 @@ ChangeLogs.insert({
 		"Overhauled how effects' stats are chosen",
 	],
 });
+
+ChangeLogs.insert({
+	version: "0.5.4",
+	changes: [
+		"Fixed rounding error on net worth calculation",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.5.5",
+	changes: [
+		"Fixed reports from google users not correctly storing the reply-to email address",
+	],
+});
+
+ChangeLogs.insert({
+	version: "0.5.5",
+	changes: [
+		"Changed front page",
+		"Moved to a darker style",
+		"Added support for letting characters be viewed by \"anyone with the link\"",
+	],
+});

rpg-docs/server/publications/singleCharacter.js

@@ -1,12 +1,12 @@
 Meteor.publish("singleCharacter", function(characterId){
 	userId = this.userId;
-	if (!userId) return [];
 	var char = Characters.findOne({
 		_id: characterId,
 		$or: [
 			{readers: userId},
 			{writers: userId},
 			{owner: userId},
+			{"settings.viewPermission": "public"},
 		],
 	});
 	if (char){