Layout improved and WIP save function

2016-10-10 17:24:10 +02:00
parent 48244d1f91
commit fae2587cf5
11 changed files with 400 additions and 302 deletions
@@ -31,6 +31,19 @@

 			.scroll-inner {
 				padding: 0 35px;
+				display: flex;
+				flex-wrap: wrap;
+
+				> div:not(.btn):not(.iconbutton):not(.textfield):not(.dropdown), > h2, > h3, > h4, > ul {
+					flex: 1 0 auto;
+					width: 100%;
+				}
+
+				.textfield, .dropdown {
+					+ .iconbutton {
+						margin: 10px 0 10px 11px;
+					}
+				}
 			}
 		}

@@ -1,5 +1,6 @@
 import AppDispatcher from '../dispatcher/AppDispatcher';
 import ActionTypes from '../constants/ActionTypes';
+import saveHero from '../utils/saveHero';

 var TabActions = {
 	openTab: function(tab) {
@@ -27,11 +28,7 @@ var TabActions = {
 		
 	},
 	saveHero: function() {
-		
-		var heroCtrl = CharbaseStore.getHeroCore();
-		
-		WebAPIUtils.saveHero(heroCtrl);
-		
+		saveHero();
 	},
 	clearCurrentHero: function() {

@@ -151,7 +151,7 @@ class TitleBar extends Component {
 					<div className="right">
 						<div className="ap">{ap - used} AP</div>
 						<IconButton icon="&#xE166;" disabled />
-						<BorderButton label="Speichern" disabled />
+						<BorderButton label="Speichern" onClick={TabActions.saveHero} />
 					</div>
 				);
 				break;
@@ -121,6 +121,10 @@ var APStore = Object.assign({}, EventEmitter.prototype, {
 		this.removeListener('change', callback);
 	},

+	getForSave: function() {
+		return { _max, _used, _rcp, _adv, _adv_mag, _adv_kar, _disadv, _disadv_mag, _disadv_kar };
+	},
+
 	get: function() {
 		return _max;
 	},
@@ -68,7 +68,10 @@ function _rerollWeight() {
 		let elements = Array.from({ length: e[0] }, () => e[1]);
 		arr.push(...elements);
 	});
-	_weight = _size + base + arr.map(e => {
+	_weight = (parseInt(_size) || do {
+		_rerollSize();
+		_size;
+	}) + base + arr.map(e => {
 		let result = dice(Math.abs(e));
 		if (new Set(['R_1','R_2','R_3','R_4','R_5','R_6','R_7']).has(raceID)) {
 			return result % 2 > 0 ? -result : result;
@@ -0,0 +1,25 @@
+import APStore from '../stores/APStore';
+import CultureStore from '../stores/rcp/CultureStore';
+import ELStore from '../stores/ListStore';
+import ListStore from '../stores/ListStore';
+import ProfessionStore from '../stores/rcp/ProfessionStore';
+import ProfessionVariantStore from '../stores/rcp/ProfessionVariantStore';
+import RaceStore from '../stores/rcp/RaceStore';
+
+export default () => {
+	var obj = {
+		ap: APStore.getForSave()
+	};
+
+	var json = JSON.stringify(obj);
+    var blob = new Blob([json], {type: "application/json"});
+    var url  = window.URL.createObjectURL(blob);
+    window.open(url);
+	// window.open('data:application/json;' + json);
+	// var w = window.open();
+	// w.document.open();
+	// w.document.write('<html><body><pre>' + json + '</pre></body></html>');
+    // w.document.close();
+
+	return true;
+};