-
-
-
-
- )}
-
-
- dispatch(setIsSideMenuCollapsed(false))}
>
- {props.onView && (
-
+ ) : (
+
- {isCollpased ? (
-
-
- {props.backTo && (
-
- dispatch(setIsSideMenuCollapsed(false))}>
-
- ) : (
- dispatch(setIsSideMenuCollapsed(true))}>
-
- )}
-
-
- )}
+ dispatch(setIsSideMenuCollapsed(true))}
+ >
+
+ )}
+
- {props.onEdit && (
-
-
- )}
-
- {isDarkMode ? (
- dispatch(setDarkMode(false))}>
-
- ) : (
- dispatch(setDarkMode(true))}>
-
- )}
-
+
+ )}
+
+ {props.onEdit && (
+
+
+ )}
+
+ {isDarkMode ? (
+ dispatch(setDarkMode(false))}
+ >
+
+ ) : (
+ dispatch(setDarkMode(true))}
+ >
+
+ )}
+
+
+ ) : null}
+
+ ContactSupport
- - ); + return ( + <> +- {formattedText}
-
+ {formattedText}
+
Choose another image from
+
Choose another video from
Unpublished
+
+ Unpublished
+
{unpublishedItems.map((item, index) => (
-
-
-
+ {error ? (
+
);
}
+
+interface Permission {
+ id: number;
+ category: string;
+ title: string;
+ description: string;
+}
+
+// test data
+const tmpI18nObj = [
+ {
+ id: 1,
+ category: "Team",
+ title: "Invite new team member",
+ description:
+ "Permission to invite a member. An email will be sent to the new member.",
+ },
+ {
+ id: 2,
+ category: "Team",
+ title: "Remove team member",
+ description: "Permission to remove a member.",
+ },
+ {
+ id: 3,
+ category: "Roles",
+ title: "Create new role",
+ description:
+ "Permission to invite a member. An email will be sent to the new member.",
+ },
+ {
+ id: 4,
+ category: "Roles",
+ title: "Delete role",
+ description:
+ "Permission to invite a member. An email will be sent to the new member.",
+ },
+];
+
+export const tmpRoleNames = {
+ "d0f0fa0d-3f3b-438b-a76f-7febeb8aab57": "Admin",
+ "b7359e12-359e-423b-b39c-f0d4069adebc": "Moderator",
+ "a1f084ad-d501-4015-b326-4c5c46fd1c5e": "User",
+} as any;
+
+function RoleComponent({ role }: { role: Role }) {
+ const teamPermissions = tmpI18nObj.filter(
+ (permission) => permission.category === "Team"
+ );
+ const rolePermissions = tmpI18nObj.filter(
+ (permission) => permission.category === "Roles"
+ );
+
+ const MyCheckbox = ({ permission }: { permission: Permission }) => {
+ return (
+
+
+ {permission.title}
+
+
+ );
+ };
+
+ return (
+
+ );
+}
+
+/*
+function RoleComponent({ role }: { role: Role }) {
+ const [expandIconPosition, setExpandIconPosition] = useState('start');
+
+ const [editMode, setEditMode] = useState(false);
+ const [form] = useForm();
+
+ const onPositionChange = (newExpandIconPosition: ExpandIconPosition) => {
+ setExpandIconPosition(newExpandIconPosition);
+ };
+
+ const onChange = (key: string | string[]) => {};
+
+ const teamPermissions = [
+ {
+ id: 1,
+ label: 'Invite new team member',
+ description: 'Permission to invite a member. An email will be sent to the new member.',
+ },
+ {
+ id: 2,
+ label: 'Remove team member',
+ description: 'Permission to invite a member. An email will be sent to the new member.',
+ },
+ ];
+
+ const rolePermissions = [
+ {
+ id: 3,
+ label: 'Invite new team member',
+ description: 'Permission to invite a member. An email will be sent to the new member.',
+ },
+ {
+ id: 4,
+ label: 'Invite new team member',
+ description: 'Permission to invite a member. An email will be sent to the new member.',
+ },
+ ];
+
+ const MyCheckbox = ({ name, label, description }: { name: number; label: string; description: string }) => {
+ return (
+
+ {label}
+
+ );
+ };
+
+ const handleSave = () => {
+ console.log(form.getFieldsValue());
+ };
+
+ /*
+ useEffect(() => {
+ // set all checkboxes to true if role is master
+ if (role.Master) {
+ const obj = {} as any;
+ const objPermissionValues = Object.values(Constants.PERMISSIONS);
+
+ for (let i = 1; i <= Object.keys(Constants.PERMISSIONS).length; i++) {
+ obj[objPermissionValues[i - 1]] = true;
+ }
+
+ form.setFieldsValue(obj);
+ }
+ }, []);
+ */
+/*
+
+ return (
+
+ );
+}
+*/
+
+/*
+const CreateRoleButton: React.FC = () => {
+ const [createRole, { isLoading }] = useCreateRoleMutation();
+
+ const handleCreateRole = async () => {
+ try {
+ createRole('New Role');
+ } catch (err) {
+ console.error(err);
+ }
+ };
+
+ return (
+ } onClick={handleCreateRole} loading={isLoading}>
+ Create role
+
+ );
+};
+*/
diff --git a/src/features/Settings/index.tsx b/src/features/Settings/index.tsx
index 64df8de..fefc9ef 100644
--- a/src/features/Settings/index.tsx
+++ b/src/features/Settings/index.tsx
@@ -25,6 +25,7 @@ import {
} from "core/reducers/appSlice";
import MyMiddleCard from "shared/components/MyMiddleCard";
import { OrganizationSettings } from "core/types/organization";
+import { useMessage } from "core/context/MessageContext";
type GeneralFieldType = {
primaryColor: string | AggregationColor;
@@ -47,7 +48,7 @@ export default function Settings() {
();
+ const { success } = useMessage();
const dispatch = useDispatch();
const debounceRef = useRef(null);
@@ -67,19 +69,21 @@ function GeneralCard({
const [updateOrganizationSettings, { isLoading: isUpdateSettingsLoading }] =
useUpdateOrganizationSettingsMutation();
- const handleSave = (values: GeneralFieldType) => {
+ const handleSave = async (values: GeneralFieldType) => {
const hexColor =
typeof values.primaryColor === "string"
? values.primaryColor
: values.primaryColor.toHexString().split("#")[1];
try {
- updateOrganizationSettings({
+ await updateOrganizationSettings({
primaryColor: hexColor,
companyName: values.companyName,
- });
+ }).unwrap();
currentPrimaryColor.current = hexColor;
+
+ success("Settings updated successfully!");
} catch (error) {
console.error(error);
}
@@ -148,7 +152,7 @@ function GeneralCard({
name="companyName" label="Company name">
-
+
@@ -157,9 +161,9 @@ function GeneralCard({
}
function MediaCard({
- data,
isLoading,
}: { data?: OrganizationSettings; isLoading?: boolean } = {}) {
+ const { success } = useMessage();
const dispatch = useDispatch();
const appLogoUrl = useSelector(logoUrl);
@@ -174,6 +178,8 @@ function MediaCard({
onChange={(info) => {
if (info.file.status === "done" && info.file.response.Data) {
dispatch(setLogoUrl(info.file.response.Data));
+
+ success("Logo updated successfully!");
}
}}
imgCropProps={{
@@ -182,7 +188,9 @@ function MediaCard({
}}
>
{
+ console.log("Banner updated1!", info.file.status);
if (info.file.status === "done" && info.file.response.Data) {
dispatch(setBannerUrl(info.file.response.Data));
+
+ console.log("Banner updated!");
+
+ success("Banner updated successfully!");
}
}}
imgCropProps={{
@@ -209,7 +222,9 @@ function MediaCard({
}}
>
setIsModalOpen(false)}
okText="Change"
- onOk={() => {
+ onOk={async () => {
try {
- reqUpdateSubdomain(form.getFieldValue("subdomain"));
+ await reqUpdateSubdomain(form.getFieldValue("subdomain"));
+ success("Subdomain updated successfully!");
+ info("You will be redirected to the new subdomain!");
+ /*
window.location.href = `https://${form.getFieldValue(
"subdomain"
- )}.${window.location.hostname.split(".").slice(1).join(".")}`;
+ )}.${window.location.hostname.split(".").slice(1).join(".")}`; */
} catch (error) {
console.error(error);
}
diff --git a/src/features/Team/CreateUser/index.tsx b/src/features/Team/CreateUser/index.tsx
index e4487ad..7466c0d 100644
--- a/src/features/Team/CreateUser/index.tsx
+++ b/src/features/Team/CreateUser/index.tsx
@@ -1,7 +1,10 @@
import { PlusOutlined } from "@ant-design/icons";
-import { Button, Card, Checkbox, Flex, Form, Input } from "antd";
+import { Button, Flex, Form, Input, Select } from "antd";
import HeaderBar from "core/components/Header";
-import { Constants } from "core/utils/utils";
+import { useMessage } from "core/context/MessageContext";
+import { useCreateTeamMemberMutation } from "core/services/organization";
+import { Constants, EncodeStringToBase64 } from "core/utils/utils";
+import { useNavigate } from "react-router-dom";
import MyMiddleCard from "shared/components/MyMiddleCard";
type FieldType = {
@@ -14,6 +17,11 @@ type FieldType = {
};
export default function TeamCreateUser() {
+ const navigate = useNavigate();
+ const { success } = useMessage();
+
+ const [reqCreateTeamMember, { isLoading }] = useCreateTeamMemberMutation();
+
return (
<>
-