Skip to content

Commit e68fe18

Browse files
authored
Merge branch 'main' into feat(frontend)-install-and-configure-tailwindcss-with-react
2 parents 11c02f6 + 702976e commit e68fe18

12 files changed

+38
-34
lines changed

.github/workflows/node.js.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ name: Node.js CI
55

66
on:
77
push:
8-
branches:
8+
branches:
99
- '*'
1010

1111
pull_request:
12-
branches:
12+
branches:
1313
- '*'
1414

1515
jobs:
1616
build:
17-
1817
runs-on: ubuntu-latest
1918

2019
strategy:
@@ -23,12 +22,11 @@ jobs:
2322
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2423

2524
steps:
26-
- uses: actions/checkout@v3
27-
- name: Use Node.js ${{ matrix.node-version }}
28-
uses: actions/setup-node@v3
29-
with:
30-
node-version: ${{ matrix.node-version }}
31-
cache: 'npm'
32-
- run: yarn install --frozen-lockfile
33-
- run: yarn build
34-
25+
- uses: actions/checkout@v3
26+
- name: Use Node.js ${{ matrix.node-version }}
27+
uses: actions/setup-node@v3
28+
with:
29+
node-version: ${{ matrix.node-version }}
30+
cache: 'npm'
31+
- run: yarn install --frozen-lockfile
32+
- run: yarn build

docs/ExportAsCsv.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ sequenceDiagram
1919
2020
```
2121

22-
This sequence diagram provides a clear visualization of the steps involved in exporting data as a CSV file, from user request through data formatting and delivery. This functionality is especially useful in applications where data portability and offline data analysis are important features.
22+
This sequence diagram provides a clear visualization of the steps involved in exporting data as a CSV file, from user request through data formatting and delivery. This functionality is especially useful in applications where data portability and offline data analysis are important features.

docs/Pagination.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ sequenceDiagram
1818
1919
```
2020

21-
This sequence outlines the interactions involved in fetching and displaying paginated scan results. This process ensures that the system can efficiently handle large datasets by only fetching and displaying a manageable subset of data at a time, which is crucial for performance and usability.
21+
This sequence outlines the interactions involved in fetching and displaying paginated scan results. This process ensures that the system can efficiently handle large datasets by only fetching and displaying a manageable subset of data at a time, which is crucial for performance and usability.

docs/SequenceDiagramExample.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ sequenceDiagram
2323
2424
```
2525

26-
This sequence diagram provides a clear, step-by-step visualization of the interactions involved in capturing and storing a photo in the system. It helps in understanding the flow of data and control between different parts of the application, which is essential for both development and troubleshooting.
26+
This sequence diagram provides a clear, step-by-step visualization of the interactions involved in capturing and storing a photo in the system. It helps in understanding the flow of data and control between different parts of the application, which is essential for both development and troubleshooting.

package.json

+1-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@
4747
"vite-plugin-eslint": "^1.8.1"
4848
},
4949
"lint-staged": {
50-
"*.ts": [
51-
"eslint --fix",
52-
"prettier --write"
53-
],
54-
"*.tsx": [
50+
"*.{ts,tsx,cjs,svg,json}": [
5551
"eslint --fix",
5652
"prettier --write"
5753
]

src/app.tsx

+7-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
44
import UserLogin from './components/UserLogin';
55
import Homepage from './components/home-page';
66

7-
87
/**
98
* The main application component.
109
*/
1110
export function App(): JSX.Element {
1211
return (
13-
<Router>
14-
<Routes>
15-
<Route path="/" element={<Homepage />} />
16-
<Route path="/login" element={<UserLogin/>} />
17-
</Routes>
18-
</Router>
19-
);
12+
<Router>
13+
<Routes>
14+
<Route path="/" element={<Homepage />} />
15+
<Route path="/login" element={<UserLogin />} />
16+
</Routes>
17+
</Router>
18+
);
2019
}

src/components/UserLogin.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import React from 'react';
22

33
const UserLogin: React.FC = () => {
44
return <h2>Login</h2>;
5-
}
5+
};
66

77
export default UserLogin;

src/components/home-page.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React from 'react';
22

33
const Homepage: React.FC = () => {
44
return <h2>Home</h2>;
5-
}
5+
};
66

77
export default Homepage;
8-

src/components/startnewscan.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import React from 'react';
22

33
const StartNewScan: React.FC = () => {
44
return <h2>Start a new scan</h2>;
5-
}
5+
};
66

77
export default StartNewScan;

src/components/take-photo.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import React from 'react';
22

33
const TakePhoto: React.FC = () => {
44
return <h2>Take a photo</h2>;
5-
}
5+
};
66

77
export default TakePhoto;

src/components/view-past-scan.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import React from 'react';
22

33
const ViewPastScan: React.FC = () => {
44
return <h2>View past scan</h2>;
5-
}
5+
};
66

77
export default ViewPastScan;

yarn.lock

+12
Original file line numberDiff line numberDiff line change
@@ -1851,6 +1851,10 @@ any-promise@^1.0.0:
18511851
version "1.3.0"
18521852
resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
18531853
integrity sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==
1854+
ansi-styles@^6.0.0, ansi-styles@^6.2.1:
1855+
version "6.2.1"
1856+
resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz"
1857+
integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
18541858

18551859
anymatch@~3.1.2:
18561860
version "3.1.3"
@@ -2168,6 +2172,7 @@ chalk@^4.0.0:
21682172
supports-color "^7.1.0"
21692173

21702174
"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.3:
2175+
"chokidar@>=3.0.0 <4.0.0":
21712176
version "3.6.0"
21722177
resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"
21732178
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -3702,6 +3707,7 @@ merge2@^1.3.0, merge2@^1.4.1:
37023707
integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
37033708

37043709
[email protected], micromatch@^4.0.4, micromatch@^4.0.5:
3710+
[email protected], micromatch@^4.0.4:
37053711
version "4.0.5"
37063712
resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
37073713
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -3727,6 +3733,7 @@ minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
37273733
brace-expansion "^1.1.7"
37283734

37293735
minimatch@^9.0.1, minimatch@^9.0.3, minimatch@^9.0.4:
3736+
minimatch@^9.0.3, minimatch@^9.0.4:
37303737
version "9.0.4"
37313738
resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz"
37323739
integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
@@ -4990,6 +4997,11 @@ yaml@^2.3.4:
49904997
resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
49914998
integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==
49924999

5000+
yaml@^1.10.0:
5001+
version "1.10.2"
5002+
resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
5003+
integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
5004+
49935005
yocto-queue@^0.1.0:
49945006
version "0.1.0"
49955007
resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"

0 commit comments

Comments
 (0)