Move css imports group to second place

This commit is contained in:
Maciej Ziarkowski 2019-11-13 19:20:47 +00:00
parent 49fd95d980
commit bc76185613
12 changed files with 25 additions and 25 deletions

View File

@ -1,6 +1,9 @@
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import { Link, Route, Switch } from 'react-router-dom'; import { Link, Route, Switch } from 'react-router-dom';
import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
import './app.css';
import Header from './header'; import Header from './header';
import MapApp from './map-app'; import MapApp from './map-app';
import { Building } from './models/building'; import { Building } from './models/building';
@ -19,9 +22,6 @@ import MyAccountPage from './user/my-account';
import PasswordReset from './user/password-reset'; import PasswordReset from './user/password-reset';
import SignUp from './user/signup'; import SignUp from './user/signup';
import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
import './app.css';
interface AppProps { interface AppProps {
user?: User; user?: User;

View File

@ -1,9 +1,9 @@
import React, { Fragment, useState } from "react"; import React, { Fragment, useState } from "react";
import { DownIcon, RightIcon } from "../../components/icons";
import './data-entry-group.css'; import './data-entry-group.css';
import { DownIcon, RightIcon } from "../../components/icons";
interface DataEntryGroupProps { interface DataEntryGroupProps {
/** Name of the group */ /** Name of the group */
name: string; name: string;

View File

@ -1,13 +1,13 @@
import React from 'react'; import React from 'react';
import './building-edit-summary.css';
import { dataFields } from '../../data_fields'; import { dataFields } from '../../data_fields';
import { arrayToDictionary, parseDate } from '../../helpers'; import { arrayToDictionary, parseDate } from '../../helpers';
import { EditHistoryEntry } from '../../models/edit-history-entry'; import { EditHistoryEntry } from '../../models/edit-history-entry';
import { CategoryEditSummary } from './category-edit-summary'; import { CategoryEditSummary } from './category-edit-summary';
import './building-edit-summary.css';
interface BuildingEditSummaryProps { interface BuildingEditSummaryProps {
historyEntry: EditHistoryEntry; historyEntry: EditHistoryEntry;
} }

View File

@ -1,9 +1,9 @@
import React from 'react'; import React from 'react';
import { FieldEditSummary } from './field-edit-summary';
import './category-edit-summary.css'; import './category-edit-summary.css';
import { FieldEditSummary } from './field-edit-summary';
interface CategoryEditSummaryProps { interface CategoryEditSummaryProps {
category: string; category: string;
fields: { fields: {

View File

@ -1,13 +1,13 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import './edit-history.css';
import { Building } from '../../models/building'; import { Building } from '../../models/building';
import { EditHistoryEntry } from '../../models/edit-history-entry'; import { EditHistoryEntry } from '../../models/edit-history-entry';
import ContainerHeader from '../container-header'; import ContainerHeader from '../container-header';
import { BuildingEditSummary } from './building-edit-summary'; import { BuildingEditSummary } from './building-edit-summary';
import './edit-history.css';
interface EditHistoryProps { interface EditHistoryProps {
building: Building; building: Building;
} }

View File

@ -1,9 +1,9 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { InfoIcon } from './icons';
import './tooltip.css'; import './tooltip.css';
import { InfoIcon } from './icons';
interface TooltipProps { interface TooltipProps {
text: string; text: string;
} }

View File

@ -1,11 +1,11 @@
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import { NavLink } from 'react-router-dom'; import { NavLink } from 'react-router-dom';
import './header.css';
import { Logo } from './components/logo'; import { Logo } from './components/logo';
import { User } from './models/user'; import { User } from './models/user';
import './header.css';
interface HeaderProps { interface HeaderProps {
user: User; user: User;

View File

@ -1,10 +1,10 @@
import React from 'react'; import React from 'react';
import './legend.css';
import { DownIcon, UpIcon } from '../components/icons'; import { DownIcon, UpIcon } from '../components/icons';
import { Logo } from '../components/logo'; import { Logo } from '../components/logo';
import './legend.css';
const LEGEND_CONFIG = { const LEGEND_CONFIG = {
location: { location: {
title: 'Location', title: 'Location',

View File

@ -2,6 +2,9 @@ import { GeoJsonObject } from 'geojson';
import React, { Component, Fragment } from 'react'; import React, { Component, Fragment } from 'react';
import { AttributionControl, GeoJSON, Map, TileLayer, ZoomControl } from 'react-leaflet-universal'; import { AttributionControl, GeoJSON, Map, TileLayer, ZoomControl } from 'react-leaflet-universal';
import '../../../node_modules/leaflet/dist/leaflet.css';
import './map.css';
import { HelpIcon } from '../components/icons'; import { HelpIcon } from '../components/icons';
import { Building } from '../models/building'; import { Building } from '../models/building';
@ -9,9 +12,6 @@ import Legend from './legend';
import SearchBox from './search-box'; import SearchBox from './search-box';
import ThemeSwitcher from './theme-switcher'; import ThemeSwitcher from './theme-switcher';
import '../../../node_modules/leaflet/dist/leaflet.css';
import './map.css';
const OS_API_KEY = 'NVUxtY5r8eA6eIfwrPTAGKrAAsoeI9E9'; const OS_API_KEY = 'NVUxtY5r8eA6eIfwrPTAGKrAAsoeI9E9';
interface ColouringMapProps { interface ColouringMapProps {

View File

@ -1,10 +1,10 @@
import { Point } from 'geojson'; import { Point } from 'geojson';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { SearchIcon } from '../components/icons';
import './search-box.css'; import './search-box.css';
import { SearchIcon } from '../components/icons';
interface SearchResult { interface SearchResult {
type: string; type: string;
attributes: { attributes: {

View File

@ -1,10 +1,10 @@
import React from 'react'; import React from 'react';
import './about.css';
import Categories from '../building/categories'; import Categories from '../building/categories';
import SupporterLogos from '../components/supporter-logos'; import SupporterLogos from '../components/supporter-logos';
import './about.css';
const AboutPage = () => ( const AboutPage = () => (
<article> <article>
<section className="main-col"> <section className="main-col">

View File

@ -7,7 +7,7 @@
{ {
"grouped-imports": true, "grouped-imports": true,
"groups": [ "groups": [
{ "name": "css", "match": "\\.css$", "order": 40 }, { "name": "css", "match": "\\.css$", "order": 15 },
{ "name": "parent directories", "match": "^\\.\\.", "order": 20 }, { "name": "parent directories", "match": "^\\.\\.", "order": 20 },
{ "name": "current directory", "match": "^\\.", "order": 30 }, { "name": "current directory", "match": "^\\.", "order": 30 },
{ "name": "libraries", "match": ".*", "order": 10 } { "name": "libraries", "match": ".*", "order": 10 }