sawa 0.0.25 → 0.0.26
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/toolbar.js.mustache +3 -0
- data/lib/sawa/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 163d67b789076b1109979e09ce8c40694d51c330
|
|
4
|
+
data.tar.gz: 3186f0751046ea664999ec8ae4a9a4a21ea44edd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6601ba0804009513a172d0992925a1b216e5b46ed4b4dc654090ab2916d6ceb4f39f73655f477ad2ba6e302673a78f09ff2aa269d71d529a147cf5df3d4728fb
|
|
7
|
+
data.tar.gz: 2f3db011a0aa922e507b0a331e27b42fb0a66ff9896f90b943bf27d308282d41927daefafce7cc5c46a43696a4499feea4e51fa29454f8191f024ef7b830c9be
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React, { Component } from 'react';
|
|
2
|
+
import GuestMenu from './components/GuestMenu';
|
|
2
3
|
import CustomMenu from './components/CustomMenu';
|
|
3
4
|
import { Link } from 'react-router-dom'
|
|
4
5
|
import { Menu, Button, Dropdown } from 'semantic-ui-react'
|
|
@@ -16,6 +17,7 @@ class Toolbar extends Component {
|
|
|
16
17
|
const { activeItem, activeTitle } = this.state
|
|
17
18
|
if(this.props.user === undefined || this.props.user === null){
|
|
18
19
|
return (<Menu inverted pointing secondary>
|
|
20
|
+
<GuestMenu activeItem={activeItem} onClick={this.handleItemClick}/>
|
|
19
21
|
<Menu.Menu position='right'>
|
|
20
22
|
<Menu.Item as={Link} to='/login'>
|
|
21
23
|
<Button primary >Sign In</Button>
|
|
@@ -29,6 +31,7 @@ class Toolbar extends Component {
|
|
|
29
31
|
const admin = this.props.user.role === "ADMIN"
|
|
30
32
|
return(
|
|
31
33
|
<Menu inverted pointing secondary>
|
|
34
|
+
<GuestMenu activeItem={activeItem} onClick={this.handleItemClick}/>
|
|
32
35
|
<CustomMenu activeItem={activeItem} onClick={this.handleItemClick} user={this.props.user} />
|
|
33
36
|
<Dropdown item text={activeTitle} style={ {display: admin ? 'block' : 'none'} } >
|
|
34
37
|
<Dropdown.Menu>
|
data/lib/sawa/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sawa
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.26
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- shouaya
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-10-
|
|
11
|
+
date: 2017-10-25 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|