sawa 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0330504b5c9c89d33e13cb6194afa44d621ded
-  data.tar.gz: 1c8c8b02de858fe598769e62f326f802cd8f3374
+  metadata.gz: ee463088334ff7af72c83f43dbc585691da3687c
+  data.tar.gz: 5e48cdc710ef8d36e9d90e733c50e9e2dbe44672
 SHA512:
-  metadata.gz: 7875b5b9d76e9509faf10a505236b82d70c6710aef471c13ec5cc4c06bd8ffff309ea0d3e9784fc513ecb366ab7d6d04441af803d1d488555535592e6f7a66d6
-  data.tar.gz: aefd76f66d531dcdb5ef1e32882a3926248abf6f98580069a2d13d8b786da33e8d3977e154bb5611db047e8798778d4532ceb6453b3b11e01090dae07390863b
+  metadata.gz: 57dcd57446a8a7069db47e300fbfcdf768e576555fb7fe18b7b1a72204b4919f63c5b64212faefba7adb227969addf2c72b6aa7cc0dca745c02acf3a5349d09c
+  data.tar.gz: cf4a3883616745288bdf8fdb75bdaf79fbc1180c0b7aa49868c2fd799ad5468cf719856eb81e1f20710fcdc98d6152f6d942363f3c6ab89d5df92412e1e2ed6f

data/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-encoding//lib/sawa/tpl/app.js.mustache=UTF-8
+encoding//lib/sawa/tpl/routes.js.mustache=UTF-8
 encoding/<project>=UTF-8

data/lib/sawa/tpl/page.js.mustache

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import MiniPage from '../Page';
+import MiniPage from '../tools/Page';
 class {{page_name}} extends Component {
   
   render() {

data/lib/sawa/tpl/routes.js.mustache

@@ -0,0 +1,20 @@
+import React, { Component } from 'react';
+{{# sheet_arr}}
+import {{page_name}} from './pages/{{page_name}}'
+{{/ sheet_arr}}
+import CustomRoute from './components/CustomRoute'
+import {Switch,Route} from 'react-router-dom'
+class Routes extends Component {
+	render() {
+		return (
+			<Switch>
+				{{# sheet_arr}}
+				<Route path='/{{resource_path}}' component={ {{page_name}} } />
+				{{/ sheet_arr}}
+				<CustomRoute user={this.props.user} setUser={this.props.setUser}/>
+			</Switch>
+		)
+	}
+}
+
+export default Routes;

data/lib/sawa/tpl/toolbar.js.mustache

@@ -0,0 +1,34 @@
+import React, { Component } from 'react';
+import CustomMenu from './components/CustomMenu';
+import { Link } from 'react-router-dom'
+import { Menu, Button } from 'semantic-ui-react'
+
+class Toolbar extends Component {
+
+  constructor (props) {
+	super(props)
+	this.handleItemClick = (e, { name }) => this.setState({ activeItem: name })
+	this.state = {activeItem: ""}
+  }
+  
+  render() {
+	  const { activeItem } = this.state
+	  if(this.props.user === undefined || this.props.user === null) return null
+	  const admin = this.props.user.role === "ADMIN"
+	  return(
+	  <Menu inverted pointing secondary>
+		{{# sheet_arr}}
+			<Menu.Item style={ {display: admin ? 'block' : 'none'} } name='{{resource_path}}' active={activeItem === '{{resource_path}}'} as={Link} to='/{{resource_path}}' onClick={this.handleItemClick} >{{model_title}}</Menu.Item>
+		{{/ sheet_arr}}
+		<CustomMenu activeItem={activeItem} onClick={this.handleItemClick} />
+		<Menu.Menu position='right'>
+		    <Menu.Item as={Link} to='/logout'> 
+		      <Button primary >Sign out</Button>
+		    </Menu.Item>
+		</Menu.Menu>
+	  </Menu>
+	 )
+  }
+}
+
+export default Toolbar;

data/lib/sawa/version.rb

@@ -1,3 +1,3 @@
 class Sawa
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/lib/sawa.rb

@@ -63,17 +63,22 @@ class Sawa
     str_property = @work.render
     File.open("#{@XML_PATH}/property.properties", 'w') { |file| file.write(str_property) }
 
-    #app.js
-    @work.template_file = "#{@TPL_PATH}/app.js.mustache"
-    str_app_js = @work.render
-    File.open("#{@JSRC_PATH}/App.js", 'w') { |file| file.write(str_app_js) }
+    #Routes.js
+    @work.template_file = "#{@TPL_PATH}/routes.js.mustache"
+    str_routes_js = @work.render
+    File.open("#{@JSRC_PATH}/Routes.js", 'w') { |file| file.write(str_routes_js) }
+      
+    #Toolbar.js
+    @work.template_file = "#{@TPL_PATH}/toolbar.js.mustache"
+    str_toolbar_js = @work.render
+    File.open("#{@JSRC_PATH}/Toolbar.js", 'w') { |file| file.write(str_toolbar_js) }
 
-    #source.js
+    #Source.js
     @work.template_file = "#{@TPL_PATH}/source.js.mustache"
     str_source_js = @work.render
     File.open("#{@JSRC_PATH}/Source.js", 'w') { |file| file.write(str_source_js) }
 
-    #page.js
+    #pages
     @work.sheets.each do |name, sheet|
       sheet.template_file = "#{@TPL_PATH}/page.js.mustache"
       str_page_js = sheet.render

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sawa
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - shouaya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,14 +121,15 @@ files:
 - lib/sawa/MiniSheet.rb
 - lib/sawa/MiniWork.rb
 - lib/sawa/tpl/api.mustache
-- lib/sawa/tpl/app.js.mustache
 - lib/sawa/tpl/crud.mustache
 - lib/sawa/tpl/dao.mustache
 - lib/sawa/tpl/model.mustache
 - lib/sawa/tpl/page.js.mustache
 - lib/sawa/tpl/property.mustache
 - lib/sawa/tpl/resource.mustache
+- lib/sawa/tpl/routes.js.mustache
 - lib/sawa/tpl/source.js.mustache
+- lib/sawa/tpl/toolbar.js.mustache
 - lib/sawa/version.rb
 - sawa.gemspec
 homepage: https://github.com/shouaya/sawagem

data/lib/sawa/tpl/app.js.mustache

@@ -1,82 +0,0 @@
-import React, { Component } from 'react';
-import './App.css';
-import Guide from './Guide';
-{{# sheet_arr}}
-import {{page_name}} from './pages/{{page_name}}'
-{{/ sheet_arr}}
-import CustomMenu from './CustomMenu'
-import CustomRoute from './CustomRoute'
-import {
-  BrowserRouter as Router,
-  Route,
-  Link
-} from 'react-router-dom'
-import { Menu, Divider, Header,Image } from 'semantic-ui-react'
-
-class App extends Component {
-  state = {user:null, users: [], login:false}
-
-  handleItemClick = (e, { name }) => this.setState({ activeItem: name })
-  
-  getCookie(name) {
-	  var value = "; " + document.cookie;
-	  var parts = value.split("; " + name + "=");
-	  if (parts.length === 2) return parts.pop().split(";").shift();
-  }
-  
-  deleteCookie(name) {
-	  document.cookie = name + '=; expires=Thu, 01 Jan 1970 00:00:01 GMT;';
-  }
-  
-  onError(res){
-	  if(res.status === 403 || res.status === 401){
-		  this.deleteCookie("uid")
-	      this.deleteCookie("tooken")
-	      this.setState({ login:false })
-	  }
-  }
-  
-  componentWillMount(){
-      let uid = this.getCookie("uid")
-      let token = this.getCookie("tooken")
-      if(uid !== null && token !== null){
-        this.setState({ login:true })
-      }
-  }
-  
-  onlineChange(users){
-	  this.setState({ users: users })
-  }
-  
-  onLogin(user){
-	  this.setState({ user: user, login:true })
-  }
-
-  render() {
-	const { activeItem } = this.state
-	if(!this.state.login) return  <Guide onLogin={this.onLogin.bind(this)} login={this.state.login}/>
-    return (
-      <Router>
-      <div className="body">
-		<Link to='/'>
-			<Header><Image src='http://s3.9jialu.com/whale64.png' size='tiny' wrapped verticalAlign='bottom'/></Header>
-		</Link>
-        <Menu>
-        {{# sheet_arr}}
-			<Menu.Item name='{{resource_path}}' active={activeItem === '{{resource_path}}'} as={Link} to='/{{resource_path}}' onClick={this.handleItemClick} >{{model_title}}</Menu.Item>
-		{{/ sheet_arr}}
-		<CustomMenu activeItem={activeItem} onClick={this.handleItemClick} />
-        </Menu>
-	    <Divider />
-		<Route exact path="/" render={() => <Guide onLogin={this.onLogin.bind(this)} login={this.state.login} onError={this.onError.bind(this)}/>} />
-		{{# sheet_arr}}
-		<Route path='/{{resource_path}}' render={() => <{{page_name}} onError={this.onError.bind(this)}/>}/>
-		{{/ sheet_arr}}
-		<CustomRoute onError={this.onError.bind(this)}/>
-	  </div>
-	  </Router>
-    );
-  }
-}
-
-export default App;