Skip to content

Commit

Permalink
✨ Clean up files and remove debug statements
Browse files Browse the repository at this point in the history
  • Loading branch information
Creative-Difficulty committed Sep 5, 2023
1 parent 7fce4eb commit efbc090
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ node_modules
!.env.example
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
/test-results/
/playwright-report/
/playwright/.cache/
2 changes: 1 addition & 1 deletion components.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://shadcn-svelte.com/schema.json",
"style": "default",
"tailwind": {
"config": "tailwind.config.js",
"config": "tailwind.config.ts",
"css": "src/app.postcss",
"baseColor": "slate"
},
Expand Down
7 changes: 7 additions & 0 deletions package-lock.json

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

File renamed without changes.
4 changes: 1 addition & 3 deletions src/routes/api/getrecenttrades/+server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,15 @@ export const GET = (async ({ cookies }) => {
});

const parsedTradeDetailsResponse: CapitalComTradeDetailsResponse = await tradeDetailsResponse.json();
console.log(parsedTradeDetailsResponse);
if(parsedTradeDetailsResponse.errorCode === undefined) {
tradeArrayToReturn.push({
title: `${parsedTradeDetailsResponse.position!.direction! === "BUY" ? "Bought" : "Sold"} ${parsedTradeDetailsResponse.position!.size!} ${parsedTradeDetailsResponse!.market?.instrumentType.toLowerCase()} of ${parsedTradeDetailsResponse.market!.instrumentName}`,
description: `${new Date(new Date().getTime() - new Date(parsedTradeDetailsResponse.position!.createdDate).getTime()).getMinutes()} ${(new Date(new Date().getTime() - new Date(parsedTradeDetailsResponse.position!.createdDate).getTime()).getMinutes()) === 1 ? "minute" : "minutes"} ago`
})
} else {
console.log(`Error when getting details of one trade: ${parsedTradeDetailsResponse.errorCode}`);
console.error(`Error when getting details of one trade: ${parsedTradeDetailsResponse.errorCode}`);
}
}
}));
console.log(tradeArrayToReturn);
return json(tradeArrayToReturn, { status: 200 });
}) satisfies RequestHandler
6 changes: 3 additions & 3 deletions src/routes/api/selectcapitalcomaccount/+server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export const POST: RequestHandler = (async ({ cookies, request }) => {
});

let parsedUserAccountsResponse: CapitalComUserAccounts = await userAccountsResponse.json();
if(parsedUserAccountsResponse.errorCode !== undefined) { console.log(`Error while getting all acounts for user: ${parsedUserAccountsResponse.errorCode}`); return json({ error: `Error while getting all acounts for user: ${parsedUserAccountsResponse.errorCode}` }, { status: 500 }); }
if(parsedUserAccountsResponse.accounts?.length === 0) { console.log(`User has no accounts!: ${parsedUserAccountsResponse}`); return json({ error: "The selected account does not have any trading accounts." }, { status: 500 }); }
if(parsedUserAccountsResponse.errorCode !== undefined) { console.error(`Error while getting all acounts for user: ${parsedUserAccountsResponse.errorCode}`); return json({ error: `Error while getting all acounts for user: ${parsedUserAccountsResponse.errorCode}` }, { status: 500 }); }
if(parsedUserAccountsResponse.accounts?.length === 0) { console.error(`User has no accounts!: ${parsedUserAccountsResponse}`); return json({ error: "The selected account does not have any trading accounts." }, { status: 500 }); }

let submittedAccountName = JSON.parse((await request.text())).selectedAccount;
if(parsedUserAccountsResponse.accounts!.find(account => account.accountName === submittedAccountName) !== undefined) {
Expand All @@ -48,7 +48,7 @@ export const POST: RequestHandler = (async ({ cookies, request }) => {
})).json();

if(parsedSwitchAccountResponse.errorCode !== undefined && parsedSwitchAccountResponse.errorCode !== "error.not-different.accountId") {
console.log(`Error while selecting account: ${parsedSwitchAccountResponse.errorCode!}`); return json({ error: `Error while switching account: ${parsedSwitchAccountResponse.errorCode!}` }, { status: 500 });
console.error(`Error while selecting account: ${parsedSwitchAccountResponse.errorCode!}`); return json({ error: `Error while switching account: ${parsedSwitchAccountResponse.errorCode!}` }, { status: 500 });
} else if(parsedSwitchAccountResponse.errorCode === "error.not-different.accountId") {
return json({ success: true, msg: `Already signed in to ${submittedAccountName}.` }, { status: 200 });
}
Expand Down
4 changes: 1 addition & 3 deletions src/routes/login/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import type { CapitalComCreateSessionResponse, CapitalComUserAccounts } from "$l
import type { Actions } from "./$types";
import { UserCST, UserXSecurityToken } from "$lib/stores"

// export const ssr = false;

let userCST: string;
UserCST.subscribe((value: string) => {
userCST = value;
Expand Down Expand Up @@ -79,7 +77,7 @@ export const actions = {
});

let parsedUserAccountsResponse: CapitalComUserAccounts = await userAccountsResponse.json();
if(parsedUserAccountsResponse.errorCode !== undefined) { console.log(`Error while getting all acounts for user: ${parsedUserAccountsResponse.errorCode}`); }
if(parsedUserAccountsResponse.errorCode !== undefined) { console.error(`Error while getting all acounts for user: ${parsedUserAccountsResponse.errorCode}`); }

return {
"showSelectAccountDialog": true,
Expand Down
9 changes: 4 additions & 5 deletions src/routes/login/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
async function handleSelectedAcountSubmit() {
showDialogLoadingButton = true;
if(selectedAccount === undefined || dialogOpen === false) { return; }
console.log(selectedAccount);
const apiResponse = await (await fetch("/api/selectcapitalcomaccount", {
method: "POST",
headers: {
Expand All @@ -45,8 +45,6 @@
})
})).json();
console.log(apiResponse);
showDialogLoadingButton = false
if(apiResponse.success === true) {
toast.success("Successfully signed in!");
Expand Down Expand Up @@ -159,7 +157,8 @@
</Card.Root>
</div>

<div class="flex justify-center items-center h-screen max-w-[3/4] w-[400px]">

<div class="content-center shadow-2xl w-1/2 md:max-w-[400px] max-w-[3/4]">
<Dialog.Root open={dialogOpen} closeOnOutsideClick={false} closeOnEscape={false} onOpenChange={(open) => { if(open === false) { selectedAccount = undefined; dialogOpen = false } else if(open === true) { dialogOpen = true } } }>
<Dialog.Content>
<Dialog.Header>
Expand Down Expand Up @@ -201,4 +200,4 @@
</Dialog.Footer>
</Dialog.Content>
</Dialog.Root>
</div>
</div>
File renamed without changes.
File renamed without changes.

0 comments on commit efbc090

Please sign in to comment.