sawa 0.0.21 → 0.0.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/sawa/tpl/routes.js.mustache +3 -3
- data/lib/sawa/tpl/toolbar.js.mustache +12 -1
- data/lib/sawa/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b2274f76f38ee732bdac7d12d04ea09fa8a323b2
|
|
4
|
+
data.tar.gz: 3a7011e1d74921825b8d5c4bd5666a2c419f574b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d19dc374327e6661d1065194b7c86a34829a33e4738f2512cbf5a9eda4fa06ed401ab1cad9c99bbbf4ad72bbab850c95ee1f687cb271c96c7ea89c946f19d4a0
|
|
7
|
+
data.tar.gz: 48a993f188feb17e0022b1b5e05c8ddc709ff5d4902cf38cf3287bb47f1e5a9438b0441b8930e1c37a542285d7b4216ecb0b62d87ee04e2ecb3f16a7f6cad2d8
|
|
@@ -3,16 +3,16 @@ import React, { Component } from 'react';
|
|
|
3
3
|
import {{page_name}} from './pages/{{page_name}}'
|
|
4
4
|
{{/ sheet_arr}}
|
|
5
5
|
import CustomRoute from './components/CustomRoute'
|
|
6
|
-
import {
|
|
6
|
+
import {Route} from 'react-router-dom'
|
|
7
7
|
class Routes extends Component {
|
|
8
8
|
render() {
|
|
9
9
|
return (
|
|
10
|
-
<
|
|
10
|
+
<div>
|
|
11
11
|
{{# sheet_arr}}
|
|
12
12
|
<Route path='/{{resource_path}}' component={ {{page_name}} } />
|
|
13
13
|
{{/ sheet_arr}}
|
|
14
14
|
<CustomRoute user={this.props.user} setUser={this.props.setUser}/>
|
|
15
|
-
</
|
|
15
|
+
</div>
|
|
16
16
|
)
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -13,7 +13,18 @@ class Toolbar extends Component {
|
|
|
13
13
|
|
|
14
14
|
render() {
|
|
15
15
|
const { activeItem } = this.state
|
|
16
|
-
if(this.props.user === undefined || this.props.user === null)
|
|
16
|
+
if(this.props.user === undefined || this.props.user === null){
|
|
17
|
+
return (<Menu inverted pointing secondary>
|
|
18
|
+
<Menu.Menu position='right'>
|
|
19
|
+
<Menu.Item as={Link} to='/login'>
|
|
20
|
+
<Button primary >Sign In</Button>
|
|
21
|
+
</Menu.Item>
|
|
22
|
+
<Menu.Item as={Link} to='/regist'>
|
|
23
|
+
<Button primary >Sign Up</Button>
|
|
24
|
+
</Menu.Item>
|
|
25
|
+
</Menu.Menu>
|
|
26
|
+
</Menu>)
|
|
27
|
+
}
|
|
17
28
|
const admin = this.props.user.role === "ADMIN"
|
|
18
29
|
return(
|
|
19
30
|
<Menu inverted pointing secondary>
|
data/lib/sawa/version.rb
CHANGED