-
Notifications
You must be signed in to change notification settings - Fork 36
v-3388: Update all skeleton loaders on mobile and desktop #127
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Cichorek
wants to merge
4
commits into
main
Choose a base branch
from
feature/v-3388-update-all-skeleton-loaders-on-mobile-and-desktop
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
8803fbf
Update skeleton loaders across storefront and checkout
Cichorek a036187
Add dedicated skeletons for forgot/reset password and cart drawer
Cichorek 31aa5d6
Address PR review: preserve redirect, guard open-redirect, forward Sl…
Cichorek 15749ce
Merge remote-tracking branch 'origin/main' into feature/v-3388-update…
Cichorek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
src/app/[country]/[locale]/(storefront)/account/addresses/loading.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { AddressesSkeleton } from "@/components/account/AddressesSkeleton"; | ||
|
|
||
| export default function AddressesLoading() { | ||
| return <AddressesSkeleton />; | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/app/[country]/[locale]/(storefront)/account/credit-cards/loading.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { CreditCardsSkeleton } from "@/components/account/CreditCardsSkeleton"; | ||
|
|
||
| export default function CreditCardsLoading() { | ||
| return <CreditCardsSkeleton />; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
src/app/[country]/[locale]/(storefront)/account/gift-cards/loading.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import { GiftCardsSkeleton } from "@/components/account/GiftCardsSkeleton"; | ||
|
|
||
| export default function GiftCardsLoading() { | ||
| return <GiftCardsSkeleton />; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
167 changes: 167 additions & 0 deletions
167
src/app/[country]/[locale]/(storefront)/account/login/page.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| "use client"; | ||
|
|
||
| import { CircleAlert, Eye, EyeOff } from "lucide-react"; | ||
| import Link from "next/link"; | ||
| import { usePathname, useRouter, useSearchParams } from "next/navigation"; | ||
| import { useTranslations } from "next-intl"; | ||
| import { useEffect, useState } from "react"; | ||
| import { Alert, AlertDescription } from "@/components/ui/alert"; | ||
| import { Button } from "@/components/ui/button"; | ||
| import { | ||
| Card, | ||
| CardContent, | ||
| CardDescription, | ||
| CardFooter, | ||
| CardHeader, | ||
| CardTitle, | ||
| } from "@/components/ui/card"; | ||
| import { Field, FieldLabel } from "@/components/ui/field"; | ||
| import { Input } from "@/components/ui/input"; | ||
| import { useAuth } from "@/contexts/AuthContext"; | ||
| import { extractBasePath } from "@/lib/utils/path"; | ||
|
|
||
| export default function LoginPage() { | ||
| const router = useRouter(); | ||
| const pathname = usePathname(); | ||
| const searchParams = useSearchParams(); | ||
| const basePath = extractBasePath(pathname); | ||
| const t = useTranslations("account"); | ||
| const { login, isAuthenticated, loading: authLoading } = useAuth(); | ||
|
|
||
| // Get redirect URL from query params (e.g., from checkout) | ||
| const redirectUrl = searchParams.get("redirect"); | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| const [email, setEmail] = useState(""); | ||
| const [password, setPassword] = useState(""); | ||
| const [showPassword, setShowPassword] = useState(false); | ||
| const [loading, setLoading] = useState(false); | ||
| const [error, setError] = useState<string | null>(null); | ||
|
|
||
| // Redirect if already authenticated | ||
| // useEffect is needed here to prevent rendering issues. | ||
| useEffect(() => { | ||
| if (!authLoading && isAuthenticated) { | ||
| router.push(redirectUrl ?? `${basePath}/account`); | ||
| } | ||
| }, [authLoading, isAuthenticated, redirectUrl, router, basePath]); | ||
| if (authLoading || isAuthenticated) { | ||
| return null; | ||
| } | ||
|
|
||
| const handleSubmit = async (e: React.FormEvent) => { | ||
| e.preventDefault(); | ||
| setError(null); | ||
| setLoading(true); | ||
|
|
||
| const result = await login(email, password); | ||
| if (result.success) { | ||
| // Redirect to the specified URL or go to account dashboard | ||
| router.push(redirectUrl ?? `${basePath}/account`); | ||
| } else { | ||
| setError(result.error || t("invalidCredentials")); | ||
| } | ||
| setLoading(false); | ||
| }; | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
| return ( | ||
| <div className="max-w-md mx-auto px-4 sm:px-6 lg:px-8 py-16"> | ||
| <Card> | ||
| <CardHeader className="text-center"> | ||
| <CardTitle>{t("myAccount")}</CardTitle> | ||
| <CardDescription>{t("signInDescription")}</CardDescription> | ||
| </CardHeader> | ||
|
|
||
| <CardContent> | ||
| <form onSubmit={handleSubmit} className="space-y-4"> | ||
| {error && ( | ||
| <Alert variant="destructive"> | ||
| <CircleAlert /> | ||
| <AlertDescription>{error}</AlertDescription> | ||
| </Alert> | ||
| )} | ||
|
|
||
| <Field> | ||
| <FieldLabel htmlFor="email">{t("email")}</FieldLabel> | ||
| <Input | ||
| type="email" | ||
| id="email" | ||
| name="email" | ||
| autoComplete="email" | ||
| value={email} | ||
| onChange={(e) => setEmail(e.target.value)} | ||
| required | ||
| placeholder="you@example.com" | ||
| /> | ||
| </Field> | ||
|
|
||
| <Field> | ||
| <FieldLabel htmlFor="password">{t("password")}</FieldLabel> | ||
| <div className="relative"> | ||
| <Input | ||
| type={showPassword ? "text" : "password"} | ||
| id="password" | ||
| name="current-password" | ||
| autoComplete="current-password" | ||
| value={password} | ||
| onChange={(e) => setPassword(e.target.value)} | ||
| required | ||
| placeholder="••••••••" | ||
| className="pr-10" | ||
| /> | ||
| <div className="absolute right-1 top-1/2 -translate-y-1/2"> | ||
| <Button | ||
| type="button" | ||
| variant="ghost" | ||
| size="icon-sm" | ||
| onClick={() => setShowPassword(!showPassword)} | ||
| aria-label={ | ||
| showPassword ? t("hidePassword") : t("showPassword") | ||
| } | ||
| > | ||
| {showPassword ? ( | ||
| <EyeOff className="w-5 h-5" /> | ||
| ) : ( | ||
| <Eye className="w-5 h-5" /> | ||
| )} | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| </Field> | ||
|
|
||
| <div className="flex justify-end"> | ||
| <Link | ||
| href={`${basePath}/account/forgot-password`} | ||
| className="text-sm text-primary hover:text-primary/70 font-medium" | ||
| > | ||
| {t("forgotPassword")} | ||
| </Link> | ||
| </div> | ||
|
|
||
| <div className="w-full"> | ||
| <Button | ||
| type="submit" | ||
| disabled={loading} | ||
| size="lg" | ||
| className="w-full" | ||
| > | ||
| {loading ? t("signingIn") : t("signIn")} | ||
| </Button> | ||
| </div> | ||
| </form> | ||
| </CardContent> | ||
|
|
||
| <CardFooter className="justify-center"> | ||
| <p className="text-sm text-muted-foreground"> | ||
| {t("dontHaveAccount")}{" "} | ||
| <Link | ||
| href={`${basePath}/account/register`} | ||
| className="text-primary hover:text-primary/70 font-medium" | ||
| > | ||
| {t("signUp")} | ||
| </Link> | ||
| </p> | ||
| </CardFooter> | ||
| </Card> | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.