front/dev

2025-06-30 13:16:33 +05:00 · 2025-06-30 13:16:33 +05:00 · 3a5b0bdcbc
commit 3a5b0bdcbc
parent 6f7b821c8b
162 changed files with 15801 additions and 224 deletions
--- a/FRONT/BUILD/index.html
+++ b/FRONT/BUILD/index.html
@ -0,0 +1,13 @@
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>GoNets</title>
+    <link rel="icon" type="image/x-icon" href="/assets/icon-4fEsvohP.png" />
+    <script type="module" crossorigin src="/assets/index-QSWEVNb0.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-DWFkiel1.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
--- a/FRONT/BUILD/resources/app/src/api/request.ts
+++ b/FRONT/BUILD/resources/app/src/api/request.ts
@ -1,13 +1,13 @@
 import axios, { AxiosResponse } from "axios";

 const axiosWithoutCredentials = axios.create({
-  baseURL: `http://localhost:8001`,
+  baseURL: `https://localhost:8001`,
 })

 export class NetworkService {
  static createAxiosInstance(ipAddress: string) {
    return axios.create({
-      baseURL: `http://${ipAddress}:8001`,
+      baseURL: `https://${ipAddress}:8001`,
    });
  }

--- a/FRONT/BUILD/resources/app/src/components/UI/Dropdown/DeviceCard.tsx
+++ b/FRONT/BUILD/resources/app/src/components/UI/Dropdown/DeviceCard.tsx
@ -100,7 +100,7 @@ const DeviceCard: React.FC<DeviceCardProps> = ({ device, status }) => {
            <CardContent isExpanded={isExpanded}>
                <InfoRow>
                    <Label>Имя:</Label>
-                    <Value>{device.hostname || device.ip}</Value>
+                    <Value>{device.hostname || 'Неизвестно'}</Value>
                </InfoRow>

                <InfoRow>
--- a/FRONT/BUILD/resources/app/src/components/UI/Pagination.tsx
+++ b/FRONT/BUILD/resources/app/src/components/UI/Pagination.tsx
@ -1,65 +0,0 @@
-import React from 'react';
-import styled from "styled-components";
-import {buttonNames} from "../../const/buttons/names";
-import {IconComponent} from "../../const/buttons/icons";
-
-const PaginateWrapper = styled.div`
-    width: 100%;
-    margin-top: 24px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    gap: 10px;
-`
-const Page = styled.button`
-    width: 36px;
-    height: 36px;
-    background: ${(props => props.theme.primary)};
-    color: ${(props => props.theme.textColor)};
-    border: 1px solid ${(props => props.theme.borderColor)};
-    font-size: 16px;
-    cursor: pointer;
-    border-radius: 4px;
-
-    transition: .4s ease;
-    &:hover {
-        background: ${(props => props.theme.background)};
-    }
-`
-
-interface PaginationProps {
-    currentPage: number;
-    totalPages: number;
-    onPrevPage: () => void;
-    onNextPage: () => void;
-}
-
-const Pagination = ({currentPage, totalPages, onPrevPage, onNextPage}: PaginationProps) => {
-    return (
-        <PaginateWrapper>
-            <Page
-                onClick={onPrevPage}
-                disabled={currentPage === 1}
-            >
-                <IconComponent
-                    width="20"
-                    height="20"
-                    name={buttonNames[17]}
-                />
-            </Page>
-
-            <Page
-                onClick={onNextPage}
-                disabled={currentPage === totalPages}
-            >
-                <IconComponent
-                    width="20"
-                    height="20"
-                    name={buttonNames[6]}
-                />
-            </Page>
-        </PaginateWrapper>
-    );
-};
-
-export default Pagination;
--- a/FRONT/BUILD/resources/app/src/components/UI/tables/TableScanner.tsx
+++ b/FRONT/BUILD/resources/app/src/components/UI/tables/TableScanner.tsx
@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React from 'react';
 import { DeviceUser } from '../../../store/useDeviceStore';

 interface TableScannerProps {
@ -9,19 +9,18 @@ import {IconComponent} from "../../../const/buttons/icons";
 import {buttonNames} from "../../../const/buttons/names";
 import {ModalMap} from "../../modalwindows/windowsType";
 import {useModalContext} from "../../../store";
-import Pagination from "../Pagination";

 const TableContainer = styled.div`
  width: 100%;
+  box-shadow: 0 4px 24px rgba(0, 0, 0, 0.08);
+  background: ${({ theme }) => theme.primary};
  margin: 24px 0;
 `;

 const StyledTable = styled.table`
-        width: 100%;
-    border-collapse: separate;
-    border-spacing: 0;
-    box-shadow: 0 4px 24px rgba(0, 0, 0, 0.08);
-    background: ${({ theme }) => theme.primary};
+  width: 100%;
+  border-collapse: separate;
+  border-spacing: 0;
 `;

 const TableHeaderCell = styled.th<{ sortable?: boolean }>`
@ -29,7 +28,7 @@ const TableHeaderCell = styled.th<{ sortable?: boolean }>`
  text-align: left;
  font-weight: 600;
  font-size: 14px;
-  color: ${({ theme }) => theme.textColor};
+  color: ${({ theme }) => theme.textSecondary};
  background: ${({ theme }) => theme.primary};
  border-bottom: 1px solid ${({ theme }) => theme.borderColor};
  transition: all 0.2s ease;
@ -48,11 +47,6 @@ const TableCell = styled.td`
  color: ${({ theme }) => theme.text};
  border-bottom: 1px solid ${({ theme }) => theme.borderColor};
  transition: all 0.2s ease;
-    button{
-        background-color: transparent;
-        border: none;
-        cursor: pointer;
-    }
 `;

 const StatusBadge = styled.span<{ status:string }>`
@ -74,23 +68,7 @@ const TableScanner = ({devices}:TableScannerProps) => {
        });
    };

-    // Пагинация
-    const [currentPage, setCurrentPage] = useState(1);
-    const [devicesPerPage] = useState(10);
-
-    const indexOfLastDevice = currentPage * devicesPerPage;
-    const indexOfFirstDevice = indexOfLastDevice - devicesPerPage;
-    const currentDevices = devices.slice(indexOfFirstDevice, indexOfLastDevice);
-    const totalPages = Math.ceil(devices.length / devicesPerPage);
-
-    const handlePrevPage = () => {
-        if(currentPage > 1) setCurrentPage(currentPage - 1);
-    }
-    const handleNextPage = () => {
-        if(currentPage < totalPages) setCurrentPage(currentPage + 1);
-    }
-
-    return (
+        return (
            <TableContainer>
                <StyledTable>
                    <thead>
@ -106,30 +84,24 @@ const TableScanner = ({devices}:TableScannerProps) => {
                        </tr>
                    </thead>
                    <tbody>
-                    {currentDevices.map((item, i) => (
+                    {devices.map((item, i) => (
                        <TableRow key={i}>
                            <TableCell><StatusBadge status={item.status}></StatusBadge></TableCell>
-                            <TableCell>{item.hostname || item.ip}</TableCell>
+                            <TableCell>{item.hostname || 'Неизвестен'}</TableCell>
                            <TableCell>{item.vendor}</TableCell>
                            <TableCell>{item.ip}</TableCell>
                            <TableCell>{item.open_ports.join(', ') || '-'}</TableCell>
                            <TableCell>{item.last_seen}</TableCell>
                            <TableCell>{item.note || '-'}</TableCell>
                            <TableCell>
-                                <button onClick={(e)=>openModalNote(e, item)}>
+                                <span onClick={(e)=>openModalNote(e, item)}>
                                    <IconComponent name={buttonNames[16]} width="26" height="26" />
-                                </button>
+                                </span>
                            </TableCell>
                        </TableRow>
                    ))}
                    </tbody>
                </StyledTable>
-                <Pagination
-                    currentPage={currentPage}
-                    totalPages={totalPages}
-                    onPrevPage={handlePrevPage}
-                    onNextPage={handleNextPage}
-                />
            </TableContainer>
        );
 };
--- a/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/about.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/about.tsx
@ -2,10 +2,8 @@
 import { MainButton } from "../../../UI/buttons/mainButton"
 import { workSpaceNames } from "../../../../const/workspace/names"
 import { useWorkSpaceStore } from "../../../../store"
-import styled, {useTheme} from "styled-components"
+import styled from "styled-components"
 import ThemeButton from "../../../UI/buttons/toggletheme"
-import {buttonNames} from "../../../../const/buttons/names";
-import {IconComponent} from "../../../../const/buttons/icons";

 type Props = {
    from: 'reg' | 'helloWindow' | 'workSpace'
@ -31,41 +29,23 @@ const Content = styled.div`
    justify-content: space-between;
    height: 100%;
    box-sizing: border-box;
-    padding: 40px 50px;
-    background: ${(props => props.theme.primary)};
+    padding: 25px 50px;
+    background: ${(props => props.theme.secondary)};
    border-radius: 18px;
-    position: relative;
 `

 const Listing = styled.div`
    display: flex;
    flex-direction: column;
-    background-color: ${(props => props.theme.secondary)};
-    border-radius: 10px;
-    padding: 24px 20px;
-    p{
-        font-weight: bold;
-        font-size: 24px;
-    }
+    gap: 15px;
+    
 `

-const List = styled.ul`
+const List = styled.div`
    display: flex;
    flex-direction: column;
-    margin: 10px 0;
-    padding: 0;
-    list-style-type: none;
-    font-size: 18px;
-    gap: 4px;
-    & li:before {
-        color: ${(props => props.theme.accent)};
-        content: "•";
-        font-size: 28px;
-        width: .8em;
-        display: inline-block;
-        position: relative;
-        top: 2px;
-    } 
+    gap: 15px;
+    margin-left: 10px;
 `

 const Title = styled.div`
@ -75,55 +55,43 @@ const Title = styled.div`
 const SubTitle = styled.div`
    display: flex;
    flex-direction: column;
-    gap: 24px;
-    background-color:rgba(255, 248, 225, 0.6);
-    border-left: #ff9800 solid 4px;
-    border-radius: 0 8px 8px 0;
-    padding: 20px 12px;
-    
-    a{
-        text-decoration: none;
-        color: ${(props => props.theme.errorColor)};
-        font-weight: 500;
-        font-size: 18px;
-        width: max-content;
-    }
+    gap: 10px;
+
    p{
        font-size: 18px;
-        color: ${(props=>props.theme.textColor)};
-    }
-    .icon{
-        width: 32px;
-        height: 32px;
-        fill: #ff9800;
    }
+
 `

 const Links = styled.div`
    display: flex;
-    justify-content: start;
+    flex-direction: column;
    gap: 20px;
 `

-const LinkBlock = styled.a`
-    text-decoration: none;
-    color: ${(props => props.theme.accent)};;
+const LinkColumn = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+`
+
+
+const LinkBlock = styled.div`
+    display: flex;
+    gap: 5px;
 `

 const Copyright = styled.div`
    width: 100%;
-    text-align: start;
-    color: ${(props => props.theme.offlineColor)};
+    text-align: center;
+    margin-top: 50px;
 `

 const ButtonContainer = styled.div`
-    position: absolute;
-    top: 12px;
-    right: 14px;
-`
-const AboutLine = styled.hr`
-    border: ${(props => props.theme.hoverBtn)} 1px solid;
    width: 100%;
+    display: flex;
+    justifi-content: flex-start;
+    align-items: center;
 `

 const MainTitle = styled.div`
@ -131,33 +99,24 @@ const MainTitle = styled.div`
    display: flex;
    gap: 15px;
    align-items: center;
-    justify-content: space-between;
-    padding-top: 10px;
+    justify-content: center;
+    padding-top: 50px;
    box-sizing: border-box;

    img{
-        width: 50px;
-        height: 50px;
-    }
-    .version{
-        text-wrap: nowrap;
-        background-color: ${(props => props.theme.hoverBtn)};
-        color: ${(props => props.theme.borderColor)};
-        border-radius: 20px;
-        font-size: 18px;
-        padding: 10px 18px;
-        line-height: 1;
-    }
-    .title{
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        gap: 24px;
+        width: 40px;
+        height: 40px;
    }
 `
+const Text = styled.div`
+    display: flex;
+    flex-direction: column;
+    gap: 30px;
+`

 export default function About({ from, onBack }: Props) {
    const { setWorkModule } = useWorkSpaceStore()
+
    const getBackHandler = () => {
        switch (from) {
            case 'reg':
@ -179,63 +138,68 @@ export default function About({ from, onBack }: Props) {
            <Content>

                <MainTitle>
-                    <div className={'title'}>
-                        <img src="./assets/images/gossys.png" alt="" />
-                        <div style={{width: '100%', display: "flex", justifyContent: 'center'}}><h1>О приложении</h1></div>
-                    </div>
-                    <p className={'version'}>v 0.0.3</p>
+                    <img src="./assets/images/gossys.png" alt="" />
+                    <div style={{width: '100%', display: "flex", justifyContent: 'center'}}><h1>О приложении</h1></div>
+                    
                </MainTitle>

-                <AboutLine/>

-                <Title>
-                    <p>ГоNets — минимально работоспособный кроссплатформенный продукт (MVP) для демонстрации нашего подхода к управлению настройками ПК в корпоративной среде.</p>
-                </Title>
+                <Text>

-                <Listing>
-                    <p>Возможности:</p>
-                    <List>
-                        <li>Визуализация активных сетевых ресурсов</li>
-                        <li>Настройка параметров локальных и удалённых сетевых ресурсов</li>
-                        <li>Управление взаимодействием ресурсов с Клиентом ГoNets</li>
-                    </List>
-                </Listing>
+                    <Title>
+                        <p>Приложение ГоNets является минимально работоспособным кроссплатформенным продуктом (MVP) для демонстрации нашего подхода к управлению настройками ПК в корпоративной среде.</p>
+                    </Title>

-                <SubTitle>
-                    <svg className="icon" viewBox="0 0 24 24">
-                        <path d="M12 2L1 21h22M12 6l7.53 13H4.47M11 10v4h2v-4m-2 6v2h2v-2"/>
-                    </svg>
-                    <p>Программное обеспечение исключительно для ознакомления и домашнего использования.</p>
-                    <a href={'https://gossys.dev/pages/projects/gonets'}>Перейти на ГоNets-PRO</a>
-                </SubTitle>

-                <Links>
-                    <LinkBlock href={'https://gossys.dev/pages/projects/gonets'}>
-                        Домашняя страницa
-                    </LinkBlock>
+                    <Listing>
+                        <p>Данное приложение умеет:</p>
+                        <List>
+                            <p>- Отображать в графическом виде активные сетевые ресурсы</p>
+                            <p>- Настраивать сетевые параметры локального и удаленных сетевых ресурсов</p>
+                            <p>- Отображать и изменять взаимодействие сетевых ресурсов с установленным Клиентом ГоNets</p>
+                        </List>
+                    </Listing>

-                    <LinkBlock href={'https://wiki.gossys.dev/ru/gonets'}>
-                        Документация
-                    </LinkBlock>
+                    <SubTitle>
+                        <p>Программное обеспечение исключительно для ознакомления и домашнего использования.</p>
+                        <p>Для коммерческого использования приобретите версию ГоNets-PRO (Подробная информация на странице продукта)</p>
+                    </SubTitle>

-                    <LinkBlock href={'https://wiki.gossys.dev/ru/lic/GosysPUB'}>
-                        Лицензия
-                    </LinkBlock>
-                </Links>
+                    <Links>
+                        <LinkBlock>
+                            <p>Ссылка на домашнюю страницу:</p>
+                            <a href="https://gossys.dev/pages/projects/gonets">https://gossys.dev/pages/projects/gonets</a>
+                        </LinkBlock>
+
+                        <LinkBlock>
+                            <p>Инструкции и информация:</p>
+                            <a href="https://wiki.gossys.dev/ru/gonets">https://wiki.gossys.dev/ru/gonets</a>
+                        </LinkBlock>
+
+                        <LinkColumn>
+                            <p>Распространяется под лицензией GosysPUB текущей версии.</p>
+                            <LinkBlock>
+                                <p>Полный текст актуальной лицензии:</p>
+                                <a href="https://wiki.gossys.dev/ru/lic/GosysPUB">https://wiki.gossys.dev/ru/lic/GosysPUB</a>
+                            </LinkBlock>
+                        </LinkColumn>
+
+                    </Links>
+
+                    <Copyright>
+                        <p>Разработано и поддерживается ООО «Гибридные Офисные Системы» 2024-2025 г. Все права защищены.</p>
+                    </Copyright>
+
+                </Text>

-                <Copyright>
-                    Разработано и поддерживается ООО «Гибридные Офисные Системы» 2024-2025 г. Все права защищены.
-                </Copyright>

                <ButtonContainer>
                    {showBackButton && backHandler && (
-                        <IconComponent
-                            width="36"
-                            height="36"
-                            name={buttonNames[12]}
+                        <MainButton
+                            title="Назад"
                            onClick={backHandler}
+                            style={{ marginRight: '10px' }}
                        />
-
                    )}

                    {from == 'reg' &&
--- a/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/usersScanner/modules/ListUsers.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/usersScanner/modules/ListUsers.tsx
@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import styled from 'styled-components';
 import DeviceCard from "../../../../../UI/Dropdown/DeviceCard";
 import {DeviceUser} from "../../../../../../store/useDeviceStore";
@ -28,15 +28,10 @@ const ListUsers = ({loading, handleScan, devices, scanInitiated}: ListUsersProps
    const activeDevices = devices.filter(device => device.status === 'online');
    const inactiveDevices = devices.filter(device => device.status !== 'online');

-    // Пагинация
-    const [currentPage, setCurrentPage] = useState(1);
-    const [devicesPerPage] = useState(10);
-
-
    return (
        <>
            <ScanBtn onClick={handleScan} disabled={loading}>
-                {devices.length > 0 ? 'Обновить список' : 'Сканировать узлы'}
+                {devices.length > 0 ? 'Обновить список' : 'Сканировать сеть'}
            </ScanBtn>

            {devices.length > 0 ? (
@ -47,7 +42,7 @@ const ListUsers = ({loading, handleScan, devices, scanInitiated}: ListUsersProps
                }}>
                    {/* Колонка активных устройств */}
                    <div style={{ flex: 1 }}>
-                        <h3 style={{ color: '#4CAF50', marginBottom:'12px' }}>Активные узлы ({activeDevices.length})</h3>
+                        <h3 style={{ color: '#4CAF50', marginBottom:'12px' }}>Активные устройства ({activeDevices.length})</h3>
                        {activeDevices.map((device, index) => (
                            <DeviceCard
                                key={index}
@ -58,7 +53,7 @@ const ListUsers = ({loading, handleScan, devices, scanInitiated}: ListUsersProps
                    </div>
                    {/* Колонка неактивных устройств */}
                    <div style={{ flex: 1 }}>
-                        <h3 style={{ color: '#ababab', marginBottom:'12px' }}>Неактивные узлы ({inactiveDevices.length})</h3>
+                        <h3 style={{ color: '#ababab', marginBottom:'12px' }}>Неактивные устройства ({inactiveDevices.length})</h3>
                        {inactiveDevices.map((device, index) => (
                            <DeviceCard
                                key={index}
@ -69,7 +64,7 @@ const ListUsers = ({loading, handleScan, devices, scanInitiated}: ListUsersProps
                    </div>
                </div>
            ) : scanInitiated ? (
-                <p style={{ marginTop: '20px' }}>Узлы не найдены</p>
+                <p style={{ marginTop: '20px' }}>Устройства не найдены</p>
            ) : null}
        </>
    );
--- a/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx
@ -30,13 +30,13 @@ const ListUsers = ({loading, handleScan, devices, scanInitiated}: ListUsersProps
    return (
        <>
            <ScanBtn onClick={handleScan} disabled={loading}>
-                {devices.length > 0 ? 'Обновить список' : 'Сканировать узлы'}
+                {devices.length > 0 ? 'Обновить список' : 'Сканировать сеть'}
            </ScanBtn>

            {devices.length > 0 ? (
                <TableScanner devices={devices} />
            ) : scanInitiated ? (
-                <p style={{ marginTop: '20px' }}>Узлы не найдены</p>
+                <p style={{ marginTop: '20px' }}>Устройства не найдены</p>
            ) : null}
        </>
    );
--- a/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/usersScanner/userScanner.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/usersScanner/userScanner.tsx
@ -77,7 +77,7 @@ const UserLocate = styled.div<{ loading: boolean, scanInitiated: boolean }>`
  span {
    position: absolute;
    display: inline-block;
-    background: ${(props) => props.theme.scannerColor};
+    background: ${(props) => props.theme.accent};
    top: 50%;
    left: 50%;
    transform: translate(-50%, -50%);
@ -163,7 +163,7 @@ export default function UserScanner() {

    return (
        <Wrapper scanInitiated={scanInitiated} loading={loading}>
-            {(!scanInitiated || loading) && (<TitleWrapper>Сканирование узлов подсети</TitleWrapper>)}
+            {(!scanInitiated || loading) && (<TitleWrapper>Сканирование пользователей в сети</TitleWrapper>)}
            <UserLocate loading={loading} scanInitiated={scanInitiated}>
                <span className="center"></span>
                <span className="ring1"></span>
@ -177,7 +177,7 @@ export default function UserScanner() {

            {loading ? (
                <LoadingText>
-                    Сканирование узлов <ScanningText />
+                    Сканирование сети<ScanningText />
                </LoadingText>
            ) : selectedView.value == 1 ? (
                <TableUsers loading={loading} handleScan={handleScan} devices={devices} scanInitiated={scanInitiated} />
--- a/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/wifiScanner/WifiScanner.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/wifiScanner/WifiScanner.tsx
@ -136,8 +136,7 @@ const ScanBtn = styled.button<{scanInitiated: boolean}>`
 `

 export function WifiScanner() {
-    //const { ipAddress } = useIpStore();
-    const ipAddress = '192.168.1.147'
+    const { ipAddress } = useIpStore();
    const [loading, setLoading] = useState(false);
    const [scanInitiated, setScanInitiated] = useState(false);
    const { wifiNetworks, setWifiNetworks } = useNetworkStore();
@ -162,19 +161,17 @@ export function WifiScanner() {

    return (
        <Wrapper scanInitiated={scanInitiated} loading={loading}>
-            <TitleWrapper>Сканирование точек доступа Wi-Fi сети</TitleWrapper>
+            <TitleWrapper>Сканирование Wi-Fi сети</TitleWrapper>

            <UserLocate loading={loading} scanInitiated={scanInitiated}>
                <span className="center circel"></span>
                <span className="ring1 circel"></span>
                <span className="ring2 circel"></span>
                <span className="ring3 circel"></span>
-                {wifiNetworks.map((network, index) => (
+                {wifiNetworks.map((network) => (
                    <WifiDot
                        key={network.bssid}
                        network={network}
-                        index={index}
-                        total={wifiNetworks.length}
                        onSelect={setCurrentNetwork}
                    />
                ))}
@ -189,11 +186,11 @@ export function WifiScanner() {

            {loading ? (
                <LoadingText>
-                    Сканирование точек доступа <ScanningText/>
+                    Сканирование сети <ScanningText/>
                </LoadingText>
            ) : (
                <ScanBtn onClick={handleScan} disabled={loading} scanInitiated={wifiNetworks.length > 0 }>
-                    {wifiNetworks.length > 0 ? 'Обновить список' : 'Сканировать точки доступа'}
+                    {wifiNetworks.length > 0 ? 'Обновить список' : 'Сканировать сеть'}
                </ScanBtn>
            )}
        </Wrapper>
--- a/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/wifiScanner/modules/WifiDot.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/modules/appModules/wifiScanner/modules/WifiDot.tsx
@ -31,45 +31,43 @@ const Dot = styled.div<{ top: string; left: string }>`
    }
 `;

-const getPositionInRing = (index: number, total: number, ringSize: number) => {
-    const angle = (index * (2 * Math.PI / total)) + (Math.PI / total * (index % 2));
-    const innerRadius = ringSize * 0.4;
-    const outerRadius = ringSize * 0.5;
-    const radius = innerRadius + (outerRadius - innerRadius) * (0.3 + 0.7 * (index % 10) / 10);
+const WifiDot = ({ network, onSelect }: { network: WifiNetworkScanner, onSelect: (n: WifiNetworkScanner) => void }) => {
+    const getPositionInRing = (bssid: string, ringSize: number) => {
+        const hash = bssid.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0);
+        const randomAngle = (hash % 360) * (Math.PI / 180);
+        const innerRadius = ringSize * 0.4;
+        const outerRadius = ringSize * 0.5;
+        const randomValue = (hash % 1000) / 1000;
+        const randomRadius = Math.sqrt(innerRadius * innerRadius + randomValue * (outerRadius * outerRadius - innerRadius * innerRadius));

-    return {
-        x: Math.cos(angle) * radius,
-        y: Math.sin(angle) * radius
+        return {
+            x: Math.cos(randomAngle) * randomRadius,
+            y: Math.sin(randomAngle) * randomRadius
+        };
    };
-};

-const WifiDot = ({ network, index, total, onSelect }: {
-    network: WifiNetworkScanner,
-    index: number,
-    total: number,
-    onSelect: (n: WifiNetworkScanner) => void
-}) => {
-    const getPosition = (signal: number, index: number, total: number) => {
+    const getPosition = (signal: number, bssid: string) => {
        let strength: 1 | 2 | 3;
        if (signal >= -50) {
            strength = 3;
        } else if (signal >= -70) {
            strength = 2;
+        } else if (signal >= -90) {
+            strength = 1;
        } else {
            strength = 1;
        }
-
        const ringSizes = { 1: 550, 2: 400, 3: 250 };
        const ringSize = ringSizes[strength];
-        const offset = getPositionInRing(index, total, ringSize);
+        const offset = getPositionInRing(bssid, ringSize);

        return {
-            top: `calc(50% + ${offset.y}px)`,
-            left: `calc(50% + ${offset.x}px)`
+            top: `calc(50% - ${offset.y}px)`,
+            left: `calc(50% - ${offset.x}px)`
        };
    };

-    const position = getPosition(network.signal, index, total);
+    const position = getPosition(network.signal, network.bssid);

    return (
        <Dot top={position.top} left={position.left} onClick={() => onSelect(network)}>
--- a/FRONT/BUILD/resources/app/src/components/workSpace/modules/workModules/networkInterfaces.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/modules/workModules/networkInterfaces.tsx
@ -76,7 +76,7 @@ export const NetworkInterfaces = ({ startConnection, ws }: Props) => {
      setHasInited(false)
      initializationAttempt.current = 0;

-      const newSocket = new WebSocket(`ws://${ws}:8001/api/v1`);
+      const newSocket = new WebSocket(`wss://${ws}:8001/api/v1`);

      let connectionTimeout;
      setSocket(newSocket);
--- a/FRONT/BUILD/resources/app/src/components/workSpace/sideBar/toolSpace/devicesBar.tsx
+++ b/FRONT/BUILD/resources/app/src/components/workSpace/sideBar/toolSpace/devicesBar.tsx
@ -115,7 +115,7 @@ export const DevicesBar = () => {

    const checkWebSocketAvailability = async (ip: string): Promise<boolean> => {
        return new Promise((resolve) => {
-            const testSocket = new WebSocket(`ws://${ip}:8001/api/v1`);
+            const testSocket = new WebSocket(`wss://${ip}:8001/api/v1`);
            const timeout = setTimeout(() => {
                    testSocket.close();
                    resolve(false);
--- a/FRONT/BUILD/resources/app/src/const/buttons/icons.tsx
+++ b/FRONT/BUILD/resources/app/src/const/buttons/icons.tsx
@ -9,7 +9,6 @@ import settings from '@iconify/icons-ic/baseline-settings';
 import info from '@iconify/icons-ic/baseline-info';
 import arrowDown from '@iconify/icons-ic/baseline-keyboard-arrow-down';
 import arrowRight from '@iconify/icons-ic/baseline-keyboard-arrow-right';
-import arrowLeft from '@iconify/icons-ic/baseline-keyboard-arrow-left';
 import edit from '@iconify/icons-ic/baseline-edit';
 import checkCircle from '@iconify/icons-ic/round-check-circle';
 import cancel from '@iconify/icons-ic/baseline-cancel';
@ -38,7 +37,6 @@ export const ICONS = {
    [buttonNames[14]]: userSearch,
    [buttonNames[15]]: wifiFind,
    [buttonNames[16]]: noteEdit,
-    [buttonNames[17]]: arrowLeft,
 } as const;

 type IconName = keyof typeof ICONS;
--- a/FRONT/BUILD/resources/app/src/const/buttons/names.ts
+++ b/FRONT/BUILD/resources/app/src/const/buttons/names.ts
@ -16,6 +16,5 @@ export const buttonNames: names ={
    13: 'noAdmin',
    14: 'userSearch',
    15: 'wifiFind',
-    16: 'noteEdit',
-    17: 'arrowLeft',
+    16: 'noteEdit'
 }
--- a/FRONT/BUILD/resources/app/src/const/menus/sideBar/icons.tsx
+++ b/FRONT/BUILD/resources/app/src/const/menus/sideBar/icons.tsx
@ -3,7 +3,7 @@ import { toolBarNames } from "./names"
 import { useTheme } from "styled-components"
 import { Icon } from '@iconify/react';

-import desktop from '@iconify/icons-ic/baseline-menu';
+import desktop from '@iconify/icons-ic/round-desktop-windows';

 export const ICONS = {
    [toolBarNames[1]]: desktop,
--- a/FRONT/BUILD/resources/app/src/const/theme/theme.ts
+++ b/FRONT/BUILD/resources/app/src/const/theme/theme.ts
@ -24,7 +24,7 @@ export const dark = {
    background: '#3A3A3A',
    textColor: '#FFFFFF',
    borderColor: '#b6b6b6',
-    scannerColor: '#00E5FF',
+    scannerColor: '#0E9C9D',
    offlineColor: '#656565',
    hoverBtn: '#4a4a4a',
 };