bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix (!me) logic

Browse source
This commit is contained in:
Alex Gleason 2020-04-02 14:28:19 -05:00
parent d3952925d7
commit cbf799d53f
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/gabsocial/containers/gabsocial.js
View file

@ -39,6 +39,7 @@ const mapStateToProps = (state) => {
return {
showIntroduction,
me,
}
}
@ -50,6 +51,8 @@ class GabSocialMount extends React.PureComponent {
};
render () {
const { me } = this.props;
if (me == null) return null;
// Disabling introduction for launch
// const { showIntroduction } = this.props;
//

2
app/gabsocial/features/ui/util/react_router_helpers.js
View file

@ -72,7 +72,7 @@ class WrappedRoute extends React.Component {
render () {
const { component: Component, content, publicRoute, me, ...rest } = this.props;
if (!publicRoute && !me) {
if (!publicRoute && me == false) {
const actualUrl = encodeURIComponent(this.props.computedMatch.url);
return <Route path={this.props.path} component={() => {
window.location.href = `/auth/sign_in?redirect_uri=${actualUrl}`;

6
app/gabsocial/reducers/me.js
View file

@ -1,12 +1,14 @@
import { ME_FETCH_SUCCESS } from '../actions/me';
import { ME_FETCH_SUCCESS, ME_FETCH_FAIL } from '../actions/me';
import { Map as ImmutableMap, fromJS } from 'immutable';
const initialState = ImmutableMap();
const initialState = null;
export default function me(state = initialState, action) {
switch(action.type) {
case ME_FETCH_SUCCESS:
return fromJS(action.me.id);
case ME_FETCH_FAIL:
return false;
default:
return state;
}