Delete workout-types in FE. Use the ones in types

Author: morteako

apps/frontend/src/components/Modals/WorkoutEditorModal.tsx

@@ -10,7 +10,6 @@ import {
 import * as React from 'react';
 import { ArrowLeft } from 'react-bootstrap-icons';
 import { WorkoutOverview } from '../WorkoutMenu/WorkoutOverview';
-import { Workout, WorkoutType } from '../../types';
 import { WorkoutEditor } from '../WorkoutMenu/WorkoutEditor';
 import { useUser } from '../../context/UserContext';
 import { useWorkoutEditorModal } from '../../context/ModalContext';
@@ -26,6 +25,8 @@ import {
   HStack,
 } from '@chakra-ui/react';
 import { useNavigate } from 'react-router-dom';
+import { Workout } from '@dundring/types';
+import { WorkoutType } from '../../types';
 
 export interface WorkoutToEdit extends Workout {
   type: WorkoutType;

apps/frontend/src/components/WorkoutDisplay.tsx

@@ -2,12 +2,12 @@ import { Text, Stack } from '@chakra-ui/layout';
 import * as React from 'react';
 import { useActiveWorkout } from '../context/ActiveWorkoutContext';
 import { useData } from '../context/DataContext';
-import { Workout } from '../types';
 import { wattFromFtpPercent } from '../utils/general';
 import {
   getTotalWorkoutTime,
   secondsToHoursMinutesAndSecondsString,
 } from '@dundring/utils';
+import { Workout } from '@dundring/types';
 
 export const WorkoutDisplay = () => {
   const { activeWorkout, activeFtp, changeActivePart } = useActiveWorkout();

apps/frontend/src/components/WorkoutMenu/WorkoutEditor.tsx

@@ -7,7 +7,6 @@ import {
 import { Input, InputGroup, InputRightAddon } from '@chakra-ui/input';
 import { Grid, HStack, Stack, Text } from '@chakra-ui/layout';
 import * as React from 'react';
-import { Workout, WorkoutPart } from '../../types';
 import { templateColumns, WorkoutIntervalInput } from './WorkoutIntervalInput';
 import { DropResult } from 'react-beautiful-dnd';
 import { DraggableList } from './DraggableList';
@@ -41,7 +40,7 @@ import {
   getTotalWorkoutDistance,
   secondsToHoursMinutesAndSecondsString,
 } from '@dundring/utils';
-import { ApiStatus } from '@dundring/types';
+import { ApiStatus, Workout, WorkoutPart } from '@dundring/types';
 import { parseInputAsInt } from '../../utils/general';
 
 interface Props {

apps/frontend/src/components/WorkoutMenu/WorkoutIntervalInput.tsx

@@ -5,7 +5,6 @@ import { Text, Grid, Center } from '@chakra-ui/layout';
 import { FormControl, Icon } from '@chakra-ui/react';
 import * as React from 'react';
 import { Files, List, X } from 'react-bootstrap-icons';
-import { WorkoutPart } from '../../types';
 import {
   ftpPercentFromWatt,
   parseFtpPercentInput,
@@ -14,6 +13,7 @@ import {
   wattFromFtpPercent,
 } from '../../utils/general';
 import { findZone } from '../../utils/zones';
+import { WorkoutPart } from '@dundring/types';
 
 interface Data {
   seconds: number;

apps/frontend/src/components/WorkoutMenu/WorkoutListItem.tsx

@@ -3,13 +3,14 @@ import { Center, Grid, Heading, HStack, Stack, Text } from '@chakra-ui/layout';
 import { useClipboard, useToast, Icon } from '@chakra-ui/react';
 import { Tooltip } from '@chakra-ui/tooltip';
 import { Cloud, Gear, Hdd, Clipboard, Book } from 'react-bootstrap-icons';
-import { StoredWorkoutType, Workout, WorkoutType } from '../../types';
+import { StoredWorkoutType } from '../../types';
 import {
   getTotalWorkoutDistance,
   getTotalWorkoutTime,
   secondsToHoursMinutesAndSecondsString,
 } from '@dundring/utils';
 import * as api from '../../api';
+import { Workout } from '@dundring/types';
 
 interface Props {
   workout: Workout;

apps/frontend/src/components/WorkoutMenu/WorkoutOverview.tsx

@@ -11,14 +11,15 @@ import * as React from 'react';
 import { PencilSquare } from 'react-bootstrap-icons';
 import { useActiveWorkout } from '../../context/ActiveWorkoutContext';
 import { useUser } from '../../context/UserContext';
-import { StoredWorkoutType, Workout } from '../../types';
 import { parseInputAsInt } from '../../utils/general';
 import { WorkoutToEdit } from '../Modals/WorkoutEditorModal';
 import { defaultWorkouts } from './defaultWorkouts';
 import { ImportWorkout } from './ImportWorkout';
 import { WorkoutListItem } from './WorkoutListItem';
 import { useData } from '../../context/DataContext';
 import { stringToRouteName } from '../../gps';
+import { StoredWorkoutType } from '../../types';
+import { Workout } from '@dundring/types';
 
 interface Props {
   setActiveWorkout: (workout: Workout, ftp: number) => void;

apps/frontend/src/context/ActiveWorkoutContext.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
-import { ActiveWorkout, Workout } from '../types';
+import { ActiveWorkout } from '../types';
 import { wattFromFtpPercent } from '../utils/general';
 import { useSmartTrainer } from './SmartTrainerContext';
 import { useUser } from './UserContext';
+import { Workout } from '@dundring/types';
 
 export const ActiveWorkoutContext = React.createContext<{
   activeWorkout: ActiveWorkout;

apps/frontend/src/context/UserContext.tsx

@@ -1,7 +1,8 @@
 import * as React from 'react';
 import useSWR from 'swr';
 import { fetchMyWorkouts, validateToken } from '../api';
-import { UserContextType, Workout } from '../types';
+import { UserContextType } from '../types';
+import { Workout } from '@dundring/types';
 
 export const defaultUser: UserContextType = {
   loggedIn: false,

apps/frontend/src/types.ts

@@ -1,4 +1,4 @@
-import { Scopes } from '@dundring/types';
+import { Scopes, Workout } from '@dundring/types';
 
 export interface Lap {
   dataPoints: DataPoint[];
@@ -20,22 +20,10 @@ export interface Waypoint {
   distance: number;
 }
 
-export interface Workout {
-  id: string;
-  name: string;
-  parts: WorkoutPart[];
-}
-
 export type WorkoutType = 'local' | 'remote' | 'new' | 'library';
 
 export type StoredWorkoutType = Exclude<WorkoutType, 'new'>;
 
-export interface WorkoutPart {
-  duration: number;
-  targetPower: number;
-  type: 'steady';
-}
-
 export interface ActiveWorkout {
   workout: Workout | null;
   partElapsedTime: number;

apps/frontend/src/utils/zones.ts

@@ -1,5 +1,5 @@
-import { WorkoutPart } from '../types';
 import { secondsToHoursMinutesAndSecondsString } from '@dundring/utils';
+import { WorkoutPart } from '@dundring/types';
 
 export type Zone = 'Z1' | 'Z2' | 'Z3' | 'Z4' | 'Z5' | 'Z6' | 'Z7';