Skip to content

Core multitenants #14

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.

Sign up for GitHub

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

Merged
Stivenjs merged 3 commits into from
May 9, 2025
Merged

Core multitenants #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
922a281
refactor(layouts): reorganize layout and component structure for bett…
Stivenjs May 8, 2025
dd5b972
refactor(test): update mock path and remove unused variable
Stivenjs May 8, 2025
567fbf1
refactor: update subscription store and fix animation paths
Stivenjs May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...count-settings/anim/cancel-animation.json → ...count-settings/anim/cancel-animation.json
View file
Open in desktop
File renamed without changes.
0 ...bar)/account-settings/anim/not-found.json → ...out)/account-settings/anim/not-found.json
View file
Open in desktop
File renamed without changes.
0 ...ount-settings/anim/success-animation.json → ...ount-settings/anim/success-animation.json
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...t-settings/components/AccountSettings.tsx → ...t-settings/components/AccountSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState } from 'react'
import { Pencil, BadgeCheck } from 'lucide-react'
import { Button } from '@/components/ui/button'
import { EditProfileDialog } from '@/app/(with-navbar)/account-settings/components/EditProfileDialog'
import { EditProfileDialog } from '@/app/(main-layout)/account-settings/components/EditProfileDialog'
import {
AlertDialog,
AlertDialogAction,
Expand All @@ -16,10 +16,10 @@ import { Amplify } from 'aws-amplify'
import { deleteUser } from 'aws-amplify/auth'
import { useRouter } from 'next/navigation'
import { LoadingIndicator } from '@/components/ui/loading-indicator'
import { UserAvatar } from '@/app/(with-navbar)/account-settings/components/UserAvatar'
import { ChangePasswordDialog } from '@/app/(with-navbar)/account-settings/components/ChangePasswordDialog'
import { ChangeEmailDialog } from '@/app/(with-navbar)/account-settings/components/ChangeEmailDialog'
import useUserStore from '@/zustand-states/userStore'
import { UserAvatar } from '@/app/(main-layout)/account-settings/components/UserAvatar'
import { ChangePasswordDialog } from '@/app/(main-layout)/account-settings/components/ChangePasswordDialog'
import { ChangeEmailDialog } from '@/app/(main-layout)/account-settings/components/ChangeEmailDialog'
import useUserStore from '@/context/core/userStore'
import outputs from '@/amplify_outputs.json'
import CustomToolTip from '@/components/ui/custom-tooltip'

Expand Down
2 changes: 1 addition & 1 deletion ...nt-settings/components/ActiveSessions.tsx → ...nt-settings/components/ActiveSessions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
Shield,
} from 'lucide-react'
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
import { useDeviceSessions } from '@/app/(with-navbar)/account-settings/hooks/useDeviceSessions'
import { useDeviceSessions } from '@/app/(main-layout)/account-settings/hooks/useDeviceSessions'

export function ActiveSessions() {
// Se utiliza el hook para obtener la información de las sesiones
Expand Down
4 changes: 2 additions & 2 deletions ...ettings/components/CancellationDialog.tsx → ...ettings/components/CancellationDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import {
AlertDialogFooter,
} from '@/components/ui/alert-dialog'
import { Button } from '@/components/ui/button'
import cancelAnimation from '@/app/(with-navbar)/account-settings/anim/cancel-animation.json'
import successAnimation from '@/app/(with-navbar)/account-settings/anim/success-animation.json'
import cancelAnimation from '@/app/(main-layout)/account-settings/anim/cancel-animation.json'
import successAnimation from '@/app/(main-layout)/account-settings/anim/success-animation.json'

interface CancellationDialogProps {
onCancel: () => Promise<void>
Expand Down
6 changes: 3 additions & 3 deletions ...settings/components/ChangeEmailDialog.tsx → ...settings/components/ChangeEmailDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import {
DialogTitle,
} from '@/components/ui/dialog'
import { Input } from '@/components/ui/input'
import { useUserAttributes } from '@/app/(with-navbar)/account-settings/hooks/useUserAttributes'
import { emailSchema, verificationCodeSchema } from '@/lib/schemas/email-change'
import { useUserAttributes } from '@/app/(main-layout)/account-settings/hooks/useUserAttributes'
import { emailSchema, verificationCodeSchema } from '@/lib/zod-schemas/email-change'
import { zodResolver } from '@hookform/resolvers/zod'
import { useForm } from 'react-hook-form'
import { useToast } from '@/hooks/custom-toast/use-toast'
import { useToast } from '@/hooks/ui/use-toasts'
import { Toast } from '@/components/ui/toasts'
import type { z } from 'zod'
import { OTPInput, type SlotProps } from 'input-otp'
Expand Down
4 changes: 2 additions & 2 deletions ...tings/components/ChangePasswordDialog.tsx → ...tings/components/ChangePasswordDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState } from 'react'
import { useForm } from 'react-hook-form'
import { zodResolver } from '@hookform/resolvers/zod'
import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
import { passwordSchema, PasswordFormValues } from '@/lib/schemas/password-change'
import { passwordSchema, PasswordFormValues } from '@/lib/zod-schemas/password-change'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import {
Expand All @@ -13,7 +13,7 @@ import {
FormLabel,
FormMessage,
} from '@/components/ui/form'
import usePasswordManagement from '@/app/(with-navbar)/account-settings/hooks/usePasswordManagement'
import usePasswordManagement from '@/app/(main-layout)/account-settings/hooks/usePasswordManagement'
import { Eye, EyeOff } from 'lucide-react'
import { Loader } from '@/components/ui/loader'

Expand Down
8 changes: 4 additions & 4 deletions ...settings/components/EditProfileDialog.tsx → ...settings/components/EditProfileDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import { Input } from '@/components/ui/input'
import { Textarea } from '@/components/ui/textarea'
import { Button } from '@/components/ui/button'
import { useEffect } from 'react'
import { useUserAttributes } from '@/app/(with-navbar)/account-settings/hooks/useUserAttributes'
import { useUserAttributes } from '@/app/(main-layout)/account-settings/hooks/useUserAttributes'
import { Loader } from '@/components/ui/loader'
import { useToast } from '@/hooks/custom-toast/use-toast'
import { useToast } from '@/hooks/ui/use-toasts'
import { Toast } from '@/components/ui/toasts'
import { formSchema } from '@/lib/schemas/email-change'
import useAuthStore from '@/zustand-states/userStore'
import { formSchema } from '@/lib/zod-schemas/email-change'
import useAuthStore from '@/context/core/userStore'

interface EditProfileDialogProps {
open: boolean
Expand Down
25 changes: 7 additions & 18 deletions ...t-settings/components/PaymentSettings.tsx → ...t-settings/components/PaymentSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import { Suspense, useState, useEffect } from 'react'
import { Button } from '@/components/ui/button'
import { useSubscriptionStore } from '@/zustand-states/useSubscriptionStore'
import { useSubscriptionStore } from '@/context/core/useSubscriptionStore'
import { post } from 'aws-amplify/api'
import { SubscriptionCard } from '@/app/(with-navbar)/account-settings/components/SubscriptionCard'
import { SubscriptionCard } from '@/app/(main-layout)/account-settings/components/SubscriptionCard'
import { Card, CardHeader, CardTitle, CardDescription } from '@/components/ui/card'
import { CancellationDialog } from '@/app/(with-navbar)/account-settings/components/CancellationDialog'
import { CancellationDialog } from '@/app/(main-layout)/account-settings/components/CancellationDialog'
import { Loader } from '@/components/ui/loader'
import useUserStore from '@/zustand-states/userStore'
import useUserStore from '@/context/core/userStore'
import Link from 'next/link'

function SubscriptionLoader() {
const { subscriptionResource } = useSubscriptionStore()
const subscription = subscriptionResource.read()
const subscription = subscriptionResource?.read()
const [isSubmitting, setIsSubmitting] = useState(false)

const { user } = useUserStore()
const cognitoUsername = user?.cognitoUsername

Expand Down Expand Up @@ -134,18 +135,6 @@ function SubscriptionLoader() {
)
}

// Componente de fallback para errores
function ErrorFallback() {
return (
<Card>
<CardHeader>
<CardTitle>Error al cargar la suscripción</CardTitle>
<CardDescription>Por favor, intenta de nuevo más tarde.</CardDescription>
</CardHeader>
</Card>
)
}

// Componente principal
export function PaymentSettings() {
const { setCognitoUsername } = useSubscriptionStore()
Expand All @@ -156,7 +145,7 @@ export function PaymentSettings() {
if (user?.cognitoUsername) {
setCognitoUsername(user.cognitoUsername)
}
}, [user?.cognitoUsername, setCognitoUsername])
}, [user])

return (
<div className="space-y-8 px-4 pt-4 pb-4 min-h-screen flex flex-col justify-start">
Expand Down
0 ...)/account-settings/components/SideBar.tsx → ...)/account-settings/components/SideBar.tsx
View file
Open in desktop
File renamed without changes.
0 ...-settings/components/SubscriptionCard.tsx → ...-settings/components/SubscriptionCard.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ccount-settings/components/UserAvatar.tsx → ...ccount-settings/components/UserAvatar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useState, useRef } from 'react'
import { ImagePlus } from 'lucide-react'
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
import { cn } from '@/lib/utils'
import { useUpdateProfilePicture } from '@/app/(with-navbar)/account-settings/hooks/useUpdateProfilePicture'
import { useUpdateProfilePicture } from '@/app/(main-layout)/account-settings/hooks/useUpdateProfilePicture'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

Expand Down
0 ...count-settings/hooks/useDeviceSessions.ts → ...count-settings/hooks/useDeviceSessions.ts
View file
Open in desktop
File renamed without changes.
0 ...t-settings/hooks/usePasswordManagement.ts → ...t-settings/hooks/usePasswordManagement.ts
View file
Open in desktop
File renamed without changes.
0 ...settings/hooks/useUpdateProfilePicture.ts → ...settings/hooks/useUpdateProfilePicture.ts
View file
Open in desktop
File renamed without changes.
0 ...count-settings/hooks/useUserAttributes.ts → ...count-settings/hooks/useUserAttributes.ts
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions app/(with-navbar)/account-settings/page.tsx → app/(main-layout)/account-settings/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
'use client'

import { Sidebar } from '@/app/(with-navbar)/account-settings/components/SideBar'
import { AccountSettings } from '@/app/(with-navbar)/account-settings/components/AccountSettings'
import { PaymentSettings } from '@/app/(with-navbar)/account-settings/components/PaymentSettings'
import { ActiveSessions } from '@/app/(with-navbar)/account-settings/components/ActiveSessions'
import { Sidebar } from '@/app/(main-layout)/account-settings/components/SideBar'
import { AccountSettings } from '@/app/(main-layout)/account-settings/components/AccountSettings'
import { PaymentSettings } from '@/app/(main-layout)/account-settings/components/PaymentSettings'
import { ActiveSessions } from '@/app/(main-layout)/account-settings/components/ActiveSessions'
import { useState, useEffect, Suspense } from 'react'
import { Loader } from '@/components/ui/loader'
import { Amplify } from 'aws-amplify'
import { useSearchParams } from 'next/navigation'
import useUserStore from '@/zustand-states/userStore'
import useUserStore from '@/context/core/userStore'
import outputs from '@/amplify_outputs.json'

Amplify.configure(outputs)
Expand Down
0 ...th-navbar)/landing/components/AboutUs.tsx → ...in-layout)/landing/components/AboutUs.tsx
View file
Open in desktop
File renamed without changes.
22 changes: 11 additions & 11 deletions ...avbar)/landing/components/DocsLanding.tsx → ...ayout)/landing/components/DocsLanding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { DropshippingIntro } from '@/app/(with-navbar)/landing/components/DropshippingIntro'
import { Platform } from '@/app/(with-navbar)/landing/components/Platform'
import { Footer } from '@/app/(with-navbar)/landing/components/Footer'
import { StepGuide } from '@/app/(with-navbar)/landing/components/StepGuide'
import { FirstView } from '@/app/(with-navbar)/landing/components/FirstView'
import { AboutUs } from '@/app/(with-navbar)/landing/components/AboutUs'
import { FashionSlider } from '@/app/(with-navbar)/landing/components/FashionSlider'
import { Feature } from '@/app/(with-navbar)/landing/components/Feature'
import { Testimonials } from '@/app/(with-navbar)/landing/components/Testimonials'
import { MarqueeLogos } from '@/app/(with-navbar)/landing/components/MarqueeLogos'
import { LogoCarousell } from '@/app/(with-navbar)/landing/components/LogoCarousell'
import { DropshippingIntro } from '@/app/(main-layout)/landing/components/DropshippingIntro'
import { Platform } from '@/app/(main-layout)/landing/components/Platform'
import { Footer } from '@/app/(main-layout)/landing/components/Footer'
import { StepGuide } from '@/app/(main-layout)/landing/components/StepGuide'
import { FirstView } from '@/app/(main-layout)/landing/components/FirstView'
import { AboutUs } from '@/app/(main-layout)/landing/components/AboutUs'
import { FashionSlider } from '@/app/(main-layout)/landing/components/FashionSlider'
import { Feature } from '@/app/(main-layout)/landing/components/Feature'
import { Testimonials } from '@/app/(main-layout)/landing/components/Testimonials'
import { MarqueeLogos } from '@/app/(main-layout)/landing/components/MarqueeLogos'
import { LogoCarousell } from '@/app/(main-layout)/landing/components/LogoCarousell'
import outputs from '@/amplify_outputs.json'
import { Amplify } from 'aws-amplify'

Expand Down
0 .../landing/components/DropshippingIntro.tsx → .../landing/components/DropshippingIntro.tsx
View file
Open in desktop
File renamed without changes.
0 ...bar)/landing/components/FashionSlider.tsx → ...out)/landing/components/FashionSlider.tsx
View file
Open in desktop
File renamed without changes.
0 ...th-navbar)/landing/components/Feature.tsx → ...in-layout)/landing/components/Feature.tsx
View file
Open in desktop
File renamed without changes.
0 ...-navbar)/landing/components/FirstView.tsx → ...-layout)/landing/components/FirstView.tsx
View file
Open in desktop
File renamed without changes.
0 ...ith-navbar)/landing/components/Footer.tsx → ...ain-layout)/landing/components/Footer.tsx
View file
Open in desktop
File renamed without changes.
0 ...bar)/landing/components/LogoCarousell.tsx → ...out)/landing/components/LogoCarousell.tsx
View file
Open in desktop
File renamed without changes.
0 ...vbar)/landing/components/MarqueeLogos.tsx → ...yout)/landing/components/MarqueeLogos.tsx
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...ith-navbar)/landing/components/NavBar.tsx → ...ain-layout)/landing/components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import {
NavigationMenuList,
NavigationMenuTrigger,
} from '@/components/ui/navigation-menu'
import { useAuth } from '@/hooks/auth/useAuth'
import { useAuth } from '@/context/hooks/useAuth'
import { signOut } from 'aws-amplify/auth'
import { useRouter } from 'next/navigation'
import { UserMenu } from '@/app/(with-navbar)/landing/components/UserMenu'
import { UserMenu } from '@/app/(main-layout)/landing/components/UserMenu'
import { Skeleton } from '@/components/ui/skeleton'
import { navItems } from '@/app/(with-navbar)/landing/components/navigation'
import useUserStore from '@/zustand-states/userStore'
import { navItems } from '@/app/(main-layout)/landing/components/navigation'
import useUserStore from '@/context/core/userStore'
import outputs from '@/amplify_outputs.json'

Amplify.configure(outputs)
Expand Down
0 ...h-navbar)/landing/components/Platform.tsx → ...n-layout)/landing/components/Platform.tsx
View file
Open in desktop
File renamed without changes.
0 ...-navbar)/landing/components/StepGuide.tsx → ...-layout)/landing/components/StepGuide.tsx
View file
Open in desktop
File renamed without changes.
0 ...vbar)/landing/components/Testimonials.tsx → ...yout)/landing/components/Testimonials.tsx
View file
Open in desktop
File renamed without changes.
0 ...h-navbar)/landing/components/UserMenu.tsx → ...n-layout)/landing/components/UserMenu.tsx
View file
Open in desktop
File renamed without changes.
0 ...-navbar)/landing/components/navigation.ts → ...-layout)/landing/components/navigation.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/(with-navbar)/layout.tsx → app/(main-layout)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Navbar } from '@/app/(with-navbar)/landing/components/NavBar'
import { Navbar } from '@/app/(main-layout)/landing/components/NavBar'
import outputs from '@/amplify_outputs.json'
import { Amplify } from 'aws-amplify'

Expand Down
2 changes: 1 addition & 1 deletion app/(with-navbar)/page.tsx → app/(main-layout)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getCurrentUser, fetchUserAttributes } from 'aws-amplify/auth'
import { ConsoleLogger, Hub } from 'aws-amplify/utils'
import { Amplify } from 'aws-amplify'
import 'aws-amplify/auth/enable-oauth-listener'
import DocsLanding from '@/app/(with-navbar)/landing/components/DocsLanding'
import DocsLanding from '@/app/(main-layout)/landing/components/DocsLanding'
import outputs from '@/amplify_outputs.json'

Amplify.configure(outputs)
Expand Down
0 ...th-navbar)/pricing/components/FAQItem.tsx → ...in-layout)/pricing/components/FAQItem.tsx
View file
Open in desktop
File renamed without changes.
0 ...navbar)/pricing/components/FAQSection.tsx → ...layout)/pricing/components/FAQSection.tsx
View file
Open in desktop
File renamed without changes.
0 .../pricing/components/FeatureComparison.tsx → .../pricing/components/FeatureComparison.tsx
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...avbar)/pricing/components/PricingCard.tsx → ...ayout)/pricing/components/PricingCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import { Button } from '@/components/ui/button'
import { post } from 'aws-amplify/api'
import { LoadingIndicator } from '@/components/ui/loading-indicator'
import { useRouter } from 'next/navigation'
import { useToast } from '@/hooks/custom-toast/use-toast'
import { useToast } from '@/hooks/ui/use-toasts'
import { Toast } from '@/components/ui/toasts'
import { useAuth } from '@/hooks/auth/useAuth'
import useUserStore from '@/zustand-states/userStore'
import outputs from '@/amplify_outputs.json'
import { useAuth } from '@/context/hooks/useAuth'
import { Amplify } from 'aws-amplify'
import useUserStore from '@/context/core/userStore'
import outputs from '@/amplify_outputs.json'

Amplify.configure(outputs)
const existingConfig = Amplify.getConfig()
Expand Down
0 ...(with-navbar)/pricing/components/plans.ts → ...(main-layout)/pricing/components/plans.ts
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions app/(with-navbar)/pricing/page.tsx → app/(main-layout)/pricing/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import { useEffect } from 'react'
import { motion } from 'framer-motion'
import { PricingCard } from '@/app/(with-navbar)/pricing/components/PricingCard'
import { Footer } from '@/app/(with-navbar)/landing/components/Footer'
import { FAQSection } from '@/app/(with-navbar)/pricing/components/FAQSection'
import { faqItems } from '@/app/(with-navbar)/pricing/components/FAQItem'
import { PricingCard } from '@/app/(main-layout)/pricing/components/PricingCard'
import { Footer } from '@/app/(main-layout)/landing/components/Footer'
import { FAQSection } from '@/app/(main-layout)/pricing/components/FAQSection'
import { faqItems } from '@/app/(main-layout)/pricing/components/FAQItem'
import { Amplify } from 'aws-amplify'
import { FeatureComparison } from '@/app/(with-navbar)/pricing/components/FeatureComparison'
import { FeatureComparison } from '@/app/(main-layout)/pricing/components/FeatureComparison'
import outputs from '@/amplify_outputs.json'
import { plans } from '@/app/(with-navbar)/pricing/components/plans'
import { plans } from '@/app/(main-layout)/pricing/components/plans'

Amplify.configure(outputs)
const existingConfig = Amplify.getConfig()
Expand Down
2 changes: 1 addition & 1 deletion ...uccess/components/SubscriptionSuccess.tsx → ...uccess/components/SubscriptionSuccess.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { motion } from 'framer-motion'
import { ArrowRight, Check, Sparkles, Zap } from 'lucide-react'
import { Footer } from '@/app/(with-navbar)/landing/components/Footer'
import { Footer } from '@/app/(main-layout)/landing/components/Footer'
import Link from 'next/link'

interface SubscriptionSuccessProps {
Expand Down
0 ...tion-success/components/WelcomeScreen.tsx → ...tion-success/components/WelcomeScreen.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ith-navbar)/subscription-success/page.tsx → ...ain-layout)/subscription-success/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client'

import { useState } from 'react'
import { WelcomeScreen } from '@/app/(with-navbar)/subscription-success/components/WelcomeScreen'
import { SubscriptionSuccess } from '@/app/(with-navbar)/subscription-success/components/SubscriptionSuccess'
import useUserStore from '@/zustand-states/userStore'
import { WelcomeScreen } from '@/app/(main-layout)/subscription-success/components/WelcomeScreen'
import { SubscriptionSuccess } from '@/app/(main-layout)/subscription-success/components/SubscriptionSuccess'
import useUserStore from '@/context/core/userStore'

export default function SubscriptionSuccessPage() {
const [showContent, setShowContent] = useState(false)
Expand Down
0 ...vbar)/terms/components/LegalDocuments.tsx → ...yout)/terms/components/LegalDocuments.tsx
View file
Open in desktop
File renamed without changes.
0 ...vbar)/terms/components/legal-content.json → ...yout)/terms/components/legal-content.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/(with-navbar)/terms/page.tsx → app/(main-layout)/terms/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LegalDocuments } from '@/app/(with-navbar)/terms/components/LegalDocuments'
import { LegalDocuments } from '@/app/(main-layout)/terms/components/LegalDocuments'
import type { Metadata } from 'next'

export const metadata: Metadata = {
Expand Down
0 ...t-steps/components/AdditionalSettings.tsx → ...t-steps/components/AdditionalSettings.tsx
View file
Open in desktop
File renamed without changes.
0 ...omponents/BackgroundGradientAnimation.tsx → ...omponents/BackgroundGradientAnimation.tsx
View file
Open in desktop
File renamed without changes.
0 ...irst-steps/components/MultiStepLoader.tsx → ...irst-steps/components/MultiStepLoader.tsx
View file
Open in desktop
File renamed without changes.
0 ...)/first-steps/components/PersonalInfo.tsx → ...)/first-steps/components/PersonalInfo.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...bar)/first-steps/components/StoreInfo.tsx → ...out)/first-steps/components/StoreInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
SelectTrigger,
SelectValue,
} from '@/components/ui/select'
import { useStoreNameValidator } from '@/app/(without-navbar)/first-steps/hooks/useStoreNameValidator'
import { useStoreNameValidator } from '@/app/(setup-layout)/first-steps/hooks/useStoreNameValidator'
import { Amplify } from 'aws-amplify'
import outputs from '@/amplify_outputs.json'

Expand Down
0 ...ar)/first-steps/data/selling-options.json → ...ut)/first-steps/data/selling-options.json
View file
Open in desktop
File renamed without changes.
0 .../first-steps/hooks/useApiKeyEncryption.ts → .../first-steps/hooks/useApiKeyEncryption.ts
View file
Open in desktop
File renamed without changes.
0 ...irst-steps/hooks/useStoreNameValidator.ts → ...irst-steps/hooks/useStoreNameValidator.ts
View file
Open in desktop
File renamed without changes.
0 ...ar)/first-steps/hooks/useUserStoreData.ts → ...ut)/first-steps/hooks/useUserStoreData.ts
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions app/(without-navbar)/first-steps/page.tsx → app/(setup-layout)/first-steps/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ import { useState, useEffect } from 'react'
import { ArrowRight, Store, User, Settings, InfoIcon } from 'lucide-react'
import { AnimatePresence, motion } from 'framer-motion'
import { Button } from '@/components/ui/button'
import { BackgroundGradientAnimation } from '@/app/(without-navbar)/first-steps/components/BackgroundGradientAnimation'
import { useUserStoreData } from '@/app/(without-navbar)/first-steps/hooks/useUserStoreData'
import { MultiStepLoader } from '@/app/(without-navbar)/first-steps/components/MultiStepLoader'
import { BackgroundGradientAnimation } from '@/app/(setup-layout)/first-steps/components/BackgroundGradientAnimation'
import { useUserStoreData } from '@/app/(setup-layout)/first-steps/hooks/useUserStoreData'
import { MultiStepLoader } from '@/app/(setup-layout)/first-steps/components/MultiStepLoader'
import Image from 'next/image'
import PersonalInfo from '@/app/(without-navbar)/first-steps/components/PersonalInfo'
import StoreInfo from '@/app/(without-navbar)/first-steps/components/StoreInfo'
import AdditionalSettings from '@/app/(without-navbar)/first-steps/components/AdditionalSettings'
import PersonalInfo from '@/app/(setup-layout)/first-steps/components/PersonalInfo'
import StoreInfo from '@/app/(setup-layout)/first-steps/components/StoreInfo'
import AdditionalSettings from '@/app/(setup-layout)/first-steps/components/AdditionalSettings'
import {
personalInfoSchema,
storeInfoSchema,
additionalSettingsSchema,
} from '@/lib/schemas/first-step'
} from '@/lib/zod-schemas/first-step'
import { useAuthUser } from '@/hooks/auth/useAuthUser'
import { v4 as uuidv4 } from 'uuid'
import { routes } from '@/utils/routes'
import { useApiKeyEncryption } from '@/app/(without-navbar)/first-steps/hooks/useApiKeyEncryption'
import { useApiKeyEncryption } from '@/app/(setup-layout)/first-steps/hooks/useApiKeyEncryption'
import sellingOptions from '@/app/(without-navbar)/first-steps/data/selling-options.json'

export default function FirstStepsPage() {
Expand Down
0 app/(without-navbar)/layout.tsx → app/(setup-layout)/layout.tsx
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions app/(without-navbar)/login/AuthForm.tsx → app/(setup-layout)/login/AuthForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import Image from 'next/image'
import { useState, useCallback } from 'react'
import { motion, AnimatePresence } from 'framer-motion'
import { Button } from '@/components/ui/button'
import { SignInForm } from '@/app/(without-navbar)/login/components/sing-in/SignInForm'
import { SignUpForm } from '@/app/(without-navbar)/login/components/sing-up/SignUpForm'
import { ForgotPasswordForm } from '@/app/(without-navbar)/login/components/forgot-password/ForgotPasswordForm'
import { VerificationForm } from '@/app/(without-navbar)/login/components/verification-form/VerificationForm'
import { SignInForm } from '@/app/(setup-layout)/login/components/sing-in/SignInForm'
import { SignUpForm } from '@/app/(setup-layout)/login/components/sing-up/SignUpForm'
import { ForgotPasswordForm } from '@/app/(setup-layout)/login/components/forgot-password/ForgotPasswordForm'
import { VerificationForm } from '@/app/(setup-layout)/login/components/verification-form/VerificationForm'
import { signInWithRedirect } from 'aws-amplify/auth'

type AuthState = 'signin' | 'signup' | 'forgot-password' | 'verification'
Expand Down
4 changes: 2 additions & 2 deletions ...t-navbar)/login/components/AuthClient.tsx → ...p-layout)/login/components/AuthClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AuthForm } from '@/app/(without-navbar)/login/AuthForm'
import ImageSlider from '@/app/(without-navbar)/login/components/ImageSlider'
import { AuthForm } from '@/app/(setup-layout)/login/AuthForm'
import ImageSlider from '@/app/(setup-layout)/login/components/ImageSlider'

const LoginPage = () => {
return (
Expand Down
0 ...-navbar)/login/components/ImageSlider.tsx → ...-layout)/login/components/ImageSlider.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ts/forgot-password/ForgotPasswordForm.tsx → ...ts/forgot-password/ForgotPasswordForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
confirmResetPasswordSchema,
type ForgotPasswordFormData,
type ConfirmResetPasswordFormData,
} from '@/lib/schemas/schemas'
} from '@/lib/zod-schemas/schemas'
import { OTPInput, type SlotProps } from 'input-otp'
import { cn } from '@/lib/utils'

Expand Down
4 changes: 2 additions & 2 deletions ...)/login/components/sing-in/SignInForm.tsx → ...)/login/components/sing-in/SignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
} from '@/components/ui/form'
import { Input } from '@/components/ui/input'
import { Checkbox } from '@/components/ui/checkbox'
import { signInSchema, type SignInFormData } from '@/lib/schemas/schemas'
import { useAuth } from '@/app/(without-navbar)/login/hooks/SignIn'
import { signInSchema, type SignInFormData } from '@/lib/zod-schemas/schemas'
import { useAuth } from '@/app/(setup-layout)/login/hooks/SignIn'

interface SignInFormProps {
onForgotPassword: () => void
Expand Down
Loading