Skip to content
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.

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

Fix logo vectorization and update course view #147

Merged
merged 41 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
526f8a7
[Client] TCCPISSUE: Update the LOGO to vector #140: logo updated
ballyalley-o Apr 17, 2024
4faaa5c
🌈 style(code styling update):
ballyalley-o Apr 17, 2024
5ae8531
View | Course #2 : NavDrawer wrapped list with map
ballyalley-o Apr 17, 2024
c4260fe
[Client] TCCPISSUE: Update the LOGO to vector #140: Update TCCP_ICON …
ballyalley-o Apr 17, 2024
4152515
View | Course #2: Add new button constant for finding courses
ballyalley-o Apr 17, 2024
dc6e53c
View | Course #2: Add course page title constant
ballyalley-o Apr 17, 2024
52dcf6d
View | Course #2: Add Course page component
ballyalley-o Apr 17, 2024
e7bafd3
View | Course #2: Add Course component export
ballyalley-o Apr 17, 2024
57c70b9
Add Bootcamp and Course components
ballyalley-o Apr 17, 2024
ab644fd
View | Course #2
ballyalley-o Apr 17, 2024
cd97ed3
Refactor BootcampSearch component styling
ballyalley-o Apr 17, 2024
004b3d3
View | Course #2: Add CourseSearch component
ballyalley-o Apr 17, 2024
1ffc5bf
View | Course #2: Add CourseSearch component and export Course module
ballyalley-o Apr 17, 2024
005f48c
bootcampSlice endpoint configuration
ballyalley-o Apr 17, 2024
8ecd17f
Add Bootcamp interface to global types
ballyalley-o Apr 17, 2024
3b689f4
Add mockCourse data to _mock/index.ts
ballyalley-o Apr 18, 2024
619895b
View | Course #2: Course component and add CourseSearch functionality
ballyalley-o Apr 18, 2024
48acebc
Refactor BootcampCard component styling and fix component prop values
ballyalley-o Apr 18, 2024
4ad263b
[Client] Perf: Update interface responses for endpoints on all Module…
ballyalley-o Apr 18, 2024
b92ad34
Add capitalize utility to format.ts
ballyalley-o Apr 18, 2024
47a1bb8
[Client] Perf: Update interface responses for endpoints on all Module…
ballyalley-o Apr 18, 2024
8d2646a
Fix typography caption line height in src/theme/typography.ts
ballyalley-o Apr 18, 2024
9ac7bf1
View | Course #2: Initial design: Add CourseCard component and Course…
ballyalley-o Apr 18, 2024
6b5e1e0
Add CourseCard component to CourseSearch in src/section/course/index.ts
ballyalley-o Apr 18, 2024
1ac0af3
updated section index.ts: Remove export of 'page/dashboard' and add e…
ballyalley-o Apr 18, 2024
7fe9c5e
Refactor BootcampCard component styling, fix component prop values, a…
ballyalley-o Apr 21, 2024
9e11e4d
Add default_badge asset to ASSET object in asset-directory.ts
ballyalley-o Apr 21, 2024
7a01dc0
Fix missing default value for lastName in UserAccount component
ballyalley-o Apr 21, 2024
97d808f
Fix error handling in LogIn component
ballyalley-o Apr 21, 2024
4b65481
Add import statement for useEffect in course.tsx
ballyalley-o Apr 21, 2024
c97c4fa
Refactor CourseCard component and update bootcamp badge handling
ballyalley-o Apr 21, 2024
c87046c
Update CourseSearch component: Remove unused lat and lang search box …
ballyalley-o Apr 21, 2024
2c6b69d
Redux: added bootcampSlice in bootcamp.ts
ballyalley-o Apr 21, 2024
86ba08b
Add bootcampReducer to slice/index.ts and export bootcamp/bootcamp in…
ballyalley-o Apr 21, 2024
9dbce50
Add bootcampReducer and bootcampPersistConfig to root-reducer.ts
ballyalley-o Apr 21, 2024
b86ad4b
Needs update : Fix avatar condition in AccountPopover component
ballyalley-o Apr 21, 2024
2dbc043
Update CourseSearch component: Add search box and replace rating with…
ballyalley-o Apr 23, 2024
7928345
Update COURSE_PAGE_TITLE in label.ts to 'World Class Courses'
ballyalley-o Apr 23, 2024
b17916f
Add SELECT_SKILL to enum PLACEHOLDER in placeholder.ts
ballyalley-o Apr 23, 2024
11774f1
[Client] TCCPISSUE: Pagination for course #146: Update course.tsx: Re…
ballyalley-o Apr 23, 2024
3129f83
Resolved asked changes: Update asset directory and global configuration
ballyalley-o Apr 23, 2024
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
54 changes: 54 additions & 0 deletions public/asset/svg/tccp-vector.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
94 changes: 94 additions & 0 deletions src/_mock/course.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
const mockCourse = [
{
_id: '660013d760b78190151214f4',
title: 'Software Engineering',
description:
'With this full course will provide you with all of the essentials to become a Software Engineer. From the very basics HTML, CSS and front end JavaScript, typescript, along with tools like Git, Visual Studio, VSCode and front end frameworks, and will also provide you with the ability to control the Backend, databasing, be involved and participate in the overall application lifecycle. Main focus on coding and debugging.',
duration: '18',
tuition: 12000,
minimumSkill: 'beginner',
scholarshipAvailable: false,
bootcamp: null,
user: '5d7a514b5d2c12c7449be045',
__v: 0,
createdAt: '2024-03-24T11:51:51.772Z',
updatedAt: '2024-03-24T11:51:51.772Z'
},
{
_id: '660013d760b78190151214f5',
title: 'FRONT-END Web Development',
description:
'This course will provide you with all of the essentials to become a successful frontend web developer. You will learn to master HTML, CSS and front end JavaScript, along with tools like Git, Visual Studi, VSCode and front end frameworks like Vue, Be a Frontier on FRONTEND Development',
duration: '8',
tuition: 24000,
minimumSkill: 'beginner',
scholarshipAvailable: false,
bootcamp: null,
user: '5d7a514b5d2c12c7449be045',
__v: 0,
createdAt: '2024-03-24T11:51:51.772Z',
updatedAt: '2024-03-24T11:51:51.772Z'
},
{
_id: '660013d760b78190151214f6',
title: 'BACK-END Web Development',
description:
"The behind-the-scenes functionality of a website is referred to as the 'back-end'. It is a combination of technology and programming that powers a website, consisting of three parts that a user never sees: a server, an application, and a database. The back-end runs a website — the user does not see it or interact with it, but it is always running in the background, delivering functionality and a desktop-like experience. Back-end developers play a critical role in web development teams, and make sure that data or services requested by the front-end system or software are delivered.",
duration: '6',
tuition: 8000,
minimumSkill: 'intermediate',
scholarshipAvailable: false,
bootcamp: null,
user: '5d7a514b5d2c12c7449be045',
__v: 0,
createdAt: '2024-03-24T11:51:51.772Z',
updatedAt: '2024-03-24T11:51:51.772Z'
},
{
_id: '5d725c84c4ded7bcb480eaa0',
title: 'FULL STACK Web Development',
description:
'In this course you will learn full stack web development, first learning all about the frontend with HTML/CSS/JS/Vue and then the backend with Node.js/Express/MongoDB',
duration: '12',
tuition: 10000,
minimumSkill: 'intermediate',
scholarshipAvailable: false,
bootcamp: null,
user: '5d7a514b5d2c12c7449be045',
__v: 0,
createdAt: '2024-03-24T11:51:51.772Z',
updatedAt: '2024-03-24T11:51:51.772Z'
},
{
_id: '5d725cb9c4ded7bcb480eaa1',
title: 'Dev Ops',
description:
'In this course you will learn all about the front end with HTML, CSS and JavaScript. You will master tools like Git and Webpack and also learn C# and ASP.NET with Postgres',
duration: '10',
tuition: 12000,
minimumSkill: 'intermediate',
scholarshipAvailable: false,
bootcamp: null,
user: '5d7a514b5d2c12c7449be046',
__v: 0,
createdAt: '2024-03-24T11:51:51.772Z',
updatedAt: '2024-03-24T11:51:51.772Z'
},
{
_id: '5d725cd2c4ded7bcb480eaa2',
title: 'UI/UX',
description:
'In this course you will learn to create beautiful interfaces. It is a mix of design and development to create modern user experiences on both web and mobile',
duration: '12',
tuition: 10000,
minimumSkill: 'intermediate',
scholarshipAvailable: false,
bootcamp: null,
user: '5d7a514b5d2c12c7449be046',
__v: 0,
createdAt: '2024-03-24T11:51:51.773Z',
updatedAt: '2024-03-24T11:51:51.773Z'
}
]

export default mockCourse
1 change: 1 addition & 0 deletions src/_mock/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export { default as image } from './image'
export { default as mockBootcamp } from './bootcamp'
export { default as mockCourse } from './course'
15 changes: 2 additions & 13 deletions src/component/form/upload-field/avatar-editor-dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,13 @@ interface AvatarEditorDialogProps {
setEditor: (editor: AvatarEditor | null) => void
}

const AvatarEditorDialog: FC<AvatarEditorDialogProps> = ({
onSave,
openDialog,
setOpenDialog,
setEditor,
previewUrl,
handleClearPreview,
}) => {
const AvatarEditorDialog: FC<AvatarEditorDialogProps> = ({ onSave, openDialog, setOpenDialog, setEditor, previewUrl, handleClearPreview }) => {
const { Icon, iconSrc: clearSrc } = useIcon(ICON_WEB_NAME.CLOSE)

return (
<Dialog open={openDialog} onClose={() => setOpenDialog(false)}>
<DialogContent>
<AvatarEditor
ref={(editor: AvatarEditor | null) => setEditor(editor)}
image={previewUrl || 'default_image_path'}
{...AvatarEditorProps}
/>
<AvatarEditor ref={(editor: AvatarEditor | null) => setEditor(editor)} image={previewUrl || 'default_image_path'} {...AvatarEditorProps} />
<SIconButton onClick={handleClearPreview}>
<Icon icon={clearSrc} />
</SIconButton>
Expand Down
2 changes: 1 addition & 1 deletion src/component/navbar/account-popover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default function AccountPopover({ user }: { user: any }) {
}
})
}}>
{user?.avatar !== '/upload/avatar/no-avatar.jpeg' ? (
{user?.avatar === '/upload/avatar/no-avatar.jpeg' ? (
<Avatar src={user?.avatar} />
) : (
<DefaultAvatar firstName={user.firstname} lastName={user.lastname} />
Expand Down
Loading