Compare commits
No commits in common. "Develop" and "master" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -27,5 +27,4 @@ bin/
|
||||
*.cache
|
||||
*.csproj.user
|
||||
|
||||
.vs/
|
||||
/Address Directory/Persistence/Migrations
|
||||
.vs/
|
||||
@ -1,11 +1,7 @@
|
||||
using Domain.Entities;
|
||||
|
||||
namespace Contracts
|
||||
namespace Contracts
|
||||
{
|
||||
public record StreetDto(Guid Id, string Name, List<int>? HouseNumbers,
|
||||
int Index, int OkatoCode, int TaxCode, Guid CityId,
|
||||
string CityName
|
||||
);
|
||||
int Index, int OkatoCode, int TaxCode, Guid CityId);
|
||||
public record StreetDtoForCreate(string Name, List<int>? HouseNumbers,
|
||||
int Index, int OkatoCode, int TaxCode, Guid CityId);
|
||||
public record StreetDtoForUpdate(string Name, List<int>? HouseNumbers,
|
||||
|
||||
@ -11,5 +11,6 @@
|
||||
|
||||
public Guid CityId { get; set; }
|
||||
public City City { get; set; } = null!;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,8 +9,5 @@ namespace Domain.Repository
|
||||
Task AddAsync(Street street);
|
||||
Task UpdateAsync(Street street);
|
||||
Task DeleteAsync(Street street);
|
||||
|
||||
//Фичи
|
||||
Task<List<Street>> SearchAsync(string query);
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,14 +36,7 @@ namespace Persistence.Repositories
|
||||
.Include(s => s.City)
|
||||
.FirstOrDefaultAsync(s => s.Id == id);
|
||||
}
|
||||
public async Task<List<Street>> SearchAsync(string query)
|
||||
{
|
||||
return await _dbContext.Streets
|
||||
.Include(s => s.City)
|
||||
.Where(s => s.Name.Contains(query))
|
||||
.OrderBy(s => s.Name)
|
||||
.ToListAsync();
|
||||
}
|
||||
|
||||
public async Task UpdateAsync(Street street)
|
||||
{
|
||||
_dbContext.Streets.Update(street);
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using Contracts;
|
||||
using Domain.Entities;
|
||||
|
||||
namespace Services.Abstractions
|
||||
{
|
||||
@ -10,8 +9,5 @@ namespace Services.Abstractions
|
||||
Task<StreetDto> CreateAsync(StreetDtoForCreate streetDto);
|
||||
Task UpdateAsync(Guid streetId, StreetDtoForUpdate street);
|
||||
Task DeleteAsync(Guid streetId);
|
||||
|
||||
//Фичи
|
||||
Task<List<StreetDto>> SearchAsync(string query);
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,9 +16,7 @@ namespace Services.Profiles
|
||||
CreateMap<City, CityDtoForCreate>().ReverseMap();
|
||||
CreateMap<City, CityDtoForUpdate>().ReverseMap();
|
||||
|
||||
CreateMap<Street, StreetDto>()
|
||||
.ForMember(dest => dest.CityName, opt => opt.MapFrom(src => src.City.Name))
|
||||
.ReverseMap();
|
||||
CreateMap<Street, StreetDto>().ReverseMap();
|
||||
CreateMap<Street, StreetDtoForCreate>().ReverseMap();
|
||||
CreateMap<Street, StreetDtoForUpdate>().ReverseMap();
|
||||
}
|
||||
|
||||
@ -69,15 +69,5 @@ namespace Services
|
||||
|
||||
await _streetRepository.UpdateAsync(street);
|
||||
}
|
||||
|
||||
public async Task<List<StreetDto>> SearchAsync(string query)
|
||||
{
|
||||
if (query == null)
|
||||
{
|
||||
throw new KeyNotFoundException("Query cannot be empty");
|
||||
}
|
||||
var streets = await _streetRepository.SearchAsync(query);
|
||||
return _mapper.Map<List<StreetDto>>(streets);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,8 +16,8 @@ namespace Web.Controllers
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetAllAsync()
|
||||
{
|
||||
var steets = await _streetService.GetAllAsync();
|
||||
return Ok(steets);
|
||||
var cities = await _streetService.GetAllAsync();
|
||||
return Ok(cities);
|
||||
}
|
||||
[HttpGet("{id:guid}")]
|
||||
public async Task<IActionResult> GetByIdAsync(Guid id)
|
||||
@ -73,13 +73,5 @@ namespace Web.Controllers
|
||||
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
|
||||
[HttpGet("search")]
|
||||
public async Task<IActionResult> SearchStreet([FromQuery] string query)
|
||||
{
|
||||
var streets = await _streetService.SearchAsync(query);
|
||||
return Ok(streets);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,17 +16,6 @@ builder.Services.AddControllers();
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
// Íàñòðîéêà CORS
|
||||
builder.Services.AddCors(options =>
|
||||
{
|
||||
options.AddPolicy("AllowFrontend",
|
||||
policy =>
|
||||
{
|
||||
policy.WithOrigins("http://localhost:3000")
|
||||
.AllowAnyHeader()
|
||||
.AllowAnyMethod();
|
||||
});
|
||||
});
|
||||
|
||||
builder.Services.AddScoped<IRegionService, RegionService>();
|
||||
builder.Services.AddScoped<ICityService, CityService>();
|
||||
@ -43,7 +32,6 @@ builder.Services.AddDbContext<RepositoryDbContext>(
|
||||
});
|
||||
|
||||
builder.Services.AddAutoMapper(typeof(MappingProfile));
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
if (app.Environment.IsDevelopment())
|
||||
@ -51,12 +39,7 @@ if (app.Environment.IsDevelopment())
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
// Ðàçðåøàåì CORS äëÿ ôðîíòåíäà
|
||||
app.UseCors("AllowFrontend");
|
||||
|
||||
app.UseAuthorization();
|
||||
app.MapControllers();
|
||||
app.Run();
|
||||
app.Run();
|
||||
|
||||
23
Address Directory/frontend/.gitignore
vendored
23
Address Directory/frontend/.gitignore
vendored
@ -1,23 +0,0 @@
|
||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
||||
|
||||
# dependencies
|
||||
/node_modules
|
||||
/.pnp
|
||||
.pnp.js
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
# production
|
||||
/build
|
||||
|
||||
# misc
|
||||
.DS_Store
|
||||
.env.local
|
||||
.env.development.local
|
||||
.env.test.local
|
||||
.env.production.local
|
||||
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
@ -1,70 +0,0 @@
|
||||
# Getting Started with Create React App
|
||||
|
||||
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
|
||||
|
||||
## Available Scripts
|
||||
|
||||
In the project directory, you can run:
|
||||
|
||||
### `npm start`
|
||||
|
||||
Runs the app in the development mode.\
|
||||
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
|
||||
|
||||
The page will reload when you make changes.\
|
||||
You may also see any lint errors in the console.
|
||||
|
||||
### `npm test`
|
||||
|
||||
Launches the test runner in the interactive watch mode.\
|
||||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
|
||||
|
||||
### `npm run build`
|
||||
|
||||
Builds the app for production to the `build` folder.\
|
||||
It correctly bundles React in production mode and optimizes the build for the best performance.
|
||||
|
||||
The build is minified and the filenames include the hashes.\
|
||||
Your app is ready to be deployed!
|
||||
|
||||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
|
||||
|
||||
### `npm run eject`
|
||||
|
||||
**Note: this is a one-way operation. Once you `eject`, you can't go back!**
|
||||
|
||||
If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
|
||||
|
||||
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
|
||||
|
||||
You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
|
||||
|
||||
## Learn More
|
||||
|
||||
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
|
||||
|
||||
To learn React, check out the [React documentation](https://reactjs.org/).
|
||||
|
||||
### Code Splitting
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
|
||||
|
||||
### Analyzing the Bundle Size
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
|
||||
|
||||
### Making a Progressive Web App
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
|
||||
|
||||
### Advanced Configuration
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
|
||||
|
||||
### Deployment
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
|
||||
|
||||
### `npm run build` fails to minify
|
||||
|
||||
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
|
||||
17262
Address Directory/frontend/package-lock.json
generated
17262
Address Directory/frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,37 +0,0 @@
|
||||
{
|
||||
"name": "frontend",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"bootstrap": "^5.3.3",
|
||||
"cra-template": "1.2.0",
|
||||
"react": "^18.0.0",
|
||||
"react-dom": "^18.0.0",
|
||||
"react-scripts": "5.0.1",
|
||||
"web-vitals": "^4.2.4"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"test": "react-scripts test",
|
||||
"eject": "react-scripts eject"
|
||||
},
|
||||
"eslintConfig": {
|
||||
"extends": [
|
||||
"react-app",
|
||||
"react-app/jest"
|
||||
]
|
||||
},
|
||||
"browserslist": {
|
||||
"production": [
|
||||
">0.2%",
|
||||
"not dead",
|
||||
"not op_mini all"
|
||||
],
|
||||
"development": [
|
||||
"last 1 chrome version",
|
||||
"last 1 firefox version",
|
||||
"last 1 safari version"
|
||||
]
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
@ -1,43 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="theme-color" content="#000000" />
|
||||
<meta
|
||||
name="description"
|
||||
content="Web site created using create-react-app"
|
||||
/>
|
||||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
|
||||
<!--
|
||||
manifest.json provides metadata used when your web app is installed on a
|
||||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
|
||||
-->
|
||||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
|
||||
<!--
|
||||
Notice the use of %PUBLIC_URL% in the tags above.
|
||||
It will be replaced with the URL of the `public` folder during the build.
|
||||
Only files inside the `public` folder can be referenced from the HTML.
|
||||
|
||||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
|
||||
work correctly both with client-side routing and a non-root public URL.
|
||||
Learn how to configure a non-root public URL by running `npm run build`.
|
||||
-->
|
||||
<title>React App</title>
|
||||
</head>
|
||||
<body>
|
||||
<noscript>You need to enable JavaScript to run this app.</noscript>
|
||||
<div id="root"></div>
|
||||
<!--
|
||||
This HTML file is a template.
|
||||
If you open it directly in the browser, you will see an empty page.
|
||||
|
||||
You can add webfonts, meta tags, or analytics to this file.
|
||||
The build step will place the bundled scripts into the <body> tag.
|
||||
|
||||
To begin the development, run `npm start` or `yarn start`.
|
||||
To create a production bundle, use `npm run build` or `yarn build`.
|
||||
-->
|
||||
</body>
|
||||
</html>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.4 KiB |
@ -1,25 +0,0 @@
|
||||
{
|
||||
"short_name": "React App",
|
||||
"name": "Create React App Sample",
|
||||
"icons": [
|
||||
{
|
||||
"src": "favicon.ico",
|
||||
"sizes": "64x64 32x32 24x24 16x16",
|
||||
"type": "image/x-icon"
|
||||
},
|
||||
{
|
||||
"src": "logo192.png",
|
||||
"type": "image/png",
|
||||
"sizes": "192x192"
|
||||
},
|
||||
{
|
||||
"src": "logo512.png",
|
||||
"type": "image/png",
|
||||
"sizes": "512x512"
|
||||
}
|
||||
],
|
||||
"start_url": ".",
|
||||
"display": "standalone",
|
||||
"theme_color": "#000000",
|
||||
"background_color": "#ffffff"
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
# https://www.robotstxt.org/robotstxt.html
|
||||
User-agent: *
|
||||
Disallow:
|
||||
@ -1,38 +0,0 @@
|
||||
.App {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.App-logo {
|
||||
height: 40vmin;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
.App-logo {
|
||||
animation: App-logo-spin infinite 20s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.App-header {
|
||||
background-color: #282c34;
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: calc(10px + 2vmin);
|
||||
color: white;
|
||||
}
|
||||
|
||||
.App-link {
|
||||
color: #61dafb;
|
||||
}
|
||||
|
||||
@keyframes App-logo-spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
import './App.css';
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
import SearchStreet from './common/SearchBar.jsx';
|
||||
import StreetTable from './common/StreetTable.jsx'
|
||||
|
||||
function App() {
|
||||
return (
|
||||
<div className="App">
|
||||
{/* <MyButton /> */}
|
||||
<SearchStreet />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
@ -1,8 +0,0 @@
|
||||
import { render, screen } from '@testing-library/react';
|
||||
import App from './App';
|
||||
|
||||
test('renders learn react link', () => {
|
||||
render(<App />);
|
||||
const linkElement = screen.getByText(/learn react/i);
|
||||
expect(linkElement).toBeInTheDocument();
|
||||
});
|
||||
@ -1,10 +0,0 @@
|
||||
const API_BASE_URL = "https://localhost:7184/api/";
|
||||
|
||||
export async function fetchStreets () {
|
||||
const response = await fetch(API_BASE_URL + "streets");
|
||||
return await response.json();
|
||||
};
|
||||
export async function searchStreet(name) {
|
||||
const response = await fetch(`${API_BASE_URL}streets/search?query=${name}`);
|
||||
return await response.json();
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
import React, { useState } from 'react';
|
||||
import { fetchStreets } from '../api';
|
||||
|
||||
const MyButton = () => {
|
||||
const [streets, setStreets] = useState([]);
|
||||
const [error, setError] = useState(null);
|
||||
|
||||
const handleClick = async () => {
|
||||
try {
|
||||
const streetsData = await fetchStreets();
|
||||
setStreets(streetsData);
|
||||
setError(null);
|
||||
} catch (error) {
|
||||
setError('Ошибка при получении улиц');
|
||||
setStreets([]);
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div>
|
||||
<button className="btn btn-primary" onClick={handleClick}>
|
||||
Получить улицы
|
||||
</button>
|
||||
|
||||
{streets.length > 0 && (
|
||||
<ul className="mt-3">
|
||||
{streets.map((street, index) => (
|
||||
<li key={index}>
|
||||
<strong>{street.name}</strong>
|
||||
<div>Домовые номера: {street.houseNumbers.join(', ')}</div>
|
||||
<div>Индекс: {street.index}</div>
|
||||
<div>Код ОКАТО: {street.okatoCode}</div>
|
||||
<div>Налоговый код: {street.taxCode}</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default MyButton;
|
||||
@ -1,81 +0,0 @@
|
||||
import React, { useState } from 'react';
|
||||
import './styles.css';
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
import { searchStreet } from '../api';
|
||||
import SearchResults from './SearchResults';
|
||||
|
||||
const SearchBar = () => {
|
||||
const [query, setQuery] = useState(''); // Поисковый запрос
|
||||
const [results, setResults] = useState([]); // Результаты поиска
|
||||
const [selectedStreet, setSelectedStreet] = useState(null); // Выбранная улица
|
||||
const [error, setError] = useState(''); // Сообщение об ошибке
|
||||
|
||||
const handleInputChange = (e) => {
|
||||
const value = e.target.value;
|
||||
|
||||
// Проверка на наличие цифр
|
||||
if (/\d/.test(value)) {
|
||||
setError('Ввод цифр запрещен. Пожалуйста, введите название улицы.');
|
||||
} else {
|
||||
setError('');
|
||||
}
|
||||
|
||||
setQuery(value);
|
||||
};
|
||||
|
||||
const handleSearch = async (e) => {
|
||||
e.preventDefault();
|
||||
|
||||
// Проверка перед выполнением поиска
|
||||
if (error) {
|
||||
alert('Исправьте ошибки перед поиском.');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const data = await searchStreet(query);
|
||||
setResults(data);
|
||||
setSelectedStreet(null);
|
||||
} catch (err) {
|
||||
setError('Ошибка поиска. Попробуйте снова.');
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="center-container">
|
||||
<form className="form-container d-flex mb-4" onSubmit={handleSearch}>
|
||||
<input
|
||||
type="text"
|
||||
className={`form-control ${error ? 'is-invalid' : ''}`}
|
||||
placeholder="Введите название улицы"
|
||||
value={query}
|
||||
onChange={handleInputChange}
|
||||
aria-label="Search"
|
||||
/>
|
||||
<button className="btn btn-outline-success" type="submit" disabled={!!error}>
|
||||
Поиск
|
||||
</button>
|
||||
</form>
|
||||
|
||||
{/* Вывод сообщения об ошибке */}
|
||||
{error && <div className="invalid-feedback d-block">{error}</div>}
|
||||
|
||||
{selectedStreet ? (
|
||||
<div className="table-container">
|
||||
<h2>Информация об адресе</h2>
|
||||
<SearchResults
|
||||
selectedStreet={selectedStreet}
|
||||
onBack={() => setSelectedStreet(null)}
|
||||
/>
|
||||
</div>
|
||||
) : (
|
||||
<SearchResults
|
||||
results={results}
|
||||
onSelect={(street) => setSelectedStreet(street)}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default SearchBar;
|
||||
@ -1,61 +0,0 @@
|
||||
import React from 'react';
|
||||
import 'bootstrap/dist/css/bootstrap.min.css';
|
||||
|
||||
const SearchResults = ({ results = [], onSelect, selectedStreet, onBack }) => {
|
||||
if (selectedStreet) {
|
||||
return (
|
||||
<div>
|
||||
<table className="table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Город</th>
|
||||
<th>Название улицы</th>
|
||||
<th>Код ОКАТО</th>
|
||||
<th>Почтовый индекс</th>
|
||||
<th>Код налоговой</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>{selectedStreet.cityName }</td>
|
||||
<td>{selectedStreet.name}</td>
|
||||
<td>{selectedStreet.okatoCode }</td>
|
||||
<td>{selectedStreet.index }</td>
|
||||
<td>{selectedStreet.taxCode}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<button
|
||||
className="btn btn-secondary mt-3"
|
||||
onClick={onBack}
|
||||
>
|
||||
Назад к списку
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
if (!results.length) {
|
||||
return <p>Улицы не найдены</p>;
|
||||
}
|
||||
|
||||
return (
|
||||
<ul className="list-group">
|
||||
{results.map((street, index) => (
|
||||
<li key={index} className="list-group-item d-flex justify-content-between align-items-center">
|
||||
<span>
|
||||
Город: {street.cityName || 'Не указано'} ул. {street.name}
|
||||
</span>
|
||||
<button
|
||||
className="btn btn-primary"
|
||||
onClick={() => onSelect(street)} // Выбрать улицу
|
||||
>
|
||||
Выбрать
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
);
|
||||
};
|
||||
|
||||
export default SearchResults;
|
||||
@ -1,64 +0,0 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { fetchStreets } from '../api';
|
||||
import './styles.css';
|
||||
|
||||
const StreetTable = () => {
|
||||
const [streets, setStreets] = useState([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState(null);
|
||||
|
||||
const loadStreets = async () => {
|
||||
try {
|
||||
const data = await fetchStreets();
|
||||
setStreets(data);
|
||||
} catch (err) {
|
||||
setError(err.message);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
loadStreets();
|
||||
}, []);
|
||||
|
||||
if (loading) {
|
||||
return <p>Загрузка данных...</p>;
|
||||
}
|
||||
|
||||
if (error) {
|
||||
return <p>{error}</p>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="table-container">
|
||||
<h2>Список улиц</h2>
|
||||
<table className="table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Город</th>
|
||||
<th>Название улицы</th>
|
||||
<th>Код ОКАТО</th>
|
||||
<th>Почтовый индекс</th>
|
||||
<th>Код налоговой</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{streets.map((street, index) => (
|
||||
<tr key={street.id}>
|
||||
<td>{index + 1}</td>
|
||||
<td>{street.cityName}</td>
|
||||
<td>{street.name}</td>
|
||||
<td>{street.okatoCode}</td>
|
||||
<td>{street.index}</td>
|
||||
<td>{street.taxCode}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default StreetTable;
|
||||
@ -1,13 +0,0 @@
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
||||
sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
|
||||
monospace;
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import './index.css';
|
||||
import App from './App';
|
||||
import reportWebVitals from './reportWebVitals';
|
||||
|
||||
const root = ReactDOM.createRoot(document.getElementById('root'));
|
||||
root.render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
);
|
||||
|
||||
// If you want to start measuring performance in your app, pass a function
|
||||
// to log results (for example: reportWebVitals(console.log))
|
||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
||||
reportWebVitals();
|
||||
@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 2.6 KiB |
@ -1,13 +0,0 @@
|
||||
const reportWebVitals = onPerfEntry => {
|
||||
if (onPerfEntry && onPerfEntry instanceof Function) {
|
||||
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
|
||||
getCLS(onPerfEntry);
|
||||
getFID(onPerfEntry);
|
||||
getFCP(onPerfEntry);
|
||||
getLCP(onPerfEntry);
|
||||
getTTFB(onPerfEntry);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
export default reportWebVitals;
|
||||
@ -1,5 +0,0 @@
|
||||
// jest-dom adds custom jest matchers for asserting on DOM nodes.
|
||||
// allows you to do things like:
|
||||
// expect(element).toHaveTextContent(/react/i)
|
||||
// learn more: https://github.com/testing-library/jest-dom
|
||||
import '@testing-library/jest-dom';
|
||||
Loading…
x
Reference in New Issue
Block a user