From 3799f150a8d0be6f8519103d480f7fba8c2c3cbd Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Mon, 25 Oct 2021 22:19:27 +0300
Subject: [PATCH] feat: create course page layout

---
 src/interfaces/index.ts                       |  6 +-
 .../components/CourseList/CourseItem.tsx      |  4 +-
 .../create/components/CreateCourseForm.tsx    | 62 +++++++++++++++++++
 src/pages/courses/create/components/index.ts  |  3 +
 src/pages/courses/create/create.tsx           | 15 ++---
 .../users/components/UserList/UserItem.tsx    |  4 +-
 src/stores/UserStore.ts                       |  4 +-
 src/types/index.d.ts                          | 10 +--
 vite.config.ts                                |  4 ++
 9 files changed, 91 insertions(+), 21 deletions(-)
 create mode 100644 src/pages/courses/create/components/CreateCourseForm.tsx
 create mode 100644 src/pages/courses/create/components/index.ts

diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
index b5e460b..4757bd3 100644
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -1,5 +1,5 @@
 import type { RouteComponentProps } from 'react-router-dom';
-import { CourseImage, LinkType } from '@educt/types';
+import { AttachmentFileType, LinkType } from '@educt/types';
 import { CourseStatusEnum, UserRoleEnum } from '../enums';
 
 export interface IAppConfig {
@@ -18,10 +18,10 @@ export interface IToken {
 
 export interface ICourse {
   id: string;
+  image: AttachmentFileType | null;
   title: string;
   description: string;
   status: CourseStatusEnum;
-  image: null | CourseImage;
   teacher: Pick<IUser, 'id' | 'first_name' | 'last_name' | 'email'>;
   category: ICategory;
   lessons: ILesson[];
@@ -81,6 +81,7 @@ export interface IUser {
   id: string;
   first_name: string;
   last_name: string;
+  fullname: string;
   email: string;
   roles: IUserRole[];
   contacts: IUserContacts | null;
@@ -90,7 +91,6 @@ export interface IUser {
  * Current authenticated user data
  */
 export interface IMe extends IUser {
-  fullname: string;
   /**
    * The field can be undefined if the user
    * does not have the STUDENT role
diff --git a/src/pages/courses/components/CourseList/CourseItem.tsx b/src/pages/courses/components/CourseList/CourseItem.tsx
index 44d6c1c..5ea2248 100644
--- a/src/pages/courses/components/CourseList/CourseItem.tsx
+++ b/src/pages/courses/components/CourseList/CourseItem.tsx
@@ -111,7 +111,7 @@ const CourseItem: React.FC<CourseItemPropsType> = ({ course, onDelete, onSetStat
           borderTopRightRadius='lg'
           p='10px'
         >
-          {course.image && (
+          {course.image && course.image.url && (
             <Image
               position='absolute'
               top='0'
@@ -123,7 +123,7 @@ const CourseItem: React.FC<CourseItemPropsType> = ({ course, onDelete, onSetStat
               w='100%'
               borderTopLeftRadius='lg'
               borderTopRightRadius='lg'
-              src={`/api/assets/images/courses/${course.image.name}`}
+              src={course.image.url}
             />
           )}
         </Box>
diff --git a/src/pages/courses/create/components/CreateCourseForm.tsx b/src/pages/courses/create/components/CreateCourseForm.tsx
new file mode 100644
index 0000000..debec8f
--- /dev/null
+++ b/src/pages/courses/create/components/CreateCourseForm.tsx
@@ -0,0 +1,62 @@
+import React from 'react';
+import { Box, Grid } from '@chakra-ui/react';
+import { Input } from '@chakra-ui/react';
+import { Select, Flex, Button, Textarea } from '@chakra-ui/react';
+import { FormControl, FormLabel, InputGroup, InputRightElement } from '@chakra-ui/react';
+
+/**
+ * Types
+ */
+import { MdCloudUpload } from 'react-icons/md';
+
+type CreateCourseFormProps = {};
+
+const CreateCourseForm: React.FC<CreateCourseFormProps> = () => {
+  return (
+    <Box>
+      <form>
+        <Grid templateColumns={{ md: '2.5fr 1fr' }} gap='5'>
+          <FormControl id='title'>
+            <FormLabel>Title</FormLabel>
+            <InputGroup>
+              <Input size='md' placeholder='Type course title' type='text' />
+              <InputRightElement fontSize='sm' mr='2' color='gray.500' children={'0/60'} />
+            </InputGroup>
+          </FormControl>
+
+          <FormControl id='image'>
+            <FormLabel>Image</FormLabel>
+            <Input size='md' variant='unstyled' type='file' />
+          </FormControl>
+
+          <FormControl id='category' gridColumn='1'>
+            <FormLabel>Category</FormLabel>
+            <Select size='md' placeholder='Select category'>
+              <option value='option1'>Option 1</option>
+              <option value='option2'>Option 2</option>
+              <option value='option3'>Option 3</option>
+            </Select>
+          </FormControl>
+
+          <FormControl id='title' gridColumn={{ md: '2' }} gridRow={{ md: '1' }}>
+            <FormLabel>Teacher</FormLabel>
+            <Button w='full'>Select Teacher</Button>
+          </FormControl>
+
+          <FormControl id='description' gridColumn='1'>
+            <FormLabel>Description</FormLabel>
+            <Textarea resize='none' minH='150px' placeholder='Write some description for course...' />
+          </FormControl>
+        </Grid>
+        <Flex mt='6'>
+          <Button mr='2' colorScheme='blue' variant='outline' rightIcon={<MdCloudUpload size='14px' />}>
+            Save as Draft
+          </Button>
+          <Button colorScheme='green'>Publish</Button>
+        </Flex>
+      </form>
+    </Box>
+  );
+};
+
+export default CreateCourseForm;
diff --git a/src/pages/courses/create/components/index.ts b/src/pages/courses/create/components/index.ts
new file mode 100644
index 0000000..158a67b
--- /dev/null
+++ b/src/pages/courses/create/components/index.ts
@@ -0,0 +1,3 @@
+import CreateCourseForm from './CreateCourseForm';
+
+export default CreateCourseForm;
diff --git a/src/pages/courses/create/create.tsx b/src/pages/courses/create/create.tsx
index 92be5c5..9e0bdd8 100644
--- a/src/pages/courses/create/create.tsx
+++ b/src/pages/courses/create/create.tsx
@@ -5,21 +5,22 @@ import { Box, Heading, Text } from '@chakra-ui/react';
  * Types
  */
 import { IPageProps } from '@educt/interfaces';
-import { observer } from 'mobx-react-lite';
+import CreateCourseForm from './components';
 
 /**
  * Create course page
  */
 const CreateCoursePage: React.FC<IPageProps> = ({ title }) => {
   return (
-    <>
+    <Box maxW='1200px'>
       <Box>
-        <Box>
-          <Heading as='h1'>Create</Heading>
-          <Text mt='2'>Create new course in the system.</Text>
-        </Box>
+        <Heading as='h1'>Create course</Heading>
+        <Text mt='2'>Fill in the required fields to create a course</Text>
       </Box>
-    </>
+      <Box mt='6'>
+        <CreateCourseForm />
+      </Box>
+    </Box>
   );
 };
 
diff --git a/src/pages/users/components/UserList/UserItem.tsx b/src/pages/users/components/UserList/UserItem.tsx
index b615f09..8e00fb1 100644
--- a/src/pages/users/components/UserList/UserItem.tsx
+++ b/src/pages/users/components/UserList/UserItem.tsx
@@ -49,10 +49,10 @@ const UserItem: React.FC<UserItemPropsType> = ({ user, onEdit, onDelete }) => {
     <Box borderWidth='1px' borderRadius='lg' w='full' p='3'>
       <Flex alignItems='center' justifyContent='space-between' sx={{ gap: '20px' }}>
         <Flex alignItems='center' flexBasis='230px'>
-          <Avatar name={`${user.first_name} ${user.last_name}`} size='sm' mr='3' />
+          <Avatar name={user.fullname} size='sm' mr='3' />
           <Box>
             <Link as={ReactRouterLink} to={`/user/${user.id}`} fontSize='md' fontWeight='medium'>
-              {user.first_name}&nbsp;{user.last_name}
+              {user.fullname}
             </Link>
             <Text fontSize='sm'>{user.email}</Text>
           </Box>
diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts
index 80cc47e..88245a9 100644
--- a/src/stores/UserStore.ts
+++ b/src/stores/UserStore.ts
@@ -55,17 +55,17 @@ export default class UserStore {
     try {
       const result = await this.userService.fetchMe();
       const {
-        data: { id, first_name, last_name, email, roles, contacts, courses },
+        data: { id, first_name, last_name, fullname, email, roles, contacts, courses },
       } = result;
 
       runInAction(() => {
         this.me = {
           id,
-          fullname: `${first_name} ${last_name}`,
           first_name,
           last_name,
           email,
           roles,
+          fullname,
           contacts,
           courses,
           isAdmin: helpers.userContainRoles(roles, [UserRoleEnum.ADMIN]),
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index ce29456..fe8f00f 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -15,12 +15,12 @@ export type LinkType = {
   icon: IconType;
 };
 
-export type CourseImage = {
-  id: number;
+export type AttachmentFileType = {
+  url?: string;
+  size: number;
   name: string;
-  ext: string;
-  created_at: string;
-  updated_at: string;
+  mimeType: string;
+  extname: string;
 };
 
 export type ConfirmEmailContainerDataType = {
diff --git a/vite.config.ts b/vite.config.ts
index 81d390d..286acad 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -25,6 +25,10 @@ export default defineConfig({
         target: constants.BACKEND_URL,
         changeOrigin: true,
       },
+      '/uploads': {
+        target: constants.BACKEND_URL,
+        changeOrigin: true,
+      },
     },
   },
   resolve: {