+
handleDateChange(item)}
@@ -249,6 +249,6 @@ export const DashboardCalendar = () => {
"userName")}
/>
}
-
+
);
};
diff --git a/view.react/src/components/dashboard-calendar/DashboardCalendar.module.scss b/view.react/src/components/dashboard-calendar/DashboardCalendar.module.scss
index 53578274..5beb3a42 100644
--- a/view.react/src/components/dashboard-calendar/DashboardCalendar.module.scss
+++ b/view.react/src/components/dashboard-calendar/DashboardCalendar.module.scss
@@ -41,7 +41,7 @@
.rdrSelected + .rdrDayNumber {
color: transparent;
}
-
+
&:hover {
border: 1px solid #78A612;
transition: all 0.6s ease-in-out;
@@ -225,8 +225,6 @@
}
.filterSection {
- display: flex;
- flex-direction: column;
align-items: center;
width: 100%;
}
@@ -269,4 +267,4 @@
.filter + .filter {
margin-top: 0;
}
-}
\ No newline at end of file
+}
diff --git a/view.react/src/components/extended-worker/absence-history-section/AbsenceHistorySection.test.js b/view.react/src/components/extended-worker/absence-history-section/AbsenceHistorySection.test.jsx
similarity index 100%
rename from view.react/src/components/extended-worker/absence-history-section/AbsenceHistorySection.test.js
rename to view.react/src/components/extended-worker/absence-history-section/AbsenceHistorySection.test.jsx
diff --git a/view.react/src/components/extended-worker/change-days-pool-and-work-time-section/ChangeDaysPoolAndWorkTimeSection.test.js b/view.react/src/components/extended-worker/change-days-pool-and-work-time-section/ChangeDaysPoolAndWorkTimeSection.test.jsx
similarity index 100%
rename from view.react/src/components/extended-worker/change-days-pool-and-work-time-section/ChangeDaysPoolAndWorkTimeSection.test.js
rename to view.react/src/components/extended-worker/change-days-pool-and-work-time-section/ChangeDaysPoolAndWorkTimeSection.test.jsx
diff --git a/view.react/src/components/extended-worker/change-days-pool-form/ChangeDaysPoolForm.test.js b/view.react/src/components/extended-worker/change-days-pool-form/ChangeDaysPoolForm.test.jsx
similarity index 100%
rename from view.react/src/components/extended-worker/change-days-pool-form/ChangeDaysPoolForm.test.js
rename to view.react/src/components/extended-worker/change-days-pool-form/ChangeDaysPoolForm.test.jsx
diff --git a/view.react/src/components/extended-worker/reports-section/ReportsSection.test.js b/view.react/src/components/extended-worker/reports-section/ReportsSection.test.jsx
similarity index 100%
rename from view.react/src/components/extended-worker/reports-section/ReportsSection.test.js
rename to view.react/src/components/extended-worker/reports-section/ReportsSection.test.jsx
diff --git a/view.react/src/components/holidays-config/decision-buttons-pair/DecisionButtonsPair.test.js b/view.react/src/components/holidays-config/decision-buttons-pair/DecisionButtonsPair.test.jsx
similarity index 100%
rename from view.react/src/components/holidays-config/decision-buttons-pair/DecisionButtonsPair.test.js
rename to view.react/src/components/holidays-config/decision-buttons-pair/DecisionButtonsPair.test.jsx
diff --git a/view.react/src/components/main/Main.jsx b/view.react/src/components/main/Main.jsx
index 0f5d68b0..08fb85e9 100644
--- a/view.react/src/components/main/Main.jsx
+++ b/view.react/src/components/main/Main.jsx
@@ -62,19 +62,17 @@ export const Main = () => {
-
+
-
-
{isUserALeader &&
}
-
+
+
+
diff --git a/view.react/src/components/main/Main.module.scss b/view.react/src/components/main/Main.module.scss
index ec7bea31..28464138 100644
--- a/view.react/src/components/main/Main.module.scss
+++ b/view.react/src/components/main/Main.module.scss
@@ -4,4 +4,10 @@
.sidebarRowClass {
overflow: hidden;
}
-}
\ No newline at end of file
+}
+
+.mainContent {
+ flex-basis: 0;
+ flex-grow: 999;
+ min-inline-size: 50%;
+}
diff --git a/view.react/src/components/main/Main.test.js b/view.react/src/components/main/Main.test.jsx
similarity index 76%
rename from view.react/src/components/main/Main.test.js
rename to view.react/src/components/main/Main.test.jsx
index c1c694dd..5068e689 100644
--- a/view.react/src/components/main/Main.test.js
+++ b/view.react/src/components/main/Main.test.jsx
@@ -1,4 +1,5 @@
import {act, render, screen} from "@testing-library/react";
+import {vi} from "vitest";
import {USER_DATA_KEY} from "../../constants/session.keystorage";
import {AppInfoProvider} from "../../contexts/app-info-context/appInfoContext";
@@ -9,10 +10,19 @@ import {Sidebar} from "../sidebar/Sidebar";
import {TopBar} from "../topbar/TopBar";
import {Main} from "./Main";
-jest.mock("../acceptance-loader/AcceptanceLoader")
-jest.mock("../../router/MainContentRouting")
-jest.mock("../sidebar/Sidebar")
-jest.mock("../topbar/TopBar")
+vi.mock("../acceptance-loader/AcceptanceLoader")
+vi.mock("../../router/MainContentRouting")
+vi.mock("../sidebar/Sidebar")
+vi.mock("../topbar/TopBar")
+vi.mock("../../contexts/app-info-context/actions/fetchAppInfo")
+vi.mock("../../contexts/user-preferences-context/actions/fetchWorkingHoursPreferences")
+vi.mock("./actions/fetchWorkingHoursPreferences")
+vi.mock( "./actions/changeWorkingHoursPreferences")
+vi.mock("../../helpers/RequestHelper", () => {
+ return {
+ sendGetRequest: () => new Promise(() => {})
+ };
+})
describe("Main", () => {
const sessionStorageMock = mockLocalStorage()
@@ -54,4 +64,4 @@ describe("Main", () => {
// then
expect(screen.queryByText("AcceptanceLoaderMock")).toBeInTheDocument()
})
-})
\ No newline at end of file
+})
diff --git a/view.react/src/components/presence-confirmation-panel/ConfirmationLabel.test.js b/view.react/src/components/presence-confirmation-panel/ConfirmationLabel.test.jsx
similarity index 100%
rename from view.react/src/components/presence-confirmation-panel/ConfirmationLabel.test.js
rename to view.react/src/components/presence-confirmation-panel/ConfirmationLabel.test.jsx
diff --git a/view.react/src/components/presence-confirmation-panel/PresenceConfirmationPanel.jsx b/view.react/src/components/presence-confirmation-panel/PresenceConfirmationPanel.jsx
index 8e2cc567..d3ab3697 100644
--- a/view.react/src/components/presence-confirmation-panel/PresenceConfirmationPanel.jsx
+++ b/view.react/src/components/presence-confirmation-panel/PresenceConfirmationPanel.jsx
@@ -77,7 +77,7 @@ export const PresenceConfirmationPanel = ({userId, onConfirmation}) => {
const [chosenDate, setChosenDate] = useState(TODAY)
const [chosenStartTime, setChosenStartTime] = useState(() => getStartTimeValue(userPreferences, chosenDate))
const [chosenEndTime, setChosenEndTime] = useState(() => getEndTimeValue(userPreferences, chosenDate))
-
+
useEffect(() => {
setChosenStartTime(() => getStartTimeValue(userPreferences, chosenDate))
setChosenEndTime(() => getEndTimeValue(userPreferences, chosenDate))
@@ -128,58 +128,54 @@ export const PresenceConfirmationPanel = ({userId, onConfirmation}) => {
}
return (
-
-
-
-
-
Rejestracja godzin obecności
-
-
- }
- chosenDate={chosenDate}
- onChange={date => setChosenDate(date)}
- />
-
-
-
- }
- chosenTime={chosenStartTime}
- onChange={date => setChosenStartTime(date)}
- />
-
-
-
-
-
-
- }
- chosenTime={chosenEndTime}
- onChange={date => setChosenEndTime(date)}
- />
-
-
-
-
+
+ Rejestracja godzin obecności
+
+
+ }
+ chosenDate={chosenDate}
+ onChange={date => setChosenDate(date)}
/>
-
-
+
+
+
+ }
+ chosenTime={chosenStartTime}
+ onChange={date => setChosenStartTime(date)}
+ />
+
+
+
+
+
+
+ }
+ chosenTime={chosenEndTime}
+ onChange={date => setChosenEndTime(date)}
+ />
+
+
-
+
{`${version} ${commitId}`}
diff --git a/view.react/src/components/sidebar/Sidebar.module.scss b/view.react/src/components/sidebar/Sidebar.module.scss
index fc8628c4..cebf6954 100644
--- a/view.react/src/components/sidebar/Sidebar.module.scss
+++ b/view.react/src/components/sidebar/Sidebar.module.scss
@@ -4,13 +4,12 @@
.main {
z-index: 6;
font-size: 1.2rem;
- padding: 0;
- position: fixed;
+ padding: 35px 20px 0 0;
height: 100%;
width: fit-content;
max-height: 100%;
- a {
+ a {
color: $GREY-COLOR;
padding-bottom: 12px;
margin-top: 18px;
@@ -18,14 +17,13 @@
}
.nav {
- position: absolute;
- top: 6rem;
- left: 0;
+ flex-direction: column;
white-space: nowrap;
text-transform: uppercase;
margin-left: 2rem;
button {
+ width: fit-content;
background-color: transparent;
border: none;
position: relative;
@@ -60,7 +58,7 @@
&--open {
button {
position: relative;
- transform: translateX(450%) rotate(-180deg);
+ transform: translateX(435%) rotate(-180deg);
transition: transform 0.3s ease-in-out;
}
@@ -133,7 +131,7 @@
font-size: 1.6rem;
color: $BLACK-COLOR;
padding: 2rem 0 0 2rem;
-
+
p {
margin: 0;
}
@@ -151,19 +149,15 @@
.versionContainer {
font-size: 0.9rem;
color: #cccccc;
- position: absolute;
+ position: fixed;
bottom: 1%;
left: 1%;
+ z-idnex: 7;
}
@include media-breakpoint-up(lg) {
.main {
max-width: 25%;
- padding-right: 0;
background-color: white;
}
-
- .nav {
- padding-right: 0;
- }
}
diff --git a/view.react/src/components/sidebar/Sidebar.test.js b/view.react/src/components/sidebar/Sidebar.test.jsx
similarity index 94%
rename from view.react/src/components/sidebar/Sidebar.test.js
rename to view.react/src/components/sidebar/Sidebar.test.jsx
index 0504cd18..6c93a7a0 100644
--- a/view.react/src/components/sidebar/Sidebar.test.js
+++ b/view.react/src/components/sidebar/Sidebar.test.jsx
@@ -6,24 +6,25 @@ import {AppInfoProvider} from "../../contexts/app-info-context/appInfoContext";
import {VacationDaysProvider} from "../../contexts/vacation-days-context/vacationDaysContext";
import {mockLocalStorage} from "../../helpers/TestHelper";
import {Sidebar} from "./Sidebar";
+import { vi } from 'vitest';
-jest.mock("../../contexts/vacation-days-context/actions/fetchPendingDays", () => {
- const originalModule = jest.requireActual("../../contexts/vacation-days-context/actions/fetchPendingDays");
+vi.mock("../../contexts/vacation-days-context/actions/fetchPendingDays", async () => {
+ const originalModule = await vi.importActual("../../contexts/vacation-days-context/actions/fetchPendingDays");
return {
__esModule: true,
...originalModule,
- fetchPendingDays: () => {}
+ fetchPendingDays: vi.fn()
};
})
-jest.mock("../../contexts/vacation-days-context/actions/fetchVacationDays", () => {
- const originalModule = jest.requireActual("../../contexts/vacation-days-context/actions/fetchVacationDays");
+vi.mock("../../contexts/vacation-days-context/actions/fetchVacationDays", async () => {
+ const originalModule = await vi.importActual("../../contexts/vacation-days-context/actions/fetchVacationDays");
return {
__esModule: true,
...originalModule,
- fetchVacationDays: () => {}
+ fetchVacationDays: vi.fn()
};
})
diff --git a/view.react/src/components/team-requests-list/TeamRequestsList.test.js b/view.react/src/components/team-requests-list/TeamRequestsList.test.jsx
similarity index 100%
rename from view.react/src/components/team-requests-list/TeamRequestsList.test.js
rename to view.react/src/components/team-requests-list/TeamRequestsList.test.jsx
diff --git a/view.react/src/components/topbar/TopBar.test.js b/view.react/src/components/topbar/TopBar.test.jsx
similarity index 84%
rename from view.react/src/components/topbar/TopBar.test.js
rename to view.react/src/components/topbar/TopBar.test.jsx
index ff5c0cff..43198204 100644
--- a/view.react/src/components/topbar/TopBar.test.js
+++ b/view.react/src/components/topbar/TopBar.test.jsx
@@ -5,6 +5,17 @@ import {USER_DATA_KEY} from "../../constants/session.keystorage";
import {UserPreferencesProvider} from "../../contexts/user-preferences-context/userPreferencesContext";
import {mockLocalStorage} from "../../helpers/TestHelper";
import {TopBar} from "./TopBar";
+import {vi} from "vitest";
+
+vi.mock("../../contexts/user-preferences-context/actions/fetchWorkingHoursPreferences", async () => {
+ const originalModule = await vi.importActual("../../contexts/user-preferences-context/actions/fetchWorkingHoursPreferences");
+
+ return {
+ __esModule: true,
+ ...originalModule,
+ fetchWorkingHoursPreferences: vi.fn()
+ };
+})
describe("TopBar", () => {
const sessionStorageMock = mockLocalStorage()
diff --git a/view.react/src/components/topbar/team-dropdown/TeamDropdown.test.js b/view.react/src/components/topbar/team-dropdown/TeamDropdown.test.jsx
similarity index 100%
rename from view.react/src/components/topbar/team-dropdown/TeamDropdown.test.js
rename to view.react/src/components/topbar/team-dropdown/TeamDropdown.test.jsx
diff --git a/view.react/src/components/user-requests-list/UserRequestsList.test.js b/view.react/src/components/user-requests-list/UserRequestsList.test.jsx
similarity index 100%
rename from view.react/src/components/user-requests-list/UserRequestsList.test.js
rename to view.react/src/components/user-requests-list/UserRequestsList.test.jsx
diff --git a/view.react/src/components/workers-table/WorkersTable.test.js b/view.react/src/components/workers-table/WorkersTable.test.jsx
similarity index 100%
rename from view.react/src/components/workers-table/WorkersTable.test.js
rename to view.react/src/components/workers-table/WorkersTable.test.jsx
diff --git a/view.react/src/contexts/absence-history-context/absenceHistoryContext.js b/view.react/src/contexts/absence-history-context/absenceHistoryContext.jsx
similarity index 100%
rename from view.react/src/contexts/absence-history-context/absenceHistoryContext.js
rename to view.react/src/contexts/absence-history-context/absenceHistoryContext.jsx
diff --git a/view.react/src/contexts/app-info-context/appInfoContext.js b/view.react/src/contexts/app-info-context/appInfoContext.jsx
similarity index 100%
rename from view.react/src/contexts/app-info-context/appInfoContext.js
rename to view.react/src/contexts/app-info-context/appInfoContext.jsx
diff --git a/view.react/src/contexts/holidays-context/holidaysContext.js b/view.react/src/contexts/holidays-context/holidaysContext.jsx
similarity index 100%
rename from view.react/src/contexts/holidays-context/holidaysContext.js
rename to view.react/src/contexts/holidays-context/holidaysContext.jsx
diff --git a/view.react/src/contexts/presence-context/presenceContext.js b/view.react/src/contexts/presence-context/presenceContext.jsx
similarity index 100%
rename from view.react/src/contexts/presence-context/presenceContext.js
rename to view.react/src/contexts/presence-context/presenceContext.jsx
diff --git a/view.react/src/contexts/request-context/requestContext.js b/view.react/src/contexts/request-context/requestContext.jsx
similarity index 100%
rename from view.react/src/contexts/request-context/requestContext.js
rename to view.react/src/contexts/request-context/requestContext.jsx
diff --git a/view.react/src/contexts/user-preferences-context/userPreferencesContext.js b/view.react/src/contexts/user-preferences-context/userPreferencesContext.jsx
similarity index 100%
rename from view.react/src/contexts/user-preferences-context/userPreferencesContext.js
rename to view.react/src/contexts/user-preferences-context/userPreferencesContext.jsx
diff --git a/view.react/src/contexts/users-vacations-context/usersVacationsContext.js b/view.react/src/contexts/users-vacations-context/usersVacationsContext.jsx
similarity index 100%
rename from view.react/src/contexts/users-vacations-context/usersVacationsContext.js
rename to view.react/src/contexts/users-vacations-context/usersVacationsContext.jsx
diff --git a/view.react/src/contexts/vacation-days-context/vacationDaysContext.js b/view.react/src/contexts/vacation-days-context/vacationDaysContext.jsx
similarity index 100%
rename from view.react/src/contexts/vacation-days-context/vacationDaysContext.js
rename to view.react/src/contexts/vacation-days-context/vacationDaysContext.jsx
diff --git a/view.react/src/contexts/workers-context/workersContext.js b/view.react/src/contexts/workers-context/workersContext.jsx
similarity index 100%
rename from view.react/src/contexts/workers-context/workersContext.js
rename to view.react/src/contexts/workers-context/workersContext.jsx
diff --git a/view.react/src/global-styles/bootstrap-breakpoints.scss b/view.react/src/global-styles/bootstrap-breakpoints.scss
index 716220ad..67ab7f3a 100644
--- a/view.react/src/global-styles/bootstrap-breakpoints.scss
+++ b/view.react/src/global-styles/bootstrap-breakpoints.scss
@@ -1,3 +1,3 @@
@import '~bootstrap/scss/_functions';
@import '~bootstrap/scss/_variables';
-@import '~bootstrap/scss/mixins/_breakpoints';
\ No newline at end of file
+@import '~bootstrap/scss/mixins/_breakpoints';
diff --git a/view.react/src/helpers/authentication/LogoutHelper.js b/view.react/src/helpers/authentication/LogoutHelper.js
index 043cb637..a59f9dd8 100644
--- a/view.react/src/helpers/authentication/LogoutHelper.js
+++ b/view.react/src/helpers/authentication/LogoutHelper.js
@@ -8,7 +8,7 @@ export const logout = () => {
}
export const isNoAuthMode = () =>{
- const currentAuthMode = process.env.REACT_APP_AUTH_MODE || '';
+ const currentAuthMode = import.meta.env.VITE_AUTH_MODE || '';
return 'NO-AUTH' === currentAuthMode;
}
@@ -24,4 +24,4 @@ const noAuthLogout = () => {
localStorage.removeItem(NO_AUTH_USER_KEY)
localStorage.removeItem(USER_DATA_KEY)
window.location.href = window.location.origin
-}
\ No newline at end of file
+}
diff --git a/view.react/src/helpers/icons/Icons.js b/view.react/src/helpers/icons/Icons.jsx
similarity index 100%
rename from view.react/src/helpers/icons/Icons.js
rename to view.react/src/helpers/icons/Icons.jsx
diff --git a/view.react/src/helpers/notifications/Notifications.js b/view.react/src/helpers/notifications/Notifications.jsx
similarity index 100%
rename from view.react/src/helpers/notifications/Notifications.js
rename to view.react/src/helpers/notifications/Notifications.jsx
diff --git a/view.react/src/helpers/pagination/PaginationHelper.js b/view.react/src/helpers/pagination/PaginationHelper.jsx
similarity index 100%
rename from view.react/src/helpers/pagination/PaginationHelper.js
rename to view.react/src/helpers/pagination/PaginationHelper.jsx
diff --git a/view.react/src/helpers/react-bootstrap-table2/RequestMapperHelper.js b/view.react/src/helpers/react-bootstrap-table2/RequestMapperHelper.jsx
similarity index 100%
rename from view.react/src/helpers/react-bootstrap-table2/RequestMapperHelper.js
rename to view.react/src/helpers/react-bootstrap-table2/RequestMapperHelper.jsx
diff --git a/view.react/src/index.js b/view.react/src/index.tsx
similarity index 100%
rename from view.react/src/index.js
rename to view.react/src/index.tsx
diff --git a/view.react/src/pages/absence-requests-page/AbsenceRequestPage.test.js b/view.react/src/pages/absence-requests-page/AbsenceRequestPage.test.jsx
similarity index 86%
rename from view.react/src/pages/absence-requests-page/AbsenceRequestPage.test.js
rename to view.react/src/pages/absence-requests-page/AbsenceRequestPage.test.jsx
index 38b68061..605cef88 100644
--- a/view.react/src/pages/absence-requests-page/AbsenceRequestPage.test.js
+++ b/view.react/src/pages/absence-requests-page/AbsenceRequestPage.test.jsx
@@ -1,4 +1,5 @@
import {render, screen} from "@testing-library/react";
+import { vi } from 'vitest';
import {CompanyRequestsListWrapper} from "../../components/company-requests-list/company-requests-list-wrapper/CompanyRequestsListWrapper";
import {CreateAbsenceRequestFormWrapper} from "../../components/create-absence-request-form/create-absence-request-form-wrapper/CreateAbsenceRequestFormWrapper";
@@ -8,10 +9,10 @@ import {USER_DATA_KEY} from "../../constants/session.keystorage";
import {mockLocalStorage} from "../../helpers/TestHelper";
import {AbsenceRequestsPage} from "./AbsenceRequestsPage";
-jest.mock("../../components/user-requests-list/user-requests-list-wrapper/UserRequestsListWrapper")
-jest.mock("../../components/team-requests-list/team-requests-list-wrapper/TeamRequestsListWrapper")
-jest.mock("../../components/company-requests-list/company-requests-list-wrapper/CompanyRequestsListWrapper")
-jest.mock("../../components/create-absence-request-form/create-absence-request-form-wrapper/CreateAbsenceRequestFormWrapper")
+vi.mock("../../components/user-requests-list/user-requests-list-wrapper/UserRequestsListWrapper")
+vi.mock("../../components/team-requests-list/team-requests-list-wrapper/TeamRequestsListWrapper")
+vi.mock("../../components/company-requests-list/company-requests-list-wrapper/CompanyRequestsListWrapper")
+vi.mock("../../components/create-absence-request-form/create-absence-request-form-wrapper/CreateAbsenceRequestFormWrapper")
describe("AbsenceRequestPage", () => {
const sessionStorageMock = mockLocalStorage()
@@ -79,4 +80,4 @@ describe("AbsenceRequestPage", () => {
// then
expect(screen.queryByText("TeamRequestListMock")).toBeInTheDocument()
})
-})
\ No newline at end of file
+})
diff --git a/view.react/src/pages/page-404/Page404.test.js b/view.react/src/pages/page-404/Page404.test.jsx
similarity index 100%
rename from view.react/src/pages/page-404/Page404.test.js
rename to view.react/src/pages/page-404/Page404.test.jsx
diff --git a/view.react/src/react-app-env.d.ts b/view.react/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5f..00000000
--- a/view.react/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-///
diff --git a/view.react/src/router/MainContentRouting.test.js b/view.react/src/router/MainContentRouting.test.jsx
similarity index 91%
rename from view.react/src/router/MainContentRouting.test.js
rename to view.react/src/router/MainContentRouting.test.jsx
index 71e234fd..dee1c1c4 100644
--- a/view.react/src/router/MainContentRouting.test.js
+++ b/view.react/src/router/MainContentRouting.test.jsx
@@ -1,5 +1,6 @@
import {render, screen} from "@testing-library/react";
import {MemoryRouter} from "react-router-dom";
+import { vi } from 'vitest';
import {USER_DATA_KEY} from "../constants/session.keystorage";
import {mockLocalStorage} from "../helpers/TestHelper";
@@ -12,13 +13,13 @@ import {ReportsPage, URL as ReportsURL} from '../pages/reports-page/ReportsPage'
import {URL as WorkersURL, WorkersPage} from '../pages/workers-page/WorkersPage';
import {MainContentRouting} from "./MainContentRouting";
-jest.mock('../pages/absence-requests-page/AbsenceRequestsPage');
-jest.mock('../pages/associates-page/AssociatesPage');
-jest.mock('../pages/calendar-page/CalendarPage');
-jest.mock('../pages/history-page/HistoryPage');
-jest.mock('../pages/holidays-page/HolidaysPage');
-jest.mock('../pages/reports-page/ReportsPage');
-jest.mock('../pages/workers-page/WorkersPage');
+vi.mock('../pages/absence-requests-page/AbsenceRequestsPage');
+vi.mock('../pages/associates-page/AssociatesPage');
+vi.mock('../pages/calendar-page/CalendarPage');
+vi.mock('../pages/history-page/HistoryPage');
+vi.mock('../pages/holidays-page/HolidaysPage');
+vi.mock('../pages/reports-page/ReportsPage');
+vi.mock('../pages/workers-page/WorkersPage');
describe("MainContentRouting", () => {
const sessionStorageMock = mockLocalStorage()
@@ -113,4 +114,4 @@ describe("MainContentRouting", () => {
expect(screen.queryByText(`${url}Mock`)).not.toBeInTheDocument()
}
}
-})
\ No newline at end of file
+})
diff --git a/view.react/src/vite-env.d.ts b/view.react/src/vite-env.d.ts
new file mode 100644
index 00000000..11f02fe2
--- /dev/null
+++ b/view.react/src/vite-env.d.ts
@@ -0,0 +1 @@
+///
diff --git a/view.react/tsconfig.json b/view.react/tsconfig.json
index a273b0cf..aeafbb70 100644
--- a/view.react/tsconfig.json
+++ b/view.react/tsconfig.json
@@ -1,6 +1,6 @@
{
"compilerOptions": {
- "target": "es5",
+ "target": "esnext",
"lib": [
"dom",
"dom.iterable",
@@ -18,9 +18,10 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
- "jsx": "react-jsx"
+ "jsx": "react-jsx",
+ "types": ["vitest/globals"]
},
"include": [
"src"
- ]
+ ],
}
diff --git a/view.react/vite.config.ts b/view.react/vite.config.ts
new file mode 100644
index 00000000..621618e8
--- /dev/null
+++ b/view.react/vite.config.ts
@@ -0,0 +1,34 @@
+///
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import viteTsconfigPaths from 'vite-tsconfig-paths';
+import svgrPlugin from 'vite-plugin-svgr';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+ plugins: [
+ react(),
+ viteTsconfigPaths(),
+ svgrPlugin()
+ ],
+ resolve: {
+ alias: [
+ {
+ // this is required for the SCSS modules
+ find: /^~(.*)$/,
+ replacement: '$1',
+ },
+ ],
+ },
+ test: {
+ globals: true,
+ environment: 'jsdom',
+ setupFiles: './src/setupTests.js'
+ },
+ build: {
+ outDir: 'build'
+ },
+ server: {
+ port: 3000
+ }
+});