From d2e1298251284bb2c8e3802ccd0f45762e03f70d Mon Sep 17 00:00:00 2001 From: Deepak Date: Sun, 19 Mar 2017 23:04:48 +0530 Subject: [PATCH] added reactstrap --- .../client/views/nonOrg/app/module/AppLayout.js | 40 +++++++++++++++++++--- package.json | 4 +-- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/imports/client/views/nonOrg/app/module/AppLayout.js b/imports/client/views/nonOrg/app/module/AppLayout.js index b8ee04c..b6d2669 100644 --- a/imports/client/views/nonOrg/app/module/AppLayout.js +++ b/imports/client/views/nonOrg/app/module/AppLayout.js @@ -9,13 +9,28 @@ import classNames from 'classnames'; import { logout } from '/imports/client/app/utils/loginMethods'; import Signup from '/imports/client/views/nonOrg/enter/SignupView'; -import { VerifyModule } from '/imports/client/views/verify/module/index'; -import ReactSVG from 'react-svg' +import { Collapse, Navbar, NavbarToggler, + NavbarBrand, Nav, NavItem, NavLink } from 'reactstrap'; + export class AppLayout extends Component { + constructor(props) { + super(props); + + this.toggle = this.toggle.bind(this); + this.state = { + isOpen: false + }; + } + toggle() { + this.setState({ + isOpen: !this.state.isOpen + }); + } render() { const {user, org} = this.props.data; console.log(user); + console.log(org); if(!user) { return ( ); } - - + const theUrl = Meteor.absoluteUrl(); + OrgUrl = theUrl.replace("http://","http://"+org.slug+"."); return (
+ + + reactstrap + + + +
- + Hi, {user.getFullName()}, + Please visit your organization page by clicking here and login using your credentials!
diff --git a/package.json b/package.json index f35bc52..ae22141 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "dependencies": { "babel-runtime": "^6.18.0", "bcrypt": "^0.8.7", - "bootstrap": "^3.3.7", + "bootstrap": "^4.0.0-alpha.6", "jquery": "^2.2.4", "jquery-validation": "^1.15.1", "moment": "^2.18.0", @@ -80,7 +80,7 @@ "react-router": "^2.6.1", "react-router-bootstrap": "^0.23.1", "react-svg": "^2.1.19", - "reactstrap": "^4.2.0", + "reactstrap": "^4.3.0", "velocity-animate": "^1.4.3", "velocity-react": "^1.2.1" } -- 2.0.0