Skip to content

Commit 55e0228

Browse files
RoaochRoaoch
authored
Merge pull request #5 from Eternal-Encoders/release
Release
2 parents 39b6358 + af0077e commit 55e0228

File tree

150 files changed

+3223
-1427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+3223
-1427
lines changed

‎.eslintrc.cjs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.stylelintrc.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{ "extends": ["stylelint-config-standard"],
2+
"rules": {
3+
"selector-class-pattern": null,
4+
"block-no-empty": null
5+
}
6+
}

‎eslint.config.js‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import pluginJs from '@eslint/js';
2+
import pluginReact from 'eslint-plugin-react';
3+
import globals from 'globals';
4+
import tseslint from 'typescript-eslint';
5+
6+
7+
export default [
8+
pluginJs.configs.recommended,
9+
...tseslint.configs.recommended,
10+
pluginReact.configs.flat.recommended,
11+
{
12+
files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'],
13+
settings: {
14+
react: {
15+
version: 'detect',
16+
},
17+
},
18+
languageOptions: {
19+
parserOptions: {
20+
ecmaFeatures: {
21+
jsx: true,
22+
},
23+
ecmaVersion: 'latest',
24+
sourceType: 'module',
25+
globals: globals.browser
26+
},
27+
},
28+
rules: {
29+
'indent': [2, 4],
30+
'quotes': [2, 'single', { avoidEscape: true }],
31+
'linebreak-style': 'off',
32+
'max-len': ['error', { code: 120, ignoreComments: true }],
33+
'import/no-unresolved': 'off',
34+
'import/extensions': 'off',
35+
'import/prefer-default-export': 'off',
36+
'no-multiple-empty-lines': [2, { max: 2 }],
37+
'no-shadow': 'off',
38+
'no-underscore-dangle': 'off',
39+
'no-unused-vars': 'off',
40+
'no-console': 'off',
41+
'react/react-in-jsx-scope': 'off',
42+
'@typescript-eslint/no-unused-vars': ['warn', {
43+
'argsIgnorePattern': '^_',
44+
'varsIgnorePattern': '^_',
45+
'caughtErrorsIgnorePattern': '^_'
46+
}]
47+
},
48+
},
49+
];

‎package.json‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,25 @@
44
"version": "0.0.0",
55
"type": "module",
66
"scripts": {
7-
"dev": "vite",
7+
"dev": "vite --mode development",
88
"build": "tsc && vite build",
99
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
10+
"lint:ts": "eslint \"**/*.{ts,tsx}\"",
11+
"lint:ts:fix": "eslint \"**/*.{ts,tsx}\" --fix",
12+
"lint:scss": "npx stylelint \"**/*.scss\"",
13+
"lint:scss:fix": "npx stylelint \"**/*.scss\" --fix",
1014
"preview": "vite preview"
1115
},
1216
"dependencies": {
1317
"@pbe/react-yandex-maps": "^1.2.4",
1418
"@reduxjs/toolkit": "^2.2.6",
1519
"axios": "^1.7.2",
20+
"i18next": "^23.15.1",
1621
"konva": "^9.3.13",
1722
"react": "^18.2.0",
1823
"react-dom": "^18.2.0",
1924
"react-helmet-async": "^2.0.5",
25+
"react-i18next": "^15.0.1",
2026
"react-konva": "^18.2.10",
2127
"react-redux": "^9.1.2",
2228
"react-router-dom": "^6.24.1",
@@ -26,17 +32,26 @@
2632
"vite-tsconfig-paths": "^4.3.1"
2733
},
2834
"devDependencies": {
35+
"@eslint/js": "^9.10.0",
2936
"@types/node": "^20.14.10",
30-
"@types/react": "^18.3.3",
37+
"@types/react": "^18.3.6",
3138
"@types/react-dom": "^18.2.7",
3239
"@types/react-helmet": "^6.1.6",
3340
"@typescript-eslint/eslint-plugin": "^7.15.0",
3441
"@typescript-eslint/parser": "^7.15.0",
3542
"@vitejs/plugin-react-swc": "^3.7.0",
36-
"eslint": "^9.6.0",
43+
"eslint": "^9.10.0",
44+
"eslint-plugin-react": "^7.36.1",
3745
"eslint-plugin-react-hooks": "^4.6.0",
3846
"eslint-plugin-react-refresh": "^0.4.7",
47+
"globals": "^15.9.0",
48+
"i18next-browser-languagedetector": "^8.0.0",
49+
"i18next-http-backend": "^2.6.1",
50+
"sass": "^1.78.0",
51+
"stylelint": "^16.9.0",
52+
"stylelint-config-standard": "^36.0.1",
3953
"typescript": "^5.5.3",
54+
"typescript-eslint": "^8.6.0",
4055
"vite": "^5.3.3"
4156
}
4257
}

‎public/locales/en/translation.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Wait": "Wait...",
3+
"To": "To",
4+
"From": "From",
5+
"SearchForAudiencesAndPlaces": "Search for audiences and places",
6+
"Language": "Language",
7+
"Settings": "Settings",
8+
"AreYouHavingAnyProblemsWithOurSite": "Are you having any problems with our site? Want to leave a comment or ask a question? Fill out this form!",
9+
"FeedbackForm": "Feedback form",
10+
"PersonalDataProcessingPolicyAndPrivacyPolicy": "Personal Data Processing Policy and Privacy Policy",
11+
"Contacts": "Contacts",
12+
"WC (W)": "WC (W)",
13+
"WC (M)": "WC (M)",
14+
"Cafe": "Cafe",
15+
"Vending Machine": "Vending Machine",
16+
"Coworking": "Coworking",
17+
"ATM": "ATM",
18+
"Cloakroom": "Cloakroom",
19+
"Public Printer": "Public Printer",
20+
"Head Office": "Head Office",
21+
"Student Union": "Student Union",
22+
"Canteen": "Canteen",
23+
"QuickSearch": "Quick search"
24+
}

‎public/locales/ru/translation.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"Wait": "Подождите...",
3+
"To": "Куда",
4+
"From": "От",
5+
"SearchForAudiencesAndPlaces": "Поиск аудиторий и мест",
6+
"Language": "Язык",
7+
"Settings": "Настройки",
8+
"AreYouHavingAnyProblemsWithOurSite": "У вас возникли проблемы? Хотите оставить комментарий или задать вопрос? Заполните форму.",
9+
"FeedbackForm": "Форма обратной связи",
10+
"PersonalDataProcessingPolicyAndPrivacyPolicy": "Политика обработки персональных данных и Политика конфиденциальности",
11+
"Contacts": "Контакты",
12+
"WC (W)": "Санузел (Ж)",
13+
"WC (M)": "Санузел (М)",
14+
"Cafe": "Кафе",
15+
"Vending Machine": "Вендинг",
16+
"Coworking": "Коворкинг",
17+
"ATM": "Банкомат",
18+
"Cloakroom": "Гардероб",
19+
"Public Printer": "Печать",
20+
"Head Office": "Деканат",
21+
"Student Union": "Союз студентов",
22+
"Canteen": "Столовая",
23+
"QuickSearch": "Быстрый поиск"
24+
}

‎src/App.tsx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import './normalize.css';
2-
import "./style.css";
2+
import './style.css';
33

4-
import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom";
5-
import { HelmetProvider } from "react-helmet-async";
4+
import { HelmetProvider } from 'react-helmet-async';
5+
import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
66

77
import HomePage from './pages/home-page/HomePage';
88
import InstitutesPage from './pages/institutes-page/InstitutesPage';
99

1010
function App() {
11-
return (
12-
<HelmetProvider>
13-
<BrowserRouter>
14-
<Routes>
15-
<Route path='/' element={<HomePage />}></Route>
16-
<Route
17-
path='/institute/:intstName'
18-
element={<InstitutesPage />}
19-
/>
20-
<Route path="*" element={<Navigate to={"/"} />} />
21-
</Routes>
22-
</BrowserRouter>
23-
</HelmetProvider>
24-
);
11+
return (
12+
<HelmetProvider>
13+
<BrowserRouter>
14+
<Routes>
15+
<Route path='/' element={<HomePage />}></Route>
16+
<Route
17+
path='/institute/:intstName'
18+
element={<InstitutesPage />}
19+
/>
20+
<Route path="*" element={<Navigate to={'/'} />} />
21+
</Routes>
22+
</BrowserRouter>
23+
</HelmetProvider>
24+
);
2525
}
2626

2727
export default App;

‎src/components/konva-components/audience-icon.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import React, { useEffect, useState } from "react";
2-
import { Image } from "react-konva";
3-
import useImage from "use-image";
4-
import nullSvg from "./img/null.svg";
1+
import React, { useEffect, useState } from 'react';
2+
import { Image } from 'react-konva';
3+
import useImage from 'use-image';
4+
import nullSvg from './img/null.svg';
55

66
interface AudienceIconProps {
77
imgName: string,

‎src/components/konva-components/audience-text.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import React from "react";
2-
import { Text } from "react-konva";
1+
import React from 'react';
2+
import { Text } from 'react-konva';
33

44
interface AudienceTextProps {
55
x: number,
66
y: number,
77
text: string,
8-
alignX: "LEFT" | "CENTER" | "RIGHT" | "JUSTIFIED" | undefined,
9-
alignY: "CENTER" | "TOP" | "BOTTOM" | undefined
8+
alignX: 'LEFT' | 'CENTER' | 'RIGHT' | 'JUSTIFIED' | undefined,
9+
alignY: 'CENTER' | 'TOP' | 'BOTTOM' | undefined
1010
}
1111

1212
function AudienceText({text, x, y, alignX, alignY}: AudienceTextProps) {

‎src/components/konva-components/audience.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React from "react";
2-
import { Rect, Group } from "react-konva";
1+
import React from 'react';
2+
import { Group, Rect } from 'react-konva';
33

44
interface AudienceProps {
55
x: number,
@@ -25,8 +25,8 @@ function Audience({
2525
<Rect
2626
width={width}
2727
height={height}
28-
fill={fill ? fill: ""}
29-
stroke={stroke ? stroke: ""}
28+
fill={fill ? fill: ''}
29+
stroke={stroke ? stroke: ''}
3030
strokeWidth={stroke ? 5: 0}
3131
/>
3232
{children}

0 commit comments

Comments
 (0)