[Glitch] Remove Keybase integration
Port 7de0ee7aba to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
			
			
This commit is contained in:
		
							parent
							
								
									b356a995c1
								
							
						
					
					
						commit
						bb1a3e902d
					
				
					 7 changed files with 6 additions and 111 deletions
				
			
		| 
						 | 
					@ -115,7 +115,7 @@ class Header extends ImmutablePureComponent {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
    const { account, intl, domain, identity_proofs } = this.props;
 | 
					    const { account, intl, domain } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!account) {
 | 
					    if (!account) {
 | 
				
			||||||
      return null;
 | 
					      return null;
 | 
				
			||||||
| 
						 | 
					@ -301,20 +301,8 @@ class Header extends ImmutablePureComponent {
 | 
				
			||||||
          {!suspended && (
 | 
					          {!suspended && (
 | 
				
			||||||
            <div className='account__header__extra'>
 | 
					            <div className='account__header__extra'>
 | 
				
			||||||
              <div className='account__header__bio'>
 | 
					              <div className='account__header__bio'>
 | 
				
			||||||
                { (fields.size > 0 || identity_proofs.size > 0) && (
 | 
					                { fields.size > 0 && (
 | 
				
			||||||
                  <div className='account__header__fields'>
 | 
					                  <div className='account__header__fields'>
 | 
				
			||||||
                    {identity_proofs.map((proof, i) => (
 | 
					 | 
				
			||||||
                      <dl key={i}>
 | 
					 | 
				
			||||||
                        <dt dangerouslySetInnerHTML={{ __html: proof.get('provider') }} className='translate' />
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
                        <dd className='verified'>
 | 
					 | 
				
			||||||
                          <a href={proof.get('proof_url')} target='_blank' rel='noopener noreferrer'><span title={intl.formatMessage(messages.linkVerifiedOn, { date: intl.formatDate(proof.get('updated_at'), dateFormatOptions) })}>
 | 
					 | 
				
			||||||
                            <Icon id='check' className='verified__mark' />
 | 
					 | 
				
			||||||
                          </span></a>
 | 
					 | 
				
			||||||
                          <a href={proof.get('profile_url')} target='_blank' rel='noopener noreferrer'><span dangerouslySetInnerHTML={{ __html: ' '+proof.get('provider_username') }} className='translate' /></a>
 | 
					 | 
				
			||||||
                        </dd>
 | 
					 | 
				
			||||||
                      </dl>
 | 
					 | 
				
			||||||
                    ))}
 | 
					 | 
				
			||||||
                    {fields.map((pair, i) => (
 | 
					                    {fields.map((pair, i) => (
 | 
				
			||||||
                      <dl key={i}>
 | 
					                      <dl key={i}>
 | 
				
			||||||
                        <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} />
 | 
					                        <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} />
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,6 @@ export default class Header extends ImmutablePureComponent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  static propTypes = {
 | 
					  static propTypes = {
 | 
				
			||||||
    account: ImmutablePropTypes.map,
 | 
					    account: ImmutablePropTypes.map,
 | 
				
			||||||
    identity_proofs: ImmutablePropTypes.list,
 | 
					 | 
				
			||||||
    onFollow: PropTypes.func.isRequired,
 | 
					    onFollow: PropTypes.func.isRequired,
 | 
				
			||||||
    onBlock: PropTypes.func.isRequired,
 | 
					    onBlock: PropTypes.func.isRequired,
 | 
				
			||||||
    onMention: PropTypes.func.isRequired,
 | 
					    onMention: PropTypes.func.isRequired,
 | 
				
			||||||
| 
						 | 
					@ -93,7 +92,7 @@ export default class Header extends ImmutablePureComponent {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
    const { account, hideTabs, identity_proofs } = this.props;
 | 
					    const { account, hideTabs } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (account === null) {
 | 
					    if (account === null) {
 | 
				
			||||||
      return null;
 | 
					      return null;
 | 
				
			||||||
| 
						 | 
					@ -105,7 +104,6 @@ export default class Header extends ImmutablePureComponent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <InnerHeader
 | 
					        <InnerHeader
 | 
				
			||||||
          account={account}
 | 
					          account={account}
 | 
				
			||||||
          identity_proofs={identity_proofs}
 | 
					 | 
				
			||||||
          onFollow={this.handleFollow}
 | 
					          onFollow={this.handleFollow}
 | 
				
			||||||
          onBlock={this.handleBlock}
 | 
					          onBlock={this.handleBlock}
 | 
				
			||||||
          onMention={this.handleMention}
 | 
					          onMention={this.handleMention}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,7 +22,6 @@ import { blockDomain, unblockDomain } from 'flavours/glitch/actions/domain_block
 | 
				
			||||||
import { initEditAccountNote } from 'flavours/glitch/actions/account_notes';
 | 
					import { initEditAccountNote } from 'flavours/glitch/actions/account_notes';
 | 
				
			||||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 | 
					import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 | 
				
			||||||
import { unfollowModal } from 'flavours/glitch/util/initial_state';
 | 
					import { unfollowModal } from 'flavours/glitch/util/initial_state';
 | 
				
			||||||
import { List as ImmutableList } from 'immutable';
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
const messages = defineMessages({
 | 
					const messages = defineMessages({
 | 
				
			||||||
  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
 | 
					  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
 | 
				
			||||||
| 
						 | 
					@ -35,7 +34,6 @@ const makeMapStateToProps = () => {
 | 
				
			||||||
  const mapStateToProps = (state, { accountId }) => ({
 | 
					  const mapStateToProps = (state, { accountId }) => ({
 | 
				
			||||||
    account: getAccount(state, accountId),
 | 
					    account: getAccount(state, accountId),
 | 
				
			||||||
    domain: state.getIn(['meta', 'domain']),
 | 
					    domain: state.getIn(['meta', 'domain']),
 | 
				
			||||||
    identity_proofs: state.getIn(['identity_proofs', accountId], ImmutableList()),
 | 
					 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  return mapStateToProps;
 | 
					  return mapStateToProps;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,7 +13,6 @@ import ColumnBackButton from 'flavours/glitch/components/column_back_button';
 | 
				
			||||||
import { List as ImmutableList } from 'immutable';
 | 
					import { List as ImmutableList } from 'immutable';
 | 
				
			||||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
					import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
				
			||||||
import { FormattedMessage } from 'react-intl';
 | 
					import { FormattedMessage } from 'react-intl';
 | 
				
			||||||
import { fetchAccountIdentityProofs } from '../../actions/identity_proofs';
 | 
					 | 
				
			||||||
import MissingIndicator from 'flavours/glitch/components/missing_indicator';
 | 
					import MissingIndicator from 'flavours/glitch/components/missing_indicator';
 | 
				
			||||||
import TimelineHint from 'flavours/glitch/components/timeline_hint';
 | 
					import TimelineHint from 'flavours/glitch/components/timeline_hint';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -77,7 +76,7 @@ class AccountTimeline extends ImmutablePureComponent {
 | 
				
			||||||
    const { accountId, withReplies, dispatch } = this.props;
 | 
					    const { accountId, withReplies, dispatch } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dispatch(fetchAccount(accountId));
 | 
					    dispatch(fetchAccount(accountId));
 | 
				
			||||||
    dispatch(fetchAccountIdentityProofs(accountId));
 | 
					
 | 
				
			||||||
    if (!withReplies) {
 | 
					    if (!withReplies) {
 | 
				
			||||||
      dispatch(expandAccountFeaturedTimeline(accountId));
 | 
					      dispatch(expandAccountFeaturedTimeline(accountId));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					@ -109,10 +108,11 @@ class AccountTimeline extends ImmutablePureComponent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if ((nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) || nextProps.withReplies !== this.props.withReplies) {
 | 
					    if ((nextProps.params.accountId !== this.props.params.accountId && nextProps.params.accountId) || nextProps.withReplies !== this.props.withReplies) {
 | 
				
			||||||
      dispatch(fetchAccount(nextProps.params.accountId));
 | 
					      dispatch(fetchAccount(nextProps.params.accountId));
 | 
				
			||||||
      dispatch(fetchAccountIdentityProofs(nextProps.params.accountId));
 | 
					
 | 
				
			||||||
      if (!nextProps.withReplies) {
 | 
					      if (!nextProps.withReplies) {
 | 
				
			||||||
        dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
 | 
					        dispatch(expandAccountFeaturedTimeline(nextProps.params.accountId));
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
 | 
					      dispatch(expandAccountTimeline(nextProps.params.accountId, { withReplies: nextProps.params.withReplies }));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,25 +0,0 @@
 | 
				
			||||||
import { Map as ImmutableMap, fromJS } from 'immutable';
 | 
					 | 
				
			||||||
import {
 | 
					 | 
				
			||||||
  IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST,
 | 
					 | 
				
			||||||
  IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS,
 | 
					 | 
				
			||||||
  IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL,
 | 
					 | 
				
			||||||
} from '../actions/identity_proofs';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
const initialState = ImmutableMap();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
export default function identityProofsReducer(state = initialState, action) {
 | 
					 | 
				
			||||||
  switch(action.type) {
 | 
					 | 
				
			||||||
  case IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST:
 | 
					 | 
				
			||||||
    return state.set('isLoading', true);
 | 
					 | 
				
			||||||
  case IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL:
 | 
					 | 
				
			||||||
    return state.set('isLoading', false);
 | 
					 | 
				
			||||||
  case IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS:
 | 
					 | 
				
			||||||
    return state.update(identity_proofs => identity_proofs.withMutations(map => {
 | 
					 | 
				
			||||||
      map.set('isLoading', false);
 | 
					 | 
				
			||||||
      map.set('loaded', true);
 | 
					 | 
				
			||||||
      map.set(action.accountId, fromJS(action.identity_proofs));
 | 
					 | 
				
			||||||
    }));
 | 
					 | 
				
			||||||
  default:
 | 
					 | 
				
			||||||
    return state;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
| 
						 | 
					@ -34,7 +34,6 @@ import conversations from './conversations';
 | 
				
			||||||
import suggestions from './suggestions';
 | 
					import suggestions from './suggestions';
 | 
				
			||||||
import pinnedAccountsEditor from './pinned_accounts_editor';
 | 
					import pinnedAccountsEditor from './pinned_accounts_editor';
 | 
				
			||||||
import polls from './polls';
 | 
					import polls from './polls';
 | 
				
			||||||
import identity_proofs from './identity_proofs';
 | 
					 | 
				
			||||||
import trends from './trends';
 | 
					import trends from './trends';
 | 
				
			||||||
import announcements from './announcements';
 | 
					import announcements from './announcements';
 | 
				
			||||||
import markers from './markers';
 | 
					import markers from './markers';
 | 
				
			||||||
| 
						 | 
					@ -73,7 +72,6 @@ const reducers = {
 | 
				
			||||||
  notifications,
 | 
					  notifications,
 | 
				
			||||||
  height_cache,
 | 
					  height_cache,
 | 
				
			||||||
  custom_emojis,
 | 
					  custom_emojis,
 | 
				
			||||||
  identity_proofs,
 | 
					 | 
				
			||||||
  lists,
 | 
					  lists,
 | 
				
			||||||
  listEditor,
 | 
					  listEditor,
 | 
				
			||||||
  listAdder,
 | 
					  listAdder,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1022,68 +1022,6 @@ code {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.connection-prompt {
 | 
					 | 
				
			||||||
  margin-bottom: 25px;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .fa-link {
 | 
					 | 
				
			||||||
    background-color: darken($ui-base-color, 4%);
 | 
					 | 
				
			||||||
    border-radius: 100%;
 | 
					 | 
				
			||||||
    font-size: 24px;
 | 
					 | 
				
			||||||
    padding: 10px;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  &__column {
 | 
					 | 
				
			||||||
    align-items: center;
 | 
					 | 
				
			||||||
    display: flex;
 | 
					 | 
				
			||||||
    flex: 1;
 | 
					 | 
				
			||||||
    flex-direction: column;
 | 
					 | 
				
			||||||
    flex-shrink: 1;
 | 
					 | 
				
			||||||
    max-width: 50%;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    &-sep {
 | 
					 | 
				
			||||||
      align-self: center;
 | 
					 | 
				
			||||||
      flex-grow: 0;
 | 
					 | 
				
			||||||
      overflow: visible;
 | 
					 | 
				
			||||||
      position: relative;
 | 
					 | 
				
			||||||
      z-index: 1;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    p {
 | 
					 | 
				
			||||||
      word-break: break-word;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  .account__avatar {
 | 
					 | 
				
			||||||
    margin-bottom: 20px;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  &__connection {
 | 
					 | 
				
			||||||
    background-color: lighten($ui-base-color, 8%);
 | 
					 | 
				
			||||||
    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
 | 
					 | 
				
			||||||
    border-radius: 4px;
 | 
					 | 
				
			||||||
    padding: 25px 10px;
 | 
					 | 
				
			||||||
    position: relative;
 | 
					 | 
				
			||||||
    text-align: center;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    &::after {
 | 
					 | 
				
			||||||
      background-color: darken($ui-base-color, 4%);
 | 
					 | 
				
			||||||
      content: '';
 | 
					 | 
				
			||||||
      display: block;
 | 
					 | 
				
			||||||
      height: 100%;
 | 
					 | 
				
			||||||
      left: 50%;
 | 
					 | 
				
			||||||
      position: absolute;
 | 
					 | 
				
			||||||
      top: 0;
 | 
					 | 
				
			||||||
      width: 1px;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  &__row {
 | 
					 | 
				
			||||||
    align-items: flex-start;
 | 
					 | 
				
			||||||
    display: flex;
 | 
					 | 
				
			||||||
    flex-direction: row;
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.input.user_confirm_password,
 | 
					.input.user_confirm_password,
 | 
				
			||||||
.input.user_website {
 | 
					.input.user_website {
 | 
				
			||||||
  &:not(.field_with_errors) {
 | 
					  &:not(.field_with_errors) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue