Skip to content

Commit

Permalink
Sort imports using biome
Browse files Browse the repository at this point in the history
starsep committed Dec 27, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 09a8ffe commit 242fdcb
Showing 32 changed files with 124 additions and 121 deletions.
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"files": {
"ignore": [".devcontainer/*"]
"ignore": [".devcontainer", "build"]
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
"typecheck": "tsc -p ./tsconfig.json --noEmit",
"sprites": "spritezero ./public/img/sprite ./src/marker_icons; spritezero --ratio=2 ./public/img/sprite@2x ./src/marker_icons; spritezero --ratio=4 ./public/img/sprite@4x ./src/marker_icons",
"lint": "biome lint .",
"lint-fix": "biome lint .",
"lint-fix": "biome lint . --apply",
"css-build": "sass sass/mystyles.scss src/mystyles.css",
"css-watch": "npm run css-build -- --watch"
},
1 change: 1 addition & 0 deletions sass/mystyles.scss
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
$navbar-breakpoint: 1344px;

@import "../src/index.css";
@import "../src/components/map.css";
@import "../node_modules/bulma/bulma.sass";
@import "../node_modules/bulma-checkradio/dist/css/bulma-checkradio.min.css";
// Update Bulma's derived variables
2 changes: 1 addition & 1 deletion src/3rdparty/react-store-badges/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Based on https://github.com/yjb94/react-store-badges

import React, { useState, useLayoutEffect, FC } from "react";
import React, { FC, useLayoutEffect, useState } from "react";

const HEIGHT_RATIO = 3.375;
const getImage = (locale: string, language: string) => ({
24 changes: 12 additions & 12 deletions src/Main.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import React, {
useEffect, Suspense, useState, useMemo,
} from "react";
// @ts-ignore
import { osmAuth } from "osm-auth";
import SiteNavbar from "./components/navbar";
import SidebarRight from "./components/sidebar-right";
import MapView from "./components/map";
import { initialModalState, ModalType } from "~/model/modal";
import React, {Suspense,
useEffect, useMemo,useState,
} from "react";
import { AppContext } from "~/appContext";
import {fetchCountriesData} from "~/backend";
import CustomModal from "~/components/modal";
import { updateOsmUsernameState } from "~/osm";
import {useLanguage} from "~/i18n";
import { AuthState } from "~/model/auth";
import SidebarAction from "~/model/sidebarAction";
import { DefibrillatorData } from "~/model/defibrillatorData";
import {Country} from "~/model/country";
import {fetchCountriesData} from "~/backend";
import {useLanguage} from "~/i18n";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { ModalType, initialModalState } from "~/model/modal";
import SidebarAction from "~/model/sidebarAction";
import { updateOsmUsernameState } from "~/osm";
import MapView from "./components/map";
import SiteNavbar from "./components/navbar";
import SidebarRight from "./components/sidebar-right";

function Main() {
// some ui elements might depend on window size i.e. we don't want some stuff open by default on mobile
6 changes: 3 additions & 3 deletions src/appContext.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as React from "react";
import { useContext } from "react";
import { initialModalState, ModalState } from "~/model/modal";
import { AuthState, initialAuthState } from "~/model/auth";
import SidebarAction from "./model/sidebarAction";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { Country } from "~/model/country";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { ModalState, initialModalState } from "~/model/modal";
import SidebarAction from "./model/sidebarAction";

interface AppContextType {
authState: AuthState,
4 changes: 2 additions & 2 deletions src/backend.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { fetchNodeData } from "./osm";
import { DefibrillatorData } from "./model/defibrillatorData";
import { Country } from "./model/country";
import { DefibrillatorData } from "./model/defibrillatorData";
import { fetchNodeData } from "./osm";

export const backendBaseUrl = import.meta.env.VITE_BACKEND_API_URL;

8 changes: 4 additions & 4 deletions src/components/downloadCard.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { mdiDownload } from "@mdi/js";
import Icon from "@mdi/react";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import Icon from "@mdi/react";
import { mdiDownload } from "@mdi/js";
import {useAppContext} from "~/appContext";
import { backendBaseUrl, fetchCountriesData } from "~/backend";
import { Country } from "~/model/country";
import {useLanguage} from "~/i18n";
import {useAppContext} from "~/appContext";
import { Country } from "~/model/country";

const worldCountryCode = "WORLD";

8 changes: 4 additions & 4 deletions src/components/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import {
mdiAccountGroup,
mdiArrowRightBold,
mdiCancel,
mdiMapMarkerPlus,
mdiAccountGroup,
} from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC } from "react";
import { Button, Footer } from "react-bulma-components";
import { useTranslation } from "react-i18next";
import ButtonsType from "../model/buttonsType";
import { useAppContext } from "~/appContext";
import ButtonsType from "~/model/buttonsType";
import { ModalType, initialModalState } from "~/model/modal";
import "./footer.css";
import { useAppContext } from "../appContext";
import { initialModalState, ModalType } from "../model/modal";

const FooterDiv: FC<FooterDivProps> = ({
startAEDAdding, mobileCancel, showFormMobile, buttonsConfiguration,
4 changes: 2 additions & 2 deletions src/components/languageSwitcher.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import i18n from "i18next";
import React from "react";
import { Navbar } from "react-bulma-components";
import {languages, useLanguage} from "../i18n";
import {languages, useLanguage} from "~/i18n";

export default function LanguageSwitcher() {
const language = useLanguage();
16 changes: 8 additions & 8 deletions src/components/legend.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { mdiMapLegend } from "@mdi/js";
import Icon from "@mdi/react";
import React from "react";
import { useTranslation } from "react-i18next";
import Icon from "@mdi/react";
import { mdiMapLegend } from "@mdi/js";
import MarkerCustomers from "../marker_icons/marker_customers.svg";
import MarkerDefault from "../marker_icons/marker_yes.svg";
import MarkerNo from "../marker_icons/marker_no.svg";
import MarkerPrivate from "../marker_icons/marker_private.svg";
import MarkerPermissive from "../marker_icons/marker_permissive.svg";
import MarkerUnknown from "../marker_icons/marker_unknown.svg";
import MarkerCustomers from "~/marker_icons/marker_customers.svg";
import MarkerNo from "~/marker_icons/marker_no.svg";
import MarkerPermissive from "~/marker_icons/marker_permissive.svg";
import MarkerPrivate from "~/marker_icons/marker_private.svg";
import MarkerUnknown from "~/marker_icons/marker_unknown.svg";
import MarkerDefault from "~/marker_icons/marker_yes.svg";

export default function MapLegend() {
const { t } = useTranslation();
6 changes: 3 additions & 3 deletions src/components/logInButton.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { mdiAccount, mdiLogoutVariant } from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC } from "react";
import { Button, Navbar } from "react-bulma-components";
import Icon from "@mdi/react";
import { mdiAccount, mdiLogoutVariant } from "@mdi/js";
import { useTranslation } from "react-i18next";
import { useAppContext } from "../appContext";
import { useAppContext } from "~/appContext";

interface LogInButtonProps {
inNavBar: boolean,
28 changes: 14 additions & 14 deletions src/components/map.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import React, {
FC, useRef, useEffect, useState,
} from "react";
import "maplibre-gl/dist/maplibre-gl.css";
import "@maplibre/maplibre-gl-geocoder/dist/maplibre-gl-geocoder.css";
import "./map.css";
import { useTranslation } from "react-i18next";
// @ts-ignore
import MaplibreGeocoder from "@maplibre/maplibre-gl-geocoder";
import "@maplibre/maplibre-gl-geocoder/dist/maplibre-gl-geocoder.css";
import maplibregl from "maplibre-gl";
import ButtonsType from "~/model/buttonsType";
import { initialModalState, ModalType } from "~/model/modal";
import SidebarAction from "~/model/sidebarAction";
import "maplibre-gl/dist/maplibre-gl.css";
import React, {
FC, useEffect, useRef, useState,
} from "react";
import { useTranslation } from "react-i18next";
import { useAppContext } from "~/appContext";
import {fetchCountriesData, fetchNodeDataFromBackend} from "~/backend";
import { DefibrillatorData } from "~/model/defibrillatorData";
import nominatimGeocoder from "~/components/nominatimGeocoder";
import { useAppContext } from "~/appContext";
import {useLanguage} from "~/i18n";
import ButtonsType from "~/model/buttonsType";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { ModalType, initialModalState } from "~/model/modal";
import SidebarAction from "~/model/sidebarAction";
import FooterDiv from "./footer";
import SidebarLeft from "./sidebar-left";
import "./map.css";
import mapStyle from "./map_style";
import {useLanguage} from "~/i18n";
import SidebarLeft from "./sidebar-left";

function fillSidebarWithOsmDataAndShow(
nodeId: string,
10 changes: 5 additions & 5 deletions src/components/modal.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { mdiInformationOutline, mdiGithub } from "@mdi/js";
import { mdiGithub, mdiInformationOutline } from "@mdi/js";
import Icon from "@mdi/react";
import { useTranslation } from "react-i18next";
import { Button, Modal } from "react-bulma-components";
import React, { FC } from "react";
import { ModalType } from "../model/modal";
import { useAppContext } from "../appContext";
import { Button, Modal } from "react-bulma-components";
import { useTranslation } from "react-i18next";
import { useAppContext } from "~/appContext";
import { ModalType } from "~/model/modal";
import LogInButton from "./logInButton";
import PartnersModal from "./partnersModal";

14 changes: 7 additions & 7 deletions src/components/navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { mdiMapLegend } from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC } from "react";
import "./navbar.css";
import { Button, Navbar } from "react-bulma-components";
import { useTranslation } from "react-i18next";
import Icon from "@mdi/react";
import { mdiMapLegend } from "@mdi/js";
import ReactStoreBadges from "~/3rdparty/react-store-badges";
import { useAppContext } from "~/appContext";
import {useLanguage} from "~/i18n";
import { ModalType, initialModalState } from "~/model/modal";
import LanguageSwitcher from "./languageSwitcher";
import LogInButton from "./logInButton";
import { initialModalState, ModalType } from "../model/modal";
import { useAppContext } from "../appContext";
import ReactStoreBadges from "../3rdparty/react-store-badges";
import {useLanguage} from "~/i18n";
import "./navbar.css";

const SiteNavbar: FC<SiteNavbarProps> = ({ toggleSidebarShown }) => {
const { setModalState } = useAppContext();
6 changes: 3 additions & 3 deletions src/components/sidebar-left.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { FC } from "react";
import "./sidebar.css";
import { Marker } from "maplibre-gl";
import SidebarAction from "~/model/sidebarAction";
import React, { FC } from "react";
import { DefibrillatorData } from "~/model/defibrillatorData";
import SidebarAction from "~/model/sidebarAction";
import "./sidebar.css";
import DefibrillatorDetails from "./sidebar/defibrillatorDetails";
import DefibrillatorEditor from "./sidebar/defibrillatorEditor";
import PhotoReport from "./sidebar/photoReporter";
2 changes: 1 addition & 1 deletion src/components/sidebar/access.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useTranslation } from "react-i18next";
import React from "react";
import { useTranslation } from "react-i18next";

const accessToColourMapping = {
yes: "has-background-green has-text-white-ter",
10 changes: 5 additions & 5 deletions src/components/sidebar/buttons.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {
mdiMagnify, mdiPencil, mdiContentCopy, mdiMap, mdiMapMarkerPlus,
import {mdiContentCopy,
mdiGoogleMaps,
mdiMagnify, mdiMap, mdiMapMarkerPlus,mdiPencil,
} from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC } from "react";
import { Button } from "react-bulma-components";
import { useTranslation } from "react-i18next";
import React, { FC } from "react";
import { OSM_DOMAIN } from "~/constants";
import { useAppContext } from "~/appContext";
import { OSM_DOMAIN } from "~/constants";
import { ModalType, initialModalState } from "~/model/modal";
import SidebarAction from "~/model/sidebarAction";
import { fetchNodeDataFromOsm } from "~/osm";
import { initialModalState, ModalType } from "~/model/modal";

type OsmId = string;

4 changes: 2 additions & 2 deletions src/components/sidebar/contactNumber.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import React from "react";
import { mdiPhone } from "@mdi/js";
import Icon from "@mdi/react";
import React from "react";
import { useTranslation } from "react-i18next";

export default function ContactPhoneFormField({ phoneNumber, setPhoneNumber }: ContactPhoneFormFieldProps) {
const { t } = useTranslation();
24 changes: 12 additions & 12 deletions src/components/sidebar/defibrillatorDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
import {
mdiAccountSupervisorOutline, mdiClockOutline, mdiHomeRoof,mdiImagePlus,
mdiInformationOutline, mdiMapMarkerOutline, mdiPhoneOutline,
} from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC } from "react";
import { useTranslation } from "react-i18next";
import {
Button,
Card, Columns, Image,
} from "react-bulma-components";
import {
mdiAccountSupervisorOutline, mdiImagePlus, mdiClockOutline, mdiHomeRoof,
mdiInformationOutline, mdiMapMarkerOutline, mdiPhoneOutline,
} from "@mdi/js";
import Icon from "@mdi/react";
import { useTranslation } from "react-i18next";
import ImageGallery, { ReactImageGalleryItem } from "react-image-gallery";
import "react-image-gallery/styles/css/image-gallery.css";
import SidebarAction from "~/model/sidebarAction";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { useAppContext } from "~/appContext";
import { backendBaseUrl } from "~/backend";
import {useLanguage} from "~/i18n";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { ModalType, initialModalState } from "~/model/modal";
import SidebarAction from "~/model/sidebarAction";
import { accessColourClass } from "./access";
import {
CloseSidebarButton,
CopyUrlButton, EditButton,
GoogleMapsNavigationButton,
OpenStreetMapNavigationButton,
ViewButton,
} from "./buttons";
import DetailTextRow from "./detailTextRow";
import { OpeningHoursField } from "./openingHours";
import { CheckDateField } from "./verificationDate";
import DetailTextRow from "./detailTextRow";
import { accessColourClass } from "./access";
import { initialModalState, ModalType } from "../../model/modal";
import {useLanguage} from "~/i18n";

function photoGallery(data: DefibrillatorData, closeSidebar: () => void) {
const { t } = useTranslation();
16 changes: 8 additions & 8 deletions src/components/sidebar/defibrillatorEditor.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { Marker } from "maplibre-gl";
import React, { FC, useState } from "react";
import { Image, Card } from "react-bulma-components";
import { Card, Image } from "react-bulma-components";
import { useTranslation } from "react-i18next";
import { Marker } from "maplibre-gl";
import { initialModalState, ModalType } from "~/model/modal";
import { useAppContext } from "~/appContext";
import {useLanguage} from "~/i18n";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { ModalType, initialModalState } from "~/model/modal";
import { addDefibrillatorToOSM, editDefibrillatorInOSM, getOpenChangesetId } from "~/osm";
import { AddAedButton, CloseSidebarButton, SaveAedButton } from "./buttons";
import AccessFormField from "./access";
import { AddAedButton, CloseSidebarButton, SaveAedButton } from "./buttons";
import ContactPhoneFormField from "./contactNumber";
import IndoorFormField from "./indoor";
import LocationFormField from "./location";
import ContactPhoneFormField from "./contactNumber";
import { CheckDateFormField } from "./verificationDate";
import { useAppContext } from "~/appContext";
import { DefibrillatorData } from "~/model/defibrillatorData";
import {useLanguage} from "~/i18n";

const DefibrillatorEditor: FC<DefibrillatorEditorProps> = ({
closeSidebar, marker, openChangesetId, setOpenChangesetId, data,
2 changes: 1 addition & 1 deletion src/components/sidebar/indoor.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useTranslation } from "react-i18next";
import React from "react";
import { useTranslation } from "react-i18next";

export default function IndoorFormField({
indoor, setIndoor, level, setLevel,
6 changes: 3 additions & 3 deletions src/components/sidebar/openingHours.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { useTranslation } from "react-i18next";
import OpeningHours, { argument_hash } from "opening_hours";
import i18n from "i18next";
import OpeningHours, { argument_hash } from "opening_hours";
import React, { FC } from "react";
import { useTranslation } from "react-i18next";

import SpanNoData from "./spanNoData";
import {useLanguage} from "~/i18n";
import SpanNoData from "./spanNoData";

interface OpeningHoursProps {
openingHours: string,
12 changes: 6 additions & 6 deletions src/components/sidebar/photoReporter.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { mdiArrowLeftBold, mdiSend } from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC } from "react";
import { Button, Card, Image } from "react-bulma-components";
import { useTranslation } from "react-i18next";
import { mdiArrowLeftBold, mdiSend } from "@mdi/js";
import Icon from "@mdi/react";
import { DefibrillatorData } from "~/model/defibrillatorData";
import SidebarAction from "~/model/sidebarAction";
import { initialModalState, ModalType } from "~/model/modal";
import { useAppContext } from "~/appContext";
import { backendBaseUrl } from "~/backend";
import { CloseSidebarButton } from "./buttons";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { ModalType, initialModalState } from "~/model/modal";
import SidebarAction from "~/model/sidebarAction";
import { accessColourClass } from "./access";
import { CloseSidebarButton } from "./buttons";

interface DefibrillatorDetailsProps {
data: DefibrillatorData | null,
12 changes: 6 additions & 6 deletions src/components/sidebar/photoUploader.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { mdiArrowLeftBold, mdiFileDocumentRemove, mdiFileSend } from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC, useState } from "react";
import {
Button, Card, Image,
} from "react-bulma-components";
import { useTranslation } from "react-i18next";
import store from "store";
import { mdiArrowLeftBold, mdiFileDocumentRemove, mdiFileSend } from "@mdi/js";
import Icon from "@mdi/react";
import { DefibrillatorData } from "~/model/defibrillatorData";
import SidebarAction from "~/model/sidebarAction";
import { initialModalState, ModalType } from "~/model/modal";
import { useAppContext } from "~/appContext";
import { backendBaseUrl } from "~/backend";
import { CloseSidebarButton } from "./buttons";
import { DefibrillatorData } from "~/model/defibrillatorData";
import { ModalType, initialModalState } from "~/model/modal";
import SidebarAction from "~/model/sidebarAction";
import { accessColourClass } from "./access";
import { CloseSidebarButton } from "./buttons";

interface DefibrillatorDetailsProps {
data: DefibrillatorData | null,
2 changes: 1 addition & 1 deletion src/components/sidebar/spanNoData.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useTranslation } from "react-i18next";
import React from "react";
import { useTranslation } from "react-i18next";

export default function SpanNoData() {
const { t } = useTranslation();
2 changes: 1 addition & 1 deletion src/components/sidebar/verificationDate.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { mdiCalendar } from "@mdi/js";
import Icon from "@mdi/react";
import React, { FC } from "react";
import { useTranslation } from "react-i18next";
import SpanNoData from "./spanNoData";

export const CheckDateField: FC<CheckDateProps> = ({ check_date }) => {
2 changes: 1 addition & 1 deletion src/i18n.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import i18n from "i18next";
import { initReactI18next, useTranslation } from "react-i18next";
import LanguageDetector from "i18next-browser-languagedetector";
import Backend from "i18next-http-backend";
import { initReactI18next, useTranslation } from "react-i18next";

const isProduction = import.meta.env.VITE_ENV === "production";

5 changes: 3 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from "react";
import ReactDOM from "react-dom/client";
import "./mystyles.css";
import "~/i18n";
import "~/mystyles.css";
import Main from "./Main";
import "./i18n";


const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement);
root.render(
1 change: 1 addition & 0 deletions src/mystyles.css
2 changes: 1 addition & 1 deletion src/mystyles.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vite.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import path from 'path';
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import { defineConfig } from 'vite';

export default defineConfig(() => {
return {

0 comments on commit 242fdcb

Please sign in to comment.