PenaSide/front-hub
3
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade package

Browse Source
This commit is contained in:
nflnkr 2023-06-11 13:18:37 +03:00
parent 7faf0cc4b3
commit b705d7c0a6
13 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -11,7 +11,7 @@
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@frontend/kitui": "^1.0.2",
"@frontend/kitui": "^1.0.5",
"@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.14",
"axios": "^1.3.4",
@ -22,7 +22,6 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.4.3",
"reconnecting-eventsource": "^1.6.2",
"web-vitals": "^2.1.0",
"yup": "^1.1.1",
"zustand": "^4.3.6"

2
src/api/auth.ts
View File

@ -1,4 +1,4 @@
import { makeRequest } from "./makeRequest";
import { makeRequest } from "@frontend/kitui";
const apiUrl = process.env.NODE_ENV === "production" ? "" : "https://hub.pena.digital";

5
src/api/makeRequest.ts
View File

@ -1,5 +0,0 @@
import { createMakeRequest } from "@frontend/kitui";
import { getToken, setToken } from "@root/stores/auth";
export const makeRequest = createMakeRequest(getToken, setToken);

2
src/api/user.ts
View File

@ -1,5 +1,5 @@
import { makeRequest } from "@frontend/kitui";
import { PatchUserRequest, User } from "@root/model/user";
import { makeRequest } from "./makeRequest";
const apiUrl = process.env.NODE_ENV === "production" ? "" : "https://hub.pena.digital";

4
src/components/FloatingSupportChat/Chat.tsx
View File

@ -7,7 +7,7 @@ import ChatMessage from "../ChatMessage";
import SendIcon from "../icons/SendIcon";
import UserCircleIcon from "./UserCircleIcon";
import { throttle } from "@frontend/kitui";
import { makeRequest } from "@root/api/makeRequest";
import { makeRequest } from "@frontend/kitui";
import { useTicketMessages, getMessageFromFetchError, useSSESubscription, useEventListener, createTicket } from "@frontend/kitui";
@ -29,7 +29,6 @@ export default function Chat({ sx }: Props) {
const chatBoxRef = useRef<HTMLDivElement>(null);
const fetchState = useTicketMessages({
makeRequest,
url: "https://admin.pena.digital/heruvym/getMessages",
isUnauth: true,
ticketId: sessionData?.ticketId,
@ -89,7 +88,6 @@ export default function Chat({ sx }: Props) {
if (!sessionData) {
setIsMessageSending(true);
createTicket({
makeRequest,
url: "https://hub.pena.digital/heruvym/create",
body: {
Title: "Unauth title",

2
src/index.tsx
View File

@ -23,7 +23,6 @@ import Layout from "./components/Layout";
import { setUser, useUserStore } from "./stores/user";
import TariffConstructor from "./pages/TariffConstructor/TariffConstructor";
import { useUser } from "./utils/hooks/useUser";
import { makeRequest } from "./api/makeRequest";
const App = () => {
@ -31,7 +30,6 @@ const App = () => {
const userId = useUserStore(state => state.userId);
useUser({
makeRequest,
url: `https://hub.pena.digital/user/${userId}`,
userId,
onNewUser: setUser,

2
src/pages/Support/CreateTicket.tsx
View File

@ -3,7 +3,6 @@ import { useState } from "react";
import { useNavigate } from "react-router-dom";
import CustomButton from "@components/CustomButton";
import { enqueueSnackbar } from "notistack";
import { makeRequest } from "@root/api/makeRequest";
import { createTicket } from "@frontend/kitui";
@ -18,7 +17,6 @@ export default function CreateTicket() {
if (!ticketBodyField || !ticketNameField) return;
createTicket({
makeRequest,
url: "https://hub.pena.digital/heruvym/create",
body: {
Title: ticketNameField,

2
src/pages/Support/Support.tsx
View File

@ -11,7 +11,6 @@ import { Ticket } from "@frontend/kitui";
import { updateTickets, setTicketCount, clearTickets, useTicketStore } from "@root/stores/tickets";
import { enqueueSnackbar } from "notistack";
import { useAuthStore } from "@root/stores/auth";
import { makeRequest } from "@root/api/makeRequest";
import { useSSESubscription, useTickets } from "@frontend/kitui";
@ -24,7 +23,6 @@ export default function Support() {
const token = useAuthStore(state => state.token);
const fetchState = useTickets({
makeRequest,
url: "https://hub.pena.digital/heruvym/getTickets",
ticketsPerPage,
ticketApiPage,

4
src/pages/Support/SupportChat.tsx
View File

@ -4,14 +4,13 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useParams } from "react-router-dom";
import CustomButton from "@components/CustomButton";
import SendIcon from "@components/icons/SendIcon";
import { throttle } from "@frontend/kitui";
import { makeRequest, throttle } from "@frontend/kitui";
import { enqueueSnackbar } from "notistack";
import { useTicketStore } from "@root/stores/tickets";
import { addOrUpdateMessages, clearMessageState, incrementMessageApiPage, setIsPreventAutoscroll, useMessageStore } from "@root/stores/messages";
import { TicketMessage } from "@frontend/kitui";
import ChatMessage from "@root/components/ChatMessage";
import { useAuthStore } from "@root/stores/auth";
import { makeRequest } from "@root/api/makeRequest";
import { getMessageFromFetchError, useEventListener, useSSESubscription, useTicketMessages } from "@frontend/kitui";
@ -31,7 +30,6 @@ export default function SupportChat() {
const chatBoxRef = useRef<HTMLDivElement>(null);
const fetchState = useTicketMessages({
makeRequest,
url: "https://admin.pena.digital/heruvym/getMessages",
ticketId,
messagesPerPage,

2
src/pages/auth/Signin.tsx
View File

@ -12,7 +12,7 @@ import { useEffect, useState } from "react";
import { LoginRequest, LoginResponse } from "@root/model/auth";
import { setUserId, useUserStore } from "@root/stores/user";
import { getMessageFromFetchError } from "@frontend/kitui";
import { makeRequest } from "@root/api/makeRequest";
import { makeRequest } from "@frontend/kitui";
interface Values {
login: string;

2
src/pages/auth/Signup.tsx
View File

@ -12,7 +12,7 @@ import { useEffect, useState } from "react";
import { RegisterRequest, RegisterResponse } from "@root/model/auth";
import { setUserId, useUserStore } from "@root/stores/user";
import { getMessageFromFetchError } from "@frontend/kitui";
import { makeRequest } from "@root/api/makeRequest";
import { makeRequest } from "@frontend/kitui";
interface Values {

7
src/utils/hooks/useUser.ts
View File

@ -1,10 +1,9 @@
import { createMakeRequest, devlog } from "@frontend/kitui";
import { devlog, makeRequest } from "@frontend/kitui";
import { User } from "@root/model/user";
import { useEffect } from "react";
export function useUser({ makeRequest, onError, onNewUser, url, userId }: {
makeRequest: ReturnType<typeof createMakeRequest>;
export function useUser({ onError, onNewUser, url, userId }: {
url: string;
userId: string | null;
onNewUser: (response: User) => void;
@ -30,5 +29,5 @@ export function useUser({ makeRequest, onError, onNewUser, url, userId }: {
});
return () => controller.abort();
}, [makeRequest, onError, onNewUser, url, userId]);
}, [onError, onNewUser, url, userId]);
}

18
yarn.lock
View File

@ -1450,12 +1450,11 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"
"@frontend/kitui@^1.0.2":
version "1.0.4"
resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/21/packages/npm/@frontend/kitui/-/@frontend/kitui-1.0.4.tgz#32c842f5aeb6d71d2735cc8f3cad4f902c601dd9"
integrity sha1-MshC9a621x0nNcyPPK1PkCxgHdk=
"@frontend/kitui@^1.0.5":
version "1.0.5"
resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/21/packages/npm/@frontend/kitui/-/@frontend/kitui-1.0.5.tgz#0d8e8c6e564ee87ab8b7d5a2f86a9f4bd924db81"
integrity sha1-DY6MblZO6Hq4t9Wi+GqfS9kk24E=
dependencies:
axios "^1.4.0"
reconnecting-eventsource "^1.6.2"
"@humanwhocodes/config-array@^0.11.6":
@ -3281,15 +3280,6 @@ axios@^1.3.4:
form-data "^4.0.0"
proxy-from-env "^1.1.0"
axios@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
proxy-from-env "^1.1.0"
axobject-query@^2.2.0:
version "2.2.0"
resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz"