SQuiz/frontPanel
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into staging

Browse Source
This commit is contained in:
Nastya 2024-07-26 23:36:33 +03:00
commit ec2b957450
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -6,7 +6,7 @@
"@craco/craco": "^7.0.0", "@craco/craco": "^7.0.0",
"@emotion/react": "^11.10.5", "@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5", "@emotion/styled": "^11.10.5",
"@frontend/kitui": "^1.0.82", "@frontend/kitui": "^1.0.84",
"@frontend/squzanswerer": "^1.0.55", "@frontend/squzanswerer": "^1.0.55",
"@mui/icons-material": "^5.10.14", "@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.14", "@mui/material": "^5.10.14",

2
src/App.tsx
View File

@ -84,7 +84,7 @@ export default function App() {
}); });
useUserAccountFetcher<UserAccount>({ useUserAccountFetcher<UserAccount>({
url: `${process.env.REACT_APP_DOMAIN}/customer/v1.0.0/account`, url: `${process.env.REACT_APP_DOMAIN}/customer/v1.0.1/account`,
userId, userId,
onNewUserAccount: setCustomerAccount, onNewUserAccount: setCustomerAccount,
onError: (error) => { onError: (error) => {

2
src/api/cart.ts
View File

@ -4,7 +4,7 @@ import { parseAxiosError } from "@utils/parse-error";
import type { UserAccount } from "@frontend/kitui"; import type { UserAccount } from "@frontend/kitui";
const API_URL = `${process.env.REACT_APP_DOMAIN}/customer/v1.0.0/cart`; const API_URL = `${process.env.REACT_APP_DOMAIN}/customer/v1.0.1/cart`;
const payCart = async (): Promise<[UserAccount | null, string?]> => { const payCart = async (): Promise<[UserAccount | null, string?]> => {
try { try {

2
src/api/user.ts
View File

@ -13,7 +13,7 @@ export const getUser = async (): Promise<[UserAccount | null, string?]> => {
try { try {
const user = await makeRequest<never, UserAccount>({ const user = await makeRequest<never, UserAccount>({
method: "GET", method: "GET",
url: `${process.env.REACT_APP_DOMAIN}/customer/v1.0.0/account`, url: `${process.env.REACT_APP_DOMAIN}/customer/v1.0.1/account`,
}); });
return [user]; return [user];

8
yarn.lock
View File

@ -1513,10 +1513,10 @@
resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5" resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"
integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw== integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==
"@frontend/kitui@^1.0.82": "@frontend/kitui@^1.0.84":
version "1.0.82" version "1.0.84"
resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/21/packages/npm/@frontend/kitui/-/@frontend/kitui-1.0.82.tgz#696ab79a14357608c20bcdf47aadd5a77155f609" resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/21/packages/npm/@frontend/kitui/-/@frontend/kitui-1.0.84.tgz#9b655b776433fb8ea6d0840897d941e66530df7f"
integrity sha1-aWq3mhQ1dgjCC830eq3Vp3FV9gk= integrity sha1-m2Vbd2Qz+46m0IQIl9lB5mUw338=
dependencies: dependencies:
immer "^10.0.2" immer "^10.0.2"
reconnecting-eventsource "^1.6.2" reconnecting-eventsource "^1.6.2"