Further work #3

src/_actions/AccountActions.ts

@@ -1,11 +1,11 @@
-import * as ActionTypes from '../constants/ActionTypes';
+import ActionTypes from '../constants/ActionTypes';
 import alert from '../utils/alert';
 import AppDispatcher from '../dispatcher/AppDispatcher';
 import WebAPIUtils from '../utils/WebAPIUtils';
 
 export async function register(email: string, name: string, displayName: string, password: string) {
 	AppDispatcher.dispatch({
-		type: ActionTypes.REGISTER,
+		type: ActionTypes.WAIT_START,
 		status: 'pending',
 		statusMessage: 'Registrierung wird durchgeführt'
 	});
@@ -31,7 +31,7 @@ export async function register(email: string, name: string, displayName: string,
 				alert('Benutzername und Email-Adresse bereits vorhanden', 'Sowohl die E-Mail-Adresse als auch der Benutzername werden bereits verwendet.');
 			}
 			AppDispatcher.dispatch({
-				type: ActionTypes.REGISTER,
+				type: ActionTypes.REGISTRATION_SUCCESS,
 				status: 'success'
 			});
 		}
@@ -39,7 +39,7 @@ export async function register(email: string, name: string, displayName: string,
 	catch (e) {
 		WebAPIUtils.connectionError(e);
 		AppDispatcher.dispatch({
-			type: ActionTypes.REGISTER,
+			type: ActionTypes.REGISTRATION_SUCCESS,
 			error: e,
 			status: 'error'
 		});

src/_actions/HerolistActions.ts

@@ -0,0 +1,66 @@
+import AppDispatcher from '../dispatcher/AppDispatcher';
+import ActionTypes from '../constants/ActionTypes';
+import createOverlay from '../utils/createOverlay';
+import ELStore from '../stores/ELStore';
+import HeroCreation from '../views/herolist/HeroCreation';
+import React from 'react';
+import alert from '../utils/alert';
+import WebAPIUtils from '../utils/WebAPIUtils';
+
+export default {
+	refresh(): void {
+		WebAPIUtils.getHeroes();
+	},
+	filter(text: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.FILTER_HEROLIST,
+			text
+		});
+	},
+	sort(option: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.SORT_HEROLIST,
+			option
+		});
+	},
+	changeView(view: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.CHANGE_HEROLIST_VIEW,
+			view
+		});
+	},
+	load(id: string): void {
+		if (ELStore.getStartID() !== 'EL_0') {
+			alert(
+				'Nicht gespeicherter Held',
+				'Du hast offenbar bereits einen Helden geöffnet, der noch nicht vollständig gespeichert wurde. Möchtest du trotzdem fortfahren oder vorher den anderen Helden speichern, damit keine Änderungen verloren gehen?',
+				[
+					{
+						label: 'Laden',
+						onClick: this.loadFx.bind(null, id)
+					},
+					{
+						label: 'Abbrechen'
+					}
+				]
+			);
+		} else {
+			this.loadFx(id);
+		}
+	},
+	loadFx(id: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.CLEAR_HERO
+		});
+		WebAPIUtils.loadHero(id);
+	},
+	createNewHero(options: Object): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.CREATE_NEW_HERO,
+			...options
+		});
+	},
+	save(): void {
+
+	}
+};

src/_actions/RaceActions.ts

@@ -0,0 +1,28 @@
+import AppDispatcher from '../dispatcher/AppDispatcher';
+import ActionTypes from '../constants/ActionTypes';
+
+export default {
+	selectRace(raceID: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.SELECT_RACE,
+			raceID
+		});
+	},
+	filter(text: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.FILTER_RACES,
+			text
+		});
+	},
+	sort(option: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.SORT_RACES,
+			option
+		});
+	},
+	changeValueVisibility(): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.CHANGE_RACE_VALUE_VISIBILITY
+		});
+	}
+};

src/_actions/ServerActions.ts

@@ -0,0 +1,205 @@
+import ActionTypes from '../constants/ActionTypes';
+import alert from '../utils/alert';
+import AppDispatcher from '../dispatcher/AppDispatcher';
+import HerolistStore from '../stores/HerolistStore';
+
+export default {
+	startLoading(): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.WAIT_START
+		});
+	},
+	runtimeError(): void {
+		alert('Da hat etwas nicht geklappt', 'Dies darf nicht passieren! Melde dies bitte als Fehler! Wir versuchen, das Problem schnellstmöglich zu beheben!');
+		AppDispatcher.dispatch({
+			type: ActionTypes.WAIT_END
+		});
+	},
+	connectionError(error: Error): void {
+		alert('Verbindung nicht möglich', 'Die App konnte keine Verbindung zum Server herstellen. Bitte überprüfe deine Internetverbindung! ' + JSON.stringify(error) + ' Es kann bei diesem Problem auch möglich sein, dass etwas im Programmablauf nicht stimmt. Informiere uns bitte über dein Problem, sollte es deiner Erkenntnis nach nicht an der Verbindung liegen!');
+		AppDispatcher.dispatch({
+			type: ActionTypes.WAIT_END
+		});
+	},
+
+	receiveLists(raw: Object): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.RECEIVE_RAW_LISTS,
+			...raw
+		});
+	},
+	registrationSuccess(): void {
+		alert('Konto bestätigen', 'Wir haben dir eine E-Mail an die angegebene Adresse geschickt. Dort wirst du einen Bestätigungslink finden, dem du einfach nur zu folgen brauchst, um dein Konto zu aktivieren.');
+		AppDispatcher.dispatch({
+			type: ActionTypes.REGISTRATION_SUCCESS
+		});
+	},
+	forgotPasswordSuccess(callback: string): void {
+		switch (callback) {
+			case 'false':
+				alert('E-Mail nicht vorhanden', 'Die eingegebene E-Mail-Adresse ist nicht registriert.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+
+			default:
+				alert('E-Mail erfolgreich verschickt', 'Du kannst jetzt in dein Postfach schauen; wir haben dir die E-Mail mit dem Link zum Zurücksetzen deines Passworts geschickt!');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+		}
+	},
+	forgotUsernameSuccess(callback: string): void {
+		switch (callback) {
+			case 'false':
+				alert('E-Mail nicht vorhanden', 'Die eingegebene E-Mail-Adresse ist nicht registriert.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+
+			default:
+				alert('E-Mail erfolgreich verschickt', 'Du kannst jetzt in dein Postfach schauen; wir haben dir die E-Mail mit deinem Benutzernamen geschickt!');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+		}
+	},
+	resendActivationSuccess(callback: string): void {
+		switch (callback) {
+			case 'false':
+				this.runtimeError();
+				break;
+
+			default:
+				alert('E-Mail erfolgreich verschickt', 'Du kannst jetzt in dein Postfach schauen; wir haben dir die Aktivierungsemail erneut geschickt!');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+		}
+	},
+	receiveAccount(callback: string, name: string): void {
+		switch (callback) {
+			case 'false':
+				alert('Anmeldeversuch fehlgeschlagen', 'Die eigegebene Kombination aus Benutzername und Passwort wurde nicht erkannt. Stelle sicher, dass du dich nicht vertippt hast und versuche es nochmal.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+			case 'notactive':
+				alert('Benutzerkonto nicht aktiviert', 'Das hinterlegte Benutzerkonto wurde noch nicht aktivert. Bitte aktiviere das Konto über den Aktivierungslink in der Aktivierungsemail.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+			case 'logged':
+				alert('Benutzer bereits angemeldet', 'Das Konto ist momentan an einem anderen Ort (Gerät oder Browser) angemeldet. Es kann nicht mehrere Male auf ein Konto zugegriffen werden.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.WAIT_END
+				});
+				break;
+			default: {
+				// let [ id, heroes ] = JSON.parse(callback);
+				let id = parseInt(callback);
+				let heroes = [];
+				AppDispatcher.dispatch({
+					type: ActionTypes.RECEIVE_ACCOUNT,
+					id, name, heroes
+				});
+			}
+		}
+	},
+	logoutSuccess(): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.LOGOUT_SUCCESS
+		});
+	},
+	changeUsernameSuccess(callback: string, name: string): void {
+		switch (callback) {
+			case 'false':
+				this.runtimeError();
+				break;
+
+			default:
+				alert('Passwort erfolgreich geändert', 'Dein Passwort wurde erfolgreich geändert.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.ACCOUNTNAME_CHANGE_SUCCESS,
+					name
+				});
+				break;
+		}
+	},
+	changePasswordSuccess(callback: string): void {
+		switch (callback) {
+			case 'false':
+				this.runtimeError();
+				break;
+
+			default:
+				alert('Passwort erfolgreich geändert', 'Dein Passwort wurde erfolgreich geändert.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.PASSWORD_CHANGE_SUCCESS
+				});
+				break;
+		}
+	},
+	deleteAccountSuccess(callback: string): void {
+		switch (callback) {
+			case 'false':
+				this.runtimeError();
+				break;
+
+			default:
+				alert('Konto gelöscht', 'Dein Konto wurde mitsamt aller Helden und Gruppen erfolgreich gelöscht.');
+				AppDispatcher.dispatch({
+					type: ActionTypes.CLEAR_ACCOUNT
+				});
+				break;
+		}
+	},
+	herolistRefreshSuccess(rawHeroes: string): void {
+		switch (rawHeroes) {
+			case 'false':
+				this.runtimeError();
+				break;
+
+			default:
+				AppDispatcher.dispatch({
+					type: ActionTypes.RECEIVE_RAW_HEROLIST,
+					rawHeroes
+				});
+				break;
+		}
+	},
+	loadHeroSuccess(id: string, data: string): void {
+		var short = HerolistStore.get(id);
+		data = JSON.parse(data);
+		AppDispatcher.dispatch({
+			type: ActionTypes.RECEIVE_HERO,
+			...(Object.assign({}, short, data))
+		});
+	},
+	saveHeroSuccess(): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.SAVE_HERO_SUCCESS
+		});
+	},
+	changeHeroAvatarSuccess(url: string): void {
+		switch (url) {
+			case 'false':
+				this.runtimeError();
+				break;
+
+			default:
+				AppDispatcher.dispatch({
+					type: ActionTypes.UPDATE_HERO_AVATAR,
+					url
+				});
+				break;
+		}
+	}
+};

src/_actions/TabActions.ts

@@ -0,0 +1,17 @@
+import AppDispatcher from '../dispatcher/AppDispatcher';
+import ActionTypes from '../constants/ActionTypes';
+
+export default {
+	showTab(tab: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.SHOW_TAB,
+			tab
+		});
+	},
+	showSection(section: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.SHOW_TAB_SECTION,
+			section
+		});
+	}
+};

src/_actions/TalentsActions.ts

@@ -0,0 +1,34 @@
+import AppDispatcher from '../dispatcher/AppDispatcher';
+import ActionTypes from '../constants/ActionTypes';
+
+export default {
+	filter(text: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.FILTER_TALENTS,
+			text
+		});
+	},
+	sort(option: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.SORT_TALENTS,
+			option
+		});
+	},
+	changeTalentRating(): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.CHANGE_TALENT_RATING
+		});
+	},
+	addPoint(id: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.ADD_TALENT_POINT,
+			id
+		});
+	},
+	removePoint(id: string): void {
+		AppDispatcher.dispatch({
+			type: ActionTypes.REMOVE_TALENT_POINT,
+			id
+		});
+	}
+};

src/actions/AuthActions.js

@@ -1,14 +0,0 @@
-"use strict";
-var ActionTypes = require("../constants/ActionTypes");
-exports.login = function (name, displayName, email, sessionToken) { return ({
-    type: ActionTypes.LOGIN,
-    payload: {
-        name: name,
-        displayName: displayName,
-        email: email,
-        sessionToken: sessionToken
-    }
-}); };
-exports.logout = function (tab) { return ({
-    type: ActionTypes.LOGOUT
-}); };

src/actions/AuthActions.ts

@@ -12,7 +12,7 @@ export interface LoginAction {
 	};
 }
 
-export const login = (name: string, displayName: string, email: string, sessionToken: string, heroes: RawHerolist) => ({
+export const login = (name: string, displayName: string, email: string, sessionToken: string, heroes: RawHerolist): LoginAction => ({
 	type: ActionTypes.RECEIVE_LOGIN,
 	payload: {
 		name,
@@ -27,6 +27,6 @@ export interface LogoutAction {
 	type: ActionTypes.RECEIVE_LOGOUT;
 }
 
-export const logout = () => ({
+export const logout = (): LogoutAction => ({
 	type: ActionTypes.RECEIVE_LOGOUT
 });

src/actions/HerolistActions.ts

@@ -1,7 +1,5 @@
-import AppDispatcher from '../dispatcher/AppDispatcher';
 import * as ActionTypes from '../constants/ActionTypes';
 import createOverlay from '../utils/createOverlay';
-import ELStore from '../stores/ELStore';
 import HeroCreation from '../views/herolist/HeroCreation';
 import React from 'react';
 import alert from '../utils/alert';
@@ -39,29 +37,29 @@ export interface RawHerolist {
 
 export const request = () => WebAPIUtils.getHeroes();
 
-export interface SortHerolistAction {
-	type: ActionTypes.SORT_HEROLIST;
+export interface SetHerolistSortOrderAction {
+	type: ActionTypes.SET_HEROLIST_SORT_ORDER;
 	payload: {
 		sortOrder: string;
 	};
 }
 
-export const sort = (sortOrder: string): SortHerolistAction => ({
-	type: ActionTypes.SORT_HEROLIST,
+export const setHerolistSortOrder = (sortOrder: string): SetHerolistSortOrderAction => ({
+	type: ActionTypes.SET_HEROLIST_SORT_ORDER,
 	payload: {
 		sortOrder
 	}
 });
 
-export interface FilterHerolistAction {
-	type: ActionTypes.FILTER_HEROLIST;
+export interface SetHerolistVisibilityFilterAction {
+	type: ActionTypes.SET_HEROLIST_VISIBILITY_FILTER;
 	payload: {
 		filterOption: string;
 	};
 }
 
-export const filter = (filterOption: string): FilterHerolistAction => ({
-	type: ActionTypes.FILTER_HEROLIST,
+export const setHerolistVisibilityFilter = (filterOption: string): SetHerolistVisibilityFilterAction => ({
+	type: ActionTypes.SET_HEROLIST_VISIBILITY_FILTER,
 	payload: {
 		filterOption
 	}
@@ -74,67 +72,9 @@ export interface ReceiveHerolistAction {
 	};
 }
 
-export const receive = (heroes: RawHerolist): ReceiveHerolistAction => ({
+export const receiveHerolist = (heroes: RawHerolist): ReceiveHerolistAction => ({
 	type: ActionTypes.RECEIVE_HEROLIST,
 	payload: {
 		heroes
 	}
 });
-
-export default {
-	refresh(): void {
-		WebAPIUtils.getHeroes();
-	},
-	filter(text: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.FILTER_HEROLIST,
-			text
-		});
-	},
-	sort(option: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.SORT_HEROLIST,
-			option
-		});
-	},
-	changeView(view: string): void {
-		AppDispatcher.dispatch({
-			type: 'CHANGE_HEROLIST_VIEW',
-			view
-		});
-	},
-	load(id: string): void {
-		if (ELStore.getStartID() !== 'EL_0') {
-			alert(
-				'Nicht gespeicherter Held',
-				'Du hast offenbar bereits einen Helden geöffnet, der noch nicht vollständig gespeichert wurde. Möchtest du trotzdem fortfahren oder vorher den anderen Helden speichern, damit keine Änderungen verloren gehen?',
-				[
-					{
-						label: 'Laden',
-						onClick: this.loadFx.bind(null, id)
-					},
-					{
-						label: 'Abbrechen'
-					}
-				]
-			);
-		} else {
-			this.loadFx(id);
-		}
-	},
-	loadFx(id: string): void {
-		AppDispatcher.dispatch({
-			type: 'CLEAR_HERO'
-		});
-		WebAPIUtils.loadHero(id);
-	},
-	createNewHero(options: Object): void {
-		AppDispatcher.dispatch({
-			type: 'CREATE_NEW_HERO',
-			...options
-		});
-	},
-	save(): void {
-
-	}
-};

src/actions/LocationActions.ts

@@ -0,0 +1,31 @@
+import * as ActionTypes from '../constants/ActionTypes';
+
+export interface SetSectionAction {
+	type: ActionTypes.SET_SECTION;
+	payload: {
+		section: 'main' | 'hero' | 'group';
+		tab?: string;
+	};
+}
+
+export const setSection = (section: 'main' | 'hero' | 'group', tab?: string): SetSectionAction => ({
+	type: ActionTypes.SET_SECTION,
+	payload: {
+		section,
+		tab
+	}
+});
+
+export interface SetTabAction {
+	type: ActionTypes.SET_TAB;
+	payload: {
+		tab: string;
+	};
+}
+
+export const setTab = (tab: string): SetTabAction => ({
+	type: ActionTypes.SET_TAB,
+	payload: {
+		tab
+	}
+});

src/actions/RaceActions.ts

@@ -1,4 +1,3 @@
-import AppDispatcher from '../dispatcher/AppDispatcher';
 import * as ActionTypes from '../constants/ActionTypes';
 
 export interface SelectRaceAction {
@@ -8,7 +7,7 @@ export interface SelectRaceAction {
 	};
 }
 
-export const selectRace = (id: string) => ({
+export const selectRace = (id: string): SelectRaceAction => ({
 	type: ActionTypes.SELECT_RACE,
 	payload: {
 		id
@@ -16,41 +15,23 @@ export const selectRace = (id: string) => ({
 });
 
 export interface SortRacesAction {
-	type: ActionTypes.SORT_RACES;
+	type: ActionTypes.SET_RACES_SORT_ORDER;
 	payload: {
 		sortOrder: string;
 	};
 }
 
-export const sortRaces = (sortOrder: string) => ({
-	type: ActionTypes.SORT_RACES,
+export const sortRaces = (sortOrder: string): SortRacesAction => ({
+	type: ActionTypes.SET_RACES_SORT_ORDER,
 	payload: {
 		sortOrder
 	}
 });
 
-export default {
-	selectRace(raceID: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.SELECT_RACE,
-			raceID
-		});
-	},
-	filter(text: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.FILTER_RACES,
-			text
-		});
-	},
-	sort(option: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.SORT_RACES,
-			option
-		});
-	},
-	changeValueVisibility(): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.CHANGE_RACE_VALUE_VISIBILITY
-		});
-	}
-};
+export interface SwitchRaceValueVisibilityAction {
+	type: ActionTypes.SWITCH_RACE_VALUE_VISIBILITY;
+}
+
+export const switchRaceValueVisibilityFilter = (sortOrder: string): SwitchRaceValueVisibilityAction => ({
+	type: ActionTypes.SWITCH_RACE_VALUE_VISIBILITY
+});

src/actions/ServerActions.ts

@@ -1,7 +1,5 @@
 import * as ActionTypes from '../constants/ActionTypes';
 import alert from '../utils/alert';
-import AppDispatcher from '../dispatcher/AppDispatcher';
-import HerolistStore from '../stores/HerolistStore';
 import { RawRace } from '../reducers/RacesReducer';
 import { Hero } from '../reducers/HerolistReducer';
 
@@ -140,7 +138,7 @@ export interface ReceiveDataTablesAction {
 	};
 }
 
-export const receiveDataTables = (data: RawData) => ({
+export const receiveDataTables = (data: RawData): ReceiveDataTablesAction => ({
 	type: ActionTypes.RECEIVE_DATA_TABLES,
 	payload: {
 		data,
@@ -156,211 +154,10 @@ export interface ReceiveHeroDataAction {
 	};
 }
 
-export const receiveHeroData = (data: Hero) => ({
+export const receiveHeroData = (data: Hero): ReceiveHeroDataAction => ({
 	type: ActionTypes.RECEIVE_HERO_DATA,
 	payload: {
 		data,
 		pending: false
 	}
 });
-
-export default {
-	startLoading(): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.WAIT_START
-		});
-	},
-	runtimeError(): void {
-		alert('Da hat etwas nicht geklappt', 'Dies darf nicht passieren! Melde dies bitte als Fehler! Wir versuchen, das Problem schnellstmöglich zu beheben!');
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.WAIT_END
-		});
-	},
-	connectionError(error: Error): void {
-		alert('Verbindung nicht möglich', 'Die App konnte keine Verbindung zum Server herstellen. Bitte überprüfe deine Internetverbindung! ' + JSON.stringify(error) + ' Es kann bei diesem Problem auch möglich sein, dass etwas im Programmablauf nicht stimmt. Informiere uns bitte über dein Problem, sollte es deiner Erkenntnis nach nicht an der Verbindung liegen!');
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.WAIT_END
-		});
-	},
-
-	receiveLists(raw: Object): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.RECEIVE_RAW_LISTS,
-			...raw
-		});
-	},
-	registrationSuccess(): void {
-		alert('Konto bestätigen', 'Wir haben dir eine E-Mail an die angegebene Adresse geschickt. Dort wirst du einen Bestätigungslink finden, dem du einfach nur zu folgen brauchst, um dein Konto zu aktivieren.');
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.REGISTRATION_SUCCESS
-		});
-	},
-	forgotPasswordSuccess(callback: string): void {
-		switch (callback) {
-			case 'false':
-				alert('E-Mail nicht vorhanden', 'Die eingegebene E-Mail-Adresse ist nicht registriert.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-
-			default:
-				alert('E-Mail erfolgreich verschickt', 'Du kannst jetzt in dein Postfach schauen; wir haben dir die E-Mail mit dem Link zum Zurücksetzen deines Passworts geschickt!');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-		}
-	},
-	forgotUsernameSuccess(callback: string): void {
-		switch (callback) {
-			case 'false':
-				alert('E-Mail nicht vorhanden', 'Die eingegebene E-Mail-Adresse ist nicht registriert.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-
-			default:
-				alert('E-Mail erfolgreich verschickt', 'Du kannst jetzt in dein Postfach schauen; wir haben dir die E-Mail mit deinem Benutzernamen geschickt!');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-		}
-	},
-	resendActivationSuccess(callback: string): void {
-		switch (callback) {
-			case 'false':
-				this.runtimeError();
-				break;
-
-			default:
-				alert('E-Mail erfolgreich verschickt', 'Du kannst jetzt in dein Postfach schauen; wir haben dir die Aktivierungsemail erneut geschickt!');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-		}
-	},
-	receiveAccount(callback: string, name: string): void {
-		switch (callback) {
-			case 'false':
-				alert('Anmeldeversuch fehlgeschlagen', 'Die eigegebene Kombination aus Benutzername und Passwort wurde nicht erkannt. Stelle sicher, dass du dich nicht vertippt hast und versuche es nochmal.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-			case 'notactive':
-				alert('Benutzerkonto nicht aktiviert', 'Das hinterlegte Benutzerkonto wurde noch nicht aktivert. Bitte aktiviere das Konto über den Aktivierungslink in der Aktivierungsemail.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-			case 'logged':
-				alert('Benutzer bereits angemeldet', 'Das Konto ist momentan an einem anderen Ort (Gerät oder Browser) angemeldet. Es kann nicht mehrere Male auf ein Konto zugegriffen werden.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.WAIT_END
-				});
-				break;
-			default: {
-				// let [ id, heroes ] = JSON.parse(callback);
-				let id = parseInt(callback);
-				let heroes = [];
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.RECEIVE_ACCOUNT,
-					id, name, heroes
-				});
-			}
-		}
-	},
-	logoutSuccess(): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.LOGOUT_SUCCESS
-		});
-	},
-	changeUsernameSuccess(callback: string, name: string): void {
-		switch (callback) {
-			case 'false':
-				this.runtimeError();
-				break;
-
-			default:
-				alert('Passwort erfolgreich geändert', 'Dein Passwort wurde erfolgreich geändert.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.ACCOUNTNAME_CHANGE_SUCCESS,
-					name
-				});
-				break;
-		}
-	},
-	changePasswordSuccess(callback: string): void {
-		switch (callback) {
-			case 'false':
-				this.runtimeError();
-				break;
-
-			default:
-				alert('Passwort erfolgreich geändert', 'Dein Passwort wurde erfolgreich geändert.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.PASSWORD_CHANGE_SUCCESS
-				});
-				break;
-		}
-	},
-	deleteAccountSuccess(callback: string): void {
-		switch (callback) {
-			case 'false':
-				this.runtimeError();
-				break;
-
-			default:
-				alert('Konto gelöscht', 'Dein Konto wurde mitsamt aller Helden und Gruppen erfolgreich gelöscht.');
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.CLEAR_ACCOUNT
-				});
-				break;
-		}
-	},
-	herolistRefreshSuccess(rawHeroes: string): void {
-		switch (rawHeroes) {
-			case 'false':
-				this.runtimeError();
-				break;
-
-			default:
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.RECEIVE_RAW_HEROLIST,
-					rawHeroes
-				});
-				break;
-		}
-	},
-	loadHeroSuccess(id: string, data: string): void {
-		var short = HerolistStore.get(id);
-		data = JSON.parse(data);
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.RECEIVE_HERO,
-			...(Object.assign({}, short, data))
-		});
-	},
-	saveHeroSuccess(): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.SAVE_HERO_SUCCESS
-		});
-	},
-	changeHeroAvatarSuccess(url: string): void {
-		switch (url) {
-			case 'false':
-				this.runtimeError();
-				break;
-
-			default:
-				AppDispatcher.dispatch({
-					type: ActionTypes.ATS.UPDATE_HERO_AVATAR,
-					url
-				});
-				break;
-		}
-	}
-};

src/actions/SkillActions.ts

@@ -1,15 +0,0 @@
-import * as ActionTypes from '../constants/ActionTypes';
-
-export interface SortTalentsAction {
-	type: ActionTypes.SORT_TALENTS;
-	payload: {
-		sortOrder: string;
-	};
-}
-
-export const sortTalents = (sortOrder: string) => ({
-	type: ActionTypes.SORT_TALENTS,
-	payload: {
-		sortOrder
-	}
-});

src/actions/TabActions.js

@@ -1,31 +0,0 @@
-"use strict";
-var AppDispatcher_1 = require("../dispatcher/AppDispatcher");
-var ActionTypes = require("../constants/ActionTypes");
-exports.showSection = function (section, tab) { return ({
-    type: ActionTypes.SHOW_SECTION,
-    payload: {
-        section: section,
-        tab: tab
-    }
-}); };
-exports.showTab = function (tab) { return ({
-    type: ActionTypes.SHOW_TAB,
-    payload: {
-        tab: tab
-    }
-}); };
-exports.__esModule = true;
-exports["default"] = {
-    showTab: function (tab) {
-        AppDispatcher_1["default"].dispatch({
-            type: ActionTypes.SHOW_TAB,
-            tab: tab
-        });
-    },
-    showSection: function (section) {
-        AppDispatcher_1["default"].dispatch({
-            type: 'SHOW_TAB_SECTION',
-            section: section
-        });
-    }
-};

src/actions/TabActions.ts

@@ -1,47 +0,0 @@
-import AppDispatcher from '../dispatcher/AppDispatcher';
-import * as ActionTypes from '../constants/ActionTypes';
-
-export interface ShowSectionAction {
-	type: ActionTypes.SHOW_SECTION;
-	payload: {
-		section: 'main' | 'hero' | 'group';
-		tab?: string;
-	};
-}
-
-export const showSection = (section: 'main' | 'hero' | 'group', tab?: string): ShowSectionAction => ({
-	type: ActionTypes.SHOW_SECTION,
-	payload: {
-		section,
-		tab
-	}
-});
-
-export interface ShowTabAction {
-	type: ActionTypes.SHOW_TAB;
-	payload: {
-		tab: string;
-	};
-}
-
-export const showTab = (tab: string): ShowTabAction => ({
-	type: ActionTypes.SHOW_TAB,
-	payload: {
-		tab
-	}
-});
-
-export default {
-	showTab(tab: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.SHOW_TAB,
-			tab
-		});
-	},
-	showSection(section: string): void {
-		AppDispatcher.dispatch({
-			type: 'SHOW_TAB_SECTION',
-			section
-		});
-	}
-};

src/actions/TalentsActions.ts

@@ -1,48 +1,15 @@
-import AppDispatcher from '../dispatcher/AppDispatcher';
 import * as ActionTypes from '../constants/ActionTypes';
 
-export interface SortTalentsAction {
-	type: ActionTypes.SORT_TALENTS;
+export interface SetTalentsSortOrderAction {
+	type: ActionTypes.SET_TALENTS_SORT_ORDER;
 	payload: {
 		sortOrder: string;
 	};
 }
 
-export const sortTalents = (sortOrder: string) => ({
-	type: ActionTypes.SORT_TALENTS,
+export const setTalentsSortOrder = (sortOrder: string): SetTalentsSortOrderAction => ({
+	type: ActionTypes.SET_TALENTS_SORT_ORDER,
 	payload: {
 		sortOrder
 	}
 });
-
-export default {
-	filter(text: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.FILTER_TALENTS,
-			text
-		});
-	},
-	sort(option: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.SORT_TALENTS,
-			option
-		});
-	},
-	changeTalentRating(): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.CHANGE_TALENT_RATING
-		});
-	},
-	addPoint(id: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.ADD_TALENT_POINT,
-			id
-		});
-	},
-	removePoint(id: string): void {
-		AppDispatcher.dispatch({
-			type: ActionTypes.ATS.REMOVE_TALENT_POINT,
-			id
-		});
-	}
-};

src/components/titlebar/TitleBar.tsx

@@ -1,6 +1,6 @@
 import { Component, PropTypes } from 'react';
 import * as React from 'react';
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import APStore from '../../stores/APStore';
 import AuthStore from '../../stores/AuthStore';
 import AvatarWrapper from '../AvatarWrapper';
@@ -8,15 +8,15 @@ import BorderButton from '../BorderButton';
 import createOverlay from '../../utils/createOverlay';
 import ELStore from '../../stores/ELStore';
 import HeroCreation from '../../views/herolist/HeroCreation';
-import HerolistActions from '../../actions/HerolistActions';
-import HistoryActions from '../../actions/HistoryActions';
+import HerolistActions from '../../_actions/HerolistActions';
+import HistoryActions from '../../_actions/HistoryActions';
 import HistoryStore from '../../stores/HistoryStore';
 import IconButton from '../IconButton';
-import InGameActions from '../../actions/InGameActions';
+import InGameActions from '../../_actions/InGameActions';
 import Login from '../../views/account/Login';
 import PhaseStore from '../../stores/PhaseStore';
 import ProfileStore from '../../stores/ProfileStore';
-import TabActions from '../../actions/TabActions';
+import TabActions from '../../_actions/TabActions';
 import Text from '../Text';
 import TitleBarBack from './TitleBarBack';
 import TitleBarLeft from './TitleBarLeft';

src/components/titlebar/TitleBarBack.tsx

@@ -1,6 +1,6 @@
 import { Component } from 'react';
 import * as React from 'react';
-import TabActions from '../../actions/TabActions';
+import TabActions from '../../_actions/TabActions';
 import TitleBarBackArrow from './TitleBarBackArrow';
 
 export default class TitleBarBack extends Component<any, any> {

src/components/titlebar/TitleBarTabs.tsx

@@ -1,7 +1,7 @@
 import { Component, PropTypes } from 'react';
 import * as React from 'react';
 import TabProps from '../../components/Tab';
-import TabActions from '../../actions/TabActions';
+import TabActions from '../../_actions/TabActions';
 
 interface Props {
 	active: string;

src/constants/ActionTypes.js

@@ -1,167 +0,0 @@
-"use strict";
-var keymirror_1 = require("keymirror");
-exports.INITIALIZE = 'INITIALIZE';
-exports.SHOW_SECTION = 'SHOW_SECTION';
-exports.SHOW_TAB = 'SHOW_TAB';
-exports.FILTER_HEROLIST = 'FILTER_HEROLIST';
-exports.SORT_HEROLIST = 'SORT_HEROLIST';
-exports.LOGIN = 'LOGIN';
-exports.LOGOUT = 'LOGOUT';
-exports.ATS = keymirror_1["default"]({
-    // ServerActions
-    RECEIVE_RAW_LISTS: null,
-    // WaitStore
-    WAIT_START: null,
-    WAIT_END: null,
-    // TabStore
-    SHOW_TAB_SECTION: null,
-    SHOW_TAB: null,
-    // AuthStore
-    RECEIVE_ACCOUNT: null,
-    UPDATE_USERNAME: null,
-    LOGOUT_SUCCESS: null,
-    CLEAR_ACCOUNT: null,
-    ACCOUNTNAME_CHANGE_SUCCESS: null,
-    PASSWORD_CHANGE_SUCCESS: null,
-    // Registration
-    REGISTRATION_SUCCESS: null,
-    // PaneStore
-    HEROES_SHOW: null,
-    HEROES_HIDE: null,
-    COLLAPSE_HEROES: null,
-    // HerolistStore
-    RECEIVE_RAW_HEROLIST: null,
-    SEARCH_HEROLIST: null,
-    FILTER_HEROLIST: null,
-    SORT_HEROLIST: null,
-    CHANGE_HEROLIST_VIEW: null,
-    CREATE_NEW_HERO: null,
-    RECEIVE_HERO: null,
-    // ProfileStore
-    UPDATE_HERO_NAME: null,
-    UPDATE_HERO_AVATAR: null,
-    UPDATE_FAMILY: null,
-    UPDATE_PLACEOFBIRTH: null,
-    UPDATE_DATEOFBIRTH: null,
-    UPDATE_AGE: null,
-    UPDATE_HAIRCOLOR: null,
-    UPDATE_EYECOLOR: null,
-    UPDATE_SIZE: null,
-    UPDATE_WEIGHT: null,
-    UPDATE_TITLE: null,
-    UPDATE_SOCIALSTATUS: null,
-    UPDATE_CHARACTERISTICS: null,
-    UPDATE_OTHERINFO: null,
-    REROLL_HAIRCOLOR: null,
-    REROLL_EYECOLOR: null,
-    REROLL_SIZE: null,
-    REROLL_WEIGHT: null,
-    UNLOAD_HERO: null,
-    CLEAR_HERO: null,
-    SAVE_HERO_SUCCESS: null,
-    // PhaseStore
-    FINALIZE_CHARACTER_CREATION: null,
-    // APStore
-    ADD_ADVENTURE_POINTS: null,
-    // RaceStore
-    SELECT_RACE: null,
-    FILTER_RACES: null,
-    SORT_RACES: null,
-    CHANGE_RACE_VALUE_VISIBILITY: null,
-    // CultureStore
-    SELECT_CULTURE: null,
-    FILTER_CULTURES: null,
-    SORT_CULTURES: null,
-    CHANGE_CULTURE_VALUE_VISIBILITY: null,
-    CHANGE_CULTURE_VIEW: null,
-    CHANGE_CULTURE_PACKAGE: null,
-    CHANGE_CULTURE_LITERACY: null,
-    // ProfessionStore
-    SELECT_PROFESSION: null,
-    FILTER_PROFESSIONS: null,
-    SORT_PROFESSIONS: null,
-    CHANGE_PROFESSION_VIEW: null,
-    ASSIGN_RCP_ENTRIES: null,
-    // ProfessionVariantStore
-    SELECT_PROFESSION_VARIANT: null,
-    // AttributeStore
-    ADD_ATTRIBUTE_POINT: null,
-    REMOVE_ATTRIBUTE_POINT: null,
-    ADD_MAX_ENERGY_POINT: null,
-    // DisAdvStore
-    FILTER_DISADV: null,
-    CHANGE_DISADV_RATING: null,
-    ACTIVATE_DISADV: null,
-    DEACTIVATE_DISADV: null,
-    UPDATE_DISADV_TIER: null,
-    // TalentsStore
-    FILTER_TALENTS: null,
-    SORT_TALENTS: null,
-    CHANGE_TALENT_RATING: null,
-    ADD_TALENT_POINT: null,
-    REMOVE_TALENT_POINT: null,
-    // CombatTechniquesStore
-    FILTER_COMBATTECHNIQUES: null,
-    SORT_COMBATTECHNIQUES: null,
-    ADD_COMBATTECHNIQUE_POINT: null,
-    REMOVE_COMBATTECHNIQUE_POINT: null,
-    // SpellsStore
-    FILTER_SPELLS: null,
-    SORT_SPELLS: null,
-    UPDATE_SPELL_VIEW: null,
-    ACTIVATE_SPELL: null,
-    DEACTIVATE_SPELL: null,
-    ADD_SPELL_POINT: null,
-    REMOVE_SPELL_POINT: null,
-    // LiturgiesStore
-    FILTER_LITURGIES: null,
-    SORT_LITURGIES: null,
-    UPDATE_LITURGY_VIEW: null,
-    ACTIVATE_LITURGY: null,
-    DEACTIVATE_LITURGY: null,
-    ADD_LITURGY_POINT: null,
-    REMOVE_LITURGY_POINT: null,
-    // SpecialAbilitiesStore
-    FILTER_SPECIALABILITIES: null,
-    SORT_SPECIALABILITIES: null,
-    UPDATE_SPECIALABILITY_VIEW: null,
-    ACTIVATE_SPECIALABILITY: null,
-    DEACTIVATE_SPECIALABILITY: null,
-    UPDATE_SPECIALABILITY_TIER: null,
-    // InventoryStore
-    FILTER_ITEMS: null,
-    SORT_ITEMS: null,
-    ADD_ITEM: null,
-    SAVE_ITEM: null,
-    REMOVE_ITEM: null,
-    // GroupsStore
-    SHOW_MASTER_REQUESTED_LIST: null,
-    HIDE_MASTER_REQUESTED_LIST: null,
-    // InGameStore
-    LOAD_RAW_INGAME_DATA: null,
-    INGAME_PREVIOUS_PHASE: null,
-    INGAME_NEXT_PHASE: null,
-    UPDATE_INGAME_CAST: null,
-    CANCEL_INGAME_CAST: null,
-    INGAME_USE_ENDURANCE: null,
-    INGAME_USE_ACTION: null,
-    INGAME_USE_FREE_ACTION: null,
-    INGAME_ACTIVATE_FIGHTER: null,
-    INGAME_DEACTIVATE_FIGHTER: null,
-    INGAME_EDIT_START: null,
-    INGAME_EDIT_UPDATE_VALUE: null,
-    INGAME_EDIT_UPDATE_CAST_VALUE: null,
-    INGAME_EDIT_UPDATE_DUPLICATE_VALUE: null,
-    INGAME_EDIT_END: null,
-    INGAME_ADD_FIGHTER: null,
-    INGAME_DUPLICATE_FIGHTER: null,
-    INGAME_REMOVE_FIGHTER: null,
-    INGAME_RESET_PHASES: null,
-    INGAME_RESET_HEALTH: null,
-    INGAME_RESET_ALL: null,
-    INGAME_UPDATE_ONLINE_LINK: null,
-    INGAME_SAVE: null,
-    INGAME_SWITCH_OPTION: null
-});
-exports.__esModule = true;
-exports["default"] = exports.ATS;

src/constants/ActionTypes.ts

@@ -8,15 +8,13 @@ function keyMirror<T>(data: T): { [K in keyof T]: K; } {
 	return newData;
 }
 
-// import keyMirror from 'keymirror';
-
 export type RECEIVE_DATA_TABLES = 'RECEIVE_DATA_TABLES';
 export const RECEIVE_DATA_TABLES = 'RECEIVE_DATA_TABLES';
 
-export type SHOW_SECTION = 'SHOW_SECTION';
-export const SHOW_SECTION = 'SHOW_SECTION';
-export type SHOW_TAB = 'SHOW_TAB';
-export const SHOW_TAB = 'SHOW_TAB';
+export type SET_SECTION = 'SET_SECTION';
+export const SET_SECTION = 'SET_SECTION';
+export type SET_TAB = 'SET_TAB';
+export const SET_TAB = 'SET_TAB';
 
 export type REQUEST_LOGIN = 'REQUEST_LOGIN';
 export const REQUEST_LOGIN = 'REQUEST_LOGIN';
@@ -26,13 +24,13 @@ export type REQUEST_LOGOUT = 'REQUEST_LOGOUT';
 export const REQUEST_LOGOUT = 'REQUEST_LOGOUT';
 export type RECEIVE_LOGOUT = 'RECEIVE_LOGOUT';
 export const RECEIVE_LOGOUT = 'RECEIVE_LOGOUT';
-export type REGISTER = 'REGISTER';
-export const REGISTER = 'REGISTER';
+export type REQUEST_REGISTRATION = 'REQUEST_REGISTRATION';
+export const REQUEST_REGISTRATION = 'REQUEST_REGISTRATION';
 
-export type FILTER_HEROLIST = 'FILTER_HEROLIST';
-export const FILTER_HEROLIST = 'FILTER_HEROLIST';
-export type SORT_HEROLIST = 'SORT_HEROLIST';
-export const SORT_HEROLIST = 'SORT_HEROLIST';
+export type SET_HEROLIST_VISIBILITY_FILTER = 'SET_HEROLIST_VISIBILITY_FILTER';
+export const SET_HEROLIST_VISIBILITY_FILTER = 'SET_HEROLIST_VISIBILITY_FILTER';
+export type SET_HEROLIST_SORT_ORDER = 'SET_HEROLIST_SORT_ORDER';
+export const SET_HEROLIST_SORT_ORDER = 'SET_HEROLIST_SORT_ORDER';
 export type REQUEST_HEROLIST = 'REQUEST_HEROLIST';
 export const REQUEST_HEROLIST = 'REQUEST_HEROLIST';
 export type RECEIVE_HEROLIST = 'RECEIVE_HEROLIST';
@@ -45,8 +43,13 @@ export const RECEIVE_HERO_DATA = 'RECEIVE_HERO_DATA';
 
 export type SELECT_RACE = 'SELECT_RACE';
 export const SELECT_RACE = 'SELECT_RACE';
-export type SORT_RACES = 'SORT_RACES';
-export const SORT_RACES = 'SORT_RACES';
+export type SET_RACES_SORT_ORDER = 'SET_RACES_SORT_ORDER';
+export const SET_RACES_SORT_ORDER = 'SET_RACES_SORT_ORDER';
+export type SWITCH_RACE_VALUE_VISIBILITY = 'SWITCH_RACE_VALUE_VISIBILITY';
+export const SWITCH_RACE_VALUE_VISIBILITY = 'SWITCH_RACE_VALUE_VISIBILITY';
+
+export type SET_TALENTS_SORT_ORDER = 'SET_TALENTS_SORT_ORDER';
+export const SET_TALENTS_SORT_ORDER = 'SET_TALENTS_SORT_ORDER';
 
 export const ATS = keyMirror({
 

src/reducers/LoadingReducer.ts

@@ -1,11 +1,7 @@
-import { fromJS, Map } from 'immutable';
 import * as ActionTypes from '../constants/ActionTypes';
 
 type Action = {
 	type: string;
-	meta: {
-		pending: boolean;
-	};
 };
 
 export type LoadingState = boolean;
@@ -14,20 +10,23 @@ const initialState: boolean = true;
 
 export default (state = initialState, a: Action) => {
 	switch (a.type) {
-		case 'TEST':
-		// case ActionTypes.RECEIVE_RAW_LISTS:
-		// case ActionTypes.WAIT_END:
+		case ActionTypes.REQUEST_HERO_DATA:
+		case ActionTypes.REQUEST_HEROLIST:
+		case ActionTypes.REQUEST_LOGIN:
+		case ActionTypes.REQUEST_LOGOUT:
 		// case ActionTypes.REGISTRATION_SUCCESS:
-		// case ActionTypes.RECEIVE_ACCOUNT:
-		// case ActionTypes.LOGOUT_SUCCESS:
 		// case ActionTypes.CLEAR_ACCOUNT:
 		// case ActionTypes.UPDATE_USERNAME:
-		// case ActionTypes.RECEIVE_RAW_HEROES:
 		// case ActionTypes.CREATE_HERO:
-		// case ActionTypes.RECEIVE_HERO:
 		// case ActionTypes.SAVE_HERO_SUCCESS:
 		// case ActionTypes.UPDATE_HERO_AVATAR:
-			return a.meta.pending;
+			return true;
+
+		case ActionTypes.RECEIVE_HERO_DATA:
+		case ActionTypes.RECEIVE_HEROLIST:
+		case ActionTypes.RECEIVE_LOGIN:
+		case ActionTypes.RECEIVE_LOGOUT:
+			return false;
 
 		default:
 			return state;

src/reducers/LocationReducer.ts

@@ -1,8 +1,8 @@
 import { LoginAction, LogoutAction } from '../actions/AuthActions';
-import { ShowSectionAction, ShowTabAction } from '../actions/TabActions';
+import { SetSectionAction, SetTabAction } from '../actions/LocationActions';
 import * as ActionTypes from '../constants/ActionTypes';
 
-type Action = LoginAction | LogoutAction | ShowSectionAction | ShowTabAction;
+type Action = LoginAction | LogoutAction | SetSectionAction | SetTabAction;
 
 export interface LocationState {
 	readonly loggedIn: boolean;
@@ -18,10 +18,10 @@ const initialState = <LocationState>{
 
 export default (state = initialState, action: Action, loggedIn: boolean) => {
 	switch (action.type) {
-		case ActionTypes.SHOW_TAB:
+		case ActionTypes.SET_TAB:
 			return { ...state, tab: action.payload.tab }
 
-		case ActionTypes.SHOW_SECTION: {
+		case ActionTypes.SET_SECTION: {
 			const section = action.payload.section;
 			let tab = action.payload.tab;
 			if (!tab) {

src/utils/WebAPIUtils.ts

@@ -1,7 +1,7 @@
 import AuthStore from '../stores/AuthStore';
 import { readFile } from 'fs';
 import ProfileStore from '../stores/ProfileStore';
-import ServerActions from '../actions/ServerActions';
+import ServerActions from '../_actions/ServerActions';
 
 export default {
 	connectionError: function(e: Error): void {

src/utils/init.ts

@@ -13,7 +13,7 @@ import {
 	RawSpecialAbility,
 	RawSpell,
 	RawTalent
-} from '../actions/ServerActions';
+} from '../_actions/ServerActions';
 import Categories from '../constants/Categories';
 import {
 	Advantage,

src/views/account/Account.tsx

@@ -1,4 +1,4 @@
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import AccountChangeName from './AccountChangeName';
 import AccountChangePassword from './AccountChangePassword';
 import BorderButton from '../../components/BorderButton';

src/views/account/AccountChangeName.tsx

@@ -1,4 +1,4 @@
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import IconButton from '../../components/IconButton';
 import * as React from 'react';
 import { Component } from 'react';

src/views/account/AccountChangePassword.tsx

@@ -1,4 +1,4 @@
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import IconButton from '../../components/IconButton';
 import React, { Component } from 'react';
 import TextField from '../../components/TextField';

src/views/account/ForgotPassword.tsx

@@ -1,4 +1,4 @@
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import createOverlay, { close } from '../../utils/createOverlay';
 import Dialog from '../../components/Dialog';
 import Login from './Login';

src/views/account/ForgotUsername.tsx

@@ -1,4 +1,4 @@
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import createOverlay, { close } from '../../utils/createOverlay';
 import Dialog from '../../components/Dialog';
 import Login from './Login';

src/views/account/Login.tsx

@@ -1,4 +1,4 @@
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import Dialog from '../../components/Dialog';
 import ForgotPassword from './ForgotPassword';
 import ForgotUsername from './ForgotUsername';

src/views/account/Register.tsx

@@ -1,7 +1,7 @@
 import createOverlay, { close } from '../../utils/createOverlay';
 import { Component, PropTypes } from 'react';
 import * as React from 'react';
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import Dialog from '../../components/Dialog';
 import Login from './Login';
 import TextField from '../../components/TextField';

src/views/account/RegistrationConfirm.tsx

@@ -1,4 +1,4 @@
-import TabActions from '../../actions/TabActions';
+import TabActions from '../../_actions/TabActions';
 import React, { Component } from 'react';
 
 export default class RegistrationConfirm extends Component<any, any> {

src/views/account/ResendActivation.tsx

@@ -1,5 +1,5 @@
 import createOverlay, { close } from '../../utils/createOverlay';
-import AccountActions from '../../actions/AccountActions';
+import AccountActions from '../../_actions/AccountActions';
 import Dialog from '../../components/Dialog';
 import Login from './Login';
 import React, { Component, PropTypes } from 'react';

src/views/attributes/AttributeCalcItem.tsx

@@ -1,5 +1,5 @@
 import { SecondaryAttribute } from '../../utils/secondaryAttributes';
-import AttributeActions from '../../actions/AttributeActions';
+import AttributeActions from '../../_actions/AttributeActions';
 import AttributeBorder from './AttributeBorder';
 import IconButton from '../../components/IconButton';
 import NumberBox from '../../components/NumberBox';

src/views/attributes/AttributeListItem.tsx

@@ -1,5 +1,5 @@
 import { AttributeInstance } from '../../utils/data/Attribute';
-import AttributeActions from '../../actions/AttributeActions';
+import AttributeActions from '../../_actions/AttributeActions';
 import AttributeBorder from './AttributeBorder';
 import IconButton from '../../components/IconButton';
 import NumberBox from '../../components/NumberBox';

src/views/disadv/Advantages.tsx

@@ -6,7 +6,7 @@ import { Active } from './DisAdvRemoveListItem';
 import { RaceInstance } from '../../utils/data/Race';
 import { CultureInstance } from '../../utils/data/Culture';
 import { ProfessionInstance } from '../../utils/data/Profession';
-import DisAdvActions from '../../actions/DisAdvActions';
+import DisAdvActions from '../../_actions/DisAdvActions';
 import DisAdvList from './DisAdvList';
 import DisAdvStore from '../../stores/DisAdvStore';
 import ProfessionStore from '../../stores/ProfessionStore';

src/views/disadv/DisAdvAddListItem.tsx

@@ -1,5 +1,5 @@
 import BorderButton from '../../components/BorderButton';
-import DisAdvActions from '../../actions/DisAdvActions';
+import DisAdvActions from '../../_actions/DisAdvActions';
 import { get } from '../../stores/ListStore';
 import Dropdown from '../../components/Dropdown';
 import * as React from 'react';

src/views/disadv/DisAdvRemoveListItem.tsx

@@ -1,5 +1,5 @@
 import BorderButton from '../../components/BorderButton';
-import DisAdvActions from '../../actions/DisAdvActions';
+import DisAdvActions from '../../_actions/DisAdvActions';
 import Dropdown from '../../components/Dropdown';
 import React, { Component, PropTypes } from 'react';
 

src/views/disadv/Disadvantages.tsx

@@ -6,7 +6,7 @@ import { Active } from './DisAdvRemoveListItem';
 import { RaceInstance } from '../../utils/data/Race';
 import { CultureInstance } from '../../utils/data/Culture';
 import { ProfessionInstance } from '../../utils/data/Profession';
-import DisAdvActions from '../../actions/DisAdvActions';
+import DisAdvActions from '../../_actions/DisAdvActions';
 import DisAdvList from './DisAdvList';
 import DisAdvStore from '../../stores/DisAdvStore';
 import ProfessionStore from '../../stores/ProfessionStore';

src/views/grouplist/Grouplist.tsx

@@ -1,7 +1,7 @@
 import BorderButton from '../../components/BorderButton';
 import React, { Component } from 'react';
 import Scroll from '../../components/Scroll';
-import TabActions from '../../actions/TabActions';
+import TabActions from '../../_actions/TabActions';
 import TextField from '../../components/TextField';
 
 export default class Grouplist extends Component<any, any> {

src/views/herolist/HeroCreation.tsx

@@ -1,6 +1,6 @@
 import Dialog from '../../components/Dialog';
 import Dropdown from '../../components/Dropdown';
-import HerolistActions from '../../actions/HerolistActions';
+import HerolistActions from '../../_actions/HerolistActions';
 import React, { Component, PropTypes } from 'react';
 import TextField from '../../components/TextField';
 

src/views/herolist/Herolist.tsx

@@ -4,7 +4,7 @@ import createOverlay from '../../utils/createOverlay';
 import Dropdown from '../../components/Dropdown';
 import ELStore from '../../stores/ELStore';
 import HeroCreation from './HeroCreation';
-import HerolistActions from '../../actions/HerolistActions';
+import HerolistActions from '../../_actions/HerolistActions';
 import HerolistItem from './HerolistItem';
 import HerolistStore from '../../stores/HerolistStore';
 import ProfileStore from '../../stores/ProfileStore';

src/views/herolist/HerolistItem.tsx

@@ -1,14 +1,14 @@
 import Avatar from '../../components/Avatar';
 import BorderButton from '../../components/BorderButton';
 import CultureStore from '../../stores/CultureStore';
-import HerolistActions from '../../actions/HerolistActions';
+import HerolistActions from '../../_actions/HerolistActions';
 import ProfessionStore from '../../stores/ProfessionStore';
 import ProfessionVariantStore from '../../stores/ProfessionVariantStore';
 import ProfileStore from '../../stores/ProfileStore';
 import ProgressArc from 'react-progress-arc';
 import RaceStore from '../../stores/RaceStore';
 import React, { PropTypes, Component } from 'react';
-import TabActions from '../../actions/TabActions';
+import TabActions from '../../_actions/TabActions';
 import VerticalList from '../../components/VerticalList';
 import classNames from 'classnames';
 

src/views/items/Equipment.tsx

@@ -1,4 +1,4 @@
-// import EquipmentActions from '../../actions/EquipmentActions';
+// import EquipmentActions from '../../_actions/EquipmentActions';
 import React, { Component } from 'react';
 
 export default class Equipment extends Component {

src/views/items/Inventory.tsx

@@ -2,7 +2,7 @@ import { ItemInstance } from '../../utils/data/Item';
 import { filterAndSort } from '../../utils/ListUtils';
 import BorderButton from '../../components/BorderButton';
 import createOverlay from '../../utils/createOverlay';
-import InventoryActions from '../../actions/InventoryActions';
+import InventoryActions from '../../_actions/InventoryActions';
 import InventoryListItem from './InventoryListItem';
 import InventoryStore from '../../stores/InventoryStore';
 import ItemEditor from './ItemEditor';

src/views/items/InventoryListItem.tsx

@@ -2,7 +2,7 @@ import { get } from '../../stores/ListStore';
 import { Item } from '../../utils/DataUtils';
 import createOverlay from '../../utils/createOverlay';
 import IconButton from '../../components/IconButton';
-import InventoryActions from '../../actions/InventoryActions';
+import InventoryActions from '../../_actions/InventoryActions';
 import InventoryStore from '../../stores/InventoryStore';
 import ItemEditor from './ItemEditor';
 import React, { Component, PropTypes } from 'react';

src/views/items/ItemEditor.tsx

@@ -5,7 +5,7 @@ import Dialog from '../../components/Dialog';
 import Dropdown from '../../components/Dropdown';
 import Hr from '../../components/Hr';
 import IconButton from '../../components/IconButton';
-import InventoryActions from '../../actions/InventoryActions';
+import InventoryActions from '../../_actions/InventoryActions';
 import InventoryStore from '../../stores/InventoryStore';
 import Label from '../../components/Label';
 import React, { Component, PropTypes } from 'react';

src/views/master/Groups.js

@@ -1,5 +1,5 @@
 import BorderButton from '../../components/BorderButton';
-import GroupsActions from '../../actions/GroupsActions';
+import GroupsActions from '../../_actions/GroupsActions';
 import GroupsStore from '../../stores/GroupsStore';
 import React, { Component } from 'react';
 import Scroll from '../../components/Scroll';

src/views/master/InGame.js

@@ -2,7 +2,7 @@ import BorderButton from '../../components/BorderButton';
 import createOverlay from '../../utils/createOverlay';
 import Dialog from '../../components/Dialog';
 import IconButton from '../../components/IconButton';
-import InGameActions from '../../actions/InGameActions';
+import InGameActions from '../../_actions/InGameActions';
 import InGameControls from './InGameControls';
 import InGameEdit from './InGameEdit';
 import InGameStore from '../../stores/InGameStore';

src/views/master/InGameControls.js

@@ -1,6 +1,6 @@
 import Checkbox from '../../components/Checkbox';
 import IconButton from '../../components/IconButton';
-import InGameActions from '../../actions/InGameActions';
+import InGameActions from '../../_actions/InGameActions';
 import React, { Component, PropTypes } from 'react';
 import classNames from 'classnames';
 

src/views/master/InGameEdit.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import InGameActions from '../../actions/InGameActions';
+import InGameActions from '../../_actions/InGameActions';
 import BorderButton from '../../components/BorderButton';
 import Dropdown from '../../components/Dropdown';
 import Slidein from '../../components/Slidein';

src/views/master/InGameTableRight.js

@@ -1,4 +1,4 @@
-import InGameActions from '../../actions/InGameActions';
+import InGameActions from '../../_actions/InGameActions';
 import React, { Component } from 'react';
 import classNames from 'classnames';
 

src/views/profile/Overview.tsx

@@ -16,7 +16,7 @@ import ProfessionStore from '../../stores/ProfessionStore';
 import ProfessionVariantStore from '../../stores/ProfessionVariantStore';
 import RaceStore from '../../stores/RaceStore';
 import PhaseStore from '../../stores/PhaseStore';
-import ProfileActions from '../../actions/ProfileActions';
+import ProfileActions from '../../_actions/ProfileActions';
 import ProfileStore from '../../stores/ProfileStore';
 import * as React from 'react';
 import Scroll from '../../components/Scroll';

src/views/profile/OverviewAddAP.tsx

@@ -1,5 +1,5 @@
 import Dialog from '../../components/Dialog';
-import ProfileActions from '../../actions/ProfileActions';
+import ProfileActions from '../../_actions/ProfileActions';
 import React, { Component, PropTypes } from 'react';
 import TextField from '../../components/TextField';
 

src/views/profile/OverviewAvatarChange.tsx

@@ -1,7 +1,7 @@
 import AvatarWrapper from '../../components/Avatar';
 import Dialog from '../../components/Dialog';
 import Dropdown from '../../components/Dropdown';
-import ProfileActions from '../../actions/ProfileActions';
+import ProfileActions from '../../_actions/ProfileActions';
 import React, { Component, PropTypes } from 'react';
 import TextField from '../../components/TextField';
 

src/views/profile/OverviewPersonalData.tsx

@@ -1,7 +1,7 @@
 import Dropdown from '../../components/Dropdown';
 import IconButton from '../../components/IconButton';
 import InputButtonGroup from '../../components/InputButtonGroup';
-import ProfileActions from '../../actions/ProfileActions';
+import ProfileActions from '../../_actions/ProfileActions';
 import React, { Component, PropTypes } from 'react';
 import TextField from '../../components/TextField';
 

src/views/rcp/Cultures.tsx

@@ -1,6 +1,6 @@
 import Checkbox from '../../components/Checkbox';
 import { CultureInstance } from '../../utils/data/Culture';
-import CultureActions from '../../actions/CultureActions';
+import CultureActions from '../../_actions/CultureActions';
 import CulturesListItem from './CulturesListItem';
 import CultureStore from '../../stores/CultureStore';
 import Dropdown from '../../components/Dropdown';

src/views/rcp/CulturesListItem.tsx

@@ -1,5 +1,5 @@
 import BorderButton from '../../components/BorderButton';
-import CultureActions from '../../actions/CultureActions';
+import CultureActions from '../../_actions/CultureActions';
 import Culture, { CultureInstance } from '../../utils/data/Culture';
 import { get } from '../../stores/ListStore';
 import React, { Component, PropTypes } from 'react';

src/views/rcp/Professions.tsx

@@ -4,10 +4,10 @@ import Dropdown from '../../components/Dropdown';
 import { filterAndSort } from '../../utils/ListUtils';
 import RadioButtonGroup from '../../components/RadioButtonGroup';
 import React, { Component, PropTypes } from 'react';
-import ProfessionActions from '../../actions/ProfessionActions';
+import ProfessionActions from '../../_actions/ProfessionActions';
 import ProfessionsListItem from './ProfessionsListItem';
 import ProfessionStore from '../../stores/ProfessionStore';
-import ProfessionVariantActions from '../../actions/ProfessionVariantActions';
+import ProfessionVariantActions from '../../_actions/ProfessionVariantActions';
 import ProfessionVariantStore from '../../stores/ProfessionVariantStore';
 import ProfileStore from '../../stores/ProfileStore';
 import Scroll from '../../components/Scroll';

src/views/rcp/ProfessionsListItem.tsx

@@ -1,8 +1,8 @@
 import BorderButton from '../../components/BorderButton';
 import CultureStore from '../../stores/CultureStore';
 import Profession, { ProfessionInstance } from '../../utils/data/Profession';
-import ProfessionActions from '../../actions/ProfessionActions';
-import ProfessionVariantActions from '../../actions/ProfessionVariantActions';
+import ProfessionActions from '../../_actions/ProfessionActions';
+import ProfessionVariantActions from '../../_actions/ProfessionVariantActions';
 import ProfessionVariantStore from '../../stores/ProfessionVariantStore';
 import ProfileStore from '../../stores/ProfileStore';
 import RadioButtonGroup from '../../components/RadioButtonGroup';

src/views/rcp/Races.tsx

@@ -3,7 +3,7 @@ import { filterAndSort } from '../../utils/ListUtils';
 import { RaceInstance } from '../../utils/data/Race';
 import RadioButtonGroup from '../../components/RadioButtonGroup';
 import React, { Component, PropTypes } from 'react';
-import RaceActions from '../../actions/RaceActions';
+import RaceActions from '../../_actions/RaceActions';
 import RacesListItem from './RacesListItem';
 import RaceStore from '../../stores/RaceStore';
 import Scroll from '../../components/Scroll';

src/views/rcp/RacesListItem.tsx

@@ -1,7 +1,7 @@
 import BorderButton from '../../components/BorderButton';
 import Race, { RaceInstance } from '../../utils/data/Race';
 import React, { Component, PropTypes } from 'react';
-import RaceActions from '../../actions/RaceActions';
+import RaceActions from '../../_actions/RaceActions';
 import VerticalList from '../../components/VerticalList';
 import classNames from 'classnames';
 

src/views/rcp/Selections.tsx

@@ -4,7 +4,7 @@ import CultureStore from '../../stores/CultureStore';
 import Dropdown from '../../components/Dropdown';
 import { get, getAllByCategory, getAllByCategoryGroup } from '../../stores/ListStore';
 import React, { Component, PropTypes } from 'react';
-import ProfessionActions from '../../actions/ProfessionActions';
+import ProfessionActions from '../../_actions/ProfessionActions';
 import ProfessionStore from '../../stores/ProfessionStore';
 import ProfessionVariantStore from '../../stores/ProfessionVariantStore';
 import RaceStore from '../../stores/RaceStore';

src/views/skills/CombatTechniques.tsx

@@ -1,7 +1,7 @@
 import { CombatTechniqueInstance } from '../../utils/data/CombatTechnique';
 import { filterAndSort } from '../../utils/ListUtils';
 import { get } from '../../stores/ListStore';
-import CombatTechniquesActions from '../../actions/CombatTechniquesActions';
+import CombatTechniquesActions from '../../_actions/CombatTechniquesActions';
 import CombatTechniquesStore from '../../stores/CombatTechniquesStore';
 import PhaseStore from '../../stores/PhaseStore';
 import RadioButtonGroup from '../../components/RadioButtonGroup';

src/views/skills/CombatTechniquesAlt.js

@@ -1,4 +1,4 @@
-import CombatTechniquesActions from '../../actions/CombatTechniquesActions';
+import CombatTechniquesActions from '../../_actions/CombatTechniquesActions';
 import CombatTechniquesStore from '../../stores/CombatTechniquesStore';
 import { get } from '../../stores/ListStore';
 import * as ListUtils from '../../utils/ListUtils';

src/views/skills/Liturgies.tsx

@@ -1,7 +1,7 @@
 import { filterAndSort } from '../../utils/ListUtils';
 import { LiturgyInstance } from '../../utils/data/Liturgy';
 import BorderButton from '../../components/BorderButton';
-import LiturgiesActions from '../../actions/LiturgiesActions';
+import LiturgiesActions from '../../_actions/LiturgiesActions';
 import LiturgiesStore from '../../stores/LiturgiesStore';
 import PhaseStore from '../../stores/PhaseStore';
 import RadioButtonGroup from '../../components/RadioButtonGroup';

src/views/skills/SpecialAbilities.tsx

@@ -6,7 +6,7 @@ import RadioButtonGroup from '../../components/RadioButtonGroup';
 import React, { Component } from 'react';
 import Scroll from '../../components/Scroll';
 import Slidein from '../../components/Slidein';
-import SpecialAbilitiesActions from '../../actions/SpecialAbilitiesActions';
+import SpecialAbilitiesActions from '../../_actions/SpecialAbilitiesActions';
 import SpecialAbilitiesListAddItem, { Deactive } from './SpecialAbilitiesListAddItem';
 import SpecialAbilitiesListRemoveItem, { Active } from './SpecialAbilitiesListRemoveItem';
 import SpecialAbilitiesStore from '../../stores/SpecialAbilitiesStore';

src/views/skills/SpecialAbilitiesListAddItem.tsx

@@ -1,5 +1,5 @@
 import BorderButton from '../../components/BorderButton';
-import SpecialAbilitiesActions from '../../actions/SpecialAbilitiesActions';
+import SpecialAbilitiesActions from '../../_actions/SpecialAbilitiesActions';
 import { get } from '../../stores/ListStore';
 import Dropdown from '../../components/Dropdown';
 import React, { Component, PropTypes } from 'react';

src/views/skills/SpecialAbilitiesListRemoveItem.tsx

@@ -1,5 +1,5 @@
 import BorderButton from '../../components/BorderButton';
-import SpecialAbilitiesActions from '../../actions/SpecialAbilitiesActions';
+import SpecialAbilitiesActions from '../../_actions/SpecialAbilitiesActions';
 import Dropdown from '../../components/Dropdown';
 import React, { Component, PropTypes } from 'react';
 

src/views/skills/Spells.tsx

@@ -7,7 +7,7 @@ import React, { Component } from 'react';
 import Scroll from '../../components/Scroll';
 import SkillListItem from './SkillListItem';
 import Slidein from '../../components/Slidein';
-import SpellsActions from '../../actions/SpellsActions';
+import SpellsActions from '../../_actions/SpellsActions';
 import SpellsStore from '../../stores/SpellsStore';
 import TextField from '../../components/TextField';
 

src/views/skills/Talents.tsx

@@ -9,7 +9,7 @@ import PhaseStore from '../../stores/PhaseStore';
 import RadioButtonGroup from '../../components/RadioButtonGroup';
 import Scroll from '../../components/Scroll';
 import SkillListItem from './SkillListItem';
-import TalentsActions from '../../actions/TalentsActions';
+import TalentsActions from '../../_actions/TalentsActions';
 import TalentsStore from '../../stores/TalentsStore';
 import TextField from '../../components/TextField';