upd

2024-06-06 18:15:51 +05:00
parent e4331fb31f
commit 7e692fee4c
11 changed files with 116 additions and 173 deletions
@@ -1,4 +1,4 @@
 # VITE_API_URL=http://localhost:3001
-VITE_API_URL=http://192.168.1.171:3001
-# VITE_API_URL=https://crm.stream.graff.tech/api
+# VITE_API_URL=http://192.168.1.171:3001
+VITE_API_URL=https://crm.stream.graff.tech/api
 VITE_STREAM_URL=https://stream.graff.tech
@@ -60,28 +60,37 @@ function Card({

  return (
    <div className="relative flex flex-col gap-2">
-      <div className="w-[264px] h-[128px] px-3 py-2 bg-white border-r border-b border-[#DAE0E5] flex flex-col gap-2">
-        <div className="flex justify-between">
-          <p className="text-sm font-semibold">{client.name}</p>
-          {manager ? (
-            <div className="bg-[#E6F2FE] rounded-full px-2 h-[20px] flex items-center gap-1">
-              <div className="w-1 h-1 rounded-full bg-[#49A1F5]"></div>
-              <p className="text-[10px] font-semibold text-[#49A1F5] pt-0.5">
-                Готов
-              </p>
+      <div className="w-[264px] h-[164px] px-3 py-2 bg-white border-r border-b border-[#DAE0E5] flex flex-col justify-between gap-2">
+        <div className="space-y-2">
+          <div className="flex justify-between">
+            <div className="">
+              <p className="text-[10px] font-semibold text-[#77828C]">Клиент</p>
+              <p className="text-sm">{client.name}</p>
            </div>
-          ) : (
-            <div className="bg-[#F2DADA] rounded-full px-2 h-[20px] flex items-center gap-1">
-              <div className="w-1 h-1 rounded-full bg-[#EB5757]"></div>
-              <p className="text-[10px] font-semibold text-[#EB5757] pt-0.5">
-                Нет менеджера
-              </p>
-            </div>
-          )}
-        </div>
-        <div className="border-b border-[#DAE0E5] pb-2">
-          <p className="text-xs text-[#77828C] leading-tight">{client.phone}</p>
-          <p className="text-xs text-[#77828C] leading-tight">{client.email}</p>
+            {manager ? (
+              <div className="bg-[#E6F2FE] rounded-full px-2 h-[20px] flex items-center gap-1">
+                <div className="w-1 h-1 rounded-full bg-[#49A1F5]"></div>
+                <p className="text-[10px] font-semibold text-[#49A1F5]">
+                  Готов
+                </p>
+              </div>
+            ) : (
+              <div className="bg-[#F2DADA] rounded-full px-2 h-[20px] flex items-center gap-1">
+                <div className="w-1 h-1 rounded-full bg-[#EB5757]"></div>
+                <p className="text-[10px] font-semibold text-[#EB5757] pt-0.5">
+                  Нет менеджера
+                </p>
+              </div>
+            )}
+          </div>
+          <div className="border-b border-[#DAE0E5] pb-2">
+            <p className="text-xs text-[#77828C] leading-tight">
+              {client.phone}
+            </p>
+            <p className="text-xs text-[#77828C] leading-tight">
+              {client.email}
+            </p>
+          </div>
        </div>
        <div className="flex justify-between items-center py-1">
          <div className=" flex items-center gap-2">
@@ -105,7 +114,9 @@ function Card({
          <div className="flex gap-2">
            {manager && (
              <Link
-                to={`${import.meta.env.VITE_STREAM_URL}/scheduled/${scheduledSessionId}`}
+                to={`${
+                  import.meta.env.VITE_STREAM_URL
+                }/scheduled/${scheduledSessionId}?admin=true`}
                target="_blank"
              >
                <Button>Начать</Button>
@@ -51,7 +51,7 @@ function DatePicker({ defaultValue, startDate, onChange }: Props) {

  function handleClick(date: Date) {
    setValue(date);
-    onChange && onChange(value);
+    onChange && onChange(date);
  }

  return (
@@ -3,7 +3,7 @@ import PlusIcon from "./icons/PlusIcon";

 function EmptyCard() {
  return (
-    <div className="w-[264px] h-[128px] text-sm font-semibold bg-[#F0F1F2] border-r border-b border-[#DAE0E5] flex items-center justify-center group">
+    <div className="w-[264px] h-[164px] text-sm font-semibold bg-[#F0F1F2] border-r border-b border-[#DAE0E5] flex items-center justify-center group">
      <Button
        color="tertiary"
        icon={<PlusIcon />}
@@ -8,36 +8,29 @@ import { useEffect, useState } from "react";
 import Select from "../Select";
 import useModalStore from "../../stores/useModalStore";
 import Input from "../Input";
-import {
-  eachMinuteOfInterval,
-  isAfter,
-  isBefore,
-  parse,
-  parseISO,
-  startOfDay,
-} from "date-fns";
+import { eachMinuteOfInterval, parse, parseISO, startOfDay } from "date-fns";
 import api from "../../utils/api";
 import ChoiceChips from "../ChoiceChips";
-import ISchedule from "../../types/ISchedule";
+// import ISchedule from "../../types/ISchedule";
 import DatePicker from "../DatePicker";
 import IScheduledSession from "../../types/IScheduledSession";

 interface Props {
  companyId: string;
  buildId: string;
-  schedules: ISchedule[];
+  // schedules: ISchedule[];
  handleCreate: () => void;
 }

 function CreateScheduleModal({
  companyId,
  buildId,
-  schedules,
+  // schedules,
  handleCreate,
 }: Props) {
  const setModal = useModalStore((state) => state.setModal);
-  const [date, setDate] = useState<Date>(new Date());
-  const [startDate, setStartDate] = useState<Date>();
+  const [date, setDate] = useState<Date>(startOfDay(new Date()));
+  const [startDate, setStartDate] = useState<Date>(startOfDay(new Date()));
  const [sessionDuration, setSessionDuration] = useState<number>(30);
  const [sessionBreak, setSessionBreak] = useState<number>(5);
  const [startTime, setStartTime] = useState<string>("10:00");
@@ -47,17 +40,15 @@ function CreateScheduleModal({

  async function getLastScheduledSessionDate() {
    try {
-      const { startAt }: IScheduledSession = await api
+      const result: IScheduledSession | null = await api
        .get(`companies/${companyId}/builds/${buildId}/last_scheduled_session`)
        .json();

-      if (!startAt) return;
+      if (!result || !result.startAt) return;

-      setStartDate(startOfDay(parseISO(startAt)));
+      setStartDate(startOfDay(parseISO(result.startAt)));
    } catch (error) {
-      if (error instanceof Error) {
-        alert(error.message);
-      }
+      alert((error as Error).message);
    }
  }

@@ -66,7 +57,7 @@ function CreateScheduleModal({
  }, []);

  function calculateSessionsPerDay() {
-    if (!startDate) return;
+    // if (!startDate) return;

    const sessionsPerDay = eachMinuteOfInterval(
      {
@@ -88,7 +79,7 @@ function CreateScheduleModal({
  async function createSchedule() {
    await api.post(`companies/${companyId}/builds/${buildId}/schedules`, {
      json: {
-        startDate,
+        startDate: date,
        startTime,
        endTime,
        weekends,
@@ -100,7 +91,7 @@ function CreateScheduleModal({
  }

  async function handleClickCreateSchedule() {
-    if (!startDate) return;
+    // if (!startDate) return;

    await createSchedule();
    handleCreate();
@@ -141,8 +132,8 @@ function CreateScheduleModal({
              <div className="flex flex-col">
                <Label value="Начало" />
                <DatePicker
-                  startDate={startDate || new Date()}
-                  onChange={(date) => setDate(date)}
+                  startDate={startDate}
+                  onChange={(date) => (setDate(date), console.log(date))}
                />
              </div>
            </div>
@@ -422,11 +422,7 @@ function DashboardPage() {
                                scheduleSessionStartAt={
                                  scheduledSession.startAt
                                }
-                                client={{
-                                  name: scheduledSession.clientName,
-                                  phone: scheduledSession.clientPhone,
-                                  email: scheduledSession.clientEmail,
-                                }}
+                                client={scheduledSession.client}
                                manager={selectedManager}
                                managers={selectedBuildManagers || []}
                                handleSelect={(scheduledSessionId, managerId) =>
@@ -523,7 +519,7 @@ function DashboardPage() {
                  <CreateScheduleModal
                    companyId={company?.id}
                    buildId={selectedBuild?.id}
-                    schedules={schedules}
+                    // schedules={schedules}
                    handleCreate={getSchedules}
                  />
                )