Compare commits

..

No commits in common. "3f8135bdbe77730d7c1f9627ac8df67b7026a015" and "c105fcddac35f8ff2699724f2afb16361f08794e" have entirely different histories.

17 changed files with 306 additions and 901 deletions

100
package-lock.json generated
View File

@ -44,18 +44,15 @@
"axios": "^1.6.8",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"cmdk": "^1.0.0",
"contentlayer": "^0.3.4",
"eslint": "8.48.0",
"eslint-config-next": "^14.0.1",
"geonames.js": "^3.0.6",
"gray-matter": "^4.0.3",
"lucide-react": "^0.291.0",
"monaco-jsx-highlighter": "^2.77.77",
"monaco-themes": "^0.4.4",
"next": "^14.0.1",
"next-mdx-remote": "^4.4.1",
"next-nprogress-bar": "^2.3.11",
"next-themes": "^0.2.1",
"postcss": "8.4.28",
"react": "^18.2.0",
@ -64,7 +61,6 @@
"react-error-boundary": "^4.0.13",
"react-error-overlay": "^6.0.11",
"react-hook-form": "^7.47.0",
"react-phone-number-input": "^3.4.0",
"react-resizable-panels": "^2.0.16",
"rehype-pretty-code": "^0.13.1",
"sharp": "^0.32.5",
@ -4418,11 +4414,6 @@
"node": ">=6"
}
},
"node_modules/classnames": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
"integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow=="
},
"node_modules/client-only": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz",
@ -4524,19 +4515,6 @@
"node": ">=6"
}
},
"node_modules/cmdk": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.0.0.tgz",
"integrity": "sha512-gDzVf0a09TvoJ5jnuPvygTB77+XdOSwEmJ88L6XPFPlv7T3RxbP9jgenfylrAMD0+Le1aO0nVjQUzl2g+vjz5Q==",
"dependencies": {
"@radix-ui/react-dialog": "1.0.5",
"@radix-ui/react-primitive": "1.0.3"
},
"peerDependencies": {
"react": "^18.0.0",
"react-dom": "^18.0.0"
}
},
"node_modules/color": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
@ -4668,11 +4646,6 @@
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
},
"node_modules/country-flag-icons": {
"version": "1.5.11",
"resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.11.tgz",
"integrity": "sha512-B+mvFywunkRJs270k7kCBjhogvIA0uNn6GAXv6m2cPn3rrwqZzZVr2gBWcz+Cz7OGVWlcbERlYRIX0S6OGr8Bw=="
},
"node_modules/cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -6179,23 +6152,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/geonames.js": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/geonames.js/-/geonames.js-3.0.6.tgz",
"integrity": "sha512-iDnDEzknKB7RXunjwYNgWg8ZbxjJhO9ChauXjo3njcsqhpHp3rpssqJLhATEp6T6NIybWlT/V3i6dxw+kFcICA==",
"dependencies": {
"axios": "^0.21.0",
"qs": "^6.9.4"
}
},
"node_modules/geonames.js/node_modules/axios": {
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"dependencies": {
"follow-redirects": "^1.14.0"
}
},
"node_modules/get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@ -6991,14 +6947,6 @@
"resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
"integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
},
"node_modules/input-format": {
"version": "0.3.10",
"resolved": "https://registry.npmjs.org/input-format/-/input-format-0.3.10.tgz",
"integrity": "sha512-5cFv/kOZD7Ch0viprVkuYPDkAU7HBZYBx8QrIpQ6yXUWbAQ0+RQ8IIojDJOf/RO6FDJLL099HDSK2KoVZ2zevg==",
"dependencies": {
"prop-types": "^15.8.1"
}
},
"node_modules/internal-slot": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
@ -7624,11 +7572,6 @@
"node": ">= 0.8.0"
}
},
"node_modules/libphonenumber-js": {
"version": "1.10.61",
"resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.61.tgz",
"integrity": "sha512-TsQsyzDttDvvzWNkbp/i0fVbzTGJIG0mUu/uNalIaRQEYeJxVQ/FPg+EJgSqfSXezREjM0V3RZ8cLVsKYhhw0Q=="
},
"node_modules/lilconfig": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@ -12802,14 +12745,6 @@
"react-dom": ">=16.x <=18.x"
}
},
"node_modules/next-nprogress-bar": {
"version": "2.3.11",
"resolved": "https://registry.npmjs.org/next-nprogress-bar/-/next-nprogress-bar-2.3.11.tgz",
"integrity": "sha512-OjSvsQwgSWa2qBMYO478QreGG9Jt82tr4wTQptmiyzNqqjzHCyKZNkhANnzPrjuFAoelIvmruJuakODofSnvTQ==",
"dependencies": {
"nprogress": "^0.2.0"
}
},
"node_modules/next-themes": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.2.1.tgz",
@ -12928,11 +12863,6 @@
"node": ">=0.10.0"
}
},
"node_modules/nprogress": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz",
"integrity": "sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA=="
},
"node_modules/object-assign": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@ -13553,20 +13483,6 @@
"node": ">=6"
}
},
"node_modules/qs": {
"version": "6.12.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
"integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
"dependencies": {
"side-channel": "^1.0.6"
},
"engines": {
"node": ">=0.6"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@ -13694,22 +13610,6 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
"node_modules/react-phone-number-input": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/react-phone-number-input/-/react-phone-number-input-3.4.0.tgz",
"integrity": "sha512-anL8OAqlSnOXd6O+lidkprOO5+OpgW+ODrbfyLc6u8lOX8ghT0nO6ZOPrGjotpZND4cr0xxH+vu3dgbdUB2lBA==",
"dependencies": {
"classnames": "^2.5.1",
"country-flag-icons": "^1.5.11",
"input-format": "^0.3.10",
"libphonenumber-js": "^1.10.61",
"prop-types": "^15.8.1"
},
"peerDependencies": {
"react": ">=16.8",
"react-dom": ">=16.8"
}
},
"node_modules/react-remove-scroll": {
"version": "2.5.5",
"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.5.5.tgz",

View File

@ -46,18 +46,15 @@
"axios": "^1.6.8",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"cmdk": "^1.0.0",
"contentlayer": "^0.3.4",
"eslint": "8.48.0",
"eslint-config-next": "^14.0.1",
"geonames.js": "^3.0.6",
"gray-matter": "^4.0.3",
"lucide-react": "^0.291.0",
"monaco-jsx-highlighter": "^2.77.77",
"monaco-themes": "^0.4.4",
"next": "^14.0.1",
"next-mdx-remote": "^4.4.1",
"next-nprogress-bar": "^2.3.11",
"next-themes": "^0.2.1",
"postcss": "8.4.28",
"react": "^18.2.0",
@ -66,7 +63,6 @@
"react-error-boundary": "^4.0.13",
"react-error-overlay": "^6.0.11",
"react-hook-form": "^7.47.0",
"react-phone-number-input": "^3.4.0",
"react-resizable-panels": "^2.0.16",
"rehype-pretty-code": "^0.13.1",
"sharp": "^0.32.5",

View File

@ -1,6 +1,6 @@
import Header from "@/components/layout/header";
import Sidebar from "@/components/layout/sidebar";
// import StoreProvider from "@/lib/store-provider";
import StoreProvider from "@/lib/store-provider";
import { createClient } from "@/utils/supabase/server";
import type { Metadata } from "next";
import { redirect } from "next/navigation";
@ -29,14 +29,14 @@ export default async function DashboardLayout({
return (
<>
{/* <StoreProvider lastUpdate={new Date().getTime()}> */}
<StoreProvider lastUpdate={new Date().getTime()}>
<Header />
<div className="flex h-screen overflow-hidden">
<Sidebar />
<main className="w-full pt-16">{children}</main>
</div>
{/* </StoreProvider> */}
</StoreProvider>
</>
);
}

View File

@ -1,5 +1,16 @@
import { ScrollArea } from "@/components/ui/scroll-area";
import {
ResizableHandle,
ResizablePanel,
ResizablePanelGroup,
} from "@/components/ui/resizable";
import markdownStyles from "@/styles/markdown-styles.module.css";
import { tutorialData } from "@/constants/tutorial-data";
import { notFound } from "next/navigation";
import { Button, buttonVariants } from "@/components/ui/button";
import Link from "next/link";
import { cn } from "@/lib/utils";
import EditorWindow from "@/components/task/editor-window";
import { LANGUAGE_VERSIONS } from "@/constants/language-options";
import { markdownToHtml } from "@/lib/markdown-to-html";
import TaskPage from "@/components/task-page";
@ -7,6 +18,10 @@ import TaskPage from "@/components/task-page";
const languages = Object.keys(LANGUAGE_VERSIONS);
const Page = async ({ params }: { params: { taskId: string[] } }) => {
// const [activeMobileView, setActiveMobileView] = useState<
// "tutorial" | "code" | "output"
// >("tutorial");
if (!params.taskId[0] || !languages.includes(params.taskId[0])) {
notFound();
}
@ -29,13 +44,15 @@ const Page = async ({ params }: { params: { taskId: string[] } }) => {
const content = await markdownToHtml(tutorial?.content || "");
return (
<TaskPage
params={params}
langTutorial={langTutorial}
tutorial={tutorial}
tutorialIndex={tutorialIndex}
content={content}
/>
<>
<TaskPage
params={params}
langTutorial={langTutorial}
tutorial={tutorial}
tutorialIndex={tutorialIndex}
content={content}
/>
</>
);
};

View File

@ -4,7 +4,6 @@ import "@uploadthing/react/styles.css";
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css";
import StoreProvider from "@/lib/store-provider";
const inter = Inter({ subsets: ["latin"] });
@ -22,13 +21,10 @@ export default async function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<body className={`${inter.className} overflow-x-hidden`}>
<StoreProvider lastUpdate={new Date().getTime()}>
<Providers>
<Toaster />
{children}
</Providers>
</StoreProvider>
<Providers>
<Toaster />
{children}
</Providers>
</body>
</html>
);

View File

@ -1,6 +1,4 @@
"use client";
import Geolocation from "@/components/geolocation";
import { PhoneInput } from "@/components/phone-input";
import {
Accordion,
AccordionContent,
@ -31,7 +29,7 @@ import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import { AlertTriangleIcon, Trash, Trash2Icon } from "lucide-react";
import { useParams, useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { useState } from "react";
import { SubmitHandler, useFieldArray, useForm } from "react-hook-form";
interface ProfileFormType {
@ -58,13 +56,8 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
const [currentStep, setCurrentStep] = useState(0);
const [data, setData] = useState({});
const delta = currentStep - previousStep;
const [countryGeoId, setCountryGeoId] = useState<null | number>(null);
const [stateGeoId, setStateGeoId] = useState<null | number>(null);
const [countryGeoId2, setCountryGeoId2] = useState<null | number>(null);
const [stateGeoId2, setStateGeoId2] = useState<null | number>(null);
const defaultValues = {
// state: "",
jobs: [
{
jobtitle: "",
@ -72,7 +65,6 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
startdate: "",
enddate: "",
jobcountry: "",
jobstate: "",
jobcity: "",
},
],
@ -104,7 +96,7 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
// console.log("product", res);
}
router.refresh();
router.push(`/dashboard`);
router.push(`/dashboard/products`);
} catch (error: any) {
} finally {
setLoading(false);
@ -143,13 +135,12 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
"email",
"contactno",
"country",
"state",
"city",
],
},
{
id: "Step 2",
name: "Professional Information",
name: "Professional Informations",
// fields are mapping and flattening for the error to be trigger for the dynamic fields
fields: fields
?.map((_, index) => [
@ -158,7 +149,6 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
`jobs.${index}.startdate`,
`jobs.${index}.enddate`,
`jobs.${index}.jobcountry`,
`jobs.${index}.jobstate`,
`jobs.${index}.jobcity`,
// Add other field names as needed
])
@ -192,8 +182,8 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
}
};
const countries = [{ id: "1", name: "india" }];
const cities = [{ id: "1", name: "kerala" }];
const countries = [{ id: "wow", name: "india" }];
const cities = [{ id: "2", name: "kerala" }];
return (
<>
@ -216,18 +206,18 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
{steps.map((step, index) => (
<li key={step.name} className="md:flex-1">
{currentStep > index ? (
<div className="group flex w-full flex-col border-l-4 border-primary py-2 pl-4 transition-colors md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4">
<span className="text-sm font-medium text-primary transition-colors ">
<div className="group flex w-full flex-col border-l-4 border-sky-600 py-2 pl-4 transition-colors md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4">
<span className="text-sm font-medium text-sky-600 transition-colors ">
{step.id}
</span>
<span className="text-sm font-medium">{step.name}</span>
</div>
) : currentStep === index ? (
<div
className="flex w-full flex-col border-l-4 border-primary py-2 pl-4 md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4"
className="flex w-full flex-col border-l-4 border-sky-600 py-2 pl-4 md:border-l-0 md:border-t-4 md:pb-0 md:pl-0 md:pt-4"
aria-current="step"
>
<span className="text-sm font-medium text-primary">
<span className="text-sm font-medium text-sky-600">
{step.id}
</span>
<span className="text-sm font-medium">{step.name}</span>
@ -317,20 +307,11 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
<FormItem>
<FormLabel>Contact Number</FormLabel>
<FormControl>
{/* <Input
<Input
type="number"
placeholder="Enter your contact number"
placeholder="Enter you contact number"
disabled={loading}
{...field}
/> */}
<PhoneInput
id="phone"
// onChange={(v) => setPhone(v)}
// value={phone}
placeholder="Enter a phone number..."
defaultCountry="IN"
international
{...field}
/>
</FormControl>
<FormMessage />
@ -342,68 +323,63 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
name="country"
render={({ field }) => (
<FormItem>
<FormLabel
// className="block mb-[6px] mt-[2px]"
<FormLabel>Country</FormLabel>
<Select
disabled={loading}
onValueChange={field.onChange}
value={field.value}
defaultValue={field.value}
>
Country
</FormLabel>
<Geolocation
geoId={null}
onChange={(country, geoId) => {
setCountryGeoId(geoId);
field.onChange(country);
}}
isCountry
placeholderText="Select a country"
searchPlaceholder="Search country..."
emptyPlaceholder="No country found"
isDisabled={false}
/>
<FormControl>
<SelectTrigger>
<SelectValue
defaultValue={field.value}
placeholder="Select a country"
/>
</SelectTrigger>
</FormControl>
<SelectContent>
{/* @ts-ignore */}
{countries.map((country) => (
<SelectItem key={country.id} value={country.id}>
{country.name}
</SelectItem>
))}
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="state"
render={({ field }) => (
<FormItem>
<FormLabel>State</FormLabel>
<Geolocation
geoId={countryGeoId}
onChange={(state, geoId) => {
setStateGeoId(geoId);
field.onChange(state);
}}
isCountry={false}
placeholderText="Select a state"
searchPlaceholder="Search state..."
emptyPlaceholder="No state found"
isDisabled={!countryGeoId}
/>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name="city"
render={({ field }) => (
<FormItem>
<FormLabel>City</FormLabel>
<Geolocation
geoId={stateGeoId}
onChange={(v) => field.onChange(v)}
isCountry={false}
placeholderText="Select a city"
searchPlaceholder="Search city..."
emptyPlaceholder="No city found"
isDisabled={!stateGeoId}
/>
<Select
disabled={loading}
onValueChange={field.onChange}
value={field.value}
defaultValue={field.value}
>
<FormControl>
<SelectTrigger>
<SelectValue
defaultValue={field.value}
placeholder="Select a city"
/>
</SelectTrigger>
</FormControl>
<SelectContent>
{/* @ts-ignore */}
{cities.map((city) => (
<SelectItem key={city.id} value={city.id}>
{city.name}
</SelectItem>
))}
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
@ -522,42 +498,31 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
render={({ field }) => (
<FormItem>
<FormLabel>Job country</FormLabel>
<Geolocation
geoId={null}
onChange={(country, geoId) => {
setCountryGeoId2(geoId);
field.onChange(country);
}}
isCountry
placeholderText="Select job country"
searchPlaceholder="Search country..."
emptyPlaceholder="No country found"
isDisabled={false}
/>
<FormMessage />
</FormItem>
)}
/>
<FormField
control={form.control}
name={`jobs.${index}.jobstate`}
render={({ field }) => (
<FormItem>
<FormLabel>Job State</FormLabel>
<Geolocation
geoId={countryGeoId2}
onChange={(state, geoId) => {
setStateGeoId2(geoId);
field.onChange(state);
}}
isCountry={false}
placeholderText="Select job state"
searchPlaceholder="Search state..."
emptyPlaceholder="No state found"
isDisabled={!countryGeoId2}
/>
<Select
disabled={loading}
onValueChange={field.onChange}
value={field.value}
defaultValue={field.value}
>
<FormControl>
<SelectTrigger>
<SelectValue
defaultValue={field.value}
placeholder="Select your job country"
/>
</SelectTrigger>
</FormControl>
<SelectContent>
{countries.map((country) => (
<SelectItem
key={country.id}
value={country.id}
>
{country.name}
</SelectItem>
))}
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
@ -568,16 +533,28 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
render={({ field }) => (
<FormItem>
<FormLabel>Job city</FormLabel>
<Geolocation
geoId={stateGeoId2}
onChange={(v) => field.onChange(v)}
isCountry={false}
placeholderText="Select job city"
searchPlaceholder="Search city..."
emptyPlaceholder="No city found"
isDisabled={!stateGeoId2}
/>
<Select
disabled={loading}
onValueChange={field.onChange}
value={field.value}
defaultValue={field.value}
>
<FormControl>
<SelectTrigger>
<SelectValue
defaultValue={field.value}
placeholder="Select your job city"
/>
</SelectTrigger>
</FormControl>
<SelectContent>
{cities.map((city) => (
<SelectItem key={city.id} value={city.id}>
{city.name}
</SelectItem>
))}
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
@ -600,7 +577,6 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
startdate: "",
enddate: "",
jobcountry: "",
jobstate: "",
jobcity: "",
})
}
@ -614,7 +590,7 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
<div>
<h1>Completed</h1>
<pre className="whitespace-pre-wrap">
{JSON.stringify(data, null, 2)}
{JSON.stringify(data)}
</pre>
</div>
)}
@ -628,12 +604,11 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
{/* Navigation */}
<div className="mt-8 pt-5">
<div className="flex justify-between">
<Button
<button
type="button"
onClick={prev}
disabled={currentStep === 0}
size="icon"
// className="rounded bg-white px-2 py-1 text-sm font-semibold text-sky-900 shadow-sm ring-1 ring-inset ring-sky-300 hover:bg-sky-50 disabled:cursor-not-allowed disabled:opacity-50"
className="rounded bg-white px-2 py-1 text-sm font-semibold text-sky-900 shadow-sm ring-1 ring-inset ring-sky-300 hover:bg-sky-50 disabled:cursor-not-allowed disabled:opacity-50"
>
<svg
xmlns="http://www.w3.org/2000/svg"
@ -649,13 +624,12 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
d="M15.75 19.5L8.25 12l7.5-7.5"
/>
</svg>
</Button>
<Button
</button>
<button
type="button"
onClick={next}
disabled={currentStep === steps.length - 1}
size="icon"
// className="rounded bg-white px-2 py-1 text-sm font-semibold text-sky-900 shadow-sm ring-1 ring-inset ring-sky-300 hover:bg-sky-50 disabled:cursor-not-allowed disabled:opacity-50"
className="rounded bg-white px-2 py-1 text-sm font-semibold text-sky-900 shadow-sm ring-1 ring-inset ring-sky-300 hover:bg-sky-50 disabled:cursor-not-allowed disabled:opacity-50"
>
<svg
xmlns="http://www.w3.org/2000/svg"
@ -671,7 +645,7 @@ export const CreateProfileOne: React.FC<ProfileFormType> = ({
d="M8.25 4.5l7.5 7.5-7.5 7.5"
/>
</svg>
</Button>
</button>
</div>
</div>
</>

View File

@ -1,161 +0,0 @@
"use client";
import { CaretSortIcon, CheckIcon } from "@radix-ui/react-icons";
import { cn } from "@/lib/utils";
import { Button } from "@/components/ui/button";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
} from "@/components/ui/command";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import { FC, useEffect, useState } from "react";
import Geonames from "geonames.js";
import { FormControl } from "./ui/form";
const frameworks = [
{
value: "next.js",
label: "Next.js",
},
{
value: "sveltekit",
label: "SvelteKit",
},
{
value: "nuxt.js",
label: "Nuxt.js",
},
{
value: "remix",
label: "Remix",
},
{
value: "astro",
label: "Astro",
},
];
// @ts-ignore
const geonames = new Geonames({
username: "thalesandrade",
lan: "en",
encoding: "JSON",
});
interface Props {
geoId: number | null;
onChange: (country: string, geoId: number) => void;
isCountry: boolean;
placeholderText: string;
searchPlaceholder: string;
emptyPlaceholder: string;
isDisabled: boolean;
}
const Geolocation: FC<Props> = ({
geoId,
onChange,
isCountry,
placeholderText,
searchPlaceholder,
emptyPlaceholder,
isDisabled,
}) => {
const [open, setOpen] = useState(false);
const [currentValue, setCurrentValue] = useState<null | number>(null);
const [options, setOptions] = useState<
{ countryName: string; geonameId: number; name: string }[]
>([]);
useEffect(() => {
try {
const data = () => {
isCountry
? geonames.countryInfo({}).then((res: any) => {
// console.log(res);
setOptions(res.geonames);
})
: geonames.children({ geonameId: geoId }).then((res: any) => {
if (res.totalResultsCount) setOptions(res.geonames);
});
};
data();
} catch (err) {
console.error(err);
}
}, [geoId, isCountry]);
const currentPlaceholderText =
currentValue && isCountry
? options.find((option: any) => option.geonameId === currentValue)
?.countryName
: currentValue
? options.find((option: any) => option.geonameId === currentValue)?.name
: placeholderText;
return (
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild disabled={isDisabled}>
<FormControl>
<Button
variant="outline"
role="combobox"
aria-expanded={open}
className="w-full justify-between"
>
{currentPlaceholderText}
<CaretSortIcon className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</FormControl>
</PopoverTrigger>
<PopoverContent className="w-[200px] md:w-[400px] p-0">
<Command>
<CommandList>
<CommandInput placeholder={searchPlaceholder} className="h-9" />
<CommandEmpty>{emptyPlaceholder}</CommandEmpty>
<CommandGroup>
{options.map((v: any, index) => (
<CommandItem
key={index}
value={v.geonameId}
onSelect={() => {
setCurrentValue(
v.geonameId === currentValue ? null : v.geonameId,
);
const name = isCountry ? v.countryName : v.name;
onChange(
v.geonameId === currentValue ? "" : name,
v.geonameId === currentValue ? null : v.geonameId,
);
setOpen(false);
}}
>
{isCountry ? v.countryName : v.name}
<CheckIcon
className={cn(
"ml-auto h-4 w-4",
currentValue === v.geonameId
? "opacity-100"
: "opacity-0",
)}
/>
</CommandItem>
))}
</CommandGroup>
</CommandList>
</Command>
</PopoverContent>
</Popover>
);
};
export default Geolocation;

View File

@ -1,19 +1,11 @@
"use client";
import React from "react";
import ThemeProvider from "./ThemeToggle/theme-provider";
import { AppProgressBar as ProgressBar } from "next-nprogress-bar";
export default function Providers({ children }: { children: React.ReactNode }) {
return (
<>
<ThemeProvider attribute="class" defaultTheme="dark" enableSystem>
{children}
<ProgressBar
height="4px"
color="hsl(217.2 91.2% 59.8%)"
options={{ showSpinner: false }}
shallowRouting
/>
</ThemeProvider>
</>
);

View File

@ -1,167 +0,0 @@
import { CheckIcon, ChevronsUpDown } from "lucide-react";
import * as React from "react";
import * as RPNInput from "react-phone-number-input";
import flags from "react-phone-number-input/flags";
import { Button } from "@/components/ui/button";
import {
Command,
CommandEmpty,
CommandGroup,
CommandInput,
CommandItem,
CommandList,
} from "@/components/ui/command";
import { Input, InputProps } from "@/components/ui/input";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import { cn } from "@/lib/utils";
import { ScrollArea } from "./ui/scroll-area";
type PhoneInputProps = Omit<
React.InputHTMLAttributes<HTMLInputElement>,
"onChange" | "value"
> &
Omit<RPNInput.Props<typeof RPNInput.default>, "onChange"> & {
onChange?: (value: RPNInput.Value) => void;
};
const PhoneInput: React.ForwardRefExoticComponent<PhoneInputProps> =
React.forwardRef<React.ElementRef<typeof RPNInput.default>, PhoneInputProps>(
({ className, onChange, ...props }, ref) => {
return (
<RPNInput.default
ref={ref}
className={cn("flex", className)}
flagComponent={FlagComponent}
countrySelectComponent={CountrySelect}
inputComponent={InputComponent}
/**
* Handles the onChange event.
*
* react-phone-number-input might trigger the onChange event as undefined
* when a valid phone number is not entered. To prevent this,
* the value is coerced to an empty string.
*
* @param {E164Number | undefined} value - The entered value
*/
onChange={(value) => onChange?.(value || "")}
{...props}
/>
);
},
);
PhoneInput.displayName = "PhoneInput";
const InputComponent = React.forwardRef<HTMLInputElement, InputProps>(
({ className, ...props }, ref) => (
<Input
className={cn("rounded-e-lg rounded-s-none", className)}
{...props}
ref={ref}
/>
),
);
InputComponent.displayName = "InputComponent";
type CountrySelectOption = { label: string; value: RPNInput.Country };
type CountrySelectProps = {
disabled?: boolean;
value: RPNInput.Country;
onChange: (value: RPNInput.Country) => void;
options: CountrySelectOption[];
};
const CountrySelect = ({
disabled,
value,
onChange,
options,
}: CountrySelectProps) => {
const handleSelect = React.useCallback(
(country: RPNInput.Country) => {
onChange(country);
},
[onChange],
);
return (
<Popover>
<PopoverTrigger asChild>
<Button
type="button"
variant={"outline"}
className={cn("flex gap-1 rounded-e-none rounded-s-lg px-3")}
disabled={disabled}
>
<FlagComponent country={value} countryName={value} />
<ChevronsUpDown
className={cn(
"-mr-2 h-4 w-4 opacity-50",
disabled ? "hidden" : "opacity-100",
)}
/>
</Button>
</PopoverTrigger>
<PopoverContent className="w-[300px] p-0">
<Command>
<CommandList>
<ScrollArea className="h-72">
<CommandInput placeholder="Search country..." />
<CommandEmpty>No country found.</CommandEmpty>
<CommandGroup>
{options
.filter((x) => x.value)
.map((option) => (
<CommandItem
className="gap-2"
key={option.value}
onSelect={() => handleSelect(option.value)}
>
<FlagComponent
country={option.value}
countryName={option.label}
/>
<span className="flex-1 text-sm">{option.label}</span>
{option.value && (
<span className="text-foreground/50 text-sm">
{`+${RPNInput.getCountryCallingCode(option.value)}`}
</span>
)}
<CheckIcon
className={cn(
"ml-auto h-4 w-4",
option.value === value ? "opacity-100" : "opacity-0",
)}
/>
</CommandItem>
))}
</CommandGroup>
</ScrollArea>
</CommandList>
</Command>
</PopoverContent>
</Popover>
);
};
const FlagComponent = ({ country, countryName }: RPNInput.FlagProps) => {
const Flag = flags[country];
return (
<span className="bg-foreground/20 flex h-4 w-6 overflow-hidden rounded-sm">
{Flag && <Flag title={countryName} />}
</span>
);
};
FlagComponent.displayName = "FlagComponent";
export { PhoneInput };

View File

@ -25,7 +25,6 @@ export const FinishedScreen = () => {
totalCorrectAns,
questionsArray,
reset,
correctAns
} = useQuizStore(
useShallow((store) => ({
points: store.points,
@ -34,7 +33,6 @@ export const FinishedScreen = () => {
totalCorrectAns: store.totalCorrectAns,
questionsArray: store.questionsArray,
reset: store.reset,
correctAns: store.correctAns
})),
);
// const {points, highscore} = useSelector(store => store.questions)
@ -60,14 +58,10 @@ export const FinishedScreen = () => {
<CardTitle>Quiz Results</CardTitle>
</CardHeader>
<CardContent>
<p className="text-green-500">Correct: {correctAns.length}</p>
<p className="text-rose-500">
Incorrect: {questionsArray.length - correctAns.length}
</p>
{/* <p className="text-green-500">Correct: {totalCorrectAns}</p>
<p className="text-green-500">Correct: {totalCorrectAns}</p>
<p className="text-rose-500">
Incorrect: {questionsArray.length - totalCorrectAns}
</p> */}
</p>
</CardContent>
<CardFooter>
<Button

View File

@ -7,19 +7,17 @@ import { Button } from "../ui/button";
// import { useDispatch, useSelector } from 'react-redux'
// import { gameEnded, nextQuestion } from '../features/questions/questionsSlice'
export const Next = ({ currentCorrectAns }: { currentCorrectAns: string }) => {
export const Next = () => {
const router = useRouter();
const { index, gameEnded, nextQuestion, questionsArray, newAnswer } =
useQuizStore(
useShallow((store) => ({
index: store.index,
gameEnded: store.gameEnded,
nextQuestion: store.nextQuestion,
questionsArray: store.questionsArray,
newAnswer: store.newAnswer,
})),
);
const { index, gameEnded, nextQuestion, questionsArray } = useQuizStore(
useShallow((store) => ({
index: store.index,
gameEnded: store.gameEnded,
nextQuestion: store.nextQuestion,
questionsArray: store.questionsArray,
})),
);
// const {index} = useSelector(store => store.questions)
@ -33,13 +31,7 @@ export const Next = ({ currentCorrectAns }: { currentCorrectAns: string }) => {
if (index < questionsArray.length - 1)
return (
<Button
className=""
onClick={() => {
newAnswer(currentCorrectAns);
nextQuestion();
}}
>
<Button className="" onClick={nextQuestion}>
Next
</Button>
);

View File

@ -18,7 +18,6 @@ export const Question = ({ difficulty }: { difficulty: string }) => {
// const { status, index, currentQuestion, answer } = useSelector(
// (store) => store.questions,
// );
const [currentCorrectAns, setCurrentCorrectAns] = useState("");
const [isStart, setIsStart] = useState(false);
@ -76,10 +75,7 @@ export const Question = ({ difficulty }: { difficulty: string }) => {
{options?.map((option: any, index: number) => {
return (
<Button
// variant={`${answer === option ? "default" : "secondary"}`}
variant={`${
currentCorrectAns === option ? "default" : "secondary"
}`}
variant={`${answer === option ? "default" : "secondary"}`}
key={index}
className={cn(
"justify-start text-lg py-6 disabled:pointer-events-auto disabled:cursor-not-allowed",
@ -94,9 +90,8 @@ export const Question = ({ difficulty }: { difficulty: string }) => {
// : ""
// }
// `}
disabled={!isStart}
onClick={() => setCurrentCorrectAns(option)}
// onClick={() => newAnswer(option)}
disabled={ !isStart}
onClick={() => newAnswer(option)}
>
{option}
</Button>
@ -105,18 +100,9 @@ export const Question = ({ difficulty }: { difficulty: string }) => {
</div>
</div>
<div className="flex justify-between mt-6 items-center">
<div>
{/* {answer && <Next currentCorrectAns={currentCorrectAns} />} */}
{currentCorrectAns !== "" && (
<Next currentCorrectAns={currentCorrectAns} />
)}
</div>
<div>{answer && <Next />}</div>
{isStart ? (
<Timer />
) : (
<Button onClick={() => setIsStart(true)}>Start</Button>
)}
{isStart ? <Timer /> : <Button onClick={() => setIsStart(true)}>Start</Button>}
</div>
</>
)}

View File

@ -1,6 +1,6 @@
"use client";
import React, { useEffect, useState } from "react";
import React, { useState } from "react";
import { ScrollArea } from "@/components/ui/scroll-area";
import {
ResizableHandle,
@ -8,14 +8,19 @@ import {
ResizablePanelGroup,
} from "@/components/ui/resizable";
import markdownStyles from "@/styles/markdown-styles.module.css";
import { tutorialData } from "@/constants/tutorial-data";
import { notFound } from "next/navigation";
import { Button, buttonVariants } from "@/components/ui/button";
import Link from "next/link";
import { cn } from "@/lib/utils";
import EditorWindow from "@/components/task/editor-window";
import { LANGUAGE_VERSIONS } from "@/constants/language-options";
import { markdownToHtml } from "@/lib/markdown-to-html";
import Header from "./task/header";
import Image from "next/image";
import ThemeToggle from "./layout/ThemeToggle/theme-toggle";
import { useQuizStore } from "@/lib/quiz-store";
import { useShallow } from "zustand/react/shallow";
const languages = Object.keys(LANGUAGE_VERSIONS);
interface LangTutorial {
id: number;
@ -50,50 +55,55 @@ const TaskPage = ({
"tutorial" | "code" | "output"
>("tutorial");
const { isTaskPageLoading, updateTaskPageLoading } = useQuizStore(
useShallow((store) => ({
isTaskPageLoading: store.isTaskPageLoading,
updateTaskPageLoading: store.updateTaskPageLoading,
})),
);
// if (!params.taskId[0] || !languages.includes(params.taskId[0])) {
// notFound();
// }
useEffect(() => {
if (typeof window !== "undefined") {
// console.log(isTaskPageLoading);
updateTaskPageLoading(false);
}
}, []);
// const langTutorial = tutorialData.find(
// (t) => t.language === params.taskId[0],
// )!;
// const tutorial = langTutorial.tutorial.find(
// (t) => t.id === (Number(params.taskId[1]) || 1),
// );
// const tutorialIndex = langTutorial.tutorial.findIndex(
// (t) => t.id === (Number(params.taskId[1]) || 1),
// );
// if (!tutorial || tutorialIndex === -1) {
// notFound();
// }
// const content = await markdownToHtml(tutorial?.content || "");
return (
<>
<div className="md:hidden">
<div
className={cn(
"flex items-center justify-center gap-4 fixed w-screen bottom-0 left-0 z-50 px-4 py-3 bg-background border-t transition-transform",
isTaskPageLoading ? "translate-y-full" : "translate-y-0",
)}
<div className="flex md:hidden items-center justify-center gap-4 fixed md:static w-screen bottom-0 left-0 z-50 px-4 py-3 bg-background border-t">
<Button
variant={activeMobileView === "tutorial" ? "default" : "outline"}
onClick={() => setActiveMobileView("tutorial")}
>
<Button
variant={activeMobileView === "tutorial" ? "default" : "outline"}
onClick={() => setActiveMobileView("tutorial")}
>
Tutorial
</Button>
<Button
variant={activeMobileView === "code" ? "default" : "outline"}
onClick={() => setActiveMobileView("code")}
>
Code
</Button>
<Button
variant={activeMobileView === "output" ? "default" : "outline"}
onClick={() => setActiveMobileView("output")}
>
Output
</Button>
</div>
Tutorial
</Button>
<Button
variant={activeMobileView === "code" ? "default" : "outline"}
onClick={() => setActiveMobileView("code")}
>
Code
</Button>
<Button
variant={activeMobileView === "output" ? "default" : "outline"}
onClick={() => setActiveMobileView("output")}
>
Output
</Button>
</div>
<div className="md:hidden w-full h-full">
{/* <ResizablePanelGroup
direction="vertical"
className="max-w-[1440px] mx-auto h-full"
> */}
{/* <ResizablePanel defaultSize={50}> */}
<div
className={cn(
"fixed left-0 top-0 h-[calc(100vh-59px)] w-screen transition-transform translate-x-0",
@ -126,14 +136,16 @@ const TaskPage = ({
</Link>
<div className="flex items-center gap-8">
{/* <Link href="/">Home</Link> */}
<Link href="/dashboard">Dashboard</Link>
{/* <Link href="/login">Login</Link> */}
<ThemeToggle />
</div>
</nav>
</div>
<ScrollArea className="h-[calc(100vh-calc(53px+59px))]">
<div className="p-4 flex flex-col gap-4 h-full mb-16">
<div className="p-4 flex flex-col gap-4 h-full mb-14">
<div
className={cn("grow", markdownStyles["markdown"])}
dangerouslySetInnerHTML={{ __html: content }}
@ -142,7 +154,6 @@ const TaskPage = ({
<div>
{langTutorial?.tutorial[tutorialIndex - 1] && (
<Link
onClick={() => updateTaskPageLoading(true)}
href={`/dashboard/task/${params.taskId[0]}/${
Number(params.taskId[1]) - 1
}`}
@ -158,7 +169,6 @@ const TaskPage = ({
<div>
{langTutorial?.tutorial[tutorialIndex + 1] && (
<Link
onClick={() => updateTaskPageLoading(true)}
href={`/dashboard/task/${params.taskId[0]}/${
Number(params.taskId[1]) + 1
}`}
@ -174,29 +184,31 @@ const TaskPage = ({
</div>
</ScrollArea>
</div>
{/* </ResizablePanel> */}
{/* <ResizableHandle withHandle /> */}
{/* <ResizablePanel defaultSize={50}> */}
<EditorWindow
activeMobileView={activeMobileView}
language={params.taskId[0]}
step={Number(params.taskId[1]) || 1}
/>
{/* </ResizablePanel> */}
{/* </ResizablePanelGroup> */}
</div>
<div className="hidden md:block w-full h-full">
{/* <div className="md:hidden w-full h-full">
<ResizablePanelGroup
direction="horizontal"
direction="vertical"
className="max-w-[1440px] mx-auto h-full"
>
<ResizablePanel defaultSize={50}>
<ScrollArea className="h-[calc(100vh-55px)]">
<div className="px-4 py-6 flex flex-col gap-4 h-full mb-6">
<div className="px-4 py-6 flex flex-col gap-4 h-full mb-[60vh]">
<div
className={cn("grow", markdownStyles["markdown"])}
dangerouslySetInnerHTML={{ __html: content }}
></div>
<div className="flex justify-between">
<div>
<div className="mb-6">
{langTutorial?.tutorial[tutorialIndex - 1] && (
<Link
href={`/dashboard/task/${params.taskId[0]}/${
@ -211,7 +223,61 @@ const TaskPage = ({
)}
</div>
<div>
<div className="mb-6">
{langTutorial?.tutorial[tutorialIndex + 1] && (
<Link
href={`/dashboard/task/${params.taskId[0]}/${
Number(params.taskId[1]) + 1
}`}
className={buttonVariants({ variant: "outline" })}
>
Next
</Link>
)}
</div>
</div>
</div>
</ScrollArea>
</ResizablePanel>
<ResizableHandle withHandle />
<ResizablePanel defaultSize={50}>
<EditorWindow
language={params.taskId[0]}
step={Number(params.taskId[1]) || 1}
/>
</ResizablePanel>
</ResizablePanelGroup>
</div> */}
<div className="hidden md:block w-full h-full">
<ResizablePanelGroup
direction="horizontal"
className="max-w-[1440px] mx-auto h-full"
>
<ResizablePanel defaultSize={50}>
<ScrollArea className="h-[calc(100vh-55px)]">
<div className="px-4 py-6 flex flex-col gap-4 h-full">
<div
className={cn("grow", markdownStyles["markdown"])}
dangerouslySetInnerHTML={{ __html: content }}
></div>
<div className="flex justify-between">
<div className="mb-6">
{langTutorial?.tutorial[tutorialIndex - 1] && (
<Link
href={`/dashboard/task/${params.taskId[0]}/${
Number(params.taskId[1]) - 1
}`}
className={buttonVariants({
variant: "outline",
})}
>
Prev
</Link>
)}
</div>
<div className="mb-6">
{langTutorial?.tutorial[tutorialIndex + 1] && (
<Link
href={`/dashboard/task/${params.taskId[0]}/${

View File

@ -12,6 +12,7 @@ import {
ResizablePanelGroup,
} from "@/components/ui/resizable";
import { ThemeDropdown } from "./theme-dropdown";
import LanguagesDropdown from "./languages-dropdown";
import Output from "./output";
import { tutorialData } from "@/constants/tutorial-data";
import { notFound, useRouter } from "next/navigation";
@ -92,10 +93,13 @@ export default function EditorWindow({
if (!tutorial) {
notFound();
}
// console.log(tutorial);
return (
<>
<div className="md:hidden">
{/* <ResizablePanelGroup direction="vertical" className="border-r">
<ResizablePanel defaultSize={50}> */}
<div
className={cn(
"fixed left-0 top-0 h-[calc(100vh-59px)] w-screen translate-x-full transition-transform ",
@ -113,6 +117,10 @@ export default function EditorWindow({
handleThemeChange={handleThemeChange}
theme={theme}
/>
{/* <LanguagesDropdown
handleLanguageChange={handleLanguageChange}
language={lang}
/> */}
</div>
<div className="h-[calc(100vh-calc(55px+53px))]">
<CodeEditor
@ -127,7 +135,9 @@ export default function EditorWindow({
/>
</div>
</div>
{/* </ResizablePanel> */}
{/* <ResizableHandle withHandle /> */}
{/* <ResizablePanel defaultSize={50}> */}
<ErrorBoundary FallbackComponent={PreviewErrorFallback}>
<div
className={cn(
@ -157,6 +167,8 @@ export default function EditorWindow({
)}
</div>
</ErrorBoundary>
{/* </ResizablePanel> */}
{/* </ResizablePanelGroup> */}
</div>
<div className="hidden md:block h-[calc(100vh-55px)]">

View File

@ -1,155 +0,0 @@
"use client"
import * as React from "react"
import { type DialogProps } from "@radix-ui/react-dialog"
import { MagnifyingGlassIcon } from "@radix-ui/react-icons"
import { Command as CommandPrimitive } from "cmdk"
import { cn } from "@/lib/utils"
import { Dialog, DialogContent } from "@/components/ui/dialog"
const Command = React.forwardRef<
React.ElementRef<typeof CommandPrimitive>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive>
>(({ className, ...props }, ref) => (
<CommandPrimitive
ref={ref}
className={cn(
"flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground",
className
)}
{...props}
/>
))
Command.displayName = CommandPrimitive.displayName
interface CommandDialogProps extends DialogProps {}
const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
return (
<Dialog {...props}>
<DialogContent className="overflow-hidden p-0">
<Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
{children}
</Command>
</DialogContent>
</Dialog>
)
}
const CommandInput = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Input>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
>(({ className, ...props }, ref) => (
<div className="flex items-center border-b px-3" cmdk-input-wrapper="">
<MagnifyingGlassIcon className="mr-2 h-4 w-4 shrink-0 opacity-50" />
<CommandPrimitive.Input
ref={ref}
className={cn(
"flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
className
)}
{...props}
/>
</div>
))
CommandInput.displayName = CommandPrimitive.Input.displayName
const CommandList = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.List>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.List>
>(({ className, ...props }, ref) => (
<CommandPrimitive.List
ref={ref}
className={cn("max-h-[300px] overflow-y-auto overflow-x-hidden", className)}
{...props}
/>
))
CommandList.displayName = CommandPrimitive.List.displayName
const CommandEmpty = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Empty>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Empty>
>((props, ref) => (
<CommandPrimitive.Empty
ref={ref}
className="py-6 text-center text-sm"
{...props}
/>
))
CommandEmpty.displayName = CommandPrimitive.Empty.displayName
const CommandGroup = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Group>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Group>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Group
ref={ref}
className={cn(
"overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground",
className
)}
{...props}
/>
))
CommandGroup.displayName = CommandPrimitive.Group.displayName
const CommandSeparator = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Separator>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Separator>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Separator
ref={ref}
className={cn("-mx-1 h-px bg-border", className)}
{...props}
/>
))
CommandSeparator.displayName = CommandPrimitive.Separator.displayName
const CommandItem = React.forwardRef<
React.ElementRef<typeof CommandPrimitive.Item>,
React.ComponentPropsWithoutRef<typeof CommandPrimitive.Item>
>(({ className, ...props }, ref) => (
<CommandPrimitive.Item
ref={ref}
className={cn(
"relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled='true']:pointer-events-none data-[disabled='true']:opacity-50",
className
)}
{...props}
/>
))
CommandItem.displayName = CommandPrimitive.Item.displayName
const CommandShortcut = ({
className,
...props
}: React.HTMLAttributes<HTMLSpanElement>) => {
return (
<span
className={cn(
"ml-auto text-xs tracking-widest text-muted-foreground",
className
)}
{...props}
/>
)
}
CommandShortcut.displayName = "CommandShortcut"
export {
Command,
CommandDialog,
CommandInput,
CommandList,
CommandEmpty,
CommandGroup,
CommandItem,
CommandShortcut,
CommandSeparator,
}

View File

@ -1,49 +1,29 @@
import * as z from "zod";
import { isValidPhoneNumber } from "react-phone-number-input";
export const profileSchema = z.object({
firstname: z
.string({ required_error: "Please enter your first name" })
.trim()
.min(1, { message: "Please enter your first name" }),
.string()
.min(3, { message: "Product Name must be at least 3 characters" }),
lastname: z
.string({ required_error: "Please enter your last name" })
.trim()
.min(1, { message: "Please enter your last name" }),
.string()
.min(3, { message: "Product Name must be at least 3 characters" }),
email: z
.string({ required_error: "Please enter your email" })
.email({ message: "Please enter a valid email" }),
contactno: z
.string({ required_error: "Please enter your phone number" })
.refine((value) => isValidPhoneNumber(value), {
message: "Please enter a valid phone number",
}),
country: z
.string({ required_error: "Please select your country" })
.trim()
.min(1, { message: "Please select your country" }),
state: z
.string({ required_error: "Please select your state" })
.trim()
.min(1, { message: "Please select your state" }),
city: z
.string({ required_error: "Please select your city" })
.trim()
.min(1, { message: "Please select your city" }),
.string()
.email({ message: "Product Name must be at least 3 characters" }),
contactno: z.coerce.number(),
country: z.string().min(1, { message: "Please select a category" }),
city: z.string().min(1, { message: "Please select a category" }),
// jobs array is for the dynamic fields
jobs: z.array(
z.object({
jobcountry: z.string().min(1, { message: "Please select a country" }),
jobstate: z.string().min(1, { message: "Please select a job state" }),
jobcity: z.string().min(1, { message: "Please select a city" }),
jobcountry: z.string().min(1, { message: "Please select a category" }),
jobcity: z.string().min(1, { message: "Please select a category" }),
jobtitle: z
.string()
.trim()
.min(1, { message: "Please enter your job title" }),
.min(3, { message: "Product Name must be at least 3 characters" }),
employer: z
.string()
.trim()
.min(1, { message: "Please enter your employer name" }),
.min(3, { message: "Product Name must be at least 3 characters" }),
startdate: z
.string()
.refine((value) => /^\d{4}-\d{2}-\d{2}$/.test(value), {

View File

@ -39,10 +39,6 @@ export interface StoreInterface {
// increment: () => void;
// decrement: () => void;
reset: () => void;
correctAns: string[];
isTaskPageLoading: boolean;
updateTaskPageLoading: (value: boolean) => void;
}
function getDefaultInitialState() {
@ -69,8 +65,6 @@ function getDefaultInitialState() {
highscore: 0,
secondsRemaining: 210,
totalCorrectAns: 0,
correctAns: [],
isTaskPageLoading: false,
};
}
@ -100,15 +94,10 @@ export function initializeStore(preloadedState: PreloadedStoreInterface) {
// console.log(get().totalCorrectAns);
set({
answer,
// points:
// answer === get().currentQuestion.correctAnswer
// ? get().points + 20
// : get().points,
correctAns:
answer === get().currentQuestion.correctAnswer &&
!get().correctAns.includes(answer)
? [...get().correctAns, answer]
: get().correctAns,
points:
answer === get().currentQuestion.correctAnswer
? get().points + 20
: get().points,
totalCorrectAns:
answer === get().currentQuestion.correctAnswer
? get().totalCorrectAns + 1
@ -178,11 +167,5 @@ export function initializeStore(preloadedState: PreloadedStoreInterface) {
// set({
// count: getDefaultInitialState().count,
// }),
updateTaskPageLoading: (value) => {
console.log(value)
set({
isTaskPageLoading: value,
})},
}));
}