Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

changes for updatesubscription code sync #37

Merged
merged 3 commits into from
Aug 4, 2020
Merged

changes for updatesubscription code sync #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef1714d
minor changes
Aug 4, 2020
9012c8c
changes,modal removed
Aug 4, 2020
33e8583
changes for updatesubscription component,styling left,one issue in up…
Aug 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 76 additions & 75 deletions src/actions/user.actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export const userActions = {
createSubscription,
withdrawFromSubscription,
cancelSubscription,
enablesubscription,
disablesubscription
updateSubscriptionInfo,
disableSubscriptionInfo
};

function clean() {
Expand Down Expand Up @@ -326,6 +326,80 @@ function cancelSubscription(seller) {
};
}

function updateSubscriptionInfo(amount,days,asset) {

return async (dispatch, getState) => {
dispatch(started());
let data;
try {
const { account, market, web3 } = getState().web3;

console.log("enable subs")
data = await marketService.updateSubscriptionInfo(market,amount,days,asset);

} catch (e) {
console.log(e);
dispatch(failure(e));
dispatch(
alertActions.error(
"Error enabling subs: " + e.toString()
)
);
return;
}
if (!data.error) {
dispatch(
alertActions.success("Successfully enabled Subscription")
);
dispatch(done());
} else {
dispatch(failure(data.error));
dispatch(
alertActions.error(
"Error enabling Subscription: " + data.error
)
);
}
};
}

function disableSubscriptionInfo() {

return async (dispatch, getState) => {
dispatch(started());
let data;
try {
const { account, market, web3 } = getState().web3;

console.log("enable subs")
data = await marketService.disableSubscriptionInfo(market);

} catch (e) {
console.log(e);
dispatch(failure(e));
dispatch(
alertActions.error(
"Error disabling subs: " + e.toString()
)
);
return;
}
if (!data.error) {
dispatch(
alertActions.success("Successfully disabled Subscription")
);
dispatch(done());
} else {
dispatch(failure(data.error));
dispatch(
alertActions.error(
"Error disabling Subscription: " + data.error
)
);
}
};
}

function downloadFile(fileId) {
return async (dispatch, getState) => {
dispatch(started());
Expand Down Expand Up @@ -409,76 +483,3 @@ function failure(error) {
};
}

function enablesubscription(amountperday, minduration, tokenaddress) {

return async (dispatch, getState) => {
dispatch(started());
let data;
try {
const { account, market, web3 } = getState().web3;

console.log("enable subs")
data = await marketService.updatesubs(market, amountperday, minduration, tokenaddress);

} catch (e) {
console.log(e);
dispatch(failure(e));
dispatch(
alertActions.error(
"Error enabling subs: " + e.toString()
)
);
return;
}
if (!data.error) {
dispatch(
alertActions.success("Successfully enabled Subscription")
);
dispatch(done());
} else {
dispatch(failure(data.error));
dispatch(
alertActions.error(
"Error enabling Subscription: " + data.error
)
);
}
};
}

function disablesubscription() {

return async (dispatch, getState) => {
dispatch(started());
let data;
try {
const { account, market, web3 } = getState().web3;

console.log("enable subs")
data = await marketService.disablesubs(market);

} catch (e) {
console.log(e);
dispatch(failure(e));
dispatch(
alertActions.error(
"Error disabling subs: " + e.toString()
)
);
return;
}
if (!data.error) {
dispatch(
alertActions.success("Successfully disabled Subscription")
);
dispatch(done());
} else {
dispatch(failure(data.error));
dispatch(
alertActions.error(
"Error disabling Subscription: " + data.error
)
);
}
};
}
8 changes: 3 additions & 5 deletions src/components/UpdateSubscription.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
import React, { useState} from "react";
import config from "config";
import { connect } from "react-redux";
import { userActions } from "../actions";

function UpdateSubscription(props) {
const { enablesubscription,disablesubscription } = props;
const UpdateSubscription = ({ enablesubscription,disablesubscription }) => {
const defaultAsset = config.priceAssets[0].address;
const [asset, setAsset] = useState(defaultAsset);
const [amount, setAmount] = useState("");
const [days, setDays] = useState("");

const enableSub = async() => {
const enableresult = await enablesubscription(amount,days,asset);
const enableresult = await updateSubscriptionInfo(amount,days,asset);
console.log(enableresult);
}

const disableSub = async () => {
const disablesubresult = await disablesubscription();
const disablesubresult = await disableSubscriptionInfo();
console.log(disablesubresult);
}

Expand Down
23 changes: 4 additions & 19 deletions src/pages/UserPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,6 @@ const UserPage = ({
Subscribe
</a>
)}
<div>
<button onClick={openModal}>

{!show && !userSubscriptions.subscriptions.some(user => user.subscriber.address === account.toLowerCase() && user.isActive) &&(
<button onClick={openModal}>
Subscribe
</button>}
<Modal
closeModal={closeModal}
show={show}
createSubscription={createSubscription}
address={address}
cancelSubscription={cancelSubscription}
/>
</div>
</div>
<div className="profileRightBar">
{selected == 0 ? (
Expand All @@ -175,8 +160,8 @@ const UserPage = ({
/>
) : selected == 5 ? (
<UpdateSubscription
enablesubscription = {enablesubscription}
disablesubscription = {disablesubscription}
updateSubscriptionInfo = {updateSubscriptionInfo}
disableSubscriptionInfo = {disableSubscriptionInfo}
/>
) : (
<UserSubscriptions
Expand All @@ -200,8 +185,8 @@ const actionCreators = {
getAllFiles: userActions.getAllFiles,
createSubscription: userActions.createSubscription,
cancelSubscription: userActions.cancelSubscription,
enablesubscription: userActions.enablesubscription,
disablesubscription: userActions.disablesubscription,
updateSubscriptionInfo: userActions.updateSubscriptionInfo,
disableSubscriptionInfo: userActions.disableSubscriptionInfo,
cleanBox: boxActions.clean,
getProfile: boxActions.getDataProfile
};
Expand Down
8 changes: 4 additions & 4 deletions src/services/market.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export const marketService = {
withdrawSubscriptionAmount,
cancelSubscription,
isValidStream,
updatesubs,
disablesubs
updateSubscriptionInfo,
disableSubscriptionInfo
};

async function getFile(market, fileId) {
Expand Down Expand Up @@ -108,7 +108,7 @@ async function cancelSubscription(market, seller) {
}

// for enable subs
async function updatesubs(market, amountperday, minduration, tokenaddress) {
async function updateSubscriptionInfo(market, amountperday, minduration, tokenaddress) {
const receipt = await market.methods.updateSubscriptionInfo(amountperday, minduration, tokenaddress).send()
if (!receipt.status) {
logReceipt(receipt);
Expand All @@ -118,7 +118,7 @@ async function updatesubs(market, amountperday, minduration, tokenaddress) {
}

// for disable subs
async function disablesubs(market) {
async function disableSubscriptionInfo(market) {
const receipt = await market.methods.disableSubscriptionInfo().send()
if (!receipt.status) {
logReceipt(receipt);
Expand Down