Skip to content

Analysis/report #43

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.

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

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
0004855
Ticket Edit
ayushjnv1 Dec 8, 2022
f5db591
Merge branch 'master' of github.com:joshsoftware/providesk_admin_ui i…
ayushjnv1 Dec 8, 2022
c01e102
add Edit ticket
ayushjnv1 Dec 8, 2022
62a9965
update ticket
ayushjnv1 Dec 8, 2022
d5c4c0d
Create/Edit Ticket Dialog UI
rdgadekar Dec 8, 2022
3c638a5
Ticket Details Page UI
rdgadekar Dec 8, 2022
8c59d33
Update Ticket Modal UI
rdgadekar Dec 8, 2022
67e8bcf
remove _
ayushjnv1 Dec 9, 2022
6466b4e
favicon added
rdgadekar Dec 9, 2022
5c24979
Ticket Form Fixes
rdgadekar Dec 9, 2022
4004082
Favicon and logo changes
rdgadekar Dec 9, 2022
2b90104
MuiChip Theme Changes
rdgadekar Dec 9, 2022
82e1467
ask for update
ayushjnv1 Dec 13, 2022
7b2c413
Merge branch 'Edit/TicketMOdel' of github.com:joshsoftware/providesk_…
ayushjnv1 Dec 13, 2022
18d7f2d
complete
ayushjnv1 Dec 14, 2022
f5a7831
invalidate query
ayushjnv1 Dec 14, 2022
58c6e62
correct the url
ayushjnv1 Dec 15, 2022
95494bc
add
ayushjnv1 Dec 16, 2022
0405e0b
report mock remove
ayushjnv1 Dec 16, 2022
2cbe496
merege master
ayushjnv1 Dec 22, 2022
7133f2d
charts completed
ayushjnv1 Dec 23, 2022
c1308b5
analysis part done
ayushjnv1 Dec 26, 2022
a124cea
create category change
ayushjnv1 Jan 4, 2023
6c128d7
report part done
ayushjnv1 Jan 5, 2023
992f5ee
fix activity
ayushjnv1 Jan 5, 2023
814657f
auth fix
ayushjnv1 Jan 5, 2023
b475404
Edit button dev to prod shift
ayushjnv1 Jan 5, 2023
3437246
resolver routes define
ayushjnv1 Jan 5, 2023
bd990e6
add resolver timeline access
ayushjnv1 Jan 5, 2023
0918afe
id fix
ayushjnv1 Jan 5, 2023
ee8d57d
id fix
ayushjnv1 Jan 5, 2023
837621b
add role
ayushjnv1 Jan 5, 2023
d2d7801
clickable
ayushjnv1 Jan 5, 2023
da68bb6
add table view
ayushjnv1 Jan 9, 2023
1897240
updated employee role Edit user
ayushjnv1 Jan 10, 2023
2969d33
Ticket Status, TableView and GridView Button Changes
rdgadekar Jan 10, 2023
9c159de
Overdues Page and Ticket Component UI
rdgadekar Jan 10, 2023
eca3f76
temp
ayushjnv1 Jan 11, 2023
5b8f575
bulk update
ayushjnv1 Jan 11, 2023
7802aa2
final
ayushjnv1 Jan 11, 2023
ebc2f6f
remove comment
ayushjnv1 Jan 11, 2023
7e9f7f1
Auth Page UI
rdgadekar Jan 12, 2023
3da89d4
BulkUpdateComponent UI
rdgadekar Jan 12, 2023
1570505
remove unused componet
ayushjnv1 Jan 13, 2023
2b5a67d
yarn install remove package.lock.json
ayushjnv1 Jan 13, 2023
c2077c1
remove console.log
ayushjnv1 Jan 13, 2023
f3344cc
deploy ment script add
ayushjnv1 Jan 20, 2023
81dd07b
add dependency
ayushjnv1 Jan 20, 2023
cf0ca00
fix bug
ayushjnv1 Jan 20, 2023
93539f2
bug fix bulk update
ayushjnv1 Jan 20, 2023
dc62d11
Error message add
ayushjnv1 Jan 23, 2023
8c01542
issue fix
ayushjnv1 Jan 23, 2023
3f35547
Added Logo in Auth Page
rdgadekar Jan 24, 2023
49771c3
Added Ask to Update button in ETA
rdgadekar Jan 24, 2023
d8c3cec
Select Label Issue and ComplaintCard UI Fixes
rdgadekar Jan 30, 2023
e7d9940
changes done according to comments
ayushjnv1 Feb 9, 2023
97ac2ea
remove auth hack
ayushjnv1 Feb 9, 2023
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
28,320 changes: 0 additions & 28,320 deletions package-lock.json

This file was deleted.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"react-router-dom": "^6.4.0",
"react-scripts": "5.0.1",
"react-toastify": "^9.0.8",
"recharts": "^2.2.0",
"sass": "^1.56.1",
"typescript": "^4.8.3",
"uuid": "^9.0.0",
Expand All @@ -38,7 +39,8 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"deploy" : " yarn build && scp -r build [email protected]:/www/providesk-frontend"
},
"eslintConfig": {
"extends": [
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
28 changes: 14 additions & 14 deletions public/images/providesk-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 9 additions & 2 deletions src/apis/utils/date.utils.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
import moment from 'moment';

export const DateFormate = (date: string) =>
date ? moment(date).format('lll') : '_';
export const DateFormate = (date: string) => {
return date ? moment(date).format('lll') : '_';
};

export const getLastDaysFrom = (date: string) => {
return moment().diff(moment(date), 'days') < 7
? moment(date).fromNow()
: moment(date).format('ll');
};

export const dateDifferenceInDays = (first: string) => {
let date1 = moment(first);
let date2 = moment();
return date2.diff(date1, 'days');
};
3 changes: 3 additions & 0 deletions src/hooks/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ const API_CONSTANTS = {
USER_LIST: 'USER_LIST',
COMPLAINT_LIST: 'COMPLAINT_LIST',
ORGANZIATION_LIST: 'ORGANZIATION_LIST',
ASK_FOR_UPDATE: 'ASK_FOR_UPDATE',
OVERDUE_TICKET_LIST: 'OVERDUE_TICKET_LIST',
ANALYTICAL_REPORTS: 'ANALYTICAL_REPORTS',
};

export default API_CONSTANTS;
3 changes: 2 additions & 1 deletion src/layouts/sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,10 @@ export default function Sidebar() {
</IconButton>
<Box display={'flex'} sx={{ cursor: 'pointer' }}>
<img
src='./images/providesk-logo.svg'
src='/images/providesk-logo.svg'
alt='ProviDesk'
height={28}
onClick={() => navigate(ROUTE.DASHBOARD)}
/>
</Box>
</Box>
Expand Down
14 changes: 9 additions & 5 deletions src/layouts/sidebar/sidebarConfig.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import DomainIcon from '@mui/icons-material/Domain';
import CategoryIcon from '@mui/icons-material/Category';
import ApartmentIcon from '@mui/icons-material/Apartment';
import ConfirmationNumberIcon from '@mui/icons-material/ConfirmationNumber';
import TimelineRoundedIcon from '@mui/icons-material/TimelineRounded';
import GroupIcon from '@mui/icons-material/Group';

export const getSidebarConfig = (role: string) => {
Expand All @@ -15,11 +16,6 @@ export const getSidebarConfig = (role: string) => {
icon: <DashboardIcon fontSize='small' />,
path: ROUTE.DASHBOARD,
},
{
label: 'Ticket',
icon: <ConfirmationNumberIcon fontSize='small' />,
path: ROUTE.TICKET,
},
];

const adminAccessSidebar = [
Expand All @@ -39,6 +35,7 @@ export const getSidebarConfig = (role: string) => {
icon: <GroupIcon fontSize='small' />,
path: ROUTE.USERS,
},
{ label: 'Reports', path: ROUTE.REPORTS, icon: <TimelineRoundedIcon /> },
];

const superAdminAccessSidebar = [
Expand All @@ -61,6 +58,11 @@ export const getSidebarConfig = (role: string) => {
icon: <GroupIcon fontSize='small' />,
path: ROUTE.USERS,
},
{ label: 'Reports', path: ROUTE.REPORTS, icon: <TimelineRoundedIcon /> },
];
const resolverAccessSidebar = [
...employeeAccessSidebar,
{ label: 'Reports', path: ROUTE.REPORTS, icon: <TimelineRoundedIcon /> },
];

switch (role) {
Expand All @@ -72,6 +74,8 @@ export const getSidebarConfig = (role: string) => {
return departmentHeadAccessSidebar;
case ROLES.EMPLOYEE:
return employeeAccessSidebar;
case ROLES.RESOLVER:
return resolverAccessSidebar;
default:
return [];
}
Expand Down
57 changes: 3 additions & 54 deletions src/modules/Auth/auth.scss
Original file line number Diff line number Diff line change
@@ -1,60 +1,9 @@
@import 'stylesheets/core';

.auth-wrapper {
background-color: $primary-light;
flex-direction: column;
gap: 0;

@media (min-width: 992px) {
background-color: transparent;
flex-direction: row;
}
}

.img-box,
.auth-box {
padding: 1rem;

@media (min-width: 992px) {
height: 100%;
flex: 1;
}
}

.img-box {


.auth-heading {
display: block;
}

@media (min-width: 992px) {

.auth-heading {
display: none;
}
}
}

.auth-box {

.auth-heading {
display: none;
}

@media (min-width: 992px) {
background-color: $primary-light;

.auth-heading {
display: block;
}
}
}

.img-auth {
width: 80%;
width: 18rem;

@media (min-width: 992px) {
width: 24rem;
@media (max-width: 575.98px) {
width: 100%;
}
}
9 changes: 5 additions & 4 deletions src/modules/Auth/components/Loader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ import CircularProgress from '@mui/material/CircularProgress';

interface IProps {
isLoading: boolean;
top?: string
top?: string;
}

const Loader: React.FC<IProps> = ({ isLoading, top='64' }) => (
const Loader: React.FC<IProps> = ({ isLoading, top = '64' }) => (
<Backdrop
sx={{
color: '#fff',
// color: '#fff',
background: '#FFFFFF99',
zIndex: (theme) => theme.zIndex.drawer + 1,
top: `${top}px`
top: `${top}px`,
}}
open={isLoading}
onClick={() => {}}
Expand Down
Loading