Fix Class Management #85

Fouz7 · 2024-11-13T01:20:43Z

No description provided.

# Conflicts: # src/App.jsx # src/utils/axios/axiosConfig.js

* feat: responsive internship management (#68) * feat: implementation coordinator api in select coordinator component on create internship * feat: integration create internship api * fix: solve null internship context at internship dashboard * fix: direct user to login if token is expired * refactor: remove unused file in program management component * feat: responsive internship card component at internship dashboard * feat: responsive internship header * feat: responsive list internship at internship dashboard * feat:responsive header dashboard component * feat: responsive detail internship * refactor: remove unnecessary file * fix: header breadcumb component on all page * fix: responsive internship card title on mobile phone * feat: add limit chars for header dashboard component * fix: limit breadcumb char on header dashboard component * feat: dynamic path on header dashboard component * feat: add collapses component on detail description internship * style: change bg color on delete btn and modal * feat: responsive header on 300-400px width * feat: responsive internship card on screen less than 460 * refactor(Opportunity): refactor and standarize the code styles * fix(Opportunity): fix text rich editor render method on update opportunity * fix: payload empty after click submit at forgot password page (#69)

# Conflicts: # package-lock.json # src/App.jsx # src/components/components.js # src/enums/enums.js # src/hooks/hooks.js # src/pages/Auth/ForgotPassword.jsx # src/pages/Auth/Login.jsx # src/pages/Class/ClassDashboard.jsx # src/pages/Internship/libs/components/DetailInternship/DetailInternship.jsx # src/pages/Internship/libs/components/ListInternship/ListInternship.jsx # src/pages/Major/MajorDashboard.jsx # src/pages/School/SchoolDashboard.jsx

src/context/ClassContext.jsx

src/pages/Class/ClassDashboard.jsx

src/pages/Class/libs/components/ClassFilterButton.jsx

…management # Conflicts: # src/components/components.js # src/hooks/hooks.js # src/pages/Class/ClassDashboard.jsx # src/pages/Class/libs/components/ClassList/ClassColumns.jsx # src/pages/Class/libs/components/ClassList/ClassTable.jsx

iqbalalayubbi · 2024-11-18T03:08:18Z

src/context/ClassContext.jsx

-import {createContext, useState, useCallback} from "react";
-import {ClassApi} from "@/utils/axios/ApiService";
+import { createContext, useMemo } from "react";
+import useClass from "@/hooks/class/useClass.js";


@/hooks/hooks

src/hooks/class/useClass.js

iqbalalayubbi · 2024-11-18T03:09:57Z

src/pages/Class/libs/components/ClassFilterButton.jsx

@@ -0,0 +1,94 @@
+import {useState, useEffect, useRef} from "@/hooks/hooks";
+import {Button, Checkbox} from "antd";
+import {CaretDownFilled} from "@ant-design/icons";


import {Button, Checkbox, CaretDownFilled} from @/components/components

src/pages/Class/libs/components/ClassList/ClassColumns.jsx

src/pages/Class/libs/components/modals/ClassDetailContent.jsx

iqbalalayubbi · 2024-11-18T03:26:45Z

src/pages/Dashboard/Dashboard.jsx

@@ -0,0 +1,45 @@
+import { Header } from "@/components/Dashboard/Header.jsx";


@/components/components

iqbalalayubbi · 2024-11-18T03:27:12Z

src/pages/Dashboard/Dashboard.jsx

@@ -0,0 +1,45 @@
+import { Header } from "@/components/Dashboard/Header.jsx";
+import { useEffect, useState } from "react";


@/hooks/hooks

iqbalalayubbi · 2024-11-18T03:28:25Z

src/pages/Dashboard/Dashboard.jsx

+                    afterClose={() => setShowAlert(false)}
+                    style={{
+                        position: 'fixed',
+                        width: '80%',


use tailwind className

src/context/ClassContext.jsx

src/hooks/class/useClass.js

src/pages/Class/ClassDashboard.jsx

src/pages/Class/libs/components/ClassList/ClassHeader.jsx

src/pages/Class/libs/components/ClassList/ClassTable.jsx

src/pages/Class/libs/components/ClassList/components/ClassFilterButton.jsx

src/pages/Class/libs/components/ClassList/index.js

iqbalalayubbi · 2024-11-20T13:14:55Z

Don't forget to solve your conflict

…ev-sp8-class-management # Conflicts: # src/App.jsx # src/components/components.js # src/context/ClassContext.jsx # src/pages/Class/ClassDashboard.jsx # src/pages/Class/libs/components/ClassList/ClassTable.jsx # src/pages/Class/libs/components/modals/ClassDetail.jsx # src/pages/Dashboard/Dashboard.jsx # src/utils/axios/api/Class.js

iqbalalayubbi · 2024-11-25T22:12:38Z

src/hooks/class/useClass.js

@@ -0,0 +1,84 @@
+import { useCallback, useState } from "react";
+import { ClassApi } from "@/utils/axios/ApiService.js";


import { ClassApi } from "@/utils/utils";

iqbalalayubbi · 2024-11-25T22:14:49Z

src/pages/Class/ClassDashboard.jsx

+      <Header
+        pageName="Class Dashboard"
+        subPages={[
+          { title: "Class Management", path: "/class-management" }


import { AppRoute } from "@/enums/enums"; path: AppRoute.CLASS_MANAGEMENT

src/pages/Class/libs/components/modals/ClassDetail.jsx

iqbalalayubbi · 2024-11-25T22:17:09Z

src/pages/Class/libs/components/modals/CreateClass.jsx

-import {ClassApi, MajorApi} from "@/utils/axios/ApiService.js";
-import {fetchMajors} from "@/pages/Class/libs/components/utils.js";
+import {ClassApi} from "@/utils/utils";
+import {fetchMajors} from "@/utils/utils";


import {fetchMajors, ClassApi} from "@/utils/utils";

iqbalalayubbi · 2024-11-25T22:17:53Z

src/pages/Class/libs/components/modals/UpdateClass.jsx

-import {fetchClassData, fetchMajors} from "@/pages/Class/libs/components/utils.js";
-import {ClassApi} from "@/utils/axios/ApiService.js";
+import {fetchClassData, fetchMajors} from "@/utils/utils";
+import {ClassApi} from "@/utils/utils";


import {fetchClassData, fetchMajors, ClassApi} from "@/utils/utils";

…management # Conflicts: # src/components/components.js # src/context/contexts.js

src/hooks/class/useClass.js

iqbalalayubbi · 2024-11-29T06:43:57Z

src/hooks/class/useData.js

I think this file is not imported in any file

src/pages/Class/libs/components/ClassList/ClassTable.jsx

iqbalalayubbi · 2024-11-29T06:47:40Z

src/pages/Class/libs/components/ClassList/components/ClassFilterButton.jsx

@@ -0,0 +1,79 @@
+import {useState, useEffect, useRef} from "@/hooks/hooks.js";
+import {Button, Checkbox, CaretDownFilled} from "@/components/components.js";


remove ".js" from import statement

src/pages/Class/libs/components/modals/ClassDetail.jsx

src/pages/Class/libs/components/modals/UpdateClass.jsx

iqbalalayubbi · 2024-11-29T06:53:33Z

I get this error when running your branch in my local. This error occur when user access school menu

Fouz7 and others added 7 commits October 28, 2024 10:28

Merge remote-tracking branch 'origin/development' into dev-sp5-dhiki

55d47c2

# Conflicts: # src/App.jsx # src/utils/axios/axiosConfig.js

FIX :: Route

0517ad9

FIX :: Class Management Integrating

96f5115

FIX :: Class Management Integrating

35e04ab

Merge remote-tracking branch 'origin/development' into dev-sp5-dhiki

47c0cb6

Fouz7 requested a review from iqbalalayubbi November 13, 2024 01:20

iqbalalayubbi requested changes Nov 13, 2024

View reviewed changes

Fouz7 added 3 commits November 18, 2024 07:04

REFACTOR :: Class Management

e18c55a

FIX :: Major Modal CRUD and Class Pagination bugs

1c1d33c

Fouz7 requested a review from iqbalalayubbi November 18, 2024 00:48

iqbalalayubbi requested changes Nov 18, 2024

View reviewed changes

Fouz7 added 2 commits November 19, 2024 09:11

REFACTOR :: Class Management

3a2d177

INTEGRATE :: Search and Filter Class Endpoint

b27f662

iqbalalayubbi assigned Fouz7 Nov 20, 2024

Fouz7 requested a review from iqbalalayubbi November 20, 2024 07:41

iqbalalayubbi requested changes Nov 20, 2024

View reviewed changes

Fouz7 added 2 commits November 25, 2024 12:46

REFACTOR

bbc1231

Fouz7 requested a review from iqbalalayubbi November 25, 2024 05:50

iqbalalayubbi requested changes Nov 25, 2024

View reviewed changes

Fouz7 added 3 commits November 28, 2024 20:30

Merge remote-tracking branch 'origin/development' into dev-sp8-class-…

9123f5e

…management # Conflicts: # src/components/components.js # src/context/contexts.js

INTEGRATE :: Search and Filter Class Endpoint

451eb07

Refactor :: Class Management

0ed775f

Fouz7 requested a review from iqbalalayubbi November 29, 2024 02:10

iqbalalayubbi requested changes Nov 29, 2024

View reviewed changes

Refactor :: Class Management

33e3d00

Fouz7 requested a review from iqbalalayubbi December 2, 2024 02:47

Refactor :: Class Management

c48beb1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Class Management #85

Fix Class Management #85

Fouz7 commented Nov 13, 2024

iqbalalayubbi Nov 18, 2024

iqbalalayubbi Nov 18, 2024

iqbalalayubbi Nov 18, 2024

iqbalalayubbi Nov 18, 2024

iqbalalayubbi Nov 18, 2024

iqbalalayubbi commented Nov 20, 2024

iqbalalayubbi Nov 25, 2024

iqbalalayubbi Nov 25, 2024

iqbalalayubbi Nov 25, 2024

iqbalalayubbi Nov 25, 2024

iqbalalayubbi Nov 29, 2024

iqbalalayubbi Nov 29, 2024

iqbalalayubbi commented Nov 29, 2024

		@@ -0,0 +1,45 @@
		import { Header } from "@/components/Dashboard/Header.jsx";

		@@ -0,0 +1,45 @@
		import { Header } from "@/components/Dashboard/Header.jsx";
		import { useEffect, useState } from "react";

		@@ -0,0 +1,84 @@
		import { useCallback, useState } from "react";
		import { ClassApi } from "@/utils/axios/ApiService.js";

		@@ -0,0 +1,79 @@
		import {useState, useEffect, useRef} from "@/hooks/hooks.js";
		import {Button, Checkbox, CaretDownFilled} from "@/components/components.js";

Fix Class Management #85

Are you sure you want to change the base?

Fix Class Management #85

Conversation

Fouz7 commented Nov 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iqbalalayubbi commented Nov 20, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iqbalalayubbi commented Nov 29, 2024