User authorization

esnya · Apr 4, 2016 · 1377168 · 1377168
1 parent d26747f
commit 1377168
Show file tree

Hide file tree

Showing 16 changed files with 171 additions and 83 deletions.
diff --git a/config/default.yml b/config/default.yml
@@ -1,10 +1,17 @@
+guest: false
 database:
     client: sqlite3
     connection:
         filename: tmp/db.sqlite
 listen:
     host: localhost
     port: 8000
+redis:
+    host: localhost
+session:
+    resave: true
+    saveUninitialized: true
+    store: database
 types:
     sw2_character_ja: ソード・ワールド2.0/キャラクター
-    sw2_monster_ja: ソード・ワールド2.0/魔物
+    sw2_monster_ja: ソード・ワールド2.0/魔物
diff --git a/config/development.yml b/config/development.yml
@@ -0,0 +1,3 @@
+guest: true
+session:
+    secret: hoge
diff --git a/config/production.yml b/config/production.yml
@@ -1,3 +1,4 @@
+guest: false
 listen:
     host: '0.0.0.0'
     port: 80
diff --git a/package.json b/package.json
@@ -31,7 +31,10 @@
     "body-parser": "^1.15.0",
     "config": "^1.19.0",
     "connect-livereload": "^0.5.4",
+    "connect-redis": "^3.0.2",
+    "connect-session-knex": "^1.0.22",
     "express": "^4.13.4",
+    "express-session": "^1.13.0",
     "jade": "^1.11.0",
     "knex": "^0.10.0",
     "lodash": "^4.6.1",

diff --git a/src/components/character-list.js b/src/components/character-list.js
@@ -6,11 +6,20 @@ import {Character} from '../shapes/character';
 export const CharacterListItem = (props) => {
     const {
         id,
+        user_id,
         name,
+        created,
+        modified,
     } = props;
 
     return (
-        <ListItem href={`/${id}`} primaryText={name} />
+        <ListItem
+            href={`/${id}`}
+            primaryText={name}
+            secondaryText={
+                `@${user_id} created:${created} modified:${modified}`
+            }
+        />
     );
 };
 CharacterListItem.propTypes = Character;

diff --git a/src/components/character.js b/src/components/character.js
@@ -1,5 +1,7 @@
 import AppBar from 'material-ui/lib/app-bar';
+import IconButton from 'material-ui/lib/icon-button';
 import Paper from 'material-ui/lib/paper';
+import ChevronLeft from 'material-ui/lib/svg-icons/navigation/chevron-left';
 import React, {PropTypes} from 'react';
 import {Character as CharacterShape} from '../shapes/character';
 import {SheetField} from './sheet-field';
@@ -10,6 +12,7 @@ export const Character = (props) => {
         id,
         data,
         name,
+        readOnly,
         type,
         types,
         user_id,
@@ -24,6 +27,7 @@ export const Character = (props) => {
         <Sheet
             data={data || {}}
             id={id}
+            readOnly={readOnly}
             onChange={onChange}
             onDelete={onDelete}
             onPush={onPush}
@@ -34,7 +38,14 @@ export const Character = (props) => {
 
     return (
         <div>
-            <AppBar title={name} />
+            <AppBar
+                iconElementLeft={
+                    <IconButton onTouchTap={() => (location.href = '/')}>
+                        <ChevronLeft />
+                    </IconButton>
+                }
+                title={name}
+            />
             <Paper style={{margin: 16, padding: 16}}>
                 <SheetField
                     fullWidth
@@ -55,6 +66,7 @@ export const Character = (props) => {
     );
 };
 Character.propTypes = Object.assign({
+    readOnly: PropTypes.bool.isRequired,
     types: PropTypes.object.isRequired,
     onChange: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,

diff --git a/src/components/home.js b/src/components/home.js
@@ -16,6 +16,7 @@ export const Home = (props) => {
                 iconElementRight={
                     <IconButton onTouchTap={onCreate}><Add /></IconButton>
                 }
+                showMenuIconButton={false}
                 title="Nekosheet"
             />
             <CharacterList />

diff --git a/src/components/item-list.js b/src/components/item-list.js
@@ -58,21 +58,37 @@ export const ItemList = (props) => {
             );
         });
 
+        const deleteElement = readOnly ? null : (
+            <Td>
+                <IconButton
+                    onTouchTap={(e) => onDelete && onDelete(e, ikey)}
+                >
+                    <Delete />
+                </IconButton>
+            </Td>
+        );
+
         return (
             <Tr key={ikey}>
                 {columnElements}
-                <Td>
-                    <IconButton
-                        disabled={readOnly}
-                        onTouchTap={(e) => onDelete && onDelete(e, ikey)}
-                    >
-                        <Delete />
-                    </IconButton>
-                </Td>
+                {deleteElement}
             </Tr>
         );
     });
 
+    const appendElements = readOnly ? null : (
+        <Tr>
+            <Td colSpan={fields.length + 1}>
+                <FlatButton
+                    style={{width: '100%'}}
+                    onTouchTap={onAppend}
+                >
+                    <Add />
+                </FlatButton>
+            </Td>
+        </Tr>
+    );
+
     return (
         <Table>
             <Thead>
@@ -82,16 +98,7 @@ export const ItemList = (props) => {
                 {itemElements}
             </Tbody>
             <Tfoot>
-                <Tr>
-                    <Td colSpan={fields.length + 1}>
-                        <FlatButton
-                            style={{width: '100%'}}
-                            onTouchTap={onAppend}
-                        >
-                            <Add />
-                        </FlatButton>
-                    </Td>
-                </Tr>
+                {appendElements}
                 {children}
             </Tfoot>
         </Table>

diff --git a/src/components/sheets/sw2_character_ja/ability.js b/src/components/sheets/sw2_character_ja/ability.js
@@ -1,6 +1,6 @@
 import React, {PropTypes} from 'react';
 import {SheetField} from '../../sheet-field';
-import {Table, Thead, Tbody, Tfoot, Tr, Td, Th} from '../../sheet-table';
+import {Table, Thead, Tbody, Tr, Td, Th} from '../../sheet-table';
 
 export const AbilityTable = ({data, readOnly, changeHandler}) => {
     const lineElements = [

diff --git a/src/components/sheets/sw2_character_ja/weapon.js b/src/components/sheets/sw2_character_ja/weapon.js
@@ -1,15 +1,11 @@
-import Add from 'material-ui/lib/svg-icons/content/add';
 import Card from 'material-ui/lib/card/card';
-import CardActions from 'material-ui/lib/card/card-actions';
 import CardHeader from 'material-ui/lib/card/card-header';
-import CardTitle from 'material-ui/lib/card/card-title';
 import CardText from 'material-ui/lib/card/card-text';
 import Delete from 'material-ui/lib/svg-icons/action/delete';
 import FlatButton from 'material-ui/lib/flat-button';
-import IconButton from 'material-ui/lib/icon-button';
 import React, {PropTypes} from 'react';
 import {SheetField} from '../../sheet-field';
-import {Table, Thead, Tbody, Tfoot, Tr, Td, Th} from '../../sheet-table';
+import {Table, Thead, Tbody, Tr, Td, Th} from '../../sheet-table';
 
 export const WeaponTable = (props) => {
     const {
@@ -45,6 +41,13 @@ export const WeaponTable = (props) => {
                 </Td>
             );
         });
+        const deleteElement = readOnly ? null : (
+            <FlatButton
+                label={<Delete />}
+                style={{width: '100%'}}
+                onTouchTap={removeHandler('weapons', i)}
+            />
+        );
 
         return (
             <Card key={i} style={{margin: 16}}>
@@ -150,31 +153,29 @@ export const WeaponTable = (props) => {
                         <Thead><Tr><Th>2</Th>{impactHeaders}</Tr></Thead>
                         <Tbody><Tr><Th>*</Th>{impactElements}</Tr></Tbody>
                     </Table>
-                    <div style={{diaplay: readOnly ? 'none' : null}}>
-                        <FlatButton
-                            label={<Delete />}
-                            style={{width: '100%'}}
-                            onTouchTap={removeHandler('weapons', i)}
-                        />
-                    </div>
+                    {deleteElement}
                 </CardText>
             </Card>
         );
     });
 
+    const appendElement = readOnly ? null : (
+        <div style={{margin: '0 16px'}}>
+            <FlatButton
+                label="武器追加"
+                style={{width: '100%'}}
+                onTouchTap={pushHandler('weapons', {
+                    weapon: '(新しい武器)',
+                    critical: 10,
+                })}
+            />
+        </div>
+    );
+
     return (
         <div>
             {itemElements}
-            <div style={{display: readOnly ? 'none' : null, margin: '0 16px'}}>
-                <FlatButton
-                    label="武器追加"
-                    style={{width: '100%'}}
-                    onTouchTap={pushHandler('weapons', {
-                        weapon: '(新しい武器)',
-                        critical: 10,
-                    })}
-                />
-            </div>
+            {appendElement}
         </div>
     );
 };

diff --git a/src/containers/character.js b/src/containers/character.js
@@ -7,6 +7,7 @@ export const Character = connect(
     (state) => ({
         ...state.character,
         types: state.types,
+        readOnly: state.user.id !== state.character.user_id,
     }),
     (dispatch) => ({
         onChange: (id, key, value) => put(`/${id}/${key}`, {id, key, value})

diff --git a/src/reducers/index.js b/src/reducers/index.js
@@ -8,4 +8,5 @@ export const reducers = combineReducers({
     characters: immutable([]),
     dialogs,
     types: immutable({}),
+    user: immutable({}),
 });
diff --git a/src/server/__tests__/test-server.js b/src/server/__tests__/test-server.js
@@ -1,7 +1,10 @@
 describe('Server', () => {
+    jest.setMock('redis', {});
+
     jest.setMock('express', jest.fn());
     const express = require('express');
     const app = jest.fn();
+    app.use = jest.fn();
 
     jest.mock('http');
     const http = require('http');