Стили разделены по директориям

This commit is contained in:
Александр Сироткин 2022-12-08 12:13:58 +05:00
parent 5af996f9e5
commit d235b01c80
63 changed files with 50 additions and 65 deletions

View File

@ -5,7 +5,7 @@ import { RootPathContext } from '@asb/context'
import SuspenseFallback from '@components/SuspenseFallback' import SuspenseFallback from '@components/SuspenseFallback'
import { NoAccessComponent } from '@utils' import { NoAccessComponent } from '@utils'
import '@styles/App.less' import '@styles/pages/App.less'
const UserOutlet = lazy(() => import('@components/outlets/UserOutlet')) const UserOutlet = lazy(() => import('@components/outlets/UserOutlet'))
const DepositsOutlet = lazy(() => import('@components/outlets/DepositsOutlet')) const DepositsOutlet = lazy(() => import('@components/outlets/DepositsOutlet'))

View File

@ -11,7 +11,7 @@ import { hasPermission, isURLAvailable } from '@utils'
import { menuItems as adminMenuItems } from '@pages/AdminPanel/AdminNavigationMenu' import { menuItems as adminMenuItems } from '@pages/AdminPanel/AdminNavigationMenu'
import { menuItems as wellMenuItems } from '@pages/Well/WellNavigationMenu' import { menuItems as wellMenuItems } from '@pages/Well/WellNavigationMenu'
import '@styles/fast_run_menu.less' import '@styles/components/fast_run_menu.less'
const transliterationTable = { const transliterationTable = {
'q': 'й', 'w': 'ц', 'e': 'у', 'r': 'к', 't': 'е', 'y': 'н', 'u': 'г', 'i': 'ш', 'o': 'щ', 'p': 'з', '[': 'х', ']': 'ъ', '{': 'х', '}': 'ъ', 'q': 'й', 'w': 'ц', 'e': 'у', 'r': 'к', 't': 'е', 'y': 'н', 'u': 'г', 'i': 'ш', 'o': 'щ', 'p': 'з', '[': 'х', ']': 'ъ', '{': 'х', '}': 'ъ',

View File

@ -18,7 +18,7 @@ import SuspenseFallback from './SuspenseFallback'
import Logo from '@images/Logo' import Logo from '@images/Logo'
import '@styles/layout.less' import '@styles/components/layout.less'
const { Content, Sider } = Layout const { Content, Sider } = Layout

View File

@ -10,7 +10,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
import { isURLAvailable, removeUser } from '@utils' import { isURLAvailable, removeUser } from '@utils'
import { AuthService } from '@api' import { AuthService } from '@api'
import '@styles/user_menu.less' import '@styles/components/user_menu.less'
export type UserMenuProps = DrawerProps & { export type UserMenuProps = DrawerProps & {
isAdmin?: boolean isAdmin?: boolean

View File

@ -36,7 +36,7 @@ import type {
ChartTicks ChartTicks
} from './types' } from './types'
import '@styles/d3.less' import '@styles/components/d3.less'
const defaultOffsets: ChartOffset = { const defaultOffsets: ChartOffset = {
top: 10, top: 10,

View File

@ -4,10 +4,10 @@ import { Property } from 'csstype'
import * as d3 from 'd3' import * as d3 from 'd3'
import LoaderPortal from '@components/LoaderPortal' import LoaderPortal from '@components/LoaderPortal'
import { usePartialProps } from '@utils'
import { ChartOffset } from './types' import { ChartOffset } from './types'
import '@styles/d3.less' import '@styles/components/d3.less'
import { usePartialProps } from '@asb/utils'
export type PercentChartDataType = { export type PercentChartDataType = {
name: string name: string

View File

@ -3,7 +3,7 @@ import * as d3 from 'd3'
import { ChartOffset } from './types' import { ChartOffset } from './types'
import '@styles/d3.less' import '@styles/components/d3.less'
export type D3MouseState = { export type D3MouseState = {
/** Позиция мыши по оси X */ /** Позиция мыши по оси X */

View File

@ -9,7 +9,7 @@ import { getChartIcon, isDev, usePartialProps } from '@utils'
import { BaseDataType } from '../types' import { BaseDataType } from '../types'
import { ChartGroup, ChartSizes } from './D3MonitoringCharts' import { ChartGroup, ChartSizes } from './D3MonitoringCharts'
import '@styles/d3.less' import '@styles/components/d3.less'
type D3GroupRenderFunction<DataType extends BaseDataType> = (group: ChartGroup<DataType>, data: DataType[], flowData: DataType[] | undefined) => ReactNode type D3GroupRenderFunction<DataType extends BaseDataType> = (group: ChartGroup<DataType>, data: DataType[], flowData: DataType[] | undefined) => ReactNode

View File

@ -6,7 +6,7 @@ import { usePartialProps } from '@utils'
import { wrapPlugin } from './base' import { wrapPlugin } from './base'
import '@styles/d3.less' import '@styles/components/d3.less'
export type D3CursorSettings = { export type D3CursorSettings = {
/** Параметры стиля линии */ /** Параметры стиля линии */

View File

@ -8,7 +8,7 @@ import { BaseDataType, ChartRegistry } from '@components/d3/types'
import { D3MouseState, useD3MouseZone } from '@components/d3/D3MouseZone' import { D3MouseState, useD3MouseZone } from '@components/d3/D3MouseZone'
import { getTouchedElements, wrapPlugin } from './base' import { getTouchedElements, wrapPlugin } from './base'
import '@styles/d3.less' import '@styles/components/d3.less'
export type D3TooltipPosition = 'bottom' | 'top' | 'left' | 'right' | 'none' export type D3TooltipPosition = 'bottom' | 'top' | 'left' | 'right' | 'none'

View File

@ -10,7 +10,7 @@ import { isRawDate } from '@utils'
import { ReactComponent as DepositIcon } from '@images/DepositIcon.svg' import { ReactComponent as DepositIcon } from '@images/DepositIcon.svg'
import { ReactComponent as ClusterIcon } from '@images/ClusterIcon.svg' import { ReactComponent as ClusterIcon } from '@images/ClusterIcon.svg'
import '@styles/wellTreeSelect.css' import '@styles/components/well_tree_select.css'
/** /**
* Для поиска в URL текущего раздела по шаблону `/{type}/{id}` * Для поиска в URL текущего раздела по шаблону `/{type}/{id}`

View File

@ -9,7 +9,7 @@ import { DateRangeWrapper, makeNumericColumn, makeNumericRender, makeTextColumn,
import { arrayOrDefault, withPermissions } from '@utils' import { arrayOrDefault, withPermissions } from '@utils'
import { SubsystemOperationTimeService } from '@api' import { SubsystemOperationTimeService } from '@api'
import '@styles/statistics_adw.less' import '@styles/pages/statistics_adw.less'
const numericRender = makeNumericRender(2) const numericRender = makeNumericRender(2)

View File

@ -10,7 +10,7 @@ import { OperationStatService, WellOperationService } from '@api'
import { arrayOrDefault, withPermissions } from '@utils' import { arrayOrDefault, withPermissions } from '@utils'
import '@styles/index.css' import '@styles/index.css'
import '@styles/statistics.less' import '@styles/pages/statistics.less'
const { Text } = Typography const { Text } = Typography
const { Summary } = RawTable const { Summary } = RawTable

View File

@ -12,7 +12,7 @@ import { OperationStatService, WellCompositeService } from '@api'
import WellCompositeSections from './WellCompositeSections' import WellCompositeSections from './WellCompositeSections'
import '@styles/well_composite.less' import '@styles/pages/well_composite.less'
const ClusterWells = lazy(() => import('@pages/Cluster/ClusterWells')) const ClusterWells = lazy(() => import('@pages/Cluster/ClusterWells'))

View File

@ -8,7 +8,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
import { DrillingProgramService } from '@api' import { DrillingProgramService } from '@api'
import '@styles/drilling_program.less' import '@styles/pages/drilling_program.less'
const catSelectorRules = [{ const catSelectorRules = [{
required: true, required: true,

View File

@ -12,7 +12,7 @@ import { FileService } from '@api'
import MarksCard from './MarksCard' import MarksCard from './MarksCard'
import '@styles/drilling_program.less' import '@styles/pages/drilling_program.less'
const { RangePicker } = DatePicker const { RangePicker } = DatePicker
const { Search } = Input const { Search } = Input

View File

@ -18,7 +18,7 @@ import { formatDate, MimeTypes } from '@utils'
import MarksCard from './MarksCard' import MarksCard from './MarksCard'
import '@styles/drilling_program.less' import '@styles/pages/drilling_program.less'
const CommentPrompt = memo(({ isRequired = true, ...props }) => ( const CommentPrompt = memo(({ isRequired = true, ...props }) => (
<Poprompt <Poprompt

View File

@ -21,7 +21,7 @@ import CategoryRender from './CategoryRender'
import CategoryEditor from './CategoryEditor' import CategoryEditor from './CategoryEditor'
import CategoryHistory from './CategoryHistory' import CategoryHistory from './CategoryHistory'
import '@styles/drilling_program.less' import '@styles/pages/drilling_program.less'
const ID_STATE = { const ID_STATE = {
NotInitialized: 0, NotInitialized: 0,

View File

@ -18,7 +18,7 @@ import { MeasureService } from '@api'
import { View } from './View' import { View } from './View'
import '@styles/index.css' import '@styles/index.css'
import '@styles/measure.css' import '@styles/pages/measure.css'
const createEditingColumns = (cols, renderDelegate) => const createEditingColumns = (cols, renderDelegate) =>
cols.map(col => col.map(col => ({ render: renderDelegate, ...col }))) cols.map(col => col.map(col => ({ render: renderDelegate, ...col })))

View File

@ -4,7 +4,7 @@ import { Empty, Form } from 'antd'
import { Grid, GridItem } from '@components/Grid' import { Grid, GridItem } from '@components/Grid'
import '@styles/index.css' import '@styles/index.css'
import '@styles/measure.css' import '@styles/pages/measure.css'
export const View = memo(({ columns, item }) => !item || !columns?.length ? ( export const View = memo(({ columns, item }) => !item || !columns?.length ? (
<Empty key={'empty'} image={Empty.PRESENTED_IMAGE_SIMPLE} /> <Empty key={'empty'} image={Empty.PRESENTED_IMAGE_SIMPLE} />

View File

@ -2,7 +2,7 @@ import { Input } from 'antd'
import { RegExpIsFloat } from '@components/Table' import { RegExpIsFloat } from '@components/Table'
import '@styles/measure.css' import '@styles/pages/measure.css'
export const v = (text) => ( export const v = (text) => (
<div className={'v-div'}> <div className={'v-div'}>

View File

@ -22,7 +22,7 @@ import {
import AddGroupWindow from './AddGroupWindow' import AddGroupWindow from './AddGroupWindow'
import AddWidgetWindow, { makeWidgetFromWits } from './AddWidgetWindow' import AddWidgetWindow, { makeWidgetFromWits } from './AddWidgetWindow'
import '@styles/dashboard_nnb.less' import '@styles/pages/dashboard_nnb.less'
const getWitsInfo = async () => { const getWitsInfo = async () => {
// TODO: Добавить expire с принудительным обновлением // TODO: Добавить expire с принудительным обновлением

View File

@ -11,8 +11,8 @@ import { makeColumn, makeDateColumn, makeNumericColumn, makeNumericSorter, makeT
import { withPermissions } from '@utils' import { withPermissions } from '@utils'
import { MessageService } from '@api' import { MessageService } from '@api'
import '@styles/filter.less' import '@styles/components/filter.less'
import '@styles/message.less' import '@styles/pages/message.less'
const pageSize = 26 const pageSize = 26
const { Search } = Input const { Search } = Input

View File

@ -10,8 +10,8 @@ import { DateRangeWrapper, makeColumn, makeNumericColumn, makeNumericRender, mak
import { arrayOrDefault, range, withPermissions } from '@utils' import { arrayOrDefault, range, withPermissions } from '@utils'
import { SubsystemOperationTimeService } from '@api' import { SubsystemOperationTimeService } from '@api'
import '@styles/filter.less' import '@styles/components/filter.less'
import '@styles/operation_time.less' import '@styles/pages/operation_time.less'
const subsystemColors = [ const subsystemColors = [
'#1abc9c', '#16a085', '#2ecc71', '#27ae60', '#1abc9c', '#16a085', '#2ecc71', '#27ae60',

View File

@ -4,7 +4,7 @@ import { D3Chart } from '@components/d3'
import { Grid, GridItem } from '@components/Grid' import { Grid, GridItem } from '@components/Grid'
import { formatDate, makeDisplayValue } from '@utils' import { formatDate, makeDisplayValue } from '@utils'
import '@styles/detected_operations.less' import '@styles/pages/detected_operations.less'
const displayNumber = makeDisplayValue({ fixed: 2 }) const displayNumber = makeDisplayValue({ fixed: 2 })

View File

@ -2,7 +2,7 @@ import { memo } from 'react'
import { Table, makeTextColumn, makeNumericColumn, makeNumericRender } from '@components/Table' import { Table, makeTextColumn, makeNumericColumn, makeNumericRender } from '@components/Table'
import '@styles/detected_operations.less' import '@styles/pages/detected_operations.less'
const numericRender = makeNumericRender(2) const numericRender = makeNumericRender(2)

View File

@ -16,7 +16,7 @@ import DrillerSchedule from './DrillerSchedule'
import OperationsChart from './OperationsChart' import OperationsChart from './OperationsChart'
import OperationsTable from './OperationsTable' import OperationsTable from './OperationsTable'
import '@styles/detected_operations.less' import '@styles/pages/detected_operations.less'
const Operations = memo(() => { const Operations = memo(() => {
const [isLoading, setIsLoading] = useState(false) const [isLoading, setIsLoading] = useState(false)

View File

@ -9,7 +9,7 @@ import { MessageService } from '@api'
import { makeMessageColumns } from '../Messages' import { makeMessageColumns } from '../Messages'
import '@styles/message.less' import '@styles/pages/message.less'
export const ActiveMessagesOnline = memo(({ well: givenWell }) => { export const ActiveMessagesOnline = memo(({ well: givenWell }) => {
const [messages, setMessages] = useState([]) const [messages, setMessages] = useState([])

View File

@ -32,8 +32,8 @@ import MomentStabPicDisabled from '@images/DempherOff.png'
import SpinPicEnabled from '@images/SpinEnabled.png' import SpinPicEnabled from '@images/SpinEnabled.png'
import SpinPicDisabled from '@images/SpinDisabled.png' import SpinPicDisabled from '@images/SpinDisabled.png'
import '@styles/telemetry_view.less' import '@styles/pages/telemetry_view.less'
import '@styles/message.less' import '@styles/pages/message.less'
const { Option } = Select const { Option } = Select

View File

@ -10,7 +10,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
import { WellFinalDocumentsService } from '@api' import { WellFinalDocumentsService } from '@api'
import { formatDate } from '@utils' import { formatDate } from '@utils'
import '@styles/well_case.less' import '@styles/pages/well_case.less'
export const HistoryTable = memo(({ category }) => { export const HistoryTable = memo(({ category }) => {
const [isLoading, setIsLoading] = useState(false) const [isLoading, setIsLoading] = useState(false)

View File

@ -8,7 +8,7 @@ import { invokeWebApiWrapperAsync } from '@components/factory'
import { WellFinalDocumentsService } from '@api' import { WellFinalDocumentsService } from '@api'
import { arrayOrDefault } from '@utils' import { arrayOrDefault } from '@utils'
import '@styles/well_case.less' import '@styles/pages/well_case.less'
const filterCategoriesByText = (text) => (cat) => const filterCategoriesByText = (text) => (cat) =>
!text || !!cat?.nameCategory?.toLowerCase().includes(text.toLowerCase()) !text || !!cat?.nameCategory?.toLowerCase().includes(text.toLowerCase())

View File

@ -15,7 +15,7 @@ import { withPermissions } from '@utils'
import WellCaseEditor from './WellCaseEditor' import WellCaseEditor from './WellCaseEditor'
import { HistoryTable } from './HistoryTable' import { HistoryTable } from './HistoryTable'
import '@styles/well_case.less' import '@styles/pages/well_case.less'
const expandable = { const expandable = {
expandedRowRender: (category) => <HistoryTable category={category} />, expandedRowRender: (category) => <HistoryTable category={category} />,

View File

@ -5,7 +5,7 @@ import { makeNumericRender } from '@components/Table'
import { invokeWebApiWrapperAsync } from '@components/factory' import { invokeWebApiWrapperAsync } from '@components/factory'
import { formatDate, fractionalSum } from '@utils' import { formatDate, fractionalSum } from '@utils'
import '@styles/tvd.less' import '@styles/pages/tvd.less'
const { Item } = Descriptions const { Item } = Descriptions

View File

@ -6,7 +6,7 @@ import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory' import { invokeWebApiWrapperAsync } from '@components/factory'
import { makeDateColumn, makeNumericColumn, makeNumericRender, makeTextColumn, Table } from '@components/Table' import { makeDateColumn, makeNumericColumn, makeNumericRender, makeTextColumn, Table } from '@components/Table'
import '@styles/tvd.less' import '@styles/pages/tvd.less'
export const columns = [ export const columns = [
makeTextColumn('Конструкция секции', 'wellSectionTypeName', null, null, null, { width: 140 }), makeTextColumn('Конструкция секции', 'wellSectionTypeName', null, null, null, { width: 140 }),

View File

@ -13,9 +13,9 @@ import { formatDate } from '@utils'
import { makeTooltipRender } from '../../Telemetry/Operations/OperationsChart' import { makeTooltipRender } from '../../Telemetry/Operations/OperationsChart'
import { makeGetColor } from '.' import { makeGetColor } from '.'
import '@styles/d3.less' import '@styles/components/d3.less'
import '@styles/tvd.less' import '@styles/pages/tvd.less'
import '@styles/detected_operations.less' import '@styles/pages/detected_operations.less'
const defaultOffset = { left: 40, right: 20, top: 20, bottom: 20 } const defaultOffset = { left: 40, right: 20, top: 20, bottom: 20 }
const zeroDate = moment('2000-01-01 00:00:00') const zeroDate = moment('2000-01-01 00:00:00')

View File

@ -11,7 +11,7 @@ import { unique } from '@utils/filters'
import { makeGetColor } from '.' import { makeGetColor } from '.'
import '@styles/tvd.less' import '@styles/pages/tvd.less'
const tableColumns = [ const tableColumns = [
makeColumn('Цвет', 'color', { width: 50, render: (d) => ( makeColumn('Цвет', 'color', { width: 50, render: (d) => (

View File

@ -18,29 +18,13 @@ import NetGraphExport from './NetGraphExport'
import AdditionalTables from './AdditionalTables' import AdditionalTables from './AdditionalTables'
import '@styles/index.css' import '@styles/index.css'
import '@styles/tvd.less' import '@styles/pages/tvd.less'
const operationsColors = [ const operationsColors = [
'#1abc9c', '#1abc9c', '#16a085', '#2ecc71', '#27ae60', '#3498db',
'#16a085', '#2980b9', '#9b59b6', '#8e44ad', '#34495e', '#2c3e50',
'#2ecc71', '#f1c40f', '#f39c12', '#e67e22', '#d35400', '#e74c3c',
'#27ae60', '#c0392b', '#ecf0f1', '#bdc3c7', '#95a5a6', '#7f8c8d',
'#3498db',
'#2980b9',
'#9b59b6',
'#8e44ad',
'#34495e',
'#2c3e50',
'#f1c40f',
'#f39c12',
'#e67e22',
'#d35400',
'#e74c3c',
'#c0392b',
'#ecf0f1',
'#bdc3c7',
'#95a5a6',
'#7f8c8d',
] ]
export const makeGetColor = (types) => (type) => { export const makeGetColor = (types) => (type) => {

View File

@ -9,9 +9,10 @@ import { loginRules, passwordRules } from '@utils/validationRules'
import { setUser, withPermissions } from '@utils' import { setUser, withPermissions } from '@utils'
import { AuthService } from '@api' import { AuthService } from '@api'
import '@styles/index.css'
import Logo from '@images/Logo' import Logo from '@images/Logo'
import '@styles/index.css'
const Login = memo(() => { const Login = memo(() => {
const [showLoader, setShowLoader] = useState(false) const [showLoader, setShowLoader] = useState(false)

View File

View File

2
src/styles/App.less → src/styles/pages/App.less Executable file → Normal file
View File

@ -1,4 +1,4 @@
@import './loader.css'; @import '../components/loader.css';
#root, .app{ #root, .app{
min-height:100%; min-height:100%;

View File

0
src/styles/smbo.css → src/styles/pages/smbo.css Executable file → Normal file
View File

View File

0
src/styles/tvd.less → src/styles/pages/tvd.less Executable file → Normal file
View File