Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump express from 4.18.2 to 4.19.2 in /server #4

Closed
wants to merge 7 commits into from
+9,593 −1,428
Closed

Bump express from 4.18.2 to 4.19.2 in /server #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7bff1bd
wip
seansund Apr 30, 2024
4e2ee0b
Fix downloads
seansund May 7, 2024
e50d9c5
Removes perdiction field from upload form
seansund May 8, 2024
30f2bbc
Fixes filter logic
seansund May 9, 2024
d453fa7
Upload corrected file
seansund May 10, 2024
58b1c3e
Handles Excel file uploads
seansund May 11, 2024
135bc9a
Bump express from 4.18.2 to 4.19.2 in /server
dependabot[bot] May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,051 changes: 8,051 additions & 0 deletions WHT data to EY_2023.csv
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions env.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
API_TARGET=""
GRAPHQL_TARGET=""
SOCKET_TARGET=""
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/png" href="/watsonx.ai.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Family Allowance</title>
<title>Csv Documents</title>
</head>
<body>
<div id="root"></div>
Expand Down
109 changes: 75 additions & 34 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"preview": "vite preview"
},
"dependencies": {
"@apollo/client": "^3.8.6",
"@apollo/client": "^3.9.6",
"@carbon/charts-react": "^1.13.6",
"@carbon/grid": "^11.20.0",
"@carbon/icons-react": "^11.28.0",
Expand All @@ -19,7 +19,7 @@
"dayjs": "^1.11.10",
"graphql-ws": "^5.14.1",
"ibmcloud-appid-js": "^1.0.1",
"jotai": "^2.4.3",
"jotai": "^2.7.0",
"js-cookie": "^3.0.5",
"mime": "^3.0.0",
"optional-js": "^2.3.0",
Expand Down
55 changes: 9 additions & 46 deletions server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"serve": "npm start"
},
"dependencies": {
"express": "^4.18.2",
"express": "^4.19.2",
"express-http-proxy": "^2.0.0",
"express-session": "^1.17.3",
"ibmcloud-appid": "^7.0.0",
Expand Down
8 changes: 5 additions & 3 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import './App.css'
import {activeItemAtom} from "./atoms";
import {NotFound, UIShell} from "./components";
import {MenuLinksModel, NavigationModel} from "./models";
import {CaseView} from "./views";
import {CsvDocumentsListView} from "./views";
import {CsvDocumentDetailView} from "./views/CsvDocumentDetailView";

function App() {
const [activeItem, setActiveItem] = useAtom(activeItemAtom);
Expand All @@ -19,7 +20,8 @@ function App() {
}

const menuLinks: MenuLinksModel[] = [
{title: 'Family Allowance Case', href: '/:id', element: <CaseView />, excludeFromMenu: true},
{title: 'Tax Withholding', href: '/', element: <CsvDocumentsListView />, excludeFromMenu: true},
{title: 'Document', href: ':id', element: <CsvDocumentDetailView />, excludeFromMenu: true}
]

const navigation: NavigationModel = {
Expand Down Expand Up @@ -55,7 +57,7 @@ function App() {

return (
<div>
<UIShell prefix="Family Allowance" navigation={navigation} activeItem={activeItem} setActiveItem={setActiveItem}>
<UIShell prefix="Documents" navigation={navigation} activeItem={activeItem} setActiveItem={setActiveItem}>
<Routes>
{renderMenuLinks(menuLinks)}
<Route key="route-all" path="*" element={<NotFound />} />
Expand Down
Loading