diff --git a/src/routes/about/+page.ts b/src/routes/about/+page.ts
new file mode 100644
index 00000000..2ace4960
--- /dev/null
+++ b/src/routes/about/+page.ts
@@ -0,0 +1,60 @@
+import { getCache, setCache } from "$lib/store";
+import { redirect } from "@sveltejs/kit";
+
+export const load = async ({ parent }) => {
+ const getFrontendStars = async () => {
+ let output;
+
+ // Get cached data for the specific tickerID
+ const cachedData = getCache("", "getFrontendStars");
+ if (cachedData) {
+ output = cachedData;
+ } else {
+ // make the POST request to the endpoint
+ const response = await fetch(
+ "https://api.github.com/repos/stocknear/frontend",
+ {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
+
+ output = (await response.json())["stargazers_count"];
+ setCache("", output, "getFrontendStars");
+ }
+ return output;
+ };
+
+ const getBackendStars = async () => {
+ let output;
+
+ // Get cached data for the specific tickerID
+ const cachedData = getCache("", "getBackendStars");
+ if (cachedData) {
+ output = cachedData;
+ } else {
+ // make the POST request to the endpoint
+ const response = await fetch(
+ "https://api.github.com/repos/stocknear/backend",
+ {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
+
+ output = (await response.json())["stargazers_count"];
+ setCache("", output, "getBackendStars");
+ }
+ return output;
+ };
+
+ // Make sure to return a promise
+ return {
+ getFrontendStars: await getFrontendStars(),
+ getBackendStars: await getBackendStars(),
+ };
+};
diff --git a/src/routes/community/+page.server.ts b/src/routes/community/+page.server.ts
index 7f631c96..cbb53449 100644
--- a/src/routes/community/+page.server.ts
+++ b/src/routes/community/+page.server.ts
@@ -2,29 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
export const actions = {
-
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -32,113 +29,114 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(303, "/");
+ },
- redirect(303, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('path', "/community", {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60
- });
-
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
+ cookies.set("path", "/community", {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60,
+ });
- }
-
-
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/community/post/[postId]/+page.server.ts b/src/routes/community/post/[postId]/+page.server.ts
index 32f78bfb..2b8baf0f 100644
--- a/src/routes/community/post/[postId]/+page.server.ts
+++ b/src/routes/community/post/[postId]/+page.server.ts
@@ -2,29 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
export const actions = {
-
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -32,113 +29,114 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(303, "/community");
+ },
- redirect(303, '/community');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/community");
- },
-
+ redirect(303, "/community");
+ },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('path', "/community", {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60
- });
-
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
+ cookies.set("path", "/community", {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60,
+ });
- }
-
-
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/community/user/[userId]/+page.server.ts b/src/routes/community/user/[userId]/+page.server.ts
index 0f08a890..785173d9 100644
--- a/src/routes/community/user/[userId]/+page.server.ts
+++ b/src/routes/community/user/[userId]/+page.server.ts
@@ -2,46 +2,40 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-export const load = async ({locals, params}) => {
+export const load = async ({ locals, params }) => {
+ if (params.userId === locals?.user?.id) {
+ redirect(303, "/community/profile");
+ }
-
- if (params.userId === locals?.user?.id) {
- redirect(303, '/community/profile');
- }
+ const userId = async () => {
+ return params.userId;
+ };
- const userId = async () => {
- return params.userId
- };
-
-
- return {
- userId: await userId(),
- };
-
-}
+ return {
+ userId: await userId(),
+ };
+};
export const actions = {
-
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -49,107 +43,106 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(303, "/");
+ },
- redirect(303, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
-
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
-
- }
-
-
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/crypto/[tickerID]/+page.server.ts b/src/routes/crypto/[tickerID]/+page.server.ts
index f34bf12d..a17c53b3 100644
--- a/src/routes/crypto/[tickerID]/+page.server.ts
+++ b/src/routes/crypto/[tickerID]/+page.server.ts
@@ -2,28 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
export const actions = {
-
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -31,111 +29,114 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(302, "/");
+ },
- redirect(302, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies, params }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies, params }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('path', "/crypto/"+params.tickerID, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60
- });
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
+ cookies.set("path", "/crypto/" + params.tickerID, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60,
+ });
- redirect(302,authProviderRedirect);
-
- }
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/etf/[tickerID]/+page.server.ts b/src/routes/etf/[tickerID]/+page.server.ts
index 6c947809..fbc5b4e5 100644
--- a/src/routes/etf/[tickerID]/+page.server.ts
+++ b/src/routes/etf/[tickerID]/+page.server.ts
@@ -2,29 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
export const actions = {
-
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -32,113 +29,114 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(301, "/");
+ },
- redirect(301, "/");
- },
-
- register: async ({ locals, request, params }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request, params }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/etf/"+params.tickerID);
- },
-
+ redirect(303, "/etf/" + params.tickerID);
+ },
-
- oauth2: async ( { url, locals, request, cookies, params }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies, params }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('path', "/etf/"+params.tickerID, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60
- });
-
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
+ cookies.set("path", "/etf/" + params.tickerID, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60,
+ });
- }
-
-
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/portfolio/+page.server.ts b/src/routes/portfolio/+page.server.ts
index 93d79645..27cf2ef0 100644
--- a/src/routes/portfolio/+page.server.ts
+++ b/src/routes/portfolio/+page.server.ts
@@ -2,29 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
export const actions = {
-
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -32,106 +29,106 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(302, "/");
+ },
- redirect(302, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
-
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- }
-
-
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/pricing/+page.server.ts b/src/routes/pricing/+page.server.ts
index 60c318ae..3c5f6e40 100644
--- a/src/routes/pricing/+page.server.ts
+++ b/src/routes/pricing/+page.server.ts
@@ -2,7 +2,6 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
/*
export const load = async () => {
@@ -30,29 +29,26 @@ export const load = async () => {
};
*/
-
-
export const actions = {
-
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -60,112 +56,114 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(302, "/");
+ },
- redirect(302, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('path', "/pricing", {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60
- });
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
-
+ cookies.set("path", "/pricing", {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60,
+ });
- redirect(302,authProviderRedirect);
-
- }
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/register/+page.server.ts b/src/routes/register/+page.server.ts
index 3260b986..dd42cbbb 100644
--- a/src/routes/register/+page.server.ts
+++ b/src/routes/register/+page.server.ts
@@ -1,60 +1,61 @@
-import { error, fail, redirect } from '@sveltejs/kit';
-import { registerUserSchema } from '$lib/schemas';
-import { validateData } from '$lib/utils';
-
+import { error, fail, redirect } from "@sveltejs/kit";
+import { registerUserSchema } from "$lib/schemas";
+import { validateData } from "$lib/utils";
async function checkDisposableEmail(email) {
-const url = `https://disposable.debounce.io/?email=${encodeURIComponent(email)}`;
- const response = await fetch(url, {
- method: 'GET',
- headers: {
- "Content-Type": "application/json"
- },
- });
- const output = (await response.json())?.disposable ?? false;
- return output
+ const url = `https://disposable.debounce.io/?email=${encodeURIComponent(email)}`;
+ const response = await fetch(url, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ });
+ const output = (await response.json())?.disposable ?? false;
+ return output;
}
export const actions = {
- register: async ({ locals, request }) => {
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
+ const isEmailDisposable = await checkDisposableEmail(formData?.email);
+ if (isEmailDisposable === "true") {
+ error(400, "Disposable Email Addresses not allowed!");
+ }
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
- const isEmailDisposable = await checkDisposableEmail(formData?.email);
+ //let username = generateUsername(formData.name.split(' ').join('')).toLowerCase();
- if(isEmailDisposable === "true") {
- error(400, 'Disposable Email Addresses not allowed!');
- }
+ try {
+ const newUser = await locals.pb.collection("users").create(formData);
+ /*
+ await locals.pb?.collection('users').update(
+ newUser?.id, {
+ 'freeTrial' : true,
+ 'tier': 'Pro', //Give new users a free trial for the Pro Subscription
+ });
+ */
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- //let username = generateUsername(formData.name.split(' ').join('')).toLowerCase();
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
- try {
- const newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
- newUser?.id, {
- 'freeTrial' : true,
- 'tier': 'Pro', //Give new users a free trial for the Pro Subscription
- });
-
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
-
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -62,70 +63,74 @@ export const actions = {
};
}
*/
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(301, "/");
- },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ redirect(301, "/");
+ },
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('path', "/", {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60
- });
-
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
+ cookies.set("path", "/", {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60,
+ });
- }
-
-};
\ No newline at end of file
+ redirect(302, authProviderRedirect);
+ },
+};
diff --git a/src/routes/stock-screener/+page.server.ts b/src/routes/stock-screener/+page.server.ts
index 4fb7ba86..1d13454b 100644
--- a/src/routes/stock-screener/+page.server.ts
+++ b/src/routes/stock-screener/+page.server.ts
@@ -2,32 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
-
-
-
export const actions = {
-
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -35,106 +29,106 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(303, "/");
+ },
- redirect(303, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
-
- }
-
-
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/stocks/[tickerID]/+page.server.ts b/src/routes/stocks/[tickerID]/+page.server.ts
index cadb82f4..4813c176 100644
--- a/src/routes/stocks/[tickerID]/+page.server.ts
+++ b/src/routes/stocks/[tickerID]/+page.server.ts
@@ -2,28 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
export const actions = {
-
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -31,114 +29,115 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(302, "/");
+ },
- redirect(302, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
+*/
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies, params }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies, params }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('path', "/stocks/"+params.tickerID, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60
- });
-
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
+ cookies.set("path", "/stocks/" + params.tickerID, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60,
+ });
- redirect(302,authProviderRedirect);
-
- },
-
-
+ redirect(302, authProviderRedirect);
+ },
};
diff --git a/src/routes/stocks/[tickerID]/stats/+page.server.ts b/src/routes/stocks/[tickerID]/stats/+page.server.ts
index 2420ec86..27cf2ef0 100644
--- a/src/routes/stocks/[tickerID]/stats/+page.server.ts
+++ b/src/routes/stocks/[tickerID]/stats/+page.server.ts
@@ -2,28 +2,26 @@ import { error, fail, redirect } from "@sveltejs/kit";
import { validateData } from "$lib/utils";
import { loginUserSchema, registerUserSchema } from "$lib/schemas";
-
export const actions = {
-
- login: async ({ request, locals }) => {
- const { formData, errors } = await validateData(
- await request.formData(),
- loginUserSchema,
- );
+ login: async ({ request, locals }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ loginUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors,
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
- /*
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+
+ /*
if (!locals.pb?.authStore?.model?.verified) {
locals.pb.authStore.clear();
return {
@@ -31,105 +29,106 @@ export const actions = {
};
}
*/
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
+ redirect(302, "/");
+ },
- redirect(302, '/');
- },
-
- register: async ({ locals, request }) => {
- const { formData, errors } = await validateData(await request.formData(), registerUserSchema);
+ register: async ({ locals, request }) => {
+ const { formData, errors } = await validateData(
+ await request.formData(),
+ registerUserSchema
+ );
- if (errors) {
- return fail(400, {
- data: formData,
- errors: errors.fieldErrors
- });
- }
+ if (errors) {
+ return fail(400, {
+ data: formData,
+ errors: errors.fieldErrors,
+ });
+ }
-
- try {
- let newUser = await locals.pb.collection('users').create(formData);
- await locals.pb?.collection('users').update(
+ try {
+ let newUser = await locals.pb.collection("users").create(formData);
+ /*
+await locals.pb?.collection('users').update(
newUser?.id, {
'freeTrial' : true,
'tier': 'Pro', //Give new users a free trial for the Pro Subscription
});
- await locals.pb.collection('users').requestVerification(formData.email);
- } catch (err) {
- console.log('Error: ', err);
- error(err.status, err.message);
- }
+*/
+ await locals.pb.collection("users").requestVerification(formData.email);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- try {
- await locals.pb
- .collection("users")
- .authWithPassword(formData.email, formData.password);
-
-
- } catch (err) {
- console.log("Error: ", err);
- error(err.status, err.message);
- }
+ try {
+ await locals.pb
+ .collection("users")
+ .authWithPassword(formData.email, formData.password);
+ } catch (err) {
+ console.log("Error: ", err);
+ error(err.status, err.message);
+ }
- redirect(303, "/");
- },
-
+ redirect(303, "/");
+ },
-
- oauth2: async ( { url, locals, request, cookies }) => {
- const authMethods = await locals?.pb?.collection('users')?.listAuthMethods();
+ oauth2: async ({ url, locals, request, cookies }) => {
+ const authMethods = await locals?.pb
+ ?.collection("users")
+ ?.listAuthMethods();
- const data = await request?.formData();
- const providerSelected = data?.get('provider');
+ const data = await request?.formData();
+ const providerSelected = data?.get("provider");
- if (!authMethods) {
- return {
- authProviderRedirect: '',
- authProviderState: ''
- };
- }
- const redirectURL = `${url.origin}/oauth`;
-
- const targetItem = authMethods.authProviders?.findIndex(item => item?.name === providerSelected );
- //console.log("==================")
- //console.log(authMethods.authProviders)
- //console.log('target item is: ', targetItem)
+ if (!authMethods) {
+ return {
+ authProviderRedirect: "",
+ authProviderState: "",
+ };
+ }
+ const redirectURL = `${url.origin}/oauth`;
- const provider = authMethods.authProviders[targetItem];
- const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
- const state = provider.state;
- const verifier = provider.codeVerifier;
+ const targetItem = authMethods.authProviders?.findIndex(
+ (item) => item?.name === providerSelected
+ );
+ //console.log("==================")
+ //console.log(authMethods.authProviders)
+ //console.log('target item is: ', targetItem)
- cookies.set('state', state, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ const provider = authMethods.authProviders[targetItem];
+ const authProviderRedirect = `${provider.authUrl}${redirectURL}`;
+ const state = provider.state;
+ const verifier = provider.codeVerifier;
- cookies.set('verifier', verifier, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
+ cookies.set("state", state, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- cookies.set('provider', providerSelected, {httpOnly: true,
- sameSite: 'lax',
- secure: true,
- path: '/',
- maxAge: 60*60
- });
-
+ cookies.set("verifier", verifier, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
+ cookies.set("provider", providerSelected, {
+ httpOnly: true,
+ sameSite: "lax",
+ secure: true,
+ path: "/",
+ maxAge: 60 * 60,
+ });
- redirect(302,authProviderRedirect);
-
- }
-
+ redirect(302, authProviderRedirect);
+ },
};
![]({cloudFrontUrl+"/assets/stocknear_logo.png"}){kind=logo}
![logo]({cloudFrontUrl+"/assets/showcase-options-flow.png"})
- ![logo]({cloudFrontUrl+"/assets/globe.png"})
+