Skip to content

Commit

Permalink
Add typescript import sorter and sort LA Letter Builder code. (#2227)
Browse files Browse the repository at this point in the history
* Add better CSS for la letter builder site

* Run lingui:extract

* Add ask name step'

* Add import sorter and sort LA Letter builder folder

* Order import members desc
  • Loading branch information
Samara Trilling authored Nov 12, 2021
1 parent 9c58972 commit 9236926
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 34 deletions.
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
"ms-python.python",
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"ms-python.vscode-pylance"
"ms-python.vscode-pylance",
"mike-co.import-sorter"
],

"mounts": [
Expand Down
4 changes: 4 additions & 0 deletions .import-sorter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"importSorter.importStringConfiguration.quoteMark": "double",
"importSorter.sortConfiguration.importMembers.direction": "desc"
}
12 changes: 7 additions & 5 deletions frontend/lib/laletterbuilder/about.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React from "react";
import Page from "../ui/page";

import { Trans, t } from "@lingui/macro";

import { li18n } from "../i18n-lingui";
import { JustfixLogo } from "../norent/components/logo"; // TODO: change this
import { JumpArrow, getNorentImageSrc } from "../norent/homepage"; // TODO: move these out of NoRent
import { OutboundLink } from "../ui/outbound-link";
import { getNorentImageSrc, JumpArrow } from "../norent/homepage"; // TODO: move these out of NoRent
import Page from "../ui/page";
import { StaticImage } from "../ui/static-image";
import { JustfixLogo } from "../norent/components/logo"; // TODO: change this
import { li18n } from "../i18n-lingui";
import { t, Trans } from "@lingui/macro";

type PartnerLogo = {
name: string;
Expand Down
1 change: 1 addition & 0 deletions frontend/lib/laletterbuilder/components/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";

import { FooterLanguageToggle } from "../../ui/language-toggle";
import { LegalDisclaimer } from "../../ui/legal-disclaimer";

Expand Down
4 changes: 3 additions & 1 deletion frontend/lib/laletterbuilder/homepage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Trans } from "@lingui/macro";
import React from "react";

import { Trans } from "@lingui/macro";

import Page from "../ui/page";

export const LALetterBuilderHomepage: React.FC<{}> = () => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";

import { ProgressStepProps } from "../../progress/progress-step-route";
import Page from "../../ui/page";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";

import { AlreadyLoggedInErrorPage } from "../../common-steps/error-pages";
import { LALetterBuilderRoutes } from "../route-info";

Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/laletterbuilder/letter-builder/route-info.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ROUTE_PREFIX } from "../../util/route-util";
import { createStartAccountOrLoginRouteInfo } from "../../start-account-or-login/route-info";
import { ROUTE_PREFIX } from "../../util/route-util";

export type LALetterBuilderRouteInfo = ReturnType<
typeof createLALetterBuilderRouteInfo
Expand Down
10 changes: 5 additions & 5 deletions frontend/lib/laletterbuilder/letter-builder/routes.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { AskNameStep } from "../../common-steps/ask-name";
import {
buildProgressRoutesComponent,
ProgressRoutesProps,
buildProgressRoutesComponent,
} from "../../progress/progress-routes";
import { skipStepsIf } from "../../progress/skip-steps-if";
import { createStartAccountOrLoginSteps } from "../../start-account-or-login/routes";
import { isUserLoggedIn } from "../../util/session-predicates";
import { LALetterBuilderRoutes } from "../route-info";
import { LALetterBuilderConfirmation } from "./confirmation";
import { LALetterBuilderWelcome } from "./welcome";
import { AskNameStep } from "../../common-steps/ask-name";
import { skipStepsIf } from "../../progress/skip-steps-if";
import { isUserLoggedIn } from "../../util/session-predicates";
import { LALetterBuilderOnboardingStep } from "./step-decorators";
import { LALetterBuilderWelcome } from "./welcome";

const LALetterBuilderAskName = LALetterBuilderOnboardingStep(AskNameStep);

Expand Down
8 changes: 5 additions & 3 deletions frontend/lib/laletterbuilder/letter-builder/welcome.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { t, Trans } from "@lingui/macro";
import React from "react";
import { Link } from "react-router-dom";

import { assertNotNull } from "@justfixnyc/util";
import { Trans, t } from "@lingui/macro";

import { SimpleClearAnonymousSessionButton } from "../../forms/clear-anonymous-session-button";
import { li18n } from "../../i18n-lingui";
import { ProgressStepProps } from "../../progress/progress-step-route";
import Page from "../../ui/page";
import { LALetterBuilderRoutes } from "../route-info";
import { assertNotNull } from "@justfixnyc/util";
import { li18n } from "../../i18n-lingui";

export const LALetterBuilderWelcome: React.FC<ProgressStepProps> = (props) => {
return (
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/laletterbuilder/route-info.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createRoutesForSite, ROUTE_PREFIX } from "../util/route-util";
import { createDevRouteInfo } from "../dev/route-info";
import { ROUTE_PREFIX, createRoutesForSite } from "../util/route-util";
import { createLALetterBuilderRouteInfo } from "./letter-builder/route-info";

function createLocalizedRouteInfo(prefix: string) {
Expand Down
14 changes: 8 additions & 6 deletions frontend/lib/laletterbuilder/routes.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import loadable from "@loadable/component";
import { friendlyLoad, LoadingPage } from "../networking/loading-page";
import React from "react";
import { Switch, RouteComponentProps, Route } from "react-router-dom";

import loadable from "@loadable/component";

import { LoadingPage, friendlyLoad } from "../networking/loading-page";
import { AlternativeLogoutPage } from "../pages/logout-alt-page";
import { NotFound } from "../pages/not-found";
import { Route, RouteComponentProps, Switch } from "react-router-dom";
import { LALetterBuilderRoutes as Routes } from "./route-info";
import { LALetterBuilderHomepage } from "./homepage";
import { LALetterBuilderAboutPage } from "./about";
import { AlternativeLogoutPage } from "../pages/logout-alt-page";
import { LALetterBuilderHomepage } from "./homepage";
import { LALetterBuilderFormsRoutes } from "./letter-builder/routes";
import { LALetterBuilderRoutes as Routes } from "./route-info";

const LoadableDevRoutes = loadable(
() => friendlyLoad(import("../dev/routes")),
Expand Down
23 changes: 13 additions & 10 deletions frontend/lib/laletterbuilder/site.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
import loadable from "@loadable/component";
import classnames from "classnames";
import React, { useContext } from "react";
import { Link, Route, useLocation } from "react-router-dom";
import type { AppSiteProps } from "../app";
import { useLocation, Route, Link } from "react-router-dom";

import { Trans } from "@lingui/macro";
import loadable from "@loadable/component";

import { AppContext } from "../app-context";
import { createLinguiCatalogLoader } from "../i18n-lingui";
import { LoadingOverlayManager } from "../networking/loading-page";
import { LALetterBuilderRouteComponent } from "./routes";
import { NavbarLanguageDropdown } from "../ui/language-toggle";
import Navbar from "../ui/navbar";
import { LALetterBuilderFooter } from "./components/footer";
import {
LALetterBuilderRoutes as Routes,
getLALetterBuilderRoutesForPrimaryPages,
} from "./route-info";
import Navbar from "../ui/navbar";
import { AppContext } from "../app-context";
import { Trans } from "@lingui/macro";
import { NavbarLanguageDropdown } from "../ui/language-toggle";
import classnames from "classnames";
import { LALetterBuilderFooter } from "./components/footer";
import { LALetterBuilderRouteComponent } from "./routes";

import type { AppSiteProps } from "../app";

export const LALetterBuilderLinguiI18n = createLinguiCatalogLoader({
en: loadable.lib(
Expand Down
4 changes: 3 additions & 1 deletion frontend/lib/laletterbuilder/tests/site.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import React from "react";
import { AppTesterPal } from "../../tests/app-tester-pal";
import { Route } from "react-router-dom";

import { waitFor } from "@testing-library/react";

import { AppTesterPal } from "../../tests/app-tester-pal";
import LALetterBuilderSite from "../site";

describe("LALetterBuilderSite", () => {
Expand Down

0 comments on commit 9236926

Please sign in to comment.