feat: integrate ordered exercises

mok-it · Dec 28, 2024 · e6955fb · e6955fb
1 parent 043e8df
commit e6955fb
Show file tree

Hide file tree

Showing 10 changed files with 283 additions and 72 deletions.
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
@@ -8,11 +8,11 @@ import {
   ListItemButton,
   ListItemText,
   Stack,
+  ToggleButton,
+  ToggleButtonGroup,
   Typography,
   alpha,
   useColorScheme,
-  ToggleButtonGroup,
-  ToggleButton,
 } from "@mui/material";
 import { signOut as firebaseSignout } from "firebase/auth";
 import { useSetAtom } from "jotai";
@@ -58,7 +58,7 @@ export const Sidebar = () => {
     >
       <Box sx={{ width: drawerWidth }} role="presentation" pt={2} height="100%">
         <Stack height="100%" sx={{ p: 2 }}>
-          <Typography width="100%" textAlign="center">
+          <Typography width="100%" textAlign="center" mb={2}>
             Feladatbeküldő
           </Typography>
           <Stack gap={1}>

diff --git a/src/components/compose/ExerciseCard.tsx b/src/components/compose/ExerciseCard.tsx
@@ -90,7 +90,7 @@ const ExerciseCard: FC<{
     exerciseView === ExerciseView.CARD
       ? view === "all"
         ? 72
-        : 200
+        : 198
       : "fit-content";
 
   return (

diff --git a/src/components/compose/Item.tsx b/src/components/compose/Item.tsx
@@ -32,11 +32,11 @@ export const Item: FC<{
   const setItems = useSetAtom(composeAtom);
 
   const height =
-    exerciseView === ExerciseView.CARD
-      ? view === "all"
-        ? 76
-        : 200
-      : "fit-content";
+    view === "all"
+      ? 76
+      : exerciseView === ExerciseView.CARD
+        ? 200
+        : "fit-content";
   if (loading) {
     return <Skeleton width={"100%"} height={height} />;
   }
@@ -102,7 +102,7 @@ export const Item: FC<{
           <ExerciseCard id={id} exercise={data.exercise} />
         </motion.div>
       ) : (
-        <Placeholder order={order} />
+        <Placeholder order={order} height={height} />
       )}
     </Box>
   );

diff --git a/src/components/compose/Placeholder.tsx b/src/components/compose/Placeholder.tsx
@@ -1,13 +1,16 @@
 import { Card, Stack, Typography } from "@mui/material";
 import { FC } from "react";
 
-export const Placeholder: FC<{ order: number }> = ({ order }) => {
+export const Placeholder: FC<{ order: number; height: number | string }> = ({
+  order,
+  height,
+}) => {
   return (
     <Card
       component={"div"}
       sx={{
         width: "100%",
-        height: 76,
+        height,
         borderRadius: 1,
         background: "transparent",
         transition: "0.2s",

diff --git a/src/generated/graphql.schema.json b/src/generated/graphql.schema.json
@@ -1931,6 +1931,30 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "talonItems",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "ExerciseSheetTalonItem",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "updatedAt",
             "description": null,
@@ -2038,7 +2062,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "OBJECT",
-                    "name": "Exercise",
+                    "name": "OrderedExercise",
                     "ofType": null
                   }
                 }
@@ -2121,8 +2145,8 @@
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
+                    "kind": "INPUT_OBJECT",
+                    "name": "OrderedExerciseInput",
                     "ofType": null
                   }
                 }
@@ -2153,6 +2177,58 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "ExerciseSheetTalonItem",
+        "description": null,
+        "isOneOf": null,
+        "fields": [
+          {
+            "name": "exercises",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "OrderedExercise",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "id",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "ENUM",
         "name": "ExerciseStatus",
@@ -3532,6 +3608,94 @@
         ],
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "OrderedExercise",
+        "description": null,
+        "isOneOf": null,
+        "fields": [
+          {
+            "name": "exercise",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Exercise",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "order",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "OrderedExerciseInput",
+        "description": null,
+        "isOneOf": false,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "exerciseID",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "order",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "Query",

diff --git a/src/generated/graphql.tsx b/src/generated/graphql.tsx
@@ -189,6 +189,7 @@ export type ExerciseSheet = {
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
   sheetItems: Array<ExerciseSheetItem>;
+  talonItems: Array<ExerciseSheetTalonItem>;
   updatedAt: Scalars['String']['output'];
 };
 
@@ -200,17 +201,23 @@ export type ExerciseSheetInput = {
 export type ExerciseSheetItem = {
   __typename: 'ExerciseSheetItem';
   ageGroup: ExerciseAgeGroup;
-  exercises: Array<Exercise>;
+  exercises: Array<OrderedExercise>;
   id: Scalars['ID']['output'];
   level: Scalars['Int']['output'];
 };
 
 export type ExerciseSheetItemInput = {
   ageGroup: ExerciseAgeGroup;
-  exercises: Array<Scalars['ID']['input']>;
+  exercises: Array<OrderedExerciseInput>;
   level: Scalars['Int']['input'];
 };
 
+export type ExerciseSheetTalonItem = {
+  __typename: 'ExerciseSheetTalonItem';
+  exercises: Array<OrderedExercise>;
+  id: Scalars['ID']['output'];
+};
+
 export type ExerciseStatus =
   | 'APPROVED'
   | 'CREATED'
@@ -393,6 +400,17 @@ export type OrderDirection =
   | 'ASC'
   | 'DESC';
 
+export type OrderedExercise = {
+  __typename: 'OrderedExercise';
+  exercise: Exercise;
+  order: Scalars['Int']['output'];
+};
+
+export type OrderedExerciseInput = {
+  exerciseID: Scalars['ID']['input'];
+  order: Scalars['Int']['input'];
+};
+
 export type Query = {
   __typename: 'Query';
   alternativeDifficultyExerciseGroups: Array<AlternativeDifficultyExerciseGroup>;
@@ -598,7 +616,7 @@ export type ExerciseSheetQueryVariables = Exact<{
 }>;
 
 
-export type ExerciseSheetQuery = { __typename: 'Query', exerciseSheet?: { __typename: 'ExerciseSheet', id: string, name: string, createdAt: string, updatedAt: string, sheetItems: Array<{ __typename: 'ExerciseSheetItem', id: string, ageGroup: ExerciseAgeGroup, level: number, exercises: Array<{ __typename: 'Exercise', id: string, description: string, exerciseImage?: { __typename: 'Image', url: string } | null, difficulty: Array<{ __typename: 'ExerciseDifficulty', ageGroup: ExerciseAgeGroup, difficulty: number }> }> }>, createdBy: { __typename: 'User', name: string } } | null };
+export type ExerciseSheetQuery = { __typename: 'Query', exerciseSheet?: { __typename: 'ExerciseSheet', id: string, name: string, createdAt: string, updatedAt: string, sheetItems: Array<{ __typename: 'ExerciseSheetItem', id: string, ageGroup: ExerciseAgeGroup, level: number, exercises: Array<{ __typename: 'OrderedExercise', order: number, exercise: { __typename: 'Exercise', id: string, description: string, exerciseImage?: { __typename: 'Image', url: string } | null, difficulty: Array<{ __typename: 'ExerciseDifficulty', ageGroup: ExerciseAgeGroup, difficulty: number }> } }> }>, createdBy: { __typename: 'User', name: string } } | null };
 
 export type ExerciseSheetsQueryVariables = Exact<{ [key: string]: never; }>;
 
@@ -1215,15 +1233,18 @@ export const ExerciseSheetDocument = gql`
       ageGroup
       level
       exercises {
-        id
-        exerciseImage {
-          url
-        }
-        difficulty {
-          ageGroup
-          difficulty
+        order
+        exercise {
+          id
+          exerciseImage {
+            url
+          }
+          difficulty {
+            ageGroup
+            difficulty
+          }
+          description
         }
-        description
       }
     }
     createdAt