Skip to content

changed files #1

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

Open
dahnny wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changed files #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 30 additions & 19 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,26 @@ export default function App() {
await contract.methods
.createCard(number, description, image, price)
.send({ from: address });
getBalance()
getCards()
} catch (error) {
console.log(error);
}
};

const buyCard = async (_index) => {
const amount = cards[_index].amount / ( 10 ** 18);
const amount = cards[_index].amount / 10 ** 18;
console.log(amount);
const price = new BigNumber(amount * 3).shiftedBy(ERC20_DECIMALS).toString();
const price = new BigNumber(amount * 3)
.shiftedBy(ERC20_DECIMALS)
.toString();
try {
await cUSDContract.methods
.approve(contractAddress, price)
.send({ from: address });
await contract.methods.buyCard(_index).send({ from: address });
getBalance()
getCards()
} catch (error) {
console.log(error);
}
Expand All @@ -129,6 +135,7 @@ export default function App() {
await contract.methods
.giftCard(_index, giftAddress)
.send({ from: address });
getCards()
} catch (error) {
console.log(error);
}
Expand Down Expand Up @@ -185,7 +192,7 @@ export default function App() {
<div class="block">
<div class="ml-4 flex items-center md:ml-6">
<a
href="https://github.com/"
href="https://github.com/Arome8240/giftcard"
class="p-1 rounded-full text-gray-400 focus:outline-none hover:text-gray-200 focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-800 focus:ring-white"
>
<span class="sr-only">View github</span>
Expand Down Expand Up @@ -289,15 +296,17 @@ export default function App() {
${card.amount / 10 ** 18}
</p>

{card.owner === address && <div class="my-3 relative ">
<input
onChange={(e) => setGiftAddress(e.target.value)}
type="text"
id="rounded-email"
class=" rounded-lg border-transparent flex-1 appearance-none border border-gray-300 w-full py-2 px-4 bg-white text-gray-700 placeholder-gray-400 shadow-sm text-base focus:outline-none focus:ring-2 focus:ring-purple-600 focus:border-transparent"
placeholder="Gift Address"
/>
</div>}
{card.owner === address && (
<div class="my-3 relative ">
<input
onChange={(e) => setGiftAddress(e.target.value)}
type="text"
id="rounded-email"
class=" rounded-lg border-transparent flex-1 appearance-none border border-gray-300 w-full py-2 px-4 bg-white text-gray-700 placeholder-gray-400 shadow-sm text-base focus:outline-none focus:ring-2 focus:ring-purple-600 focus:border-transparent"
placeholder="Gift Address"
/>
</div>
)}

<div class="flex items-center">
{address !== card.owner ? (
Expand All @@ -317,13 +326,15 @@ export default function App() {
Buy
</button>
)}
{address === card.owner && <button
type="button"
onClick={() => giftCard(card.index)}
class="bg-blue-500 border-t border-b border-r text-base font-medium rounded-r-md text-white hover:bg-blue-600 px-4 py-2"
>
Gift
</button>}
{address === card.owner && (
<button
type="button"
onClick={() => giftCard(card.index)}
class="bg-blue-500 border-t border-b border-r text-base font-medium rounded-r-md text-white hover:bg-blue-600 px-4 py-2"
>
Gift
</button>
)}
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/contract/card.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ contract GiftCard{
cardLength++;
}


function buyCard(uint _index)public payable{
require(msg.sender != cards[_index].owner, "Cannot be owner");
require(
IERC20Token(cUsdTokenAddress).transferFrom(
msg.sender,
Expand All @@ -69,6 +71,7 @@ contract GiftCard{
}

function giftCard(uint _index, address _address)public payable{
require(msg.sender == cards[_index].owner, "must be be owner");
cards[_index].owner = payable(_address);
}

Expand Down
1 change: 0 additions & 1 deletion src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';

ReactDOM.render(
<React.StrictMode>
Expand Down