Skip to content

Commit 49262ad

Browse files
ricardovdheijdenricardovdheijden
authored
Adding prettier (#36)
* Adds Prettier to the project * Applies Prettier rules to project * Applies Prettier rules to new files in the project
1 parent 998ac1a commit 49262ad

File tree

13 files changed

+146
-117
lines changed

13 files changed

+146
-117
lines changed

‎.github/workflows/lint-test-build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
run: npm ci
3636
- run: npm run tsc
3737
- run: npm run lint
38+
- run: npm run prettier
3839

3940
unit-tests:
4041
runs-on: ubuntu-latest

‎.prettierignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Add files here to ignore them from prettier formatting
2+
3+
/coverage
4+
/mkdocs
5+
6+
.next
7+
node_modules

‎.prettierrc‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"singleQuote": true,
3+
"trailingComma": "all",
4+
"bracketSpacing": true,
5+
"importOrder": [
6+
"^react",
7+
"^react-native",
8+
"^[a-zA-Z]",
9+
"^@?\\w",
10+
"^@/?\\w",
11+
"^[./]"
12+
],
13+
"importOrderSeparation": true,
14+
"importOrderSortSpecifiers": true,
15+
"plugins": ["@trivago/prettier-plugin-sort-imports"],
16+
"tabWidth": 4
17+
}

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
"build": "next build",
1010
"start": "next start",
1111
"lint": "next lint",
12+
"prettier": "prettier -c \"{**/*,*}.{ts,tsx,json,js,md}\"",
13+
"prettier-fix": "prettier --write \"{**/*,*}.{ts,tsx,json,js,md}\"",
1214
"prepare": "husky"
1315
},
1416
"dependencies": {

‎pages/_app.tsx‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
import React, { useEffect, useState } from "react";
2-
import NoSSR from "react-no-ssr";
3-
import { QueryClient, QueryClientProvider } from "react-query";
4-
import { ReactQueryDevtools } from "react-query/devtools";
5-
import { QueryClientConfig } from "react-query/types/core/types";
6-
7-
import { SessionProvider } from "next-auth/react";
8-
import { NextAdapter } from "next-query-params";
9-
import App, { AppContext, AppInitialProps, AppProps } from "next/app";
10-
import Head from "next/head";
11-
import { useRouter } from "next/router";
12-
import { QueryParamProvider } from "use-query-params";
13-
14-
import type { EuiSideNavItemType } from "@elastic/eui";
15-
import { EuiProvider, EuiThemeColorMode } from "@elastic/eui";
16-
import "@elastic/eui/dist/eui_theme_light.min.css";
17-
1+
import React, { useEffect, useState } from 'react';
2+
import NoSSR from 'react-no-ssr';
3+
import { QueryClient, QueryClientProvider } from 'react-query';
4+
import { ReactQueryDevtools } from 'react-query/devtools';
5+
import { QueryClientConfig } from 'react-query/types/core/types';
6+
7+
import { SessionProvider } from 'next-auth/react';
8+
import { NextAdapter } from 'next-query-params';
9+
import App, { AppContext, AppInitialProps, AppProps } from 'next/app';
10+
import Head from 'next/head';
11+
import { useRouter } from 'next/router';
12+
import { QueryParamProvider } from 'use-query-params';
13+
14+
import type { EuiSideNavItemType } from '@elastic/eui';
15+
import { EuiProvider, EuiThemeColorMode } from '@elastic/eui';
16+
import '@elastic/eui/dist/eui_theme_light.min.css';
1817
import {
1918
ColorModes,
2019
ConfirmationDialogContextWrapper,
@@ -27,13 +26,13 @@ import {
2726
WfoPageTemplate,
2827
WfoToastsList,
2928
defaultOrchestratorTheme,
30-
} from "@orchestrator-ui/orchestrator-ui-components";
29+
} from '@orchestrator-ui/orchestrator-ui-components';
3130

32-
import { getAppLogo } from "@/components/AppLogo/AppLogo";
33-
import { getInitialOrchestratorConfig } from "@/configuration";
34-
import { TranslationsProvider } from "@/translations/translationsProvider";
31+
import { getAppLogo } from '@/components/AppLogo/AppLogo';
32+
import { getInitialOrchestratorConfig } from '@/configuration';
33+
import { TranslationsProvider } from '@/translations/translationsProvider';
3534

36-
import "../font/inter.css";
35+
import '../font/inter.css';
3736

3837
type AppOwnProps = { orchestratorConfig: OrchestratorConfig };
3938

@@ -55,17 +54,17 @@ function CustomApp({
5554
const [queryClient] = useState(() => new QueryClient(queryClientConfig));
5655

5756
const [themeMode, setThemeMode] = useState<EuiThemeColorMode>(
58-
ColorModes.LIGHT
57+
ColorModes.LIGHT,
5958
);
6059

6160
const handleThemeSwitch = (newThemeMode: EuiThemeColorMode) => {
6261
setThemeMode(newThemeMode);
63-
localStorage.setItem("themeMode", newThemeMode);
62+
localStorage.setItem('themeMode', newThemeMode);
6463
};
6564

6665
useEffect(() => {
6766
// Initialize theme mode from localStorage or set it to 'light' if not present
68-
const storedTheme = localStorage.getItem("themeMode");
67+
const storedTheme = localStorage.getItem('themeMode');
6968
if (
7069
!storedTheme ||
7170
(storedTheme !== ColorModes.LIGHT &&
@@ -76,19 +75,19 @@ function CustomApp({
7675
}, []);
7776

7877
const addMenuItems = (
79-
defaultMenuItems: EuiSideNavItemType<object>[]
78+
defaultMenuItems: EuiSideNavItemType<object>[],
8079
): EuiSideNavItemType<object>[] => [
8180
...defaultMenuItems,
8281
{
83-
name: "Example form",
84-
id: "10",
85-
isSelected: router.pathname === "/example-form",
86-
href: "/example-form",
82+
name: 'Example form',
83+
id: '10',
84+
isSelected: router.pathname === '/example-form',
85+
href: '/example-form',
8786
renderItem: () => (
8887
<WfoMenuItemLink
89-
path={"/example-form"}
88+
path={'/example-form'}
9089
translationString="Example form"
91-
isSelected={router.pathname === "/example-form"}
90+
isSelected={router.pathname === '/example-form'}
9291
/>
9392
),
9493
},
@@ -168,7 +167,7 @@ function CustomApp({
168167
}
169168

170169
CustomApp.getInitialProps = async (
171-
context: AppContext
170+
context: AppContext,
172171
): Promise<AppOwnProps & AppInitialProps> => {
173172
const ctx = await App.getInitialProps(context);
174173

‎pages/metadata/productblocks.tsx‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
import React from 'react';
2+
13
import {
24
PolicyResource,
35
WfoPolicyRenderPageFallback,
46
WfoProductBlocksPage,
5-
} from '@orchestrator-ui/orchestrator-ui-components';
6-
import React from 'react';
7-
8-
export const ProductBlocksPage = () => {
7+
} from '@orchestrator-ui/orchestrator-ui-components';
8+
9+
export const ProductBlocksPage = () => {
910
return (
10-
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
11-
<WfoProductBlocksPage />
12-
</WfoPolicyRenderPageFallback>
11+
<WfoPolicyRenderPageFallback
12+
resource={PolicyResource.NAVIGATION_METADATA}
13+
>
14+
<WfoProductBlocksPage />
15+
</WfoPolicyRenderPageFallback>
1316
);
14-
};
15-
16-
export default ProductBlocksPage;
17-
17+
};
18+
19+
export default ProductBlocksPage;

‎pages/metadata/products.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
import React from 'react';
2+
13
import {
24
PolicyResource,
35
WfoPolicyRenderPageFallback,
46
WfoProductsPage,
5-
} from '@orchestrator-ui/orchestrator-ui-components';
6-
import React from 'react';
7-
8-
export const ProductsPage = () => (
7+
} from '@orchestrator-ui/orchestrator-ui-components';
8+
9+
export const ProductsPage = () => (
910
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
10-
<WfoProductsPage />
11+
<WfoProductsPage />
1112
</WfoPolicyRenderPageFallback>
12-
);
13-
14-
export default ProductsPage;
15-
13+
);
14+
15+
export default ProductsPage;

‎pages/metadata/resource-types.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
import React from 'react';
2+
13
import {
24
PolicyResource,
35
WfoPolicyRenderPageFallback,
46
WfoResourceTypesPage,
5-
} from '@orchestrator-ui/orchestrator-ui-components';
6-
import React from 'react';
7-
8-
export const ResourceTypesPage = () => (
7+
} from '@orchestrator-ui/orchestrator-ui-components';
8+
9+
export const ResourceTypesPage = () => (
910
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
10-
<WfoResourceTypesPage />
11+
<WfoResourceTypesPage />
1112
</WfoPolicyRenderPageFallback>
12-
);
13-
14-
export default ResourceTypesPage;
15-
13+
);
14+
15+
export default ResourceTypesPage;

‎pages/metadata/tasks.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
import React from 'react';
2+
13
import {
24
PolicyResource,
35
WfoPolicyRenderPageFallback,
46
WfoTasksPage,
5-
} from '@orchestrator-ui/orchestrator-ui-components';
6-
import React from 'react';
7-
8-
export const TasksPage = () => (
7+
} from '@orchestrator-ui/orchestrator-ui-components';
8+
9+
export const TasksPage = () => (
910
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
10-
<WfoTasksPage />
11+
<WfoTasksPage />
1112
</WfoPolicyRenderPageFallback>
12-
);
13-
14-
export default TasksPage;
15-
13+
);
14+
15+
export default TasksPage;

‎pages/metadata/workflows.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
import React from 'react';
2+
13
import {
24
PolicyResource,
35
WfoPolicyRenderPageFallback,
46
WfoWorkflowsPage,
5-
} from '@orchestrator-ui/orchestrator-ui-components';
6-
import React from 'react';
7-
8-
export const WorkflowsPage = () => (
7+
} from '@orchestrator-ui/orchestrator-ui-components';
8+
9+
export const WorkflowsPage = () => (
910
<WfoPolicyRenderPageFallback resource={PolicyResource.NAVIGATION_METADATA}>
10-
<WfoWorkflowsPage />
11+
<WfoWorkflowsPage />
1112
</WfoPolicyRenderPageFallback>
12-
);
13-
14-
export default WorkflowsPage;
15-
13+
);
14+
15+
export default WorkflowsPage;

0 commit comments

Comments
 (0)