From 47d57960a49c54c6bb4a8d1446f34f2b84ef558c Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Thu, 17 Dec 2020 16:07:00 -0500
Subject: [PATCH] Updated groups so that anyone can create
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated:
- groups so that anyone can create
---
 .../gabsocial/features/group_create.js        | 26 -------------------
 app/javascript/gabsocial/pages/groups_page.js | 26 ++++---------------
 2 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/app/javascript/gabsocial/features/group_create.js b/app/javascript/gabsocial/features/group_create.js
index cc5f212a..f3912640 100644
--- a/app/javascript/gabsocial/features/group_create.js
+++ b/app/javascript/gabsocial/features/group_create.js
@@ -26,7 +26,6 @@ import {
 import { fetchGroup } from '../actions/groups'
 import { fetchGroupCategories } from '../actions/group_categories'
 import { me } from '../initial_state'
-import { MODAL_PRO_UPGRADE } from '../constants'
 import ColumnIndicator from '../components/column_indicator'
 import Button from '../components/button'
 import Divider from '../components/divider'
@@ -76,13 +75,6 @@ class GroupCreate extends ImmutablePureComponent {
 
 	handleSubmit = (e) => {
 		e.preventDefault()
-
-		// if not pro and not admin of group show pro upgrade modal
-		if (!this.props.isPro && !this.props.isAdmin) {
-			this.props.onOpenProUpgradeModal()
-			return
-		}
-
 		if (this.props.onClose) this.props.onClose()
 		this.props.onSubmit(this.context.router.history)
 	}
@@ -114,25 +106,12 @@ class GroupCreate extends ImmutablePureComponent {
 			groupId,
 			categories,
 			isAdmin,
-			isPro,
 		} = this.props
 
 		if (!group && groupId) {
 			return <ColumnIndicator type='loading' />
 		} else if ((!group && error) || (groupId && !isAdmin)) {
 			return <ColumnIndicator type='missing' />
-		} else if (!isPro && !groupId) {
-			return <ColumnIndicator type='error' message={(
-				<React.Fragment>
-					<Text>You must be a GabPRO member to create a group.</Text>
-					<Button
-						onClick={this.props.onOpenProUpgradeModal}
-						className={[_s.mt15, _s.mlAuto, _s.mrAuto].join(' ')}
-					>
-						Learn more
-					</Button>
-				</React.Fragment>
-			)} />
 		}
 
 		const memberCount = group ? group.get('member_count') : 0
@@ -357,7 +336,6 @@ const mapStateToProps = (state, { params }) => {
 		isPrivate: state.getIn(['group_editor', 'isPrivate']),
 		isVisible: state.getIn(['group_editor', 'isVisible']),
 		categories: state.getIn(['group_categories', 'items']),
-		isPro: state.getIn(['accounts', me, 'is_pro']),
 	}
 }
 
@@ -405,9 +383,6 @@ const mapDispatchToProps = (dispatch) => ({
 	onFetchGroupCategories() {
 		dispatch(fetchGroupCategories())
 	},
-	onOpenProUpgradeModal() {
-		dispatch(openModal(MODAL_PRO_UPGRADE))
-	},
 })
 
 GroupCreate.propTypes = {
@@ -429,7 +404,6 @@ GroupCreate.propTypes = {
 	onResetEditor: PropTypes.func.isRequired,
 	onSetGroup: PropTypes.func.isRequired,
 	onSubmit: PropTypes.func.isRequired,
-	onOpenProUpgradeModal: PropTypes.func.isRequired,
 	isSubmitting: PropTypes.bool,
 	isAdmin: PropTypes.bool,
 	onClose: PropTypes.func,
diff --git a/app/javascript/gabsocial/pages/groups_page.js b/app/javascript/gabsocial/pages/groups_page.js
index 6bb17da8..04516017 100644
--- a/app/javascript/gabsocial/pages/groups_page.js
+++ b/app/javascript/gabsocial/pages/groups_page.js
@@ -8,8 +8,6 @@ import Text from '../components/text'
 import DefaultLayout from '../layouts/default_layout'
 import GroupsCollection from '../features/groups_collection'
 import WrappedBundle from '../features/ui/util/wrapped_bundle'
-import { openModal } from '../actions/modal'
-import { MODAL_PRO_UPGRADE } from '../constants'
 import {
   GroupsPanel,
   LinkFooter,
@@ -17,16 +15,11 @@ import {
 
 class GroupsPage extends React.PureComponent {
 
-  handleOpenProUpgradeModal = () => {
-    this.props.dispatch(openModal(MODAL_PRO_UPGRADE))
-  }
-
   render() {
     const {
       activeTab,
       intl,
       children,
-      isPro,
     } = this.props
 
     const dontShowChildren = (activeTab === 'timeline' && !me)
@@ -52,14 +45,11 @@ class GroupsPage extends React.PureComponent {
         title: intl.formatMessage(messages.categories),
         to: '/groups/browse/categories',
       },
-    ] : []
-
-    if (isPro) {
-      tabs.push({
+      {
         title: intl.formatMessage(messages.admin),
         to: '/groups/browse/admin',
-      })
-    }
+      },
+    ] : []
 
     const title = intl.formatMessage(messages.groups)
 
@@ -76,8 +66,7 @@ class GroupsPage extends React.PureComponent {
           {
             attrTitle: 'Create',
             icon: 'add',
-            to: isPro ? '/groups/create' : undefined,
-            onClick: isPro ? undefined : this.handleOpenProUpgradeModal,
+            to: '/groups/create',
           },
           {
             icon: 'search',
@@ -114,15 +103,10 @@ const messages = defineMessages({
   admin: { id: 'admin', defaultMessage: 'Admin' },
 })
 
-const mapStateToProps = (state) => ({
-  isPro: state.getIn(['accounts', me, 'is_pro']),
-})
-
 GroupsPage.propTypes = {
   activeTab: PropTypes.string.isRequired,
   intl: PropTypes.object.isRequired,
   children: PropTypes.node.isRequired,
-  isPro: PropTypes.bool,
 }
 
-export default injectIntl(connect(mapStateToProps)(GroupsPage))
\ No newline at end of file
+export default injectIntl(connect()(GroupsPage))
\ No newline at end of file