-
{session.owner.fullname}
+
{session.manager.fullname}
Клиент: {session.client.name} •
{session.app.name}
diff --git a/src/components/SessionCommentItem.tsx b/src/components/SessionCommentItem.tsx
index a256ab6..aeb8692 100644
--- a/src/components/SessionCommentItem.tsx
+++ b/src/components/SessionCommentItem.tsx
@@ -6,7 +6,7 @@ function SessionCommentItem({ comment }: { comment: Comment }) {
return (
-
{comment.owner.fullname}
+
{comment.manager.fullname}
{comment.text}
diff --git a/src/components/modals/CurrentSessionModal.tsx b/src/components/modals/CurrentSessionModal.tsx
index a6335f3..8b66da3 100644
--- a/src/components/modals/CurrentSessionModal.tsx
+++ b/src/components/modals/CurrentSessionModal.tsx
@@ -106,7 +106,9 @@ function CurrentSessionModal({ session }: { session: Session }) {
Менеджер:
-
{session.owner.fullname}
+
+ {session.manager.fullname}
+
diff --git a/src/components/modals/SessionModal.tsx b/src/components/modals/SessionModal.tsx
index 0e57d91..b5d1491 100644
--- a/src/components/modals/SessionModal.tsx
+++ b/src/components/modals/SessionModal.tsx
@@ -45,7 +45,7 @@ function SessionModal({ session }: { session: Session }) {
-
{session.owner.fullname}
+
{session.manager.fullname}
Продолжительность:{" "}
{getIntervalDuration(session.createdAt, session.updatedAt)}
diff --git a/src/pages/ClientsPage.tsx b/src/pages/ClientsPage.tsx
index e876d25..4820fd8 100644
--- a/src/pages/ClientsPage.tsx
+++ b/src/pages/ClientsPage.tsx
@@ -6,7 +6,7 @@ import MultySelect from "../components/MultySelect";
import SearchInput from "../components/SearchInput";
import { useState } from "react";
import { useQuery } from "@tanstack/react-query";
-import { User } from "../types/User";
+import { Manager } from "../types/Manager";
import { Client } from "../types/Client";
import { useDebounce } from "@uidotdev/usehooks";
import pluralize from "../utils/pluralize";
@@ -20,7 +20,7 @@ function ClientsPage() {
const { data: me } = useQuery({
queryKey: ["me"],
- queryFn: () => api.get("auth/me").json(),
+ queryFn: () => api.get("auth/me").json(),
});
const { data: clients, isLoading } = useQuery({
diff --git a/src/pages/DashboardPage.tsx b/src/pages/DashboardPage.tsx
index 01957f7..aafa12a 100644
--- a/src/pages/DashboardPage.tsx
+++ b/src/pages/DashboardPage.tsx
@@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import { User } from "../types/User";
+import { Manager } from "../types/Manager";
import api from "../utils/api";
import { Server } from "../types/Server";
import DesktopCard from "../components/DesktopCard";
@@ -13,7 +13,7 @@ import { useNavigate } from "react-router";
function DashboardPage() {
const { data: me } = useQuery({
queryKey: ["me"],
- queryFn: () => api.get("auth/me").json(),
+ queryFn: () => api.get("auth/me").json(),
});
const { data: servers } = useQuery({
diff --git a/src/pages/ProtectedPage.tsx b/src/pages/ProtectedPage.tsx
index 55bd0f1..e48e319 100644
--- a/src/pages/ProtectedPage.tsx
+++ b/src/pages/ProtectedPage.tsx
@@ -2,14 +2,14 @@ import { Navigate, Outlet } from "react-router";
import useAuthStore from "../stores/useAuthStore";
import api from "../utils/api";
import { useQuery } from "@tanstack/react-query";
-import { User } from "../types/User";
+import { Manager } from "../types/Manager";
function ProtectedPage() {
const { token } = useAuthStore();
const { data: user, isLoading } = useQuery({
queryKey: ["me"],
- queryFn: () => api.get("auth/me").json(),
+ queryFn: () => api.get("auth/me").json(),
enabled: !!token,
});
diff --git a/src/pages/SessionsPage.tsx b/src/pages/SessionsPage.tsx
index 8b6fb16..d867468 100644
--- a/src/pages/SessionsPage.tsx
+++ b/src/pages/SessionsPage.tsx
@@ -1,6 +1,6 @@
import { useQuery } from "@tanstack/react-query";
import api from "../utils/api";
-import { User } from "../types/User";
+import { Manager } from "../types/Manager";
import { Session } from "../types/Session";
import { useState } from "react";
import { App } from "../types/App";
@@ -28,12 +28,12 @@ function SessionsPage() {
const { data: me } = useQuery({
queryKey: ["me"],
- queryFn: () => api.get("auth/me").json(),
+ queryFn: () => api.get("auth/me").json(),
});
const { data: managers } = useQuery({
queryKey: ["managers"],
- queryFn: () => api.get("users").json(),
+ queryFn: () => api.get("users").json(),
enabled: !!me,
});
diff --git a/src/types/Client.ts b/src/types/Client.ts
index c109d10..3a245e0 100644
--- a/src/types/Client.ts
+++ b/src/types/Client.ts
@@ -5,6 +5,5 @@ export interface Client {
phone: string;
companyId: string;
createdAt: string;
- ownerId: string;
updatedAt: string;
}
diff --git a/src/types/Comment.ts b/src/types/Comment.ts
index cff77e7..8a17635 100644
--- a/src/types/Comment.ts
+++ b/src/types/Comment.ts
@@ -1,12 +1,11 @@
+import { Manager } from "./Manager";
+
export interface Comment {
id: string;
text: string;
createdAt: Date;
updatedAt: Date;
- ownerId: string;
+ managerId: string;
sessionId: string;
- owner: {
- ownerId: string;
- fullname: string;
- };
+ manager: Manager;
}
diff --git a/src/types/Company.ts b/src/types/Company.ts
index 43a9bdc..93aab5a 100644
--- a/src/types/Company.ts
+++ b/src/types/Company.ts
@@ -1,11 +1,11 @@
import { App } from "./App";
import { Server } from "./Server";
-import { User } from "./User";
+import { Manager } from "./Manager";
export interface Company {
id: string;
name: string;
apps?: App[];
servers?: Server[];
- users?: User[];
+ managers?: Manager[];
}
diff --git a/src/types/User.ts b/src/types/Manager.ts
similarity index 83%
rename from src/types/User.ts
rename to src/types/Manager.ts
index c81f1ff..4c0f265 100644
--- a/src/types/User.ts
+++ b/src/types/Manager.ts
@@ -1,6 +1,6 @@
import { Company } from "./Company";
-export interface User {
+export interface Manager {
id: string;
email: string;
fullname: string;
diff --git a/src/types/Owner.ts b/src/types/Owner.ts
deleted file mode 100644
index a8e4222..0000000
--- a/src/types/Owner.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface IOwner {
- fullname: string;
-}
diff --git a/src/types/Session.ts b/src/types/Session.ts
index a38b5f5..b219a64 100644
--- a/src/types/Session.ts
+++ b/src/types/Session.ts
@@ -1,12 +1,12 @@
import { App as App } from "./App";
import { Comment } from "./Comment";
-import { IOwner as Owner } from "./Owner";
import { Server } from "./Server";
import { Client } from "./Client";
+import { Manager } from "./Manager";
export interface Session {
id: string;
- ownerId: string;
+ managerId: string;
serverId: string;
clientId: string;
companyId: string;
@@ -15,7 +15,7 @@ export interface Session {
server: Server;
client: Client;
app: App;
- owner: Owner;
+ manager: Manager;
createdAt: Date;
updatedAt: Date;
}