Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { cleanup, render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { afterEach, describe, expect, it } from 'vitest';

import { RoutineDraftFormProvider } from './routine-draft-form';
import { RoutineDraftFormProvider } from '../routine-draft-form';
import { RoutineEditor } from './routine-editor';

afterEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { Link, useNavigate } from '@tanstack/react-router';
import { ArrowLeft, Plus } from 'lucide-react';
import { useFormContext } from 'react-hook-form';

import { AddActionButton } from '../../components/ui/add-action-button';
import { Button } from '../../components/ui/button';
import { Input } from '../../components/ui/input';
import { Label } from '../../components/ui/label';
import { PageTitle } from '../../components/ui/page-title';
import { cn } from '../../lib/utils';
import type { RoutineDraftFormValues } from './routine-draft-form';
import { AddActionButton } from '@/components/ui/add-action-button';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';
import { PageTitle } from '@/components/ui/page-title';
import { cn } from '@/lib/utils';
import type { RoutineDraftFormValues } from '../routine-draft-form';
import { RoutineScheduleField } from './routine-schedule-field';

export function RoutineEditor() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/** Displays routine schedule selections and the entry point for adding one. */
import { Plus } from 'lucide-react';

import { Button } from '../../components/ui/button';
import { Label } from '../../components/ui/label';
import { Button } from '@/components/ui/button';
import { Label } from '@/components/ui/label';

export function RoutineScheduleField() {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { Dumbbell, X } from 'lucide-react';

import { cn } from '@/lib/utils';

import { Button } from '../../components/ui/button';
import { Label } from '../../components/ui/label';
import { LoadingState } from '../../components/ui/loading-state';
import { NumberStepper } from '../../components/ui/number-stepper';
import { PageTitle } from '../../components/ui/page-title';
import { PositiveIntegerInput } from '../../components/ui/positive-integer-input';
import { useExercises } from '../exercises/exercises.query';
import { Button } from '@/components/ui/button';
import { Label } from '@/components/ui/label';
import { LoadingState } from '@/components/ui/loading-state';
import { NumberStepper } from '@/components/ui/number-stepper';
import { PageTitle } from '@/components/ui/page-title';
import { PositiveIntegerInput } from '@/components/ui/positive-integer-input';
import { useExercises } from '@/features/exercises/exercises.query';

type ExerciseConfigurationProps = {
exerciseId: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import { Link } from '@tanstack/react-router';
import { ChevronRight, Dumbbell, Plus, Search, X } from 'lucide-react';
import { useState } from 'react';

import { AddActionButton } from '../../components/ui/add-action-button';
import { Button } from '../../components/ui/button';
import { Input } from '../../components/ui/input';
import { LoadingState } from '../../components/ui/loading-state';
import { PageTitle } from '../../components/ui/page-title';
import { useExercises } from '../exercises/exercises.query';
import { AddActionButton } from '@/components/ui/add-action-button';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { LoadingState } from '@/components/ui/loading-state';
import { PageTitle } from '@/components/ui/page-title';
import { useExercises } from '@/features/exercises/exercises.query';

export function ExercisePicker() {
const [searchTerm, setSearchTerm] = useState('');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
import type { PropsWithChildren } from 'react';
import { afterEach, describe, expect, it, vi } from 'vitest';

import { ApplicationIdentityContext } from '../../app/application-identity';
import { createPublicUser } from '../../test/fixtures/public-user.fixture';
import { ApplicationIdentityContext } from '@/app/application-identity';
import { createPublicUser } from '@/test/fixtures/public-user.fixture';
import { RoutinesLanding } from './routines-landing';

afterEach(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { Link } from '@tanstack/react-router';
import { CalendarDays, Dumbbell, Plus } from 'lucide-react';
import type { ReactNode } from 'react';

import { useApplicationIdentity } from '../../app/application-identity';
import { AddActionButton } from '../../components/ui/add-action-button';
import { PageTitle } from '../../components/ui/page-title';
import { useRoutines } from './routines.query';
import { useApplicationIdentity } from '@/app/application-identity';
import { AddActionButton } from '@/components/ui/add-action-button';
import { PageTitle } from '@/components/ui/page-title';
import { useRoutines } from '../api/routines.query';

const DAY_LABELS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/routes/_app._routine-create/route.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Keeps routine draft form state mounted across the complete creation flow. */
import { createFileRoute, Outlet } from '@tanstack/react-router';

import { RoutineDraftFormProvider } from '../../features/routines/routine-draft-form';
import { RoutineDraftFormProvider } from '../../features/routines/create/routine-draft-form';

export const Route = createFileRoute('/_app/_routine-create')({
component: RoutineCreationLayout,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/routes/_app._routine-create/routines_.new.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Maps the routine-creation URL into the persistent routine form layout.
import { createFileRoute } from '@tanstack/react-router';

import { RoutineEditor } from '../../features/routines/routine-editor';
import { RoutineEditor } from '../../features/routines/create/editor/routine-editor';

export const Route = createFileRoute('/_app/_routine-create/routines_/new')({
component: RoutineEditor,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Registers the protected exercise-picker route inside routine creation. */
import { createFileRoute } from '@tanstack/react-router';

import { ExercisePicker } from '../../features/routines/exercise-picker';
import { ExercisePicker } from '../../features/routines/create/exercise-picker/exercise-picker';

export const Route = createFileRoute(
'/_app/_routine-create/routines_/new_/exercises',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Registers exercise configuration inside the persistent routine form flow. */
import { createFileRoute } from '@tanstack/react-router';

import { ExerciseConfiguration } from '../../features/routines/exercise-configuration';
import { ExerciseConfiguration } from '../../features/routines/create/exercise-configuration/exercise-configuration';

export const Route = createFileRoute(
'/_app/_routine-create/routines_/new_/exercises_/$exerciseId',
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/routes/_app.routines.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Maps the routines URL into the protected application layout.
import { createFileRoute } from '@tanstack/react-router';

import { RoutinesLanding } from '../features/routines/routines-landing';
import { RoutinesLanding } from '../features/routines/landing/routines-landing';

export const Route = createFileRoute('/_app/routines')({
component: RoutinesLanding,
Expand Down