Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM node:24-alpine AS builder
WORKDIR /app
COPY package*.json ./
RUN npm ci
COPY . .
RUN npm run build

FROM nginx:alpine
COPY --from=builder /app/dist /usr/share/nginx/html
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]
4 changes: 1 addition & 3 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom';
import {LoginPage} from './pages/LoginPage';
import LoginPage from './pages/LoginPage';
import BattlePage from './pages/BattlePage';
import WorkspacePage from './pages/WorkspacePage';
import './App.css';
import {ProfilePage} from "./pages/ProfilePage.jsx";

function App() {
return (
Expand All @@ -14,7 +13,6 @@ function App() {
<Route path="/login" element={<LoginPage />} />
<Route path="/battle" element={<BattlePage />} />
<Route path="/workspace" element={<WorkspacePage />} />
<Route path="/profile" element={<ProfilePage />} />
</Routes>
</Router>
);
Expand Down
67 changes: 32 additions & 35 deletions src/api/axiosConfig.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,37 @@
import axios from 'axios';
import {useUser} from "../context/UserContext.jsx";

const api = axios.create({
baseURL: '',
withCredentials: true,
headers: {
'Content-Type': 'application/json',
},
});


api.interceptors.response.use(
(response) => response,
async (error) => {
const originalRequest = error.config;
const {logout} = useUser();

if (error.response?.status === 401 && !originalRequest._retry) {
originalRequest._retry = true;

try {
const BASE_URL = 'http://localhost:8080';

await axios.post('/auth/refresh', {}, { withCredentials: true });


return api(originalRequest);
} catch (refreshError) {
logout();
console.error("Refresh token expired");
window.location.href = '/login';
return Promise.reject(refreshError);
const commonConfig = {
baseURL: BASE_URL,
withCredentials: true,
};

const attachInterceptors = (instance) => {
instance.interceptors.response.use(
(response) => response,
async (error) => {
const originalRequest = error.config;
if (error.response?.status === 401 && !originalRequest._retry) {
originalRequest._retry = true;
try {
await axios.post(`${BASE_URL}/auth/refresh`, {}, { withCredentials: true });
return instance(originalRequest);
} catch (refreshError) {
window.location.href = '/login';
return Promise.reject(refreshError);
}
}
return Promise.reject(error);
}

return Promise.reject(error);
}
);

export default api;
);
return instance;
};
export const api = attachInterceptors(axios.create({
...commonConfig,
headers: { 'Content-Type': 'application/json' }
}));

export const multipartApi = attachInterceptors(axios.create({
...commonConfig,
}));
21 changes: 5 additions & 16 deletions src/pages/LoginPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@ import Header from './components/layout/Header';
import './LoginPage.css';
import '../App.css';
import '../api/axiosConfig.js';
import api from "../api/axiosConfig.js";
import {useUser} from "../context/UserContext.jsx";
import {api} from "../api/axiosConfig.js";

export function LoginPage() {
export default function LoginPage() {
const [view, setView] = useState('login');

const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
const [nickname, setNickname] = useState('');
const [isLoading, setIsLoading] = useState(false);
const navigate = useNavigate();
const {login} = useUser();

const handleResetToLogin = () => {
setView('login');
};
Expand All @@ -32,22 +31,12 @@ export function LoginPage() {
)

const data = await response.data;

const responseIcon = await api.get(
'/user/icon-url'
)
const dataIcon = responseIcon.data;

data.iconUrl = dataIcon;

alert("Успешный вход для пользователя " + data.nickname);
login(data);
navigate("/battle");


} catch (error) {
console.log(error);
alert("Ошибка авторизации: " + error.response.data.message);
alert ("Ошибка авторизации: " + error.response.data.message);
} finally {
setIsLoading(false);
}
Expand All @@ -69,7 +58,7 @@ export function LoginPage() {
alert("Успешная регистрация для " + data.nickname);
setView("login");
} catch (error) {
alert("Ошибка регистрации: " + error.response.data.message);
alert ("Ошибка регистрации: " + error.response.data.message);
} finally {
setIsLoading(false);
}
Expand Down
18 changes: 10 additions & 8 deletions src/pages/LoginPage.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {render, screen, waitFor, within} from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { BrowserRouter } from 'react-router-dom';
import {LoginPage} from './LoginPage';
import api from '../api/axiosConfig';
import LoginPage from './LoginPage';
import {api} from '../api/axiosConfig';
import * as UserContext from '../context/UserContext.jsx';


Expand All @@ -18,10 +18,15 @@ vi.mock('react-router-dom', async () => {


vi.mock('../api/axiosConfig', () => ({
default: {
api: {
post: vi.fn(),
get: vi.fn()
get: vi.fn(),
put: vi.fn(),
delete: vi.fn(),
},
multipartApi: {
post: vi.fn(),
}
}));

describe('LoginPage', () => {
Expand Down Expand Up @@ -53,10 +58,7 @@ describe('LoginPage', () => {
it('успешный логин вызывает API и перенаправляет на /battle', async () => {
const user = userEvent.setup();
api.post.mockResolvedValueOnce({ data: { nickname: 'Tester' } });
api.get.mockResolvedValue({
status: 200,
data: { url: 'http://example.com/icon.png' }
});

renderComponent();


Expand Down
70 changes: 0 additions & 70 deletions src/pages/ProfilePage.css

This file was deleted.

Loading
Loading