This repository has been archived by the owner on Mar 13, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* [MM-28200] Cloud Billing - Admin Console sections and layout * Nit * Test fixes
- Loading branch information
1 parent
bbc8427
commit c6278f6
Showing
13 changed files
with
390 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. | ||
// See LICENSE.txt for license information. | ||
|
||
import React from 'react'; | ||
|
||
import FormattedAdminHeader from 'components/widgets/admin_console/formatted_admin_header'; | ||
|
||
type Props = { | ||
|
||
}; | ||
|
||
const BillingHistory: React.FC<Props> = () => { | ||
return ( | ||
<div className='wrapper--fixed BillingHistory'> | ||
<FormattedAdminHeader | ||
id='admin.billing.history.title' | ||
defaultMessage='Billing History' | ||
/> | ||
<div className='admin-console__wrapper'> | ||
<div className='admin-console__content'> | ||
<div style={{border: '1px solid #000', width: '100%', height: '463px'}}> | ||
{'Billing History Table View'} | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default BillingHistory; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
.BillingSubscriptions { | ||
.BillingSubscriptions__topWrapper { | ||
display: flex; | ||
} | ||
} |
43 changes: 43 additions & 0 deletions
43
components/admin_console/billing/billing_subscriptions.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. | ||
// See LICENSE.txt for license information. | ||
|
||
import React from 'react'; | ||
|
||
import FormattedAdminHeader from 'components/widgets/admin_console/formatted_admin_header'; | ||
|
||
import './billing_subscriptions.scss'; | ||
|
||
type Props = { | ||
|
||
}; | ||
|
||
const BillingSubscriptions: React.FC<Props> = () => { | ||
return ( | ||
<div className='wrapper--fixed BillingSubscriptions'> | ||
<FormattedAdminHeader | ||
id='admin.billing.subscription.title' | ||
defaultMessage='Subscriptions' | ||
/> | ||
<div className='admin-console__wrapper'> | ||
<div className='admin-console__content'> | ||
<div style={{border: '1px solid #000', width: '100%', height: '81px', marginBottom: '20px'}}> | ||
{'Alert Banner (credit card expired/recent payment failed)'} | ||
</div> | ||
<div className='BillingSubscriptions__topWrapper'> | ||
<div style={{border: '1px solid #000', width: '568px', height: '438px'}}> | ||
{'Plan Details Card'} | ||
</div> | ||
<div style={{border: '1px solid #000', width: '332px', marginLeft: '20px'}}> | ||
{'Billing Summary Card / Upgrade Mattermost Cloud'} | ||
</div> | ||
</div> | ||
<div style={{border: '1px solid #000', width: '100%', height: '217px', marginTop: '20px'}}> | ||
{'Private Cloud'} | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default BillingSubscriptions; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. | ||
// See LICENSE.txt for license information. | ||
|
||
import React from 'react'; | ||
import {FormattedMessage} from 'react-intl'; | ||
|
||
import FormattedAdminHeader from 'components/widgets/admin_console/formatted_admin_header'; | ||
import BlockableLink from 'components/admin_console/blockable_link'; | ||
|
||
type Props = { | ||
|
||
}; | ||
|
||
const CompanyInfo: React.FC<Props> = () => { | ||
return ( | ||
<div className='wrapper--fixed CompanyInfo'> | ||
<FormattedAdminHeader | ||
id='admin.billing.company_info.title' | ||
defaultMessage='Company Information' | ||
/> | ||
<div className='admin-console__wrapper'> | ||
<div className='admin-console__content'> | ||
<div style={{border: '1px solid #000', width: '100%', height: '432px'}}> | ||
{'Company Details Card'} | ||
<BlockableLink | ||
to='/admin_console/billing/company_info_edit' | ||
> | ||
<FormattedMessage | ||
id='admin.billing.company_info.add' | ||
defaultMessage='Add Company Information' | ||
/> | ||
</BlockableLink> | ||
</div> | ||
<div style={{border: '1px solid #000', width: '100%', height: '194px', marginTop: '20px'}}> | ||
{'Billing Admins Card'} | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default CompanyInfo; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. | ||
// See LICENSE.txt for license information. | ||
|
||
import React from 'react'; | ||
import {FormattedMessage} from 'react-intl'; | ||
|
||
import BlockableLink from 'components/admin_console/blockable_link'; | ||
import SaveButton from 'components/save_button'; | ||
|
||
type Props = { | ||
|
||
}; | ||
|
||
const CompanyInfoEdit: React.FC<Props> = () => { | ||
return ( | ||
<div className='wrapper--fixed CompanyInfoEdit'> | ||
<div className='admin-console__header with-back'> | ||
<div> | ||
<BlockableLink | ||
to='/admin_console/billing/company_info' | ||
className='fa fa-angle-left back' | ||
/> | ||
<FormattedMessage | ||
id='admin.billing.company_info_edit.title' | ||
defaultMessage='Edit Company Information' | ||
/> | ||
</div> | ||
</div> | ||
<div className='admin-console__wrapper'> | ||
<div className='admin-console__content'> | ||
<div style={{border: '1px solid #000', width: '100%', height: '432px'}}> | ||
{'Edit Company Info View'} | ||
</div> | ||
</div> | ||
</div> | ||
<div className='admin-console-save'> | ||
<SaveButton | ||
saving={false} // TODO | ||
// disabled={this.props.isDisabled || !this.state.saveNeeded || (this.canSave && !this.canSave())} | ||
// onClick={this.handleSubmit} | ||
defaultMessage={( | ||
<FormattedMessage | ||
id='admin.billing.company_info_edit.save' | ||
defaultMessage='Save info' | ||
/> | ||
)} | ||
/> | ||
<BlockableLink | ||
className='cancel-button' | ||
to='/admin_console/billing/company_info' | ||
> | ||
<FormattedMessage | ||
id='admin.billing.company_info_edit.cancel' | ||
defaultMessage='Cancel' | ||
/> | ||
</BlockableLink> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default CompanyInfoEdit; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. | ||
// See LICENSE.txt for license information. | ||
|
||
import React from 'react'; | ||
import {FormattedMessage} from 'react-intl'; | ||
|
||
import FormattedAdminHeader from 'components/widgets/admin_console/formatted_admin_header'; | ||
import BlockableLink from 'components/admin_console/blockable_link'; | ||
|
||
type Props = { | ||
|
||
}; | ||
|
||
const PaymentInfo: React.FC<Props> = () => { | ||
return ( | ||
<div className='wrapper--fixed PaymentInfo'> | ||
<FormattedAdminHeader | ||
id='admin.billing.payment_info.title' | ||
defaultMessage='Payment Information' | ||
/> | ||
<div className='admin-console__wrapper'> | ||
<div className='admin-console__content'> | ||
<div style={{border: '1px solid #000', width: '100%', height: '81px', marginBottom: '20px'}}> | ||
{'Alert Banner (credit card expired/about to expire)'} | ||
</div> | ||
<div style={{border: '1px solid #000', width: '100%', height: '484px'}}> | ||
{'Payment Details Card'} | ||
<BlockableLink | ||
to='/admin_console/billing/payment_info_edit' | ||
> | ||
<FormattedMessage | ||
id='admin.billing.payment_info.add' | ||
defaultMessage='Add Payment Information' | ||
/> | ||
</BlockableLink> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default PaymentInfo; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. | ||
// See LICENSE.txt for license information. | ||
|
||
import React from 'react'; | ||
import {FormattedMessage} from 'react-intl'; | ||
|
||
import BlockableLink from 'components/admin_console/blockable_link'; | ||
import SaveButton from 'components/save_button'; | ||
|
||
type Props = { | ||
|
||
}; | ||
|
||
const PaymentInfoEdit: React.FC<Props> = () => { | ||
return ( | ||
<div className='wrapper--fixed PaymentInfoEdit'> | ||
<div className='admin-console__header with-back'> | ||
<div> | ||
<BlockableLink | ||
to='/admin_console/billing/payment_info' | ||
className='fa fa-angle-left back' | ||
/> | ||
<FormattedMessage | ||
id='admin.billing.payment_info_edit.title' | ||
defaultMessage='Edit Payment Information' | ||
/> | ||
</div> | ||
</div> | ||
<div className='admin-console__wrapper'> | ||
<div className='admin-console__content'> | ||
<div style={{border: '1px solid #000', width: '100%', height: '432px'}}> | ||
{'Edit Payment Info View'} | ||
</div> | ||
</div> | ||
</div> | ||
<div className='admin-console-save'> | ||
<SaveButton | ||
saving={false} // TODO | ||
// disabled={this.props.isDisabled || !this.state.saveNeeded || (this.canSave && !this.canSave())} | ||
// onClick={this.handleSubmit} | ||
defaultMessage={( | ||
<FormattedMessage | ||
id='admin.billing.payment_info_edit.save' | ||
defaultMessage='Save info' | ||
/> | ||
)} | ||
/> | ||
<BlockableLink | ||
className='cancel-button' | ||
to='/admin_console/billing/payment_info' | ||
> | ||
<FormattedMessage | ||
id='admin.billing.payment_info_edit.cancel' | ||
defaultMessage='Cancel' | ||
/> | ||
</BlockableLink> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default PaymentInfoEdit; |
Oops, something went wrong.