Skip to content

Commit 10ec19d

Browse files
committed
171648125-approval-table: add approval table
- add approval table UI. [Finishes#171648125]
1 parent 5735837 commit 10ec19d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2046
-13
lines changed

.eslintrc.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"]}],
2323
"jsx-a11y/control-has-associated-label": [0],
2424
"jsx-a11y/anchor-is-valid": [0],
25-
"react/jsx-props-no-spreading": 0
25+
"react/jsx-props-no-spreading": 0,
26+
"jsx-a11y/click-events-have-key-events": [0]
2627
}
27-
}
28+
}

package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"eslint-plugin-prettier": "^3.1.3",
4343
"eslint-plugin-react": "^7.20.0",
4444
"eslint-plugin-react-hooks": "^2.5.0",
45+
"file-loader": "^6.0.0",
4546
"html-webpack-plugin": "^4.3.0",
4647
"jest": "^26.0.1",
4748
"moxios": "^0.4.0",
@@ -62,16 +63,18 @@
6263
"@babel/plugin-transform-runtime": "^7.9.6",
6364
"@babel/polyfill": "^7.8.7",
6465
"@emotion/core": "^10.0.28",
66+
"@syncfusion/ej2-react-calendars": "^18.1.53",
6567
"axios": "^0.19.2",
6668
"concurrently": "^5.2.0",
6769
"enzyme": "^3.11.0",
6870
"enzyme-adapter-react-16": "^1.15.2",
6971
"express": "^4.17.1",
7072
"jwt-decode": "^2.2.0",
7173
"prop-types": "^15.7.2",
72-
"query-string": "^6.12.1",
74+
"query-string": "^6.13.1",
7375
"react": "^16.13.1",
7476
"react-dom": "^16.13.1",
77+
"react-js-pagination": "^3.0.3",
7578
"react-redux": "^7.2.0",
7679
"react-router": "^5.2.0",
7780
"react-router-dom": "^5.2.0",
@@ -80,6 +83,7 @@
8083
"redux": "^4.0.5",
8184
"redux-devtools-extension": "^2.13.8",
8285
"redux-logger": "^3.0.6",
83-
"redux-thunk": "^2.3.0"
86+
"redux-thunk": "^2.3.0",
87+
"simple-flexbox": "^2.3.1"
8488
}
8589
}
455 Bytes
Loading
+10
Loading

src/Assets/DashboardAssets/left.png

1.85 KB
Loading
Loading
Loading

src/Assets/DashboardAssets/right.png

1.83 KB
Loading
Loading
+10
Loading

src/Assets/DashboardAssets/user.svg

+9
Loading
+10
Loading

src/Assets/leave.svg

47.9 KB
Loading

src/Assets/tripImage.svg

+9
Loading

src/Assets/user.svg

+9
Loading

src/Components/App.jsx

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import Protected from "./Shared/ProtectedRoute/ProtectedRoute.jsx";
1313
import EmailVerificationResponse from "./Shared/EmailVerificationResponse/EmailVerificationResponse.jsx";
1414
import ResetPasswordComponent from "./Auth/ForgetPassword/ResetPassword/ResetPassword.jsx";
1515
import ChangePassword from "./Auth/ForgetPassword/ChangePassword/ChangePassword.jsx";
16+
import ApprovalTableComponent from "./ApprovalTable/approvalTable.jsx";
17+
import ViewTripsComponent from "./ViewTrips/ViewTrips.jsx";
1618

1719
toast.configure();
1820

@@ -36,6 +38,8 @@ const App = () => (
3638
component={ResetPasswordComponent}
3739
/>
3840
<Route exact path="/reset-password" component={ChangePassword} />
41+
<Route exact path="/approval" component={ApprovalTableComponent} />
42+
<Route exact path="/view-trips" component={ViewTripsComponent} />
3943
</Switch>
4044
</Router>
4145
</div>

0 commit comments

Comments
 (0)