From d235b01c809f8a44d81b00305a70647f4c87a84c Mon Sep 17 00:00:00 2001 From: goodmice Date: Thu, 8 Dec 2022 12:13:58 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D1=8F?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 2 +- src/components/FastRunMenu.tsx | 2 +- src/components/LayoutPortal.tsx | 2 +- src/components/UserMenu.tsx | 2 +- src/components/d3/D3Chart.tsx | 2 +- .../d3/D3HorizontalPercentChart.tsx | 4 +-- src/components/d3/D3MouseZone.tsx | 2 +- .../d3/monitoring/D3HorizontalCursor.tsx | 2 +- src/components/d3/plugins/D3Cursor.tsx | 2 +- src/components/d3/plugins/D3Tooltip.tsx | 2 +- src/components/selectors/WellTreeSelector.tsx | 2 +- src/pages/Deposit/StatisticsADW.jsx | 2 +- src/pages/Well/Analytics/Statistics.jsx | 2 +- .../Analytics/WellCompositeEditor/index.jsx | 2 +- .../Well/DrillingProgram/CategoryAdder.jsx | 2 +- .../Well/DrillingProgram/CategoryHistory.jsx | 2 +- .../Well/DrillingProgram/CategoryRender.jsx | 2 +- src/pages/Well/DrillingProgram/index.jsx | 2 +- src/pages/Well/Measure/MeasureTable.jsx | 2 +- src/pages/Well/Measure/View.jsx | 2 +- src/pages/Well/Measure/columnsCommon.jsx | 2 +- .../Well/Telemetry/DashboardNNB/index.jsx | 2 +- src/pages/Well/Telemetry/Messages.jsx | 4 +-- .../Well/Telemetry/OperationTime/index.jsx | 4 +-- .../Telemetry/Operations/OperationsChart.jsx | 2 +- .../Telemetry/Operations/OperationsTable.jsx | 2 +- src/pages/Well/Telemetry/Operations/index.jsx | 2 +- .../TelemetryView/ActiveMessagesOnline.jsx | 2 +- .../Well/Telemetry/TelemetryView/index.jsx | 4 +-- src/pages/Well/WellCase/HistoryTable.jsx | 2 +- src/pages/Well/WellCase/WellCaseEditor.jsx | 2 +- src/pages/Well/WellCase/index.jsx | 2 +- .../WellOperations/Tvd/AdditionalTables.jsx | 2 +- .../Well/WellOperations/Tvd/NptTable.jsx | 2 +- src/pages/Well/WellOperations/Tvd/TLChart.jsx | 6 ++--- src/pages/Well/WellOperations/Tvd/TLPie.jsx | 2 +- src/pages/Well/WellOperations/Tvd/index.jsx | 26 ++++--------------- src/pages/public/Login.jsx | 3 ++- src/styles/{ => components}/charts.less | 0 src/styles/{ => components}/d3.less | 0 src/styles/{ => components}/display.less | 0 .../{ => components}/fast_run_menu.less | 0 src/styles/{ => components}/filter.less | 0 src/styles/{ => components}/layout.less | 0 src/styles/{ => components}/loader.css | 0 src/styles/{ => components}/user_menu.less | 0 .../well_tree_select.css} | 0 src/styles/{ => pages}/App.less | 2 +- src/styles/{ => pages}/dashboard_nnb.less | 0 .../{ => pages}/detected_operations.less | 0 src/styles/{ => pages}/drilling_program.less | 0 src/styles/{ => pages}/equipment_details.css | 0 src/styles/{ => pages}/measure.css | 0 src/styles/{ => pages}/message.less | 0 src/styles/{ => pages}/message_telemetry.css | 0 src/styles/{ => pages}/operation_time.less | 0 src/styles/{ => pages}/smbo.css | 0 src/styles/{ => pages}/statistics.less | 0 src/styles/{ => pages}/statistics_adw.less | 0 src/styles/{ => pages}/telemetry_view.less | 0 src/styles/{ => pages}/tvd.less | 0 src/styles/{ => pages}/well_case.less | 0 src/styles/{ => pages}/well_composite.less | 0 63 files changed, 50 insertions(+), 65 deletions(-) rename src/styles/{ => components}/charts.less (100%) mode change 100755 => 100644 rename src/styles/{ => components}/d3.less (100%) rename src/styles/{ => components}/display.less (100%) rename src/styles/{ => components}/fast_run_menu.less (100%) rename src/styles/{ => components}/filter.less (100%) rename src/styles/{ => components}/layout.less (100%) rename src/styles/{ => components}/loader.css (100%) mode change 100755 => 100644 rename src/styles/{ => components}/user_menu.less (100%) rename src/styles/{wellTreeSelect.css => components/well_tree_select.css} (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/App.less (97%) mode change 100755 => 100644 rename src/styles/{ => pages}/dashboard_nnb.less (100%) rename src/styles/{ => pages}/detected_operations.less (100%) rename src/styles/{ => pages}/drilling_program.less (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/equipment_details.css (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/measure.css (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/message.less (100%) rename src/styles/{ => pages}/message_telemetry.css (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/operation_time.less (100%) rename src/styles/{ => pages}/smbo.css (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/statistics.less (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/statistics_adw.less (100%) rename src/styles/{ => pages}/telemetry_view.less (100%) rename src/styles/{ => pages}/tvd.less (100%) mode change 100755 => 100644 rename src/styles/{ => pages}/well_case.less (100%) rename src/styles/{ => pages}/well_composite.less (100%) diff --git a/src/App.tsx b/src/App.tsx index 0d84e96..8f11027 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -5,7 +5,7 @@ import { RootPathContext } from '@asb/context' import SuspenseFallback from '@components/SuspenseFallback' import { NoAccessComponent } from '@utils' -import '@styles/App.less' +import '@styles/pages/App.less' const UserOutlet = lazy(() => import('@components/outlets/UserOutlet')) const DepositsOutlet = lazy(() => import('@components/outlets/DepositsOutlet')) diff --git a/src/components/FastRunMenu.tsx b/src/components/FastRunMenu.tsx index 30d78b2..b21db2f 100644 --- a/src/components/FastRunMenu.tsx +++ b/src/components/FastRunMenu.tsx @@ -11,7 +11,7 @@ import { hasPermission, isURLAvailable } from '@utils' import { menuItems as adminMenuItems } from '@pages/AdminPanel/AdminNavigationMenu' import { menuItems as wellMenuItems } from '@pages/Well/WellNavigationMenu' -import '@styles/fast_run_menu.less' +import '@styles/components/fast_run_menu.less' const transliterationTable = { 'q': 'й', 'w': 'ц', 'e': 'у', 'r': 'к', 't': 'е', 'y': 'н', 'u': 'г', 'i': 'ш', 'o': 'щ', 'p': 'з', '[': 'х', ']': 'ъ', '{': 'х', '}': 'ъ', diff --git a/src/components/LayoutPortal.tsx b/src/components/LayoutPortal.tsx index c81daf3..ef88f30 100644 --- a/src/components/LayoutPortal.tsx +++ b/src/components/LayoutPortal.tsx @@ -18,7 +18,7 @@ import SuspenseFallback from './SuspenseFallback' import Logo from '@images/Logo' -import '@styles/layout.less' +import '@styles/components/layout.less' const { Content, Sider } = Layout diff --git a/src/components/UserMenu.tsx b/src/components/UserMenu.tsx index f222420..f9a380b 100755 --- a/src/components/UserMenu.tsx +++ b/src/components/UserMenu.tsx @@ -10,7 +10,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory' import { isURLAvailable, removeUser } from '@utils' import { AuthService } from '@api' -import '@styles/user_menu.less' +import '@styles/components/user_menu.less' export type UserMenuProps = DrawerProps & { isAdmin?: boolean diff --git a/src/components/d3/D3Chart.tsx b/src/components/d3/D3Chart.tsx index fa7822d..c6d37ab 100644 --- a/src/components/d3/D3Chart.tsx +++ b/src/components/d3/D3Chart.tsx @@ -36,7 +36,7 @@ import type { ChartTicks } from './types' -import '@styles/d3.less' +import '@styles/components/d3.less' const defaultOffsets: ChartOffset = { top: 10, diff --git a/src/components/d3/D3HorizontalPercentChart.tsx b/src/components/d3/D3HorizontalPercentChart.tsx index 0b04bd0..17ea77b 100644 --- a/src/components/d3/D3HorizontalPercentChart.tsx +++ b/src/components/d3/D3HorizontalPercentChart.tsx @@ -4,10 +4,10 @@ import { Property } from 'csstype' import * as d3 from 'd3' import LoaderPortal from '@components/LoaderPortal' +import { usePartialProps } from '@utils' import { ChartOffset } from './types' -import '@styles/d3.less' -import { usePartialProps } from '@asb/utils' +import '@styles/components/d3.less' export type PercentChartDataType = { name: string diff --git a/src/components/d3/D3MouseZone.tsx b/src/components/d3/D3MouseZone.tsx index 464d814..72b1730 100644 --- a/src/components/d3/D3MouseZone.tsx +++ b/src/components/d3/D3MouseZone.tsx @@ -3,7 +3,7 @@ import * as d3 from 'd3' import { ChartOffset } from './types' -import '@styles/d3.less' +import '@styles/components/d3.less' export type D3MouseState = { /** Позиция мыши по оси X */ diff --git a/src/components/d3/monitoring/D3HorizontalCursor.tsx b/src/components/d3/monitoring/D3HorizontalCursor.tsx index 97dea97..d1caa2e 100644 --- a/src/components/d3/monitoring/D3HorizontalCursor.tsx +++ b/src/components/d3/monitoring/D3HorizontalCursor.tsx @@ -9,7 +9,7 @@ import { getChartIcon, isDev, usePartialProps } from '@utils' import { BaseDataType } from '../types' import { ChartGroup, ChartSizes } from './D3MonitoringCharts' -import '@styles/d3.less' +import '@styles/components/d3.less' type D3GroupRenderFunction = (group: ChartGroup, data: DataType[], flowData: DataType[] | undefined) => ReactNode diff --git a/src/components/d3/plugins/D3Cursor.tsx b/src/components/d3/plugins/D3Cursor.tsx index 2b2adab..3769981 100644 --- a/src/components/d3/plugins/D3Cursor.tsx +++ b/src/components/d3/plugins/D3Cursor.tsx @@ -6,7 +6,7 @@ import { usePartialProps } from '@utils' import { wrapPlugin } from './base' -import '@styles/d3.less' +import '@styles/components/d3.less' export type D3CursorSettings = { /** Параметры стиля линии */ diff --git a/src/components/d3/plugins/D3Tooltip.tsx b/src/components/d3/plugins/D3Tooltip.tsx index 3517b5f..1d16cb7 100644 --- a/src/components/d3/plugins/D3Tooltip.tsx +++ b/src/components/d3/plugins/D3Tooltip.tsx @@ -8,7 +8,7 @@ import { BaseDataType, ChartRegistry } from '@components/d3/types' import { D3MouseState, useD3MouseZone } from '@components/d3/D3MouseZone' import { getTouchedElements, wrapPlugin } from './base' -import '@styles/d3.less' +import '@styles/components/d3.less' export type D3TooltipPosition = 'bottom' | 'top' | 'left' | 'right' | 'none' diff --git a/src/components/selectors/WellTreeSelector.tsx b/src/components/selectors/WellTreeSelector.tsx index c9e2c34..57a5a12 100755 --- a/src/components/selectors/WellTreeSelector.tsx +++ b/src/components/selectors/WellTreeSelector.tsx @@ -10,7 +10,7 @@ import { isRawDate } from '@utils' import { ReactComponent as DepositIcon } from '@images/DepositIcon.svg' import { ReactComponent as ClusterIcon } from '@images/ClusterIcon.svg' -import '@styles/wellTreeSelect.css' +import '@styles/components/well_tree_select.css' /** * Для поиска в URL текущего раздела по шаблону `/{type}/{id}` diff --git a/src/pages/Deposit/StatisticsADW.jsx b/src/pages/Deposit/StatisticsADW.jsx index c26d948..f81864e 100644 --- a/src/pages/Deposit/StatisticsADW.jsx +++ b/src/pages/Deposit/StatisticsADW.jsx @@ -9,7 +9,7 @@ import { DateRangeWrapper, makeNumericColumn, makeNumericRender, makeTextColumn, import { arrayOrDefault, withPermissions } from '@utils' import { SubsystemOperationTimeService } from '@api' -import '@styles/statistics_adw.less' +import '@styles/pages/statistics_adw.less' const numericRender = makeNumericRender(2) diff --git a/src/pages/Well/Analytics/Statistics.jsx b/src/pages/Well/Analytics/Statistics.jsx index 68d4244..99315e8 100644 --- a/src/pages/Well/Analytics/Statistics.jsx +++ b/src/pages/Well/Analytics/Statistics.jsx @@ -10,7 +10,7 @@ import { OperationStatService, WellOperationService } from '@api' import { arrayOrDefault, withPermissions } from '@utils' import '@styles/index.css' -import '@styles/statistics.less' +import '@styles/pages/statistics.less' const { Text } = Typography const { Summary } = RawTable diff --git a/src/pages/Well/Analytics/WellCompositeEditor/index.jsx b/src/pages/Well/Analytics/WellCompositeEditor/index.jsx index b76fd84..9464b46 100644 --- a/src/pages/Well/Analytics/WellCompositeEditor/index.jsx +++ b/src/pages/Well/Analytics/WellCompositeEditor/index.jsx @@ -12,7 +12,7 @@ import { OperationStatService, WellCompositeService } from '@api' import WellCompositeSections from './WellCompositeSections' -import '@styles/well_composite.less' +import '@styles/pages/well_composite.less' const ClusterWells = lazy(() => import('@pages/Cluster/ClusterWells')) diff --git a/src/pages/Well/DrillingProgram/CategoryAdder.jsx b/src/pages/Well/DrillingProgram/CategoryAdder.jsx index bdecf0d..2c95341 100644 --- a/src/pages/Well/DrillingProgram/CategoryAdder.jsx +++ b/src/pages/Well/DrillingProgram/CategoryAdder.jsx @@ -8,7 +8,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory' import { DrillingProgramService } from '@api' -import '@styles/drilling_program.less' +import '@styles/pages/drilling_program.less' const catSelectorRules = [{ required: true, diff --git a/src/pages/Well/DrillingProgram/CategoryHistory.jsx b/src/pages/Well/DrillingProgram/CategoryHistory.jsx index a80acc5..f1605da 100644 --- a/src/pages/Well/DrillingProgram/CategoryHistory.jsx +++ b/src/pages/Well/DrillingProgram/CategoryHistory.jsx @@ -12,7 +12,7 @@ import { FileService } from '@api' import MarksCard from './MarksCard' -import '@styles/drilling_program.less' +import '@styles/pages/drilling_program.less' const { RangePicker } = DatePicker const { Search } = Input diff --git a/src/pages/Well/DrillingProgram/CategoryRender.jsx b/src/pages/Well/DrillingProgram/CategoryRender.jsx index db5b2d4..3f21adf 100644 --- a/src/pages/Well/DrillingProgram/CategoryRender.jsx +++ b/src/pages/Well/DrillingProgram/CategoryRender.jsx @@ -18,7 +18,7 @@ import { formatDate, MimeTypes } from '@utils' import MarksCard from './MarksCard' -import '@styles/drilling_program.less' +import '@styles/pages/drilling_program.less' const CommentPrompt = memo(({ isRequired = true, ...props }) => ( cols.map(col => col.map(col => ({ render: renderDelegate, ...col }))) diff --git a/src/pages/Well/Measure/View.jsx b/src/pages/Well/Measure/View.jsx index 59cbca7..6f61143 100644 --- a/src/pages/Well/Measure/View.jsx +++ b/src/pages/Well/Measure/View.jsx @@ -4,7 +4,7 @@ import { Empty, Form } from 'antd' import { Grid, GridItem } from '@components/Grid' import '@styles/index.css' -import '@styles/measure.css' +import '@styles/pages/measure.css' export const View = memo(({ columns, item }) => !item || !columns?.length ? ( diff --git a/src/pages/Well/Measure/columnsCommon.jsx b/src/pages/Well/Measure/columnsCommon.jsx index 8b512bd..1ee6bd4 100644 --- a/src/pages/Well/Measure/columnsCommon.jsx +++ b/src/pages/Well/Measure/columnsCommon.jsx @@ -2,7 +2,7 @@ import { Input } from 'antd' import { RegExpIsFloat } from '@components/Table' -import '@styles/measure.css' +import '@styles/pages/measure.css' export const v = (text) => (
diff --git a/src/pages/Well/Telemetry/DashboardNNB/index.jsx b/src/pages/Well/Telemetry/DashboardNNB/index.jsx index a37f60c..22ff620 100644 --- a/src/pages/Well/Telemetry/DashboardNNB/index.jsx +++ b/src/pages/Well/Telemetry/DashboardNNB/index.jsx @@ -22,7 +22,7 @@ import { import AddGroupWindow from './AddGroupWindow' import AddWidgetWindow, { makeWidgetFromWits } from './AddWidgetWindow' -import '@styles/dashboard_nnb.less' +import '@styles/pages/dashboard_nnb.less' const getWitsInfo = async () => { // TODO: Добавить expire с принудительным обновлением diff --git a/src/pages/Well/Telemetry/Messages.jsx b/src/pages/Well/Telemetry/Messages.jsx index 185c838..a5aed6d 100644 --- a/src/pages/Well/Telemetry/Messages.jsx +++ b/src/pages/Well/Telemetry/Messages.jsx @@ -11,8 +11,8 @@ import { makeColumn, makeDateColumn, makeNumericColumn, makeNumericSorter, makeT import { withPermissions } from '@utils' import { MessageService } from '@api' -import '@styles/filter.less' -import '@styles/message.less' +import '@styles/components/filter.less' +import '@styles/pages/message.less' const pageSize = 26 const { Search } = Input diff --git a/src/pages/Well/Telemetry/OperationTime/index.jsx b/src/pages/Well/Telemetry/OperationTime/index.jsx index 11f7597..4733f56 100644 --- a/src/pages/Well/Telemetry/OperationTime/index.jsx +++ b/src/pages/Well/Telemetry/OperationTime/index.jsx @@ -10,8 +10,8 @@ import { DateRangeWrapper, makeColumn, makeNumericColumn, makeNumericRender, mak import { arrayOrDefault, range, withPermissions } from '@utils' import { SubsystemOperationTimeService } from '@api' -import '@styles/filter.less' -import '@styles/operation_time.less' +import '@styles/components/filter.less' +import '@styles/pages/operation_time.less' const subsystemColors = [ '#1abc9c', '#16a085', '#2ecc71', '#27ae60', diff --git a/src/pages/Well/Telemetry/Operations/OperationsChart.jsx b/src/pages/Well/Telemetry/Operations/OperationsChart.jsx index 3a20be2..8f15fbd 100644 --- a/src/pages/Well/Telemetry/Operations/OperationsChart.jsx +++ b/src/pages/Well/Telemetry/Operations/OperationsChart.jsx @@ -4,7 +4,7 @@ import { D3Chart } from '@components/d3' import { Grid, GridItem } from '@components/Grid' import { formatDate, makeDisplayValue } from '@utils' -import '@styles/detected_operations.less' +import '@styles/pages/detected_operations.less' const displayNumber = makeDisplayValue({ fixed: 2 }) diff --git a/src/pages/Well/Telemetry/Operations/OperationsTable.jsx b/src/pages/Well/Telemetry/Operations/OperationsTable.jsx index 3f7a2b5..a4e3e9d 100644 --- a/src/pages/Well/Telemetry/Operations/OperationsTable.jsx +++ b/src/pages/Well/Telemetry/Operations/OperationsTable.jsx @@ -2,7 +2,7 @@ import { memo } from 'react' import { Table, makeTextColumn, makeNumericColumn, makeNumericRender } from '@components/Table' -import '@styles/detected_operations.less' +import '@styles/pages/detected_operations.less' const numericRender = makeNumericRender(2) diff --git a/src/pages/Well/Telemetry/Operations/index.jsx b/src/pages/Well/Telemetry/Operations/index.jsx index fc1129d..4589e8a 100644 --- a/src/pages/Well/Telemetry/Operations/index.jsx +++ b/src/pages/Well/Telemetry/Operations/index.jsx @@ -16,7 +16,7 @@ import DrillerSchedule from './DrillerSchedule' import OperationsChart from './OperationsChart' import OperationsTable from './OperationsTable' -import '@styles/detected_operations.less' +import '@styles/pages/detected_operations.less' const Operations = memo(() => { const [isLoading, setIsLoading] = useState(false) diff --git a/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx index dbe5af1..d2a5c0b 100644 --- a/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx +++ b/src/pages/Well/Telemetry/TelemetryView/ActiveMessagesOnline.jsx @@ -9,7 +9,7 @@ import { MessageService } from '@api' import { makeMessageColumns } from '../Messages' -import '@styles/message.less' +import '@styles/pages/message.less' export const ActiveMessagesOnline = memo(({ well: givenWell }) => { const [messages, setMessages] = useState([]) diff --git a/src/pages/Well/Telemetry/TelemetryView/index.jsx b/src/pages/Well/Telemetry/TelemetryView/index.jsx index ee21a85..ba288a7 100644 --- a/src/pages/Well/Telemetry/TelemetryView/index.jsx +++ b/src/pages/Well/Telemetry/TelemetryView/index.jsx @@ -32,8 +32,8 @@ import MomentStabPicDisabled from '@images/DempherOff.png' import SpinPicEnabled from '@images/SpinEnabled.png' import SpinPicDisabled from '@images/SpinDisabled.png' -import '@styles/telemetry_view.less' -import '@styles/message.less' +import '@styles/pages/telemetry_view.less' +import '@styles/pages/message.less' const { Option } = Select diff --git a/src/pages/Well/WellCase/HistoryTable.jsx b/src/pages/Well/WellCase/HistoryTable.jsx index 8bbb56a..6b7d41e 100644 --- a/src/pages/Well/WellCase/HistoryTable.jsx +++ b/src/pages/Well/WellCase/HistoryTable.jsx @@ -10,7 +10,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory' import { WellFinalDocumentsService } from '@api' import { formatDate } from '@utils' -import '@styles/well_case.less' +import '@styles/pages/well_case.less' export const HistoryTable = memo(({ category }) => { const [isLoading, setIsLoading] = useState(false) diff --git a/src/pages/Well/WellCase/WellCaseEditor.jsx b/src/pages/Well/WellCase/WellCaseEditor.jsx index dcc287c..1a61acc 100644 --- a/src/pages/Well/WellCase/WellCaseEditor.jsx +++ b/src/pages/Well/WellCase/WellCaseEditor.jsx @@ -8,7 +8,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory' import { WellFinalDocumentsService } from '@api' import { arrayOrDefault } from '@utils' -import '@styles/well_case.less' +import '@styles/pages/well_case.less' const filterCategoriesByText = (text) => (cat) => !text || !!cat?.nameCategory?.toLowerCase().includes(text.toLowerCase()) diff --git a/src/pages/Well/WellCase/index.jsx b/src/pages/Well/WellCase/index.jsx index db08348..44d2a20 100644 --- a/src/pages/Well/WellCase/index.jsx +++ b/src/pages/Well/WellCase/index.jsx @@ -15,7 +15,7 @@ import { withPermissions } from '@utils' import WellCaseEditor from './WellCaseEditor' import { HistoryTable } from './HistoryTable' -import '@styles/well_case.less' +import '@styles/pages/well_case.less' const expandable = { expandedRowRender: (category) => , diff --git a/src/pages/Well/WellOperations/Tvd/AdditionalTables.jsx b/src/pages/Well/WellOperations/Tvd/AdditionalTables.jsx index 35fb51c..2492921 100644 --- a/src/pages/Well/WellOperations/Tvd/AdditionalTables.jsx +++ b/src/pages/Well/WellOperations/Tvd/AdditionalTables.jsx @@ -5,7 +5,7 @@ import { makeNumericRender } from '@components/Table' import { invokeWebApiWrapperAsync } from '@components/factory' import { formatDate, fractionalSum } from '@utils' -import '@styles/tvd.less' +import '@styles/pages/tvd.less' const { Item } = Descriptions diff --git a/src/pages/Well/WellOperations/Tvd/NptTable.jsx b/src/pages/Well/WellOperations/Tvd/NptTable.jsx index db71331..b85610f 100644 --- a/src/pages/Well/WellOperations/Tvd/NptTable.jsx +++ b/src/pages/Well/WellOperations/Tvd/NptTable.jsx @@ -6,7 +6,7 @@ import LoaderPortal from '@components/LoaderPortal' import { invokeWebApiWrapperAsync } from '@components/factory' import { makeDateColumn, makeNumericColumn, makeNumericRender, makeTextColumn, Table } from '@components/Table' -import '@styles/tvd.less' +import '@styles/pages/tvd.less' export const columns = [ makeTextColumn('Конструкция секции', 'wellSectionTypeName', null, null, null, { width: 140 }), diff --git a/src/pages/Well/WellOperations/Tvd/TLChart.jsx b/src/pages/Well/WellOperations/Tvd/TLChart.jsx index c2f3a7b..c4e6bba 100644 --- a/src/pages/Well/WellOperations/Tvd/TLChart.jsx +++ b/src/pages/Well/WellOperations/Tvd/TLChart.jsx @@ -13,9 +13,9 @@ import { formatDate } from '@utils' import { makeTooltipRender } from '../../Telemetry/Operations/OperationsChart' import { makeGetColor } from '.' -import '@styles/d3.less' -import '@styles/tvd.less' -import '@styles/detected_operations.less' +import '@styles/components/d3.less' +import '@styles/pages/tvd.less' +import '@styles/pages/detected_operations.less' const defaultOffset = { left: 40, right: 20, top: 20, bottom: 20 } const zeroDate = moment('2000-01-01 00:00:00') diff --git a/src/pages/Well/WellOperations/Tvd/TLPie.jsx b/src/pages/Well/WellOperations/Tvd/TLPie.jsx index b86382f..35a9000 100644 --- a/src/pages/Well/WellOperations/Tvd/TLPie.jsx +++ b/src/pages/Well/WellOperations/Tvd/TLPie.jsx @@ -11,7 +11,7 @@ import { unique } from '@utils/filters' import { makeGetColor } from '.' -import '@styles/tvd.less' +import '@styles/pages/tvd.less' const tableColumns = [ makeColumn('Цвет', 'color', { width: 50, render: (d) => ( diff --git a/src/pages/Well/WellOperations/Tvd/index.jsx b/src/pages/Well/WellOperations/Tvd/index.jsx index ba4f036..f3357f6 100644 --- a/src/pages/Well/WellOperations/Tvd/index.jsx +++ b/src/pages/Well/WellOperations/Tvd/index.jsx @@ -18,29 +18,13 @@ import NetGraphExport from './NetGraphExport' import AdditionalTables from './AdditionalTables' import '@styles/index.css' -import '@styles/tvd.less' +import '@styles/pages/tvd.less' const operationsColors = [ - '#1abc9c', - '#16a085', - '#2ecc71', - '#27ae60', - '#3498db', - '#2980b9', - '#9b59b6', - '#8e44ad', - '#34495e', - '#2c3e50', - '#f1c40f', - '#f39c12', - '#e67e22', - '#d35400', - '#e74c3c', - '#c0392b', - '#ecf0f1', - '#bdc3c7', - '#95a5a6', - '#7f8c8d', + '#1abc9c', '#16a085', '#2ecc71', '#27ae60', '#3498db', + '#2980b9', '#9b59b6', '#8e44ad', '#34495e', '#2c3e50', + '#f1c40f', '#f39c12', '#e67e22', '#d35400', '#e74c3c', + '#c0392b', '#ecf0f1', '#bdc3c7', '#95a5a6', '#7f8c8d', ] export const makeGetColor = (types) => (type) => { diff --git a/src/pages/public/Login.jsx b/src/pages/public/Login.jsx index d322a11..125ad09 100644 --- a/src/pages/public/Login.jsx +++ b/src/pages/public/Login.jsx @@ -9,9 +9,10 @@ import { loginRules, passwordRules } from '@utils/validationRules' import { setUser, withPermissions } from '@utils' import { AuthService } from '@api' -import '@styles/index.css' import Logo from '@images/Logo' +import '@styles/index.css' + const Login = memo(() => { const [showLoader, setShowLoader] = useState(false) diff --git a/src/styles/charts.less b/src/styles/components/charts.less old mode 100755 new mode 100644 similarity index 100% rename from src/styles/charts.less rename to src/styles/components/charts.less diff --git a/src/styles/d3.less b/src/styles/components/d3.less similarity index 100% rename from src/styles/d3.less rename to src/styles/components/d3.less diff --git a/src/styles/display.less b/src/styles/components/display.less similarity index 100% rename from src/styles/display.less rename to src/styles/components/display.less diff --git a/src/styles/fast_run_menu.less b/src/styles/components/fast_run_menu.less similarity index 100% rename from src/styles/fast_run_menu.less rename to src/styles/components/fast_run_menu.less diff --git a/src/styles/filter.less b/src/styles/components/filter.less similarity index 100% rename from src/styles/filter.less rename to src/styles/components/filter.less diff --git a/src/styles/layout.less b/src/styles/components/layout.less similarity index 100% rename from src/styles/layout.less rename to src/styles/components/layout.less diff --git a/src/styles/loader.css b/src/styles/components/loader.css old mode 100755 new mode 100644 similarity index 100% rename from src/styles/loader.css rename to src/styles/components/loader.css diff --git a/src/styles/user_menu.less b/src/styles/components/user_menu.less similarity index 100% rename from src/styles/user_menu.less rename to src/styles/components/user_menu.less diff --git a/src/styles/wellTreeSelect.css b/src/styles/components/well_tree_select.css old mode 100755 new mode 100644 similarity index 100% rename from src/styles/wellTreeSelect.css rename to src/styles/components/well_tree_select.css diff --git a/src/styles/App.less b/src/styles/pages/App.less old mode 100755 new mode 100644 similarity index 97% rename from src/styles/App.less rename to src/styles/pages/App.less index 90db107..4fc5892 --- a/src/styles/App.less +++ b/src/styles/pages/App.less @@ -1,4 +1,4 @@ -@import './loader.css'; +@import '../components/loader.css'; #root, .app{ min-height:100%; diff --git a/src/styles/dashboard_nnb.less b/src/styles/pages/dashboard_nnb.less similarity index 100% rename from src/styles/dashboard_nnb.less rename to src/styles/pages/dashboard_nnb.less diff --git a/src/styles/detected_operations.less b/src/styles/pages/detected_operations.less similarity index 100% rename from src/styles/detected_operations.less rename to src/styles/pages/detected_operations.less diff --git a/src/styles/drilling_program.less b/src/styles/pages/drilling_program.less old mode 100755 new mode 100644 similarity index 100% rename from src/styles/drilling_program.less rename to src/styles/pages/drilling_program.less diff --git a/src/styles/equipment_details.css b/src/styles/pages/equipment_details.css old mode 100755 new mode 100644 similarity index 100% rename from src/styles/equipment_details.css rename to src/styles/pages/equipment_details.css diff --git a/src/styles/measure.css b/src/styles/pages/measure.css old mode 100755 new mode 100644 similarity index 100% rename from src/styles/measure.css rename to src/styles/pages/measure.css diff --git a/src/styles/message.less b/src/styles/pages/message.less similarity index 100% rename from src/styles/message.less rename to src/styles/pages/message.less diff --git a/src/styles/message_telemetry.css b/src/styles/pages/message_telemetry.css old mode 100755 new mode 100644 similarity index 100% rename from src/styles/message_telemetry.css rename to src/styles/pages/message_telemetry.css diff --git a/src/styles/operation_time.less b/src/styles/pages/operation_time.less similarity index 100% rename from src/styles/operation_time.less rename to src/styles/pages/operation_time.less diff --git a/src/styles/smbo.css b/src/styles/pages/smbo.css old mode 100755 new mode 100644 similarity index 100% rename from src/styles/smbo.css rename to src/styles/pages/smbo.css diff --git a/src/styles/statistics.less b/src/styles/pages/statistics.less old mode 100755 new mode 100644 similarity index 100% rename from src/styles/statistics.less rename to src/styles/pages/statistics.less diff --git a/src/styles/statistics_adw.less b/src/styles/pages/statistics_adw.less similarity index 100% rename from src/styles/statistics_adw.less rename to src/styles/pages/statistics_adw.less diff --git a/src/styles/telemetry_view.less b/src/styles/pages/telemetry_view.less similarity index 100% rename from src/styles/telemetry_view.less rename to src/styles/pages/telemetry_view.less diff --git a/src/styles/tvd.less b/src/styles/pages/tvd.less old mode 100755 new mode 100644 similarity index 100% rename from src/styles/tvd.less rename to src/styles/pages/tvd.less diff --git a/src/styles/well_case.less b/src/styles/pages/well_case.less similarity index 100% rename from src/styles/well_case.less rename to src/styles/pages/well_case.less diff --git a/src/styles/well_composite.less b/src/styles/pages/well_composite.less similarity index 100% rename from src/styles/well_composite.less rename to src/styles/pages/well_composite.less