diff --git a/.env.development b/.env.development index 50eda8e..aef2da9 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ -VITE_API_ORIGIN = https://admin.dev.dipal.ru/api/v1 -VITE_API_AUTH_ORIGIN = https://auth.dev.dipal.ru/api/v1/auth +VITE_API_ORIGIN=https://admin.dev.dipal.ru/api/v1 +VITE_API_AUTH_ORIGIN=https://auth.dev.dipal.ru/api/v1/auth VITE_API_AUTH_PHONENUMBER = /start-challenge VITE_API_AUTH_LOGIN = /login VITE_API_AUTH_REFRESH = /refresh-token diff --git a/.env.production b/.env.production index 50eda8e..a923826 100644 --- a/.env.production +++ b/.env.production @@ -1,11 +1,11 @@ -VITE_API_ORIGIN = https://admin.dev.dipal.ru/api/v1 -VITE_API_AUTH_ORIGIN = https://auth.dev.dipal.ru/api/v1/auth -VITE_API_AUTH_PHONENUMBER = /start-challenge -VITE_API_AUTH_LOGIN = /login -VITE_API_AUTH_REFRESH = /refresh-token -VITE_API_CREATE_MEMBER = /user_place/members -VITE_API_PLACES = /place -VITE_API_USERS = /profile -VITE_API_USERS_ACCOUNT = /account -VITE_API_USERS_PROFILE = /profile -VITE_API_QR = /qr_code \ No newline at end of file +VITE_API_ORIGIN=https://admin.dev.dipal.ru/api/v1 +VITE_API_AUTH_ORIGIN=https://auth.dev.dipal.ru/api/v1/auth +VITE_API_AUTH_PHONENUMBER=/start-challenge +VITE_API_AUTH_LOGIN=/login +VITE_API_AUTH_REFRESH=/refresh-token +VITE_API_CREATE_MEMBER=/user_place/members +VITE_API_PLACES=/place +VITE_API_USERS=/profile +VITE_API_USERS_ACCOUNT=/account +VITE_API_USERS_PROFILE=/profile +VITE_API_QR=/qr_code \ No newline at end of file diff --git a/index.html b/index.html index b032580..ddc9158 100644 --- a/index.html +++ b/index.html @@ -2,9 +2,9 @@ - + - Vite + React + TS + Dipal admin panel
diff --git a/public/logo.svg b/public/logo.svg new file mode 100644 index 0000000..f296257 --- /dev/null +++ b/public/logo.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/public/vite.svg b/public/vite.svg deleted file mode 100644 index e7b8dfb..0000000 --- a/public/vite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/driven/boundaries/http-boundary/httpBoundary.ts b/src/driven/boundaries/http-boundary/httpBoundary.ts index 3f65647..ae4acc2 100644 --- a/src/driven/boundaries/http-boundary/httpBoundary.ts +++ b/src/driven/boundaries/http-boundary/httpBoundary.ts @@ -69,12 +69,11 @@ export class HTTPPovider { } private responseIncepter(axiosInstance: AxiosInstance) { - axiosInstance.interceptors.response.use( + return axiosInstance.interceptors.response.use( (response) => response, (error) => { const originalRequest = error.config; - - if (error.response.status === 401 && error.response.message === 'Unauthorized') { + if (error.response.status === 401 && error.response.data.message === 'Unauthorized') { const newAccessToken = this.refreshAccessToken().then(() => { originalRequest.headers.Authorization = `Bearer ${newAccessToken}`; return axios(originalRequest); diff --git a/src/driving/application/core/places-list/view/PlacesListView.tsx b/src/driving/application/core/places-list/view/PlacesListView.tsx index 8409eb1..16bb9ba 100644 --- a/src/driving/application/core/places-list/view/PlacesListView.tsx +++ b/src/driving/application/core/places-list/view/PlacesListView.tsx @@ -4,7 +4,7 @@ import Loading from '~/driven/utils/components/loading/Loading'; import TableRow from '../../common/table-row'; import { IPlacesListProps } from './protocols'; -export default function UsersListView(props: IPlacesListProps) { +export default function PlacesListView(props: IPlacesListProps) { const { selectedRowId, setSelectedRowId, placesList } = props; const rows = useMemo(() => {