@@ -71,7 +81,7 @@ const Editor = () => {
theme={aceEditorTheme}
name='editor'
height='100%'
- onChange={(newCode: string) => setCode(newCode)}
+ onChange={(newCode: string) => onType(newCode)}
fontSize={fontSize}
showPrintMargin={true}
showGutter={true}
diff --git a/components/ui/useCode/StepTwo.tsx b/components/ui/useCode/StepTwo.tsx
index db053c4..67cb6e9 100644
--- a/components/ui/useCode/StepTwo.tsx
+++ b/components/ui/useCode/StepTwo.tsx
@@ -13,6 +13,7 @@ import { useRouter } from "next/navigation";
import { ChallengeFormField } from "./Challenge-FormField";
import { Loader2 } from "lucide-react";
import { challengeEnum } from "@/data-store/challenge-store";
+import { saveToLocalStorage } from "@/lib/localStorage";
const formStepTwoSchema = z.object({
challenge: z.nativeEnum(challengeEnum, {
@@ -31,7 +32,7 @@ const formStepTwoSchema = z.object({
});
export function StepTwo() {
- const { progress, setProgress, step, setStep, setChallenge } =
+ const { progress, setProgress, step, setStep, setChallenge, email } =
useStepperStore();
const { setCode } = useSessionStore();
@@ -47,7 +48,8 @@ export function StepTwo() {
setCode(LandingPageCode());
setChallenge(selection);
setProgress(progress + progressIncrements);
-
+ saveToLocalStorage("email", email);
+ saveToLocalStorage("challenge", selection);
router.push("/code-area");
}
}
diff --git a/lib/localStorage.ts b/lib/localStorage.ts
new file mode 100644
index 0000000..bf74363
--- /dev/null
+++ b/lib/localStorage.ts
@@ -0,0 +1,26 @@
+export const saveToLocalStorage = (key: string, value: string) => {
+ try {
+ localStorage.setItem(key, value);
+ } catch (error) {
+ console.error("Error saving to localStorage", error);
+ }
+};
+
+export const loadFromLocalStorage = (key: string) => {
+ try {
+ const value = localStorage.getItem(key);
+ if (value === null) {
+ return "";
+ }
+ return value;
+ } catch (error) {
+ console.error("Error reading from localStorage", error);
+ return "";
+ }
+};
+
+export const removeItemFromLocalStorage = (key: string) => {
+ if (typeof window !== "undefined") {
+ localStorage.removeItem(key);
+ }
+};
diff --git a/lib/reset-fe-state.tsx b/lib/reset-fe-state.tsx
index 0ee66d3..433fb84 100644
--- a/lib/reset-fe-state.tsx
+++ b/lib/reset-fe-state.tsx
@@ -1,5 +1,6 @@
import useCodeAreaStore from "@/data-store/code-area-store";
import useSessionStore from "@/data-store/session-store";
+import { removeItemFromLocalStorage } from "./localStorage";
/*
A custom hook that resets the coding area state. Clears the code from coding area and resets certain settings.
@@ -11,5 +12,8 @@ export function useResetFeState() {
return function performReset() {
reset();
codeAreaReset();
+ removeItemFromLocalStorage("email");
+ removeItemFromLocalStorage("code");
+ removeItemFromLocalStorage("challenge");
};
}
diff --git a/lib/validate-user.ts b/lib/validate-user.ts
index c7637e2..e87883a 100644
--- a/lib/validate-user.ts
+++ b/lib/validate-user.ts
@@ -2,6 +2,7 @@
Currently, it doesn't do anything, however it allows for more scalability if there are multiple different validations neccecary to authorize a user. */
import { maxProgress } from "@/data-store/stepper-store";
+import { loadFromLocalStorage } from "./localStorage";
export default function validateUser(
validationType: string,
@@ -12,13 +13,21 @@ export default function validateUser(
) {
validationType = validationType.toLowerCase();
+ /*
+ Email is only in local storage if you went through the proper initialization steps. If a user refreshes the /code-area, their STATE gets lost, but local storage doesn't. So, if the user refreshes their page, we'll just allow the STATE to get lost, but since this user has email in local storage, we know for a fact this user got to the /code-area via the proper path.
+ */
if (validationType === "code") {
- return (
- email === "" ||
- check === false ||
- progress !== maxProgress ||
- challenge === ""
- );
+ const localStorageEmail = loadFromLocalStorage("email");
+ if (
+ (email === "" ||
+ check === false ||
+ progress !== maxProgress ||
+ challenge === "") &&
+ localStorageEmail?.length === 0
+ ) {
+ return true;
+ }
+ return false;
} else {
throw new Error("Invalid Validation Type");
}
diff --git a/xata.ts b/xata.ts
index f2ab9ae..c4b758d 100644
--- a/xata.ts
+++ b/xata.ts
@@ -14,6 +14,22 @@ const tables = [
{ name: "field_value", type: "string" },
],
},
+ {
+ name: "Backlog-Score",
+ columns: [
+ { name: "code", type: "string" },
+ { name: "email", type: "string" },
+ { name: "retry_count", type: "int", defaultValue: "0" },
+ { name: "challenge", type: "string" },
+ ],
+ },
+ {
+ name: "EmailSubmitRateLimiting",
+ columns: [
+ { name: "email", type: "string", unique: true },
+ { name: "lastSubmission", type: "datetime", defaultValue: "now" },
+ ],
+ },
] as const;
export type SchemaTables = typeof tables;
@@ -22,8 +38,17 @@ export type InferredTypes = SchemaInference;
export type Site = InferredTypes["Site"];
export type SiteRecord = Site & XataRecord;
+export type BacklogScore = InferredTypes["Backlog-Score"];
+export type BacklogScoreRecord = BacklogScore & XataRecord;
+
+export type EmailSubmitRateLimiting = InferredTypes["EmailSubmitRateLimiting"];
+export type EmailSubmitRateLimitingRecord = EmailSubmitRateLimiting &
+ XataRecord;
+
export type DatabaseSchema = {
Site: SiteRecord;
+ "Backlog-Score": BacklogScoreRecord;
+ EmailSubmitRateLimiting: EmailSubmitRateLimitingRecord;
};
const DatabaseClient = buildClient();