twisterarmy
/
twister-react
mirror of https://github.com/twisterarmy/twister-react.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

accounts page wip

master
Julian Steinwachs 9 years ago
parent
63096c0ddf
commit
cf20ea26c0
7 changed files with 153 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 110
      build/app-bundle.js
  2. 2
      build/twister-lib.js
  3. 4
      css/main.css
  4. 63
      jsx/App.js
  5. 2
      jsx/common/ProfileBoard.js
  6. 23
      jsx/other/Accounts.js
  7. 14
      jsx/other/Conversation.js

110
build/app-bundle.js
Unescape View File

@ -107,12 +107,14 @@ App = React.createClass({displayName: "App", @@ -107,12 +107,14 @@ App = React.createClass({displayName: "App",
checkAccounts: function() {
this.state.accounts.map(function(acc){
var thisComponent = this;
thisComponent.state.accounts.map(function(acc){
Twister.getAccount(newaccoutname).verifyKey(function(key){
Twister.getAccount(acc.name).verifyKey(function(key){
thisComponent.setState(function(oldstate,props){
oldstate.accounts[acc].status = key.getStatus();
oldstate.accounts[acc.name].status = key.getStatus();
return oldstate;
@ -139,9 +141,11 @@ App = React.createClass({displayName: "App", @@ -139,9 +141,11 @@ App = React.createClass({displayName: "App",
onnewaccountbyuser: function(event) {
console.log("catched onnewaccountbyuser event !!!!! ",event,this.state)
this.saveCache();
if(!this.activeAccount){
if(!this.state.activeAccount){
this.switchAccount(event.detail.getUsername());
@ -163,17 +167,41 @@ App = React.createClass({displayName: "App", @@ -163,17 +167,41 @@ App = React.createClass({displayName: "App",
//console.log(firstroute);
var userbuttons = [];
for (var i in this.state.accounts) {
userbuttons.push(
React.createElement(MenuItem, {
key: this.state.accounts[i].name,
bsStyle: this.state.accounts[i].name==this.state.activeAccount ? 'primary' : 'default',
onClick: this.switchAccount.bind(this,this.state.accounts[i].name),
href: "javascript:void(0);"
}, this.state.accounts[i].name)
var guestMode = true;
if(this.state.accounts.filter(function(acc){
return acc.status=="confirmed";
}).length){
guestMode = false;
}
if(guestMode){
var accountSelector = (
React.createElement(Button, {href: "#/accounts", disabled: true}, "guest")
);
}else{
var userbuttons = [];
for (var i in this.state.accounts.filter(function(acc){
return acc.status=="confirmed";
})) {
userbuttons.push(
React.createElement(MenuItem, {
key: this.state.accounts[i].name,
bsStyle: this.state.accounts[i].name==this.state.activeAccount ? 'primary' : 'default',
onClick: this.switchAccount.bind(this,this.state.accounts[i].name),
href: "javascript:void(0);"
}, this.state.accounts[i].name)
);
}
var accountSelector = (
React.createElement(DropdownButton, {title: this.state.activeAccount},
userbuttons
)
);
}
return (
React.createElement(Grid, null,
@ -182,20 +210,19 @@ App = React.createClass({displayName: "App", @@ -182,20 +210,19 @@ App = React.createClass({displayName: "App",
React.createElement(ButtonGroup, {justified: true},
React.createElement(Button, {
href: "#",
bsStyle: firstroute=="home" ? 'primary' : 'default'
bsStyle: firstroute=="home" ? 'primary' : 'default',
disabled: guestMode
}, React.createElement(Glyphicon, {glyph: "home"})),
React.createElement(Button, {
href: "#/profile",
bsStyle: firstroute=="profile-active" ? 'primary' : 'default'
bsStyle: firstroute=="profile-active" ? 'primary' : 'default',
disabled: guestMode
}, React.createElement(Glyphicon, {glyph: "user"})),
React.createElement(Button, {href: "#/directmessages"}, React.createElement(Glyphicon, {glyph: "transfer"})),
React.createElement(DropdownButton, {title: this.state.activeAccount},
userbuttons
),
React.createElement(Button, {href: "#/directmessages", disabled: true}, React.createElement(Glyphicon, {glyph: "transfer"})),
accountSelector,
React.createElement(DropdownButton, {title: React.createElement(Glyphicon, {glyph: "menu-hamburger"})},
React.createElement(MenuItem, {
onClick: this.clearCache,
href: "javascript:void(0);"
onClick: this.clearCache
}, "Clear Cache"),
React.createElement(MenuItem, {href: "#/search"}, "Search"),
React.createElement(MenuItem, {href: "#/settings"}, "Settings"),
@ -1034,7 +1061,7 @@ var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup; @@ -1034,7 +1061,7 @@ var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
var Post = require("../common/Post.js");
module.exports = Postboard = React.createClass({displayName: "Postboard",
module.exports = ProfileBoard = React.createClass({displayName: "ProfileBoard",
render: function() {
var thisComponent = this;
@ -1748,19 +1775,24 @@ module.exports = Accounts = React.createClass({displayName: "Accounts", @@ -1748,19 +1775,24 @@ module.exports = Accounts = React.createClass({displayName: "Accounts",
router: React.PropTypes.func
},
render: function() {
var thisComponent = this;
return (
React.createElement(ListGroup, null,
React.createElement(ListGroupItem, null, "Settings"),
React.createElement(ListGroupItem, null, "Accounts"),
React.createElement(ListGroupItem, null,
React.createElement("ul", null,
this.props.accounts.map(function(acc,index) {
//console.log(acc,index)
return (
React.createElement("li", null, acc.name, " - ", acc.status)
);
})
),
React.createElement(ImportAccountModalButton, null)
React.createElement(ImportAccountModalButton, null),
React.createElement("hr", null),
this.props.accounts.map(function(acc,index) {
//console.log(acc,index)
return (
React.createElement("div", null,
React.createElement(MiniProfile, {username: acc.name, key: "miniprofile:"+acc.name, pollIntervalProfile: thisComponent.props.pollIntervalProfile}),
React.createElement("p", null, acc.status)
)
);
})
)
)
);
@ -1816,11 +1848,21 @@ module.exports = Conversation = React.createClass({displayName: "Conversation", @@ -1816,11 +1848,21 @@ module.exports = Conversation = React.createClass({displayName: "Conversation",
var goUpConversation = function (post) {
if(!post) return;
if (post.isReply()) {
post.doPostRepliedTo(goUpConversation);
post.doPostRepliedTo(function(otherpost){
if(otherpost){
goUpConversation(otherpost);
}else{
thisComponent.addPost(post);
thisComponent.setStateSafe({loading: false});
post.doReplies(doRepliesRecursive);
}
});
} else {

2
build/twister-lib.js
Unescape View File

@ -29660,7 +29660,7 @@ TwisterAccount.prototype.verifyKey = function (cbfunc,querySettings) { @@ -29660,7 +29660,7 @@ TwisterAccount.prototype.verifyKey = function (cbfunc,querySettings) {
TwisterAccount.prototype.getKeyStatus = function () {
this._privkey.getStatus();
return this._privkey.getStatus();
}

4
css/main.css
Unescape View File

@ -7,6 +7,10 @@ body.modal-open { @@ -7,6 +7,10 @@ body.modal-open {
margin: 0;
}
.btn-group-justified>.btn-group .dropdown-menu {
right: 0;
}
.container {
padding: 0;
}

63
jsx/App.js
Unescape View File

@ -106,12 +106,14 @@ App = React.createClass({ @@ -106,12 +106,14 @@ App = React.createClass({
checkAccounts: function() {
this.state.accounts.map(function(acc){
var thisComponent = this;
thisComponent.state.accounts.map(function(acc){
Twister.getAccount(newaccoutname).verifyKey(function(key){
Twister.getAccount(acc.name).verifyKey(function(key){
thisComponent.setState(function(oldstate,props){
oldstate.accounts[acc].status = key.getStatus();
oldstate.accounts[acc.name].status = key.getStatus();
return oldstate;
@ -138,9 +140,11 @@ App = React.createClass({ @@ -138,9 +140,11 @@ App = React.createClass({
onnewaccountbyuser: function(event) {
console.log("catched onnewaccountbyuser event !!!!! ",event,this.state)
this.saveCache();
if(!this.activeAccount){
if(!this.state.activeAccount){
this.switchAccount(event.detail.getUsername());
@ -162,17 +166,41 @@ App = React.createClass({ @@ -162,17 +166,41 @@ App = React.createClass({
//console.log(firstroute);
var userbuttons = [];
for (var i in this.state.accounts) {
userbuttons.push(
<MenuItem
key={this.state.accounts[i].name}
bsStyle={this.state.accounts[i].name==this.state.activeAccount ? 'primary' : 'default'}
onClick={this.switchAccount.bind(this,this.state.accounts[i].name)}
href="javascript:void(0);"
>{this.state.accounts[i].name}</MenuItem>
var guestMode = true;
if(this.state.accounts.filter(function(acc){
return acc.status=="confirmed";
}).length){
guestMode = false;
}
if(guestMode){
var accountSelector = (
<Button href='#/accounts' disabled>guest</Button>
);
}else{
var userbuttons = [];
for (var i in this.state.accounts.filter(function(acc){
return acc.status=="confirmed";
})) {
userbuttons.push(
<MenuItem
key={this.state.accounts[i].name}
bsStyle={this.state.accounts[i].name==this.state.activeAccount ? 'primary' : 'default'}
onClick={this.switchAccount.bind(this,this.state.accounts[i].name)}
href="javascript:void(0);"
>{this.state.accounts[i].name}</MenuItem>
);
}
var accountSelector = (
<DropdownButton title={this.state.activeAccount}>
{userbuttons}
</DropdownButton>
);
}
return (
<Grid>
@ -182,19 +210,18 @@ App = React.createClass({ @@ -182,19 +210,18 @@ App = React.createClass({
<Button
href='#'
bsStyle={firstroute=="home" ? 'primary' : 'default'}
disabled = {guestMode}
><Glyphicon glyph="home"/></Button>
<Button
href='#/profile'
bsStyle={firstroute=="profile-active" ? 'primary' : 'default'}
disabled = {guestMode}
><Glyphicon glyph="user"/></Button>
<Button href='#/directmessages'><Glyphicon glyph="transfer"/></Button>
<DropdownButton title={this.state.activeAccount}>
{userbuttons}
</DropdownButton>
<Button href='#/directmessages' disabled><Glyphicon glyph="transfer"/></Button>
{accountSelector}
<DropdownButton title={<Glyphicon glyph="menu-hamburger"/>}>
<MenuItem
onClick={this.clearCache}
href="javascript:void(0);"
>Clear Cache</MenuItem>
<MenuItem href="#/search" >Search</MenuItem>
<MenuItem href="#/settings" >Settings</MenuItem>

2
jsx/common/ProfileBoard.js
Unescape View File

@ -14,7 +14,7 @@ var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup; @@ -14,7 +14,7 @@ var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup;
var Post = require("../common/Post.js");
module.exports = Postboard = React.createClass({
module.exports = ProfileBoard = React.createClass({
render: function() {
var thisComponent = this;

23
jsx/other/Accounts.js
Unescape View File

@ -27,19 +27,24 @@ module.exports = Accounts = React.createClass({ @@ -27,19 +27,24 @@ module.exports = Accounts = React.createClass({
router: React.PropTypes.func
},
render: function() {
var thisComponent = this;
return (
<ListGroup>
<ListGroupItem>Settings</ListGroupItem>
<ListGroupItem>Accounts</ListGroupItem>
<ListGroupItem>
<ul>
{this.props.accounts.map(function(acc,index) {
//console.log(acc,index)
return (
<li>{acc.name} - {acc.status}</li>
);
})}
</ul>
<ImportAccountModalButton/>
<hr/>
{this.props.accounts.map(function(acc,index) {
//console.log(acc,index)
return (
<div>
<MiniProfile username={acc.name} key={"miniprofile:"+acc.name} pollIntervalProfile={thisComponent.props.pollIntervalProfile}/>
<p>{acc.status}</p>
</div>
);
})}
</ListGroupItem>
</ListGroup>
);

14
jsx/other/Conversation.js
Unescape View File

@ -47,11 +47,21 @@ module.exports = Conversation = React.createClass({ @@ -47,11 +47,21 @@ module.exports = Conversation = React.createClass({
var goUpConversation = function (post) {
if(!post) return;
if (post.isReply()) {
post.doPostRepliedTo(goUpConversation);
post.doPostRepliedTo(function(otherpost){
if(otherpost){
goUpConversation(otherpost);
}else{
thisComponent.addPost(post);
thisComponent.setStateSafe({loading: false});
post.doReplies(doRepliesRecursive);
}
});
} else {

Write Preview
Loading…
Cancel
Save