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

Adds validations for user login, wallet and enough money #186

Merged
merged 16 commits into from
May 14, 2021
Merged

Adds validations for user login, wallet and enough money #186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0f9f894
checks for user login and wallet added
Rucha1499 Mar 18, 2021
7b619fc
Modifying buy and sell stock cards
Rucha1499 Mar 18, 2021
5bf735b
defining new function for passing different props in cards
Rucha1499 Mar 21, 2021
e3c90cb
Validating the buy/sell quantity before transaction
Rucha1499 Mar 22, 2021
ef81dbe
Adds CSS for navigation buttons on buy/sell page
Rucha1499 Mar 22, 2021
c11fd22
Fixing the sell feature by changing id to stockId
Rucha1499 Mar 23, 2021
2d7d44e
Adding checks of login to selling page
Rucha1499 Mar 23, 2021
32a89a5
Changing URLs to work on production
Rucha1499 Mar 25, 2021
dfebce1
adding ternary operator, removing extra else statement
Rucha1499 Mar 26, 2021
eaaeb78
changing value to boolean
Rucha1499 Mar 27, 2021
ebae59d
Fixing merge conflicts
Rucha1499 Mar 27, 2021
32f5d91
Fixing URL in fetchSelfDetails function
Rucha1499 Mar 27, 2021
0ac64c6
CSS changes and refactoring code
Rucha1499 Apr 29, 2021
6c05650
Changing console.log to console.error
Rucha1499 Apr 29, 2021
4e82f3c
refactoring code
Rucha1499 May 12, 2021
7980ca2
CSS changes
Rucha1499 May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 15 additions & 19 deletions components/stock-card/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,21 @@ export const Card = ({ stock }) => {
const router = useRouter();

const getStockOperation = () => {
if (router.pathname == '/trading') {
return (
<StockOperation
stockId={stock.stockId}
name={stock.name}
price={stock.price}
availableQty={stock.quantity}
/>
);
} else {
return (
<StockOperation
stockId={stock.stockId}
name={stock.stockName}
price={stock.initialStockValue}
availableQty={stock.quantity}
/>
);
}
return router.pathname == '/trading' ? (
<StockOperation
stockId={stock.stockId}
name={stock.name}
price={stock.price}
availableQty={stock.quantity}
/>
) : (
<StockOperation
stockId={stock.stockId}
name={stock.stockName}
price={stock.initialStockValue}
availableQty={stock.quantity}
/>
);
};
return (
<div className="stock-card">
Expand Down
14 changes: 6 additions & 8 deletions components/stock-operation-modal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const StockOperationModal = (props) => {
} = props;

const [quantity, setQuantity] = useState('');
const [isUserLoggedIn, setIsUserLoggedIn] = useState('');
const [userMoney, setUserMoney] = useState();
const [isUserLoggedIn, setIsUserLoggedIn] = useState('false');
Rucha1499 marked this conversation as resolved.
Show resolved Hide resolved
const [userMoney, setUserMoney] = useState(0);

const validateQuantity = (quantity) => {
if (quantity > availableQty) {
Expand All @@ -44,12 +44,10 @@ const StockOperationModal = (props) => {
});
const { wallet } = await response.json();
if (Object.keys(wallet).length === 0) return setUserMoney(0);
else {
const {
currencies: { dinero },
} = wallet;
setUserMoney(dinero);
}
const {
currencies: { dinero },
} = wallet;
setUserMoney(dinero);
};

getUserWallet();
Expand Down