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

Hotfix dev #284

Merged
merged 2 commits into from
Jan 9, 2024
Merged

Hotfix dev #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c66004
Renamed the app name in package.json
ertush Jan 9, 2024
8baa5ff
Fixed the react-dual-list dependency issue causing build time error
ertush Jan 9, 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
26 changes: 0 additions & 26 deletions .eslintrc.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion components/HeaderLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default function HeaderLayout({
groupID == 2 ||
groupID == 3 ) && isLoggedIn &&
<li className="flex-wrap font-semibold">
<Link href="/users">
<Link href="/user">
<p
className={
`
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "KMHFR",
"name": "kmhfr",
"version": "1.0.0",
"private": true,
"scripts": {
Expand Down Expand Up @@ -53,7 +53,7 @@
"react-csv": "^2.2.2",
"react-datepicker": "^4.16.0",
"react-dom": "^18.2.0",
"react-dual-listbox": "^6.0.0",
"react-dual-listbox": "^5.0.2",
"react-highcharts": "^16.1.0",
"react-icons": "^4.10.1",
"react-leaflet": "^4.2.1",
Expand Down
10 changes: 5 additions & 5 deletions pages/user/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,18 @@ const Users = (props) => {
</div>


<div className='col-span-1 w-full col-start-1 h-auto py-0 border border-blue-600'>
<div className='col-span-1 w-full col-start-1 h-auto py-0 bg-blue-50 shadow-md'>

<List
sx={{ width: '100%', bgcolor: 'transparent', flexGrow:1, paddingTop:0, paddingBottom:0}}
component="nav"
aria-labelledby="nested-list-subheader"

>
<ListItemButton className='border-b border-blue-600' sx={{
<ListItemButton className='border-b border-gray-300' sx={{
backgroundColor: usersTheme && '#2563eb',
color: usersTheme && '#ffff',
borderBottom: 'solid 1px #2563eb',
borderBottom: 'solid 1px rgba(107, 114, 128, 1)',
"&:hover": {
backgroundColor: "#eff6ff",
color: "rgba(17, 24, 39, 1)"
Expand All @@ -187,7 +187,7 @@ const Users = (props) => {
sx={{
backgroundColor: inactiveUsersTheme && '#2563eb',
color: inactiveUsersTheme && '#ffff',
borderBottom: 'solid 1px #2563eb',
borderBottom: 'solid 1px rgba(107, 114, 128, 1)',
"&:hover": {
backgroundColor: "#eff6ff",
color: "rgba(17, 24, 39, 1)"
Expand All @@ -208,7 +208,7 @@ const Users = (props) => {
sx={{
backgroundColor: groupsTheme && '#2563eb',
color: groupsTheme && '#ffff',
borderBottom: 'solid 1px #2563eb',
borderBottom: 'solid 1px rgba(107, 114, 128, 1)',
"&:hover": {
backgroundColor: "#eff6ff",
color: "rgba(17, 24, 39, 1)"
Expand Down
11 changes: 6 additions & 5 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading