Skip to content
This repository has been archived by the owner on Jan 6, 2024. It is now read-only.

Commit

Permalink
Disable free credits, purchases, and yalcs
Browse files Browse the repository at this point in the history
  • Loading branch information
MrXyfir committed Jun 16, 2020
1 parent c40d83d commit 23936ae
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 28 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ This project adheres to [Semantic Versioning](https://semver.org) after `v6.7.2`

## [Unreleased]

## [6.8.3] - 2020-06-15

I'm trying to figure out what the future holds for Ptorx. I'm very busy with
other projects and can't give Ptorx users the attention they deserve. Still,
many people use it, including myself, so it's not going offline. - Mr. Xyfir

### Removed

- Free account credits
- Ability to purchase credits
- Yalcs live support

## [6.8.2] - 2019-10-07

### Fixed
Expand Down Expand Up @@ -161,7 +173,8 @@ This project adheres to [Semantic Versioning](https://semver.org) after `v6.7.2`

- Release 6.0.0

[unreleased]: https://github.com/Xyfir/ptorx/compare/6.8.2...HEAD
[unreleased]: https://github.com/Xyfir/ptorx/compare/6.8.3...HEAD
[6.8.3]: https://github.com/Xyfir/ptorx/releases/tag/6.8.3
[6.8.2]: https://github.com/Xyfir/ptorx/releases/tag/6.8.2
[6.8.0]: https://github.com/Xyfir/ptorx/releases/tag/6.8.0
[6.7.2]: https://github.com/Xyfir/ptorx/releases/tag/6.7.2
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ptorx",
"version": "6.8.2",
"version": "6.8.3",
"description": "Send and receive mail anonymously with email forwarding and aliases through Ptorx.",
"main": "",
"author": "Xyfir, LLC <[email protected]> (https://www.xyfir.com)",
Expand All @@ -9,8 +9,8 @@
"singleQuote": true
},
"dependencies": {
"ptorx-server": "^6.8.2",
"ptorx-web": "^6.8.2"
"ptorx-server": "^6.8.3",
"ptorx-web": "^6.8.3"
},
"keywords": [
"email forwarding",
Expand Down
14 changes: 7 additions & 7 deletions server/lib/users/tiers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ export const TIERS: {
}[] = [
{
name: 'basic',
credits: 200,
durations: [{ duration: 'life', cost: 0 }]
credits: 0,
durations: [{ duration: 'life', cost: 0 }],
},
{
name: 'premium',
credits: 1500,
durations: [
{ duration: 'month', cost: 150 },
{ duration: 'year', cost: 1500 }
]
{ duration: 'year', cost: 1500 },
],
},
{
name: 'ultimate',
credits: 10000,
durations: [
{ duration: 'month', cost: 500 },
{ duration: 'year', cost: 5000 }
]
}
{ duration: 'year', cost: 5000 },
],
},
];
2 changes: 1 addition & 1 deletion server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ptorx-server",
"version": "6.8.2",
"version": "6.8.3",
"description": "Send and receive mail anonymously with email forwarding and aliases through Ptorx.",
"main": "app.js",
"scripts": {
Expand Down
31 changes: 19 additions & 12 deletions web/components/panel/account/PurchaseCredits.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@ import {
withStyles,
Button,
Theme,
Paper
Paper,
} from '@material-ui/core';

const styles = (theme: Theme) =>
createStyles({
buttons: {
flexDirection: 'column',
display: 'flex'
display: 'flex',
},
button: {
margin: '1em 0'
margin: '1em 0',
},
paper: {
padding: '0.5em',
margin: '1em'
margin: '1em',
},
email: {
textDecoration: 'none',
color: theme.palette.primary.main
color: theme.palette.primary.main,
},
root: {
textAlign: 'center'
}
textAlign: 'center',
},
});

class _PurchaseCredits extends React.Component<
Expand All @@ -51,23 +51,23 @@ class _PurchaseCredits extends React.Component<
this.props.enqueueSnackbar('Payment complete');
return api.get('/users');
})
.then(res => this.context.dispatch({ user: res.data }))
.catch(err => this.props.enqueueSnackbar(err.response.data.error));
.then((res) => this.context.dispatch({ user: res.data }))
.catch((err) => this.props.enqueueSnackbar(err.response.data.error));
}

onBuy(tier: Ptorx.Payment['tier'], duration: Ptorx.Payment['duration']) {
api
.post('/payments/start', { tier, duration })
.then(res => (location.href = res.data.url))
.catch(err => this.props.enqueueSnackbar(err.response.data.error));
.then((res) => (location.href = res.data.url))
.catch((err) => this.props.enqueueSnackbar(err.response.data.error));
}

render() {
const { classes } = this.props;
const { user } = this.context;
return (
<div className={classes.root}>
<Typography>
{/* <Typography>
Experience Ptorx with all of its features and increased credits per
month.
</Typography>
Expand Down Expand Up @@ -135,6 +135,13 @@ class _PurchaseCredits extends React.Component<
[email protected]
</a>
.
</Typography> */}
<Typography>
Purchasing credits is disabled until further notice. Email us at{' '}
<a href="mailto:[email protected]" className={classes.email}>
[email protected]
</a>{' '}
with questions.
</Typography>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ptorx-web",
"version": "6.8.2",
"version": "6.8.3",
"description": "Send and receive mail anonymously with email forwarding and aliases through Ptorx.",
"main": "",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion web/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<link rel="icon" type="image/png" href="/icon.png" />

<script src="<%- YALCS_WEB_URL %>/static/yalcs-loader.js" async></script>
<!-- <script src="<%- YALCS_WEB_URL %>/static/yalcs-loader.js" async></script> -->
</head>
<body>
<div id="content"></div>
Expand Down

0 comments on commit 23936ae

Please sign in to comment.