diff --git a/src/Components/ValidationField/View/TextField.tsx b/src/Components/ValidationField/View/TextField.tsx
index cc544f2..d33b122 100644
--- a/src/Components/ValidationField/View/TextField.tsx
+++ b/src/Components/ValidationField/View/TextField.tsx
@@ -25,7 +25,7 @@ const TextField = ({
formik.setFieldValue(name, e.target.value);
};
return (
-
+
{no_label ? (
diff --git a/src/Components/ValidationField/utils/ValidationField.scss b/src/Components/ValidationField/utils/ValidationField.scss
index ec2bd28..07e0418 100644
--- a/src/Components/ValidationField/utils/ValidationField.scss
+++ b/src/Components/ValidationField/utils/ValidationField.scss
@@ -4,10 +4,12 @@
justify-content: space-between;
}
.ValidationField {
- margin-bottom: 1.3vw;
+ margin-bottom: 10px;
position: relative;
+ min-height: 80px;
> * {
- width: 100%;
+ width: 100% !important;
+ min-width: 200px;
}
.text,
.ant-form-item {
@@ -16,213 +18,55 @@
color: transparent;
}
}
-
- .ant-select-outlined:not(.ant-select-customize-input) .ant-select-selector {
- border: 1px solid var(--border-color);
- }
-
- .Select_error {
- .ant-select-selector {
- border: 1px solid red !important;
- }
- }
-
- // .ValidationField{
- // .ant-select-selector{
- // border: 1px solid var(--border-color) ;
-
- // }
- // }
- > span {
- margin-bottom: 0px !important;
- &:focus-within {
- border-color: var(--primary);
- box-shadow: 0 0 0 1px var(--primary);
- cursor: pointer;
- }
- &:has(.is-invalid) {
- border-color: red !important ;
- }
- input {
- color: var(--text);
- background: var(--bg);
- }
-
- input:-webkit-autofill,
- input:-webkit-autofill:hover,
- input:-webkit-autofill:focus,
- input:-webkit-autofill:active {
- -webkit-box-shadow: 0 0 0 30px white inset !important;
- }
- }
}
+
+//// upload
.ant-upload-select {
width: 100%;
}
-.Checkboxs {
- padding: 4%;
-}
-.ant-checkbox-wrapper {
- min-width: 100px;
-}
-.SearchField {
- button {
- background: var(--primary);
- }
-}
-.text {
- color: var(--text);
- margin-bottom: 15px;
- font-weight: bold;
-}
-input:disabled {
- color: var(--text) !important;
-}
-
-.isError {
- outline: red 1px solid;
- color: red;
-}
-.Error_color {
- color: red;
-}
-input:-webkit-autofill {
- -webkit-box-shadow: 0 0 0 1000px white inset !important; /* Change the color to your desired background color */
-}
-input:-webkit-autofill:focus {
- -webkit-box-shadow: 0 0 0 1000px white inset !important; /* Change the color to your desired background color */
-}
-
-/* Remove autofill background color on hover */
-input:-webkit-autofill:hover {
- -webkit-box-shadow: 0 0 0 1000px white inset !important; /* Change the color to your desired background color */
-}
-.upload_image_button {
- .ant-btn {
- min-height: 3vw !important;
- border: 0.1vw solid var(--border-color);
-
- display: flex;
- align-items: center;
- justify-content: center;
- }
-}
-.ant-select-outlined:not(.ant-select-customize-input) .ant-select-selector {
- min-height: 3vw !important;
-}
-.ant-select-multiple.ant-select-lg .ant-select-selection-overflow {
- min-height: 3vw !important;
-}
-
-.ant-upload-list .ant-upload-list-item {
- // height:3vw !important;
- border: 1px solid var(--border-color) !important;
-}
-
-.TowValidationItems {
+.ant-btn-default{
+ padding: 7px 11px;
+ height: var(--fieldHeight);
display: flex;
- gap: 3%;
- > label {
- display: none;
- }
+ justify-content: center;
+ align-items: center;
}
-.ant-select .ant-select-arrow {
- inset-inline-end: 1vw;
-}
-.ant-input-affix-wrapper-lg {
- padding: 0.5vw 1vw;
- font-size: 1vw;
- min-height: 3vw;
- border-radius: 0.6vw;
- border: 1.5px solid var(--opacity);
-}
-.ant-picker-outlined {
- padding: 0.5vw 1vw;
- font-size: 1vw;
- min-height: 3vw;
- border-radius: 0.6vw;
- border: 1px solid var(--border-color);
-}
-
-.ant-select-single.ant-select-lg .ant-select-selector {
- min-height: 3vw;
- border-radius: 0.6vw;
-}
-.ant-select-single .ant-select-selector .ant-select-selection-search-input {
- min-height: 3vw;
-}
-
-.ant-select-outlined .ant-select-selector {
- min-height: 3vw !important;
- border-radius: 0.6vw !important;
-}
-.ant-select-single.ant-select-lg {
- min-height: 3vw;
-}
-
-.ant-upload-wrapper .ant-upload-list .ant-upload-list-item {
- width: 21.5vw;
-}
-
-.ant-input-number-outlined {
+//// number input
+///
+.ant-input-number-affix-wrapper-lg{
width: 100%;
- height: 3vw;
}
-.ant-input-number-lg input.ant-input-number-input {
- width: 100%;
- height: 3vw;
+.ValidationFieldCheckbox{
+ // background-color: red;
}
-.bigRow {
- width: 100%;
- display: flex;
- justify-content: space-between;
- flex-wrap: wrap;
- > *.w-100 {
- width: 48% !important;
+/// input hight
+.ant-form-item-control-input-content{
+ height: var(--fieldHeight);
+}
+
+
+//// date picker
+.ant-picker-large{
+ height: var(--fieldHeight);
+}
+
+
+/// text area
+///
+
+.ValidationFieldTextArea{
+ .ant-form-item-control-input-content{
+ min-height: 120px;
}
+
}
-.ant-input-number-affix-wrapper-lg {
- width: 100%;
- height: 3vw;
- border-radius: 0.6vw;
- border: 1px solid var(--border-color);
-}
+ .ant-input-textarea-affix-wrapper.ant-input-affix-wrapper {
-.TwoSelectGroup {
- display: flex;
- gap: 10px;
- margin-bottom: 20px;
-}
-.TwoSelectGroupbutton {
- margin-bottom: 20px;
-}
-
-.ant-checkbox-wrapper {
- margin-top: 25px !important;
-}
-
-.add_new_button {
- margin-bottom: 20px;
- svg {
- color: var(--primary);
- }
-}
-.ValidationField:has(.input_number) {
- max-width: 100px;
-
- .input_number {
- max-width: 100px;
- }
-}
-
-.flex {
- display: flex;
- gap: 30px;
- max-width: 80% !important;
-}
+ height: 120px;
+}
\ No newline at end of file
diff --git a/src/Layout/Dashboard/FormikFormModel.tsx b/src/Layout/Dashboard/FormikFormModel.tsx
index b7affe6..6019065 100644
--- a/src/Layout/Dashboard/FormikFormModel.tsx
+++ b/src/Layout/Dashboard/FormikFormModel.tsx
@@ -1,6 +1,5 @@
import { Formik, Form, useFormikContext } from "formik";
import React, { ReactNode, useEffect } from "react";
-import { useValidationState } from "../../Components/ValidationField/utils/ValidationState";
import { useModalState } from "../../zustand/Modal";
interface FormValues {
diff --git a/src/Layout/Dashboard/LayoutModel.tsx b/src/Layout/Dashboard/LayoutModel.tsx
index e79d728..71a9112 100644
--- a/src/Layout/Dashboard/LayoutModel.tsx
+++ b/src/Layout/Dashboard/LayoutModel.tsx
@@ -32,7 +32,7 @@ const LayoutModel = ({
modelTitle,
ModelEnum,
ModelClassName,
- width = "45vw",
+ width = "800px",
isLoading = false,
}: LayoutModalProps) => {
const { isOpen, setIsOpen } = useModalState((state) => state);
diff --git a/src/Layout/Dashboard/Table/DataTable.tsx b/src/Layout/Dashboard/Table/DataTable.tsx
index 419c684..734d819 100644
--- a/src/Layout/Dashboard/Table/DataTable.tsx
+++ b/src/Layout/Dashboard/Table/DataTable.tsx
@@ -1,15 +1,13 @@
-import React from "react";
+import React, { lazy, Suspense } from "react";
import {
useAddKeyToData,
Table,
useTranslation,
usePagination,
- Loading,
- EmptyData,
} from ".";
import { DataTableProps } from "../../../types/Table";
-import NotFoundLottie from "../../../Components/Lottie/NotFound/NotFoundLottie";
-import LoadingLottie from "../../../Components/Lottie/Loading/LoadingLottie";
+const NotFoundLottie = React.lazy(() => import("../../../Components/Lottie/NotFound/NotFoundLottie"));
+const LoadingLottie = React.lazy(() => import("../../../Components/Lottie/Loading/LoadingLottie"));
const DataTable: React.FC
= ({
response,
@@ -36,7 +34,9 @@ const DataTable: React.FC = ({
className="DataTable"
loading={{
spinning: isLoading || isRefetching,
- indicator: ,
+ indicator:}>
+
+ ,
size: "large",
}}
locale={{
@@ -44,9 +44,12 @@ const DataTable: React.FC = ({
isLoading || isRefetching ?
<>
:
+
+ }>
+
),
}}
pagination={{
diff --git a/src/Layout/Dashboard/Table/index.tsx b/src/Layout/Dashboard/Table/index.tsx
index 96ce1ee..f9a1708 100644
--- a/src/Layout/Dashboard/Table/index.tsx
+++ b/src/Layout/Dashboard/Table/index.tsx
@@ -1,15 +1,11 @@
import { Table } from "antd";
import { useAddKeyToData } from "../../../Hooks/useAddKeyToData";
-import Loading from "../../../Components/DataState/Loading";
-import EmptyData from "../../../Components/DataState/EmptyData";
import usePagination from "../usePagination";
import { useTranslation } from "react-i18next";
export {
Table,
useAddKeyToData,
- Loading,
- EmptyData,
usePagination,
useTranslation,
};
diff --git a/src/Pages/Admin/User/Model/ModelForm.tsx b/src/Pages/Admin/User/Model/ModelForm.tsx
index 5a72fe4..6ee48bf 100644
--- a/src/Pages/Admin/User/Model/ModelForm.tsx
+++ b/src/Pages/Admin/User/Model/ModelForm.tsx
@@ -5,8 +5,10 @@ const Form = () => {
return (
-
+
+
+
);
};
diff --git a/src/Pages/Home/Dummy.tsx b/src/Pages/Home/Dummy.tsx
index e994eb4..d8bb30a 100644
--- a/src/Pages/Home/Dummy.tsx
+++ b/src/Pages/Home/Dummy.tsx
@@ -1,9 +1,7 @@
import React from "react";
-import Image from "../../Components/Ui/Image";
import { useTranslation } from "react-i18next";
import { ABILITIES_ENUM } from "../../enums/abilities";
import useSetPageTitle from "../../Hooks/useSetPageTitle";
-import NotFoundLottie from "../../Components/Lottie/NotFound/NotFoundLottie";
const Dummy = () => {
const [t] = useTranslation();
@@ -11,7 +9,7 @@ const Dummy = () => {
return (
-
+
);
};
diff --git a/src/Styles/Antd/Filed.scss b/src/Styles/Antd/Filed.scss
index 038549a..bb34c35 100644
--- a/src/Styles/Antd/Filed.scss
+++ b/src/Styles/Antd/Filed.scss
@@ -1,133 +1,133 @@
-/* Ant picker outlined */
-.AuthForm .AuthSelect .ant-picker-outlined {
- border-radius: 1vw;
-}
-
-/* Username */
-#username {
- border-radius: 1vw;
-}
-
-/* Ant input affix wrapper */
-.AuthForm .AuthInput .ant-input-affix-wrapper {
- border-radius: 1vw;
-}
-
-.remamberMe {
- display: flex;
- gap: 1vw;
- align-items: center;
- justify-content: flex-start;
- width: 100%;
- h6 {
- margin-bottom: 0;
- }
- .SwitchRemamberMe {
- color: var(--white);
- background: #3182ce;
- }
-}
-
-///// select
-.ant-select-outlined:not(.ant-select-customize-input) .ant-select-selector {
- border: none;
-}
-.ant-select-single.ant-select-show-arrow .ant-select-selection-item,
-.ant-select-single.ant-select-show-arrow .ant-select-selection-placeholder {
- padding-inline-end: 4vw;
-}
-.ant-select-single.ant-select-lg:not(.ant-select-customize-input)
- .ant-select-selector {
- // height: 3vw;
-}
-
-////////////// file
-
-.ValidationField
- .ant-upload-wrapper.ant-upload-picture-card-wrapper
- .ant-upload.ant-upload-select,
-.ant-upload-wrapper.ant-upload-picture-circle-wrapper
- .ant-upload.ant-upload-select {
- background: transparent;
- border: 0.3vw dashed var(--field);
-}
-
-.uploader_error {
- .ant-upload.ant-upload-select {
- border: 0.3vw dashed red !important;
- }
-}
-.ValidationField.have_value
- .ant-upload-wrapper.ant-upload-picture-card-wrapper
- .ant-upload.ant-upload-select,
-.ant-upload-wrapper.ant-upload-picture-circle-wrapper
- .ant-upload.ant-upload-select {
- background: transparent;
- border: 0.3vw dashed transparent;
-}
-
-.CustomFile {
- color: var(--subtext);
- font-size: 0.7vw !important;
- width: 80%;
- margin-inline: auto;
-}
-
-.ImageCol {
- max-width: 50%;
- flex: 0;
-}
-.ant-upload-wrapper.ant-upload-picture-card-wrapper
- .ant-upload.ant-upload-select,
-.ant-upload-wrapper.ant-upload-picture-circle-wrapper
- .ant-upload.ant-upload-select {
- width: 11vw;
- height: 11vw;
- padding: 10px;
-}
-
-.uploadIcon {
- position: absolute;
- bottom: 0;
- left: 0;
- width: 3vw;
- height: 3vw;
- border-radius: 50%;
- display: flex;
- justify-content: center;
- align-items: center;
- background: #f4f4f4;
- border: 1px solid black;
- svg {
- color: black;
- font-size: 1.5vw;
- }
-}
-
-////////// INput
-
-label {
- color: var(--label);
-}
-
-// .ant-select-dropdown{
-// border: 1px solid var(--primary);
-// border-top: none;
-// z-index: 2;
-// transform: translateY(-10px);
-// background: var(--bg2);
+// /* Ant picker outlined */
+// .AuthForm .AuthSelect .ant-picker-outlined {
+// border-radius: 1vw;
// }
-.Auth_Select {
- height: 3vw !important;
+// /* Username */
+// #username {
+// border-radius: 1vw;
+// }
- .ant-select-selector {
- border: 1px solid #d9d9d9 !important;
- height: 3vw !important;
- font-size: 1vw;
- border-radius: 1vw;
- }
- .ant-select-selection-item {
- height: 28px;
- }
-}
+// /* Ant input affix wrapper */
+// .AuthForm .AuthInput .ant-input-affix-wrapper {
+// border-radius: 1vw;
+// }
+
+// .remamberMe {
+// display: flex;
+// gap: 1vw;
+// align-items: center;
+// justify-content: flex-start;
+// width: 100%;
+// h6 {
+// margin-bottom: 0;
+// }
+// .SwitchRemamberMe {
+// color: var(--white);
+// background: #3182ce;
+// }
+// }
+
+// ///// select
+// .ant-select-outlined:not(.ant-select-customize-input) .ant-select-selector {
+// border: none;
+// }
+// .ant-select-single.ant-select-show-arrow .ant-select-selection-item,
+// .ant-select-single.ant-select-show-arrow .ant-select-selection-placeholder {
+// padding-inline-end: 4vw;
+// }
+// .ant-select-single.ant-select-lg:not(.ant-select-customize-input)
+// .ant-select-selector {
+// // height: 3vw;
+// }
+
+// ////////////// file
+
+// .ValidationField
+// .ant-upload-wrapper.ant-upload-picture-card-wrapper
+// .ant-upload.ant-upload-select,
+// .ant-upload-wrapper.ant-upload-picture-circle-wrapper
+// .ant-upload.ant-upload-select {
+// background: transparent;
+// border: 0.3vw dashed var(--field);
+// }
+
+// .uploader_error {
+// .ant-upload.ant-upload-select {
+// border: 0.3vw dashed red !important;
+// }
+// }
+// .ValidationField.have_value
+// .ant-upload-wrapper.ant-upload-picture-card-wrapper
+// .ant-upload.ant-upload-select,
+// .ant-upload-wrapper.ant-upload-picture-circle-wrapper
+// .ant-upload.ant-upload-select {
+// background: transparent;
+// border: 0.3vw dashed transparent;
+// }
+
+// .CustomFile {
+// color: var(--subtext);
+// font-size: 0.7vw !important;
+// width: 80%;
+// margin-inline: auto;
+// }
+
+// .ImageCol {
+// max-width: 50%;
+// flex: 0;
+// }
+// .ant-upload-wrapper.ant-upload-picture-card-wrapper
+// .ant-upload.ant-upload-select,
+// .ant-upload-wrapper.ant-upload-picture-circle-wrapper
+// .ant-upload.ant-upload-select {
+// width: 11vw;
+// height: 11vw;
+// padding: 10px;
+// }
+
+// .uploadIcon {
+// position: absolute;
+// bottom: 0;
+// left: 0;
+// width: 3vw;
+// height: 3vw;
+// border-radius: 50%;
+// display: flex;
+// justify-content: center;
+// align-items: center;
+// background: #f4f4f4;
+// border: 1px solid black;
+// svg {
+// color: black;
+// font-size: 1.5vw;
+// }
+// }
+
+// ////////// INput
+
+// label {
+// color: var(--label);
+// }
+
+// // .ant-select-dropdown{
+// // border: 1px solid var(--primary);
+// // border-top: none;
+// // z-index: 2;
+// // transform: translateY(-10px);
+// // background: var(--bg2);
+// // }
+
+// .Auth_Select {
+// height: 3vw !important;
+
+// .ant-select-selector {
+// border: 1px solid #d9d9d9 !important;
+// height: 3vw !important;
+// font-size: 1vw;
+// border-radius: 1vw;
+// }
+// .ant-select-selection-item {
+// height: 28px;
+// }
+// }
diff --git a/src/Styles/Antd/Model.scss b/src/Styles/Antd/Model.scss
index fb08d44..c87934b 100644
--- a/src/Styles/Antd/Model.scss
+++ b/src/Styles/Antd/Model.scss
@@ -18,37 +18,30 @@
}
header {
display: flex; justify-content: space-between;align-items: center;
- height: 4vw;
- padding: 1vw 1vw;
+ height: 60px;
+ padding: 16px ;
z-index: 10;
color: var(--black);
border-top-left-radius: 10px;
border-top-right-radius: 10px;
span{
- font-size: 1.4vw;
+ font-size: 25px;
}
svg{
font-size: 30px;
color: #6A7287;
}
}
- .time_main_modal {
- padding: 0vw 7vw;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- width: 100%;
- }
+
.main_modal {
- padding: .7vw 0vw !important;
+ padding: 15px 0vw !important;
display: flex;
flex-direction: column;
width: 100%;
}
main {
.buttons {
- padding-inline: 0 1vw;
+ padding-inline: 0 10px;
display: flex;
gap: 10px;
align-items: end;
@@ -58,9 +51,9 @@
position: relative;
outline: none;
border: none;
- width: 10vw;
+ width: 120px;
border-radius: 10px;
- padding: 0.7vw;
+ padding: 10px;
font-weight: bold;
background: var(--primary);
color: var(--white);
@@ -79,9 +72,7 @@
label {
color: var(--secondary) !important;
}
- .ant-select-outlined:not(.ant-select-customize-input) .ant-select-selector {
- border: 1px solid var(--border-color);
- }
+
}
.ant-modal-root .ant-modal-centered .ant-modal{
width: 45vw ;
diff --git a/src/Styles/App/App.scss b/src/Styles/App/App.scss
index a59adb4..1cd650c 100644
--- a/src/Styles/App/App.scss
+++ b/src/Styles/App/App.scss
@@ -11,7 +11,7 @@ body {
padding: 0;
margin: 0;
font-weight: 600;
- font-size: 0.9vw;
+ font-size: 16px;
}
h1,
h2,
@@ -73,10 +73,7 @@ svg {
}
}
}
-/* Input */
-.ant-picker-outlined .ant-picker-input input {
- font-size: 1vw;
-}
+
/* Username */
#username {
diff --git a/src/Styles/App/Varibils.scss b/src/Styles/App/Varibils.scss
index d61db87..46c08f3 100644
--- a/src/Styles/App/Varibils.scss
+++ b/src/Styles/App/Varibils.scss
@@ -35,6 +35,7 @@
--bg4: #e6e5e5;
--borderColor: #ffffff91;
--opacity: #bcbcbc;
+ --fieldHeight:40px;
}
:root:has(.dark) {
diff --git a/src/Styles/App/classNames.scss b/src/Styles/App/classNames.scss
index 63d1831..e40b662 100644
--- a/src/Styles/App/classNames.scss
+++ b/src/Styles/App/classNames.scss
@@ -48,24 +48,10 @@
display: flex;
justify-content: flex-end;
}
- .ant-picker-outlined {
- border-color: var(--border-color) !important;
- }
- .ant-select-outlined:not(.ant-select-customize-input) .ant-select-selector {
- border: 1px solid var(--border-color) !important;
- }
- .ant-input-outlined {
- border-color: var(--border-color);
- }
+
}
-.ant-input-outlined {
- border-color: var(--border-color);
- padding: 0.5vw 1vw;
- font-size: 0.8vw;
- height: 3vw;
- border-radius: 0.6vw;
-}
+
.FormCard {
// background: var(--bg);
@@ -115,45 +101,45 @@
width: 12vw;
}
}
-.Buttons_over_width {
- display: flex;
- gap: 4%;
- align-items: center;
- > button,
- > div {
- outline: none;
- border: none;
- border-radius: 50px;
- padding: 0.8vw 2vw;
- background: var(--primary);
- color: var(--white);
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 5px;
- font-size: 1vw;
- }
-}
-.Buttons {
- display: flex;
- gap: 4%;
- align-items: center;
- > button,
- > div {
- outline: none;
- border: none;
- border-radius: 50px;
- padding: 0.8vw 0.4vw;
- background: var(--primary);
- color: var(--white);
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 5px;
- font-size: 1vw;
- width: 12vw;
- }
-}
+// .Buttons_over_width {
+// display: flex;
+// gap: 4%;
+// align-items: center;
+// > button,
+// > div {
+// outline: none;
+// border: none;
+// border-radius: 50px;
+// padding: 0.8vw 2vw;
+// background: var(--primary);
+// color: var(--white);
+// display: flex;
+// align-items: center;
+// justify-content: center;
+// gap: 5px;
+// font-size: 1vw;
+// }
+// }
+// .Buttons {
+// display: flex;
+// gap: 4%;
+// align-items: center;
+// > button,
+// > div {
+// outline: none;
+// border: none;
+// border-radius: 50px;
+// padding: 0.8vw 0.4vw;
+// background: var(--primary);
+// color: var(--white);
+// display: flex;
+// align-items: center;
+// justify-content: center;
+// gap: 5px;
+// font-size: 1vw;
+// width: 12vw;
+// }
+// }
.TowButton {
display: flex;
diff --git a/src/Styles/App/index.scss b/src/Styles/App/index.scss
index 631818e..8f84d7f 100644
--- a/src/Styles/App/index.scss
+++ b/src/Styles/App/index.scss
@@ -14,7 +14,6 @@
@import "../Antd/index.scss";
-@import "../Home/index.scss";
@import "../DataTable/index.scss";
diff --git a/src/Styles/Home/Activity.scss b/src/Styles/Home/Activity.scss
deleted file mode 100644
index 4319aa0..0000000
--- a/src/Styles/Home/Activity.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-.ActivitySection {
- background: var(--bg);
- padding: 30px;
- display: flex;
- flex-direction: column;
- width: 100%;
-
- header {
- margin-bottom: 10px;
- display: flex;
- align-items: center;
- gap: 20px;
- h4 {
- color: var(--secondary);
- font-weight: bold;
- }
- }
- .ActivityScrollerChanger {
- background: #f4f7fe;
- padding: 20px 10px;
- border-radius: var(--border-radius);
- }
- .Activitys {
- display: flex;
- flex-direction: column;
- width: 100%;
- padding: 0px 20px;
- max-height: 200px;
- overflow-y: scroll;
- @include Scrollbar;
- direction: ltr; /* Right-to-left direction */
- gap: 1vw;
-
- article {
- direction: rtl; /* Right-to-left direction */
- display: flex;
- justify-content: space-between;
- gap: 1vw;
- width: 100%;
- img {
- width: 3vw;
- height: 3vw;
- }
- h5 {
- margin-bottom: 0;
- font-size: 0.8vw;
- color: #505050;
- @include Font_Poppins_Bold;
- font-weight: 600;
- }
- }
- p {
- font-size: 0.6vw;
- text-wrap: nowrap;
- color: #d16e57;
- }
- }
-}
diff --git a/src/Styles/Home/CountSection.scss b/src/Styles/Home/CountSection.scss
deleted file mode 100644
index 0a01529..0000000
--- a/src/Styles/Home/CountSection.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-.CountSection {
- width: 100%;
- display: flex;
- background: var(--bg);
- border-radius: var(--border-radius);
- padding: 10px;
- .CountCards {
- display: flex;
- justify-content: space-between;
- width: 100%;
- padding: 20px;
-
- .CountCard {
- display: flex;
- flex-direction: column;
- align-items: center;
- text-align: center;
- justify-content: center;
- width: 16%;
-
- h6 {
- color: var(--secondary);
- font-size: 1vw;
- font-weight: bold;
- }
- h4 {
- font-size: 1vw;
- font-weight: 400;
- margin-bottom: 0;
- }
- i {
- width: 3.6vw;
- height: 3.6vw;
- border-radius: 50%;
- background: var(--primary);
- @include Flex;
- margin-bottom: 4px;
- svg {
- color: var(--white);
- font-size: 2vw;
- }
- }
- }
- }
- img {
- width: 14%;
- mix-blend-mode: multiply;
- margin-inline: 2vw;
- }
-}
diff --git a/src/Styles/Home/Home.scss b/src/Styles/Home/Home.scss
deleted file mode 100644
index c11519c..0000000
--- a/src/Styles/Home/Home.scss
+++ /dev/null
@@ -1,224 +0,0 @@
-.HomePage {
- height: 100%;
-}
-.ChartSection {
- width: 70%;
- padding: 30px 40px 30px 20px;
- display: flex;
- flex-direction: column;
- gap: 20px;
-}
-.TowItem {
- display: flex;
- gap: 4%;
-
- > * {
- width: 48%;
- height: 30vw;
- }
-}
-.ant-picker-calendar-mini .ant-picker-content {
- height: 21vw;
-}
-
-.ColumnChart {
- background: var(--bg);
- @include Shadow;
- border-radius: var(--border-radius);
-
- .ColumnChart_header {
- padding: 20px;
-
- display: flex;
- width: 100%;
- justify-content: space-between;
- // flex-wrap: wrap;
-
- .ant-select-outlined:not(.ant-select-customize-input) .ant-select-selector {
- border: none;
- }
-
- > span {
- align-self: center;
- }
- }
-
- .Legend {
- display: flex;
- gap: 25px;
- align-items: center;
- color: var(--subtext);
- padding-inline: 20px;
-
- div {
- position: relative;
- font-weight: 400;
-
- &::after {
- content: "";
- position: absolute;
- top: 50%;
- right: -25px;
- transform: translate(-50%, -50%);
- width: 14px;
- /* Adjust size as needed */
- height: 14px;
- /* Adjust size as needed */
- border: 4px solid var(--utils_color_one);
- /* Set border properties */
- border-radius: 50%;
- z-index: 2;
- }
-
- &:nth-child(2) {
- &::after {
- border: 4px solid var(--utils_color_tow);
- /* Set border properties */
- }
- }
- }
- }
-}
-
-.ColumnChartWrapper {
- height: 23vw;
-}
-
-.CalendarSection {
- .Calendar {
- padding: 0 10px;
- }
-
- background: var(--bg);
- @include Shadow;
- border-radius: var(--border-radius);
-
- .ant-picker-outlined {
- border-color: var(--bg);
- direction: ltr;
- // width: 140px;
- }
-
- .CalendarHeader {
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 1vw 1.5vw;
- width: 100%;
-
- h4 {
- color: var(--secondary);
- font-weight: bold;
- font-size: 1.4vw;
- }
- }
-
- .Calendar_Div {
- // border: 1px solid red;
- // aspect-ratio: 1 / 1;
- }
-
- .Calendar_ActiveDiv:nth-child(odd) {
- background-color: var(--utils_color_one);
-
- color: var(--white);
- height: 90%;
- // aspect-ratio: 1 / 1;
- width: 70%;
- margin-inline: auto;
- border-radius: 50%;
- @include Flex;
- /* Include your Flex mixin here */
- }
-
- .Calendar_ActiveDiv:nth-child(even) {
- background-color: var(--utils_color_tow);
- color: var(--white);
- height: 90%;
- width: 70%;
- margin-inline: auto;
- border-radius: 50%;
- // aspect-ratio: 1 / 1;
-
- @include Flex;
- /* Include your Flex mixin here */
- }
-}
-
-.AreaChart {
- background: var(--bg);
- @include Shadow;
- border-radius: var(--border-radius);
-}
-
-// }
-// onChange={onChangeDatePicker}
-// picker="month"
-// />
-
-.CalenderPop {
-}
-.Calendar_Popover {
- background: var(--primary);
- color: var(--white);
- display: flex;
- gap: 10px;
- flex-direction: column;
- align-items: center;
- justify-content: center;
-
- h5 {
- font-size: 0.9vw;
- font-weight: normal;
- }
-
- h6 {
- font-size: 0.5vw;
- font-weight: normal;
- }
- .Actions {
- position: absolute;
- right: -30px;
- top: 0;
- width: 35px;
- height: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- border-radius: var(--border-radius);
- border: 1px solid var(--primary);
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
- background: var(--bg);
- }
-}
-.ant-popover .ant-popover-inner:has(.Actions) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-
-.CalenderPop .ant-popover-inner {
- background: var(--primary) !important;
- color: var(--white);
-}
-
-.ant-popover .ant-popover-arrow::after {
- background: var(--primary) !important;
-}
-
-.NoteSections {
- width: 30%;
- background: var(--bg);
-}
-
-.DummyHomePage {
- display: flex;
- justify-content: center;
- align-items: center;
- height: 70vh;
- img {
- width: 20vw;
- }
-}
diff --git a/src/Styles/Home/Note.scss b/src/Styles/Home/Note.scss
deleted file mode 100644
index 8ab08ef..0000000
--- a/src/Styles/Home/Note.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-.NoteSection {
- background: var(--bg);
- padding: 30px;
- display: flex;
- flex-direction: column;
- width: 100%;
-
- header {
- margin-bottom: 10px;
- display: flex;
- align-items: center;
- gap: 20px;
- h4 {
- color: var(--secondary);
- font-weight: bold;
- }
- }
- .NoteScrollerChanger {
- background: #f4f7fe;
- padding: 20px 10px;
- border-radius: var(--border-radius);
- }
- .Notes {
- display: flex;
- flex-direction: column;
- width: 100%;
- padding: 0px 20px;
- max-height: 500px;
- overflow-y: scroll;
- @include Scrollbar;
- direction: ltr; /* Right-to-left direction */
-
- article {
- direction: rtl; /* Right-to-left direction */
-
- display: flex;
- flex-direction: column;
- > div {
- display: flex;
- align-items: center;
- gap: 10px;
- margin-bottom: 10px;
- i {
- width: 1.7vw;
- height: 1.7vw;
- background: var(--primary);
- color: var(--white);
- border-radius: 50%;
- @include Flex;
- }
- h5 {
- margin-bottom: 0;
- font-size: 1.2vw;
- color: #606165;
- font-family: "Jost-SemiBold", sans-serif; /* Use ABeeZee font for body text */
- }
- }
- span {
- margin-right: 50px;
- font-size: 0.8vw;
- width: 90%;
- position: relative;
- font-weight: 400;
- margin-bottom: 10px;
- &::before {
- content: ""; /* Required for ::before pseudo-element */
- position: absolute;
- top: 5px;
- right: -20px;
- width: 8px; /* Set width and height to cover the entire parent */
- height: 8px;
- border-radius: 50%;
- background: #606060;
- }
- }
- }
- }
-}
diff --git a/src/Styles/Home/StudentSubjects.scss b/src/Styles/Home/StudentSubjects.scss
deleted file mode 100644
index eda3dc1..0000000
--- a/src/Styles/Home/StudentSubjects.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-.StudentSubjects {
- padding: 20px;
- @include Shadow;
- background: var(--bg);
- border-radius: var(--border-radius);
-
- header {
- display: flex;
- width: 100%;
- justify-content: space-between;
- padding: 5px;
- h6 {
- color: var(--secondary);
- }
- }
- main {
- width: 100%;
- overflow-y: scroll;
- max-height: 20vw;
- @include Scrollbar;
- display: flex;
- flex-direction: column;
- direction: ltr;
- gap: 20px;
- padding: 20px;
-
- > div {
- display: flex;
- justify-content: space-between;
- align-items: center;
- border-radius: var(--border-radius);
- background: #f0f7ff;
- padding: 1vw 2vw;
- width: 100%;
- }
-
- img {
- width: 3vw;
- height: 3vw;
- }
- h6 {
- color: var(--text);
- font-weight: bold;
- font-size: 1.2vw;
- }
- }
-}
diff --git a/src/Styles/Home/index.scss b/src/Styles/Home/index.scss
deleted file mode 100644
index 266e638..0000000
--- a/src/Styles/Home/index.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "./Home.scss";
-@import "./Activity.scss";
-@import "./CountSection.scss";
-@import "./Note.scss";
-@import "./StudentSubjects.scss";
diff --git a/src/Styles/Layout/DataTable.scss b/src/Styles/Layout/DataTable.scss
index 7abef3e..bdce934 100644
--- a/src/Styles/Layout/DataTable.scss
+++ b/src/Styles/Layout/DataTable.scss
@@ -41,4 +41,27 @@
.ant-table-wrapper .ant-table-container table>thead>tr:first-child >*:last-child,
.ant-table-wrapper .ant-table-container table>thead>tr:first-child >*:first-child{
border-radius: 0 !important;
-}
\ No newline at end of file
+}
+
+
+.TableWithHeader {
+ display: flex;
+ flex-direction: column;
+ padding: 2vw;
+ background: var(--bg);
+ // gap: 1vw;
+ border-radius: var(--border-radius);
+ transition: 1s ease-in-out;
+ animation: fadeInRight 1s ease-in-out;
+
+ > header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ width: 95%;
+ h6 {
+ color: var(--primary);
+ font-weight: bold;
+ }
+ }
+}
diff --git a/src/Styles/Layout/FilterLayout.scss b/src/Styles/Layout/FilterLayout.scss
index a3bc954..3aa9480 100644
--- a/src/Styles/Layout/FilterLayout.scss
+++ b/src/Styles/Layout/FilterLayout.scss
@@ -10,7 +10,8 @@
.filter_button{
display: flex;justify-content: space-between;align-items: center;
width: 190px;
- padding: 11px 20px 11px 20px;
+ padding-inline: 20px;
+ height: 40px;
border-radius: 10px;
border: 1px solid var(--opacity) !important;
transition: ease-in-out .4s;
@@ -31,7 +32,7 @@
.filter_modal_select{
border: 1px solid var(--opacity);
border-radius: 10px;
- padding-bottom: 46.5px;
+ // padding-bottom: 46.5px;
.addition_select_icon{
font-size: 25px;
}
diff --git a/src/Styles/Pages/Division.scss b/src/Styles/Pages/Division.scss
deleted file mode 100644
index 717b9df..0000000
--- a/src/Styles/Pages/Division.scss
+++ /dev/null
@@ -1,150 +0,0 @@
-.hidden {
- display: none !important;
-}
-
-.ShowMoreButton {
- position: absolute;
- bottom: 1vw;
- right: 0.5vw;
- background-color: var(--primary);
- color: var(--white);
- border-radius: 50%;
- height: 1.7vw;
- width: 1.7vw;
- @include Flex;
-
- svg {
- font-size: 1.5vw;
- }
-}
-
-.ModelBody {
- display: flex;
- width: 100%;
-}
-
-.ModelBodyTabs {
- width: 27%;
- display: flex;
- flex-direction: column;
- gap: 2vw;
- background: var(--primary);
- border-radius: var(--border-radius);
- padding: 2vw;
- min-height: 85vh;
- position: relative;
-
- .ModelBodyTab {
- display: flex;
- align-items: center;
- gap: 2vw;
- z-index: 4;
-
- > div {
- width: 3vw;
- height: 3vw;
- // background: var(--primary);
- color: var(--white);
- border: 1px solid var(--white);
- border-radius: 50%;
- @include Flex;
- font-size: 1vw;
- cursor: pointer;
- }
-
- h6 {
- color: #d4d4d4;
- margin-bottom: 0.4vw;
- font-size: 0.7vw;
- }
-
- h4 {
- color: var(--white);
- font-size: 1vw;
- }
- }
-
- .activeModelTab {
- > div {
- background: #bfe2fd;
- color: black;
- }
- }
-}
-.ModelBodyForm {
- padding: 2vw;
- width: 73%;
- > header {
- font-size: 2vw;
- color: var(--secondary);
- margin-bottom: 1vw;
- }
- .ant-picker-outlined {
- border-color: var(--border-color);
- }
-
- .ant-input-outlined {
- border-color: var(--border-color);
- }
- label {
- color: var(--secondary);
- }
-}
-.ant-input-outlined {
- border-color: var(--border-color);
-}
-
-.SubmitButton {
- width: 100%;
- padding-right: 30%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- cursor: pointer;
- > button,
- > span {
- outline: none;
- border: none;
- border-radius: var(--border-radius);
- padding: 0.7vw 1vw;
- background: var(--primary);
- color: var(--white);
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 5px;
- font-size: 1.2vw;
- width: 11vw;
- }
- > div {
- color: var(--secondary);
- cursor: pointer;
- }
-}
-.TableWithHeader {
- display: flex;
- flex-direction: column;
- padding: 2vw;
- background: var(--bg);
- // gap: 1vw;
- border-radius: var(--border-radius);
- transition: 1s ease-in-out;
- animation: fadeInRight 1s ease-in-out;
-
- > header {
- display: flex;
- justify-content: space-between;
- align-items: center;
- width: 95%;
- h6 {
- color: var(--primary);
- font-weight: bold;
- }
- }
-}
-
-.Selects {
- display: flex;
- align-items: center;
- gap: 8%;
-}
diff --git a/src/Styles/Pages/index.scss b/src/Styles/Pages/index.scss
index 70ef740..dc3680a 100644
--- a/src/Styles/Pages/index.scss
+++ b/src/Styles/Pages/index.scss
@@ -2,7 +2,6 @@
@import "./activity.scss";
@import "./Student.scss";
@import "./Classes.scss";
-@import "./Division.scss";
@import "./Course.scss";
@import "./EduClass.scss";
@import "./programme.scss";
diff --git a/src/lib/AntdProvider.tsx b/src/lib/AntdProvider.tsx
index 721f8c6..70c5c25 100644
--- a/src/lib/AntdProvider.tsx
+++ b/src/lib/AntdProvider.tsx
@@ -15,6 +15,7 @@ function AntdProvider({ children }: { children: React.ReactNode }) {
headerBg: bgColor,
headerColor: primaryColor,
},
+
},
}}
>