skeleton of sheet state flow

Demiplane · Apr 18, 2018 · a978a45 · a978a45
1 parent bc88bd7
commit a978a45
Show file tree

Hide file tree

Showing 21 changed files with 384 additions and 317 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,9 +4,12 @@
   "private": true,
   "dependencies": {
     "mathjs": "^4.1.1",
-    "react": "^16.3.1",
+    "react": "^16.3.2",
     "react-dom": "^16.3.1",
-    "react-scripts-ts": "2.14.0"
+    "react-redux": "^5.0.7",
+    "react-scripts-ts": "2.14.0",
+    "redux": "^4.0.0",
+    "typesafe-actions": "^1.1.2"
   },
   "scripts": {
     "start": "react-scripts-ts start",

diff --git a/public/index.html b/public/index.html
@@ -19,7 +19,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Sheets</title>
   </head>
   <body>
     <noscript>

diff --git a/src/App.tsx b/src/App.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import './App.css';
-import Sheet from './sheet/Sheet';
-import * as S from './sheet/SheetModel';
+import * as S from './sheet/sheetModel';
 import './extensions/Act';
 
 const logo = require('./logo.svg');
@@ -17,70 +16,12 @@ interface AppProps {
 class App extends React.Component<AppProps, AppState> {
 
   state = this.initialState();
-
-  initialState(): AppState {
-
-    let initial: S.Sheet = {
-      name: 'Roland of Gilead',
-      statistics: [
-        { name: 'fighter level', modifiers: [{ formula: '5' }] },
-        { name: 'wizard level', modifiers: [{ formula: '3' }] },
-        { name: 'favored class bonus', modifiers: [{ formula: '[fighter level]' }] },
-        { name: 'total level', modifiers: [{ formula: '[fighter level] + [wizard level]' }] },
-        {
-          name: 'base attack bonus', modifiers: [
-            { formula: '[fighter level]' },
-            { formula: '[wizard level] / 2' }
-          ]
-        },
-        {
-          name: 'hit point maximum',
-          modifiers: [
-            { formula: '[constitution modifier] * [total level]' },
-            { formula: '([fighter level] - 1) * 5.5 + 10' },
-            { formula: '[wizard level] * 3.5' },
-            { formula: '[favored class bonus]' },
-          ],
-          resource: {
-            name: 'hit points',
-            current: 63,
-            recharge: [{ name: 'rest', amount: ['[hit point maximum]'] }]
-          }
-        },
-        { name: 'constitution', modifiers: [{ formula: '14' }] },
-        { name: 'constitution modifier', modifiers: [{ formula: '([constitution] - 10) / 2' }] },
-      ],
-      inventory: [
-        {
-          name: 'Big Irons with the Sandalwood Grips',
-          stock: 2,
-          description: 'The Sandalwood Guns are the guns of a true gunslinger.'
-        },
-        {
-          name: 'Horn of Eld', stock: 1, description: 'The Horn of Eld is the personal horn of Arthur Eld.'
-        },
-        { name: 'Old Cowboy\'s Boots', stock: 2 },
-        { name: 'Traveler\'s Clothes', stock: 1 },
-        { name: 'Gunna', stock: 1, description: 'In his bag he always seems to have what he needs.' },
-        { name: 'Grow Bag', stock: 1, description: 'A magical bag that has the ability to generate coins.' },
-      ],
-      abilities: [
-        {
-          name: 'Weapon Training (firearms)',
-          source: 'fighter 5',
-          description: 'https://www.d20pfsrd.com/classes/core-classes/fighter/#TOC-Weapon-Training'
-        }
-      ]
-    };
-
-    let restored: S.Sheet = JSON.parse(JSON.stringify(initial));
-
     return {
       sheets: [
 
         restored,
 
-        { name: 'Steven Deschain', statistics: [], inventory: [], abilities: [] },
+        ,
 
       ]
     };

diff --git a/src/core/Cache.ts b/src/core/Cache.ts
@@ -0,0 +1,21 @@
+export default class Cache<T> {
+    private internalCache: {[key: string]: T} = {};
+
+    public getFromCache(key: string, valueCreator: (key: string) => T) : T {
+        const cachedValue = this.internalCache[key];
+
+        if (cachedValue) {
+            return cachedValue;
+        }
+
+        var calculated = valueCreator(key);
+
+        this.internalCache[key] = calculated;
+
+        return calculated;
+    }
+
+    public clear() {
+        this.internalCache = {};
+    }
+}
diff --git a/src/core/RootAction.ts b/src/core/RootAction.ts
@@ -0,0 +1,9 @@
+import * as SheetActions from '../sheet/sheetActions';
+
+type RootAction = 
+    SheetActions.CreateSheetAction |
+    SheetActions.DeleteSheetAction |
+    SheetActions.UpdateSheetAction |
+    SheetActions.LoadSheetsAction;
+
+export default RootAction;
diff --git a/src/core/RootState.ts b/src/core/RootState.ts
@@ -0,0 +1,7 @@
+import SheetState from '../sheet/SheetState';
+
+type RootState = {
+    sheetState: SheetState
+};
+
+export default RootState;
diff --git a/src/core/initialState.ts b/src/core/initialState.ts
@@ -0,0 +1,9 @@
+import RootState from '../core/RootState';
+
+const initialState: RootState = {
+    sheetState: {
+        sheets: []
+    }
+};
+
+export default initialState;
diff --git a/src/core/rootReducer.ts b/src/core/rootReducer.ts
@@ -0,0 +1,11 @@
+import { combineReducers } from 'redux';
+import RootState from './RootState';
+import RootAction from './RootAction';
+import sheetReducer from '../sheet/sheetReducer';
+
+const rootReducer = combineReducers<RootState, RootAction>(
+    {
+        sheetState: sheetReducer
+    });
+
+export default rootReducer;
diff --git a/src/sheet/AbilitiesSection.tsx b/src/sheet/AbilitiesSection.tsx
diff --git a/src/sheet/InventorySection.tsx b/src/sheet/InventorySection.tsx
diff --git a/src/sheet/ResourcesSection.tsx b/src/sheet/ResourcesSection.tsx