@symbolic/react-app
Advanced tools
Comparing version 1.3.27 to 1.3.28
{ | ||
"name": "@symbolic/react-app", | ||
"version": "1.3.27", | ||
"version": "1.3.28", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "src/index.js", |
@@ -16,3 +16,5 @@ import React from 'react'; //eslint-disable-line | ||
if (this.token) this.props.logIn({token: this.token}); | ||
var activeOrgId = Cookies.get('activeOrgId'); | ||
if (this.token) this.props.logIn({token: this.token, activeOrgId}); | ||
} | ||
@@ -38,3 +40,5 @@ | ||
<div className='sf-app-wrapper'> | ||
<Route render={(props) => <Header {...props} {...{appKey}}/>}/> | ||
{this.props.useStandardHeader && this.props.session.isLoggedIn && ( | ||
<Route render={(props) => <Header {...props} {...{appKey}}/>}/> | ||
)} | ||
<div className='sf-content'> | ||
@@ -51,2 +55,2 @@ {this.props.children} | ||
export default AppWrapper; | ||
export default connect({})(AppWrapper); |
@@ -0,6 +1,7 @@ | ||
import {className} from 'henrybuilt-react-library'; | ||
import React from 'react'; | ||
import {connect} from 'react-redux'; | ||
import {Link} from 'react-router-dom'; | ||
import appsData from '../../apps-data'; | ||
import {className} from 'henrybuilt-react-library'; | ||
import MenuButton from '../menu-button/menu-button'; | ||
import {colors} from '@symbolic/lib'; | ||
import './header.scss'; | ||
@@ -17,13 +18,17 @@ | ||
<div className='sf-header'> | ||
<MenuButton/> | ||
<a href='https://www.symbolicframeworks.com' className='company-name'> | ||
<span>symbolic</span> | ||
<span> frameworks</span> | ||
</a> | ||
{/* <div className='app-name'> | ||
<a href={appData.domain} style={{...appData.style}}>{appData.title}</a> | ||
<a href={appData.domain}>{appData.title}</a> | ||
</div> */} | ||
<div className='menu-button'> | ||
</div> | ||
{/* {session.isLoggedIn ? ( | ||
{session.isLoggedIn ? ( | ||
<> | ||
<div className='user-info'> | ||
<a href={accountsDomain}>{session.user.name}</a> | ||
<div className='active-org' style={{backgroundColor: colors.colorFor({orgId: session.activeOrg.id})}}> | ||
<span href={accountsDomain}>{session.activeOrg.title}</span> | ||
</div> | ||
@@ -41,3 +46,3 @@ <div className='session-links'> | ||
</> | ||
)} */} | ||
)} | ||
</div> | ||
@@ -44,0 +49,0 @@ ); |
@@ -42,2 +42,8 @@ import { | ||
delete global.sessionToken; | ||
}, | ||
setActiveOrgId: async (activeOrgId) => { | ||
await Cookies.set('activeOrgId', activeOrgId, {expires: 365, domain}); | ||
}, | ||
getActiveOrgId: async (orgId) => { | ||
await Cookies.get('activeOrgId'); | ||
} | ||
@@ -44,0 +50,0 @@ }; |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
18753
21
424
6