Skip to content

Commit 9f1b33c

Browse files
committed
filter and ticket action responsive
1 parent e0a7417 commit 9f1b33c

File tree

4 files changed

+116
-102
lines changed

4 files changed

+116
-102
lines changed

src/user/Admin/Tickets/Filter/Filter.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,17 +262,19 @@ class Filter extends Component {
262262
/>
263263
</Form>
264264
</div>
265-
<Button onClick={() => this.props.toggleNewTicketEditor(true)}>
266-
New Ticket
267-
</Button>
268-
{isAdmin && (
269-
<Button
270-
style={{ marginLeft: "1rem" }}
271-
onClick={() => this.setState({ modal: { view: "add" } })}
272-
>
273-
<PeopleAltIcon />
265+
<div className="searchbar-action">
266+
<Button onClick={() => this.props.toggleNewTicketEditor(true)}>
267+
New Ticket
274268
</Button>
275-
)}
269+
{isAdmin && (
270+
<Button
271+
style={{ marginLeft: "1rem" }}
272+
onClick={() => this.setState({ modal: { view: "add" } })}
273+
>
274+
<PeopleAltIcon />
275+
</Button>
276+
)}
277+
</div>
276278
</div>
277279
<div className="filters">
278280
<div onClick={this.clearFilters} className="clear-filters">

src/user/Admin/Tickets/Filter/Filter.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,16 @@
6565
}
6666
}
6767
}
68+
69+
@media (min-width: 320px) and (max-width: 1024px){
70+
.searchbar-container {
71+
flex-direction: column;;
72+
.searchbar {
73+
flex: 1;
74+
margin: 0 0 10px 0;
75+
}
76+
.searchbar-action {
77+
flex: 1;
78+
}
79+
}
80+
}

src/user/Admin/Tickets/TicketDashboard.js

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -219,89 +219,89 @@ class TicketDashboard extends Component {
219219
/>
220220
);
221221
return (
222-
<div className="ticket">
223-
<div className="navigation">
224-
<Navigation ticket={ticket} />
225-
</div>
226-
<div className="ticket-details" id="ticket-shadow">
227-
<LoadingOverlay
228-
text={spinner}
229-
active={!!spinner}
230-
spinner={<ClockLoader color={"#1A73E8"} />}
231-
styles={{
232-
spinner: (base) => ({
233-
...base,
234-
width: "100px",
235-
"& svg circle": {
236-
stroke: "rgba(26, 115, 232, 0.5)",
237-
},
238-
}),
239-
}}
240-
>
241-
<div className="ticket-description">
242-
<div className="dashboard-title">
243-
Tickets
244-
<Button variant="light" onClick={this.toggleDrawer}>
245-
<NotificationsNoneOutlinedIcon />
246-
</Button>
222+
<>
223+
<Navigation ticket={ticket} />
224+
<div className="ticket">
225+
<div className="ticket-details" id="ticket-shadow">
226+
<LoadingOverlay
227+
text={spinner}
228+
active={!!spinner}
229+
spinner={<ClockLoader color={"#1A73E8"} />}
230+
styles={{
231+
spinner: (base) => ({
232+
...base,
233+
width: "100px",
234+
"& svg circle": {
235+
stroke: "rgba(26, 115, 232, 0.5)",
236+
},
237+
}),
238+
}}
239+
>
240+
<div className="ticket-description">
241+
<div className="dashboard-title">
242+
Tickets
243+
<Button variant="light" onClick={this.toggleDrawer}>
244+
<NotificationsNoneOutlinedIcon />
245+
</Button>
246+
</div>
247+
{!editorMode && !viewingTicket && ticketDashboard}
248+
{editorMode && !viewingTicket && (
249+
<NewTicketEditor
250+
save={this.handleCreateNewTicket}
251+
cancel={() => this.toggleNewTicketEditor(false)}
252+
/>
253+
)}
254+
{viewingTicket && ticeketDiscussion}
247255
</div>
248-
{!editorMode && !viewingTicket && ticketDashboard}
249-
{editorMode && !viewingTicket && (
250-
<NewTicketEditor
251-
save={this.handleCreateNewTicket}
252-
cancel={() => this.toggleNewTicketEditor(false)}
253-
/>
254-
)}
255-
{viewingTicket && ticeketDiscussion}
256-
</div>
257-
</LoadingOverlay>
258-
<Drawer
259-
anchor={"right"}
260-
open={notificationDrawer}
261-
PaperProps={{ style: { position: "absolute", zIndex: "5000" } }}
262-
BackdropProps={{ style: { position: "absolute", zIndex: "5000" } }}
263-
ModalProps={{
264-
container: document.getElementById("ticket-shadow"),
265-
style: { position: "absolute", zIndex: "5000" },
266-
}}
267-
variant="temporary"
268-
onClose={this.toggleDrawer}
269-
>
270-
<List className="list">
271-
{notifications &&
272-
notifications.map((notification, index) => (
273-
<ListItem
274-
key={index}
275-
style={{
276-
display: "flex",
277-
flexDirection: "column",
278-
alignItems: "flex-start",
279-
}}
280-
>
281-
<div>{notification.tag}</div>
282-
<div>{notification.heading}</div>
283-
<div>
284-
<Moment date={notification.createdAt} durationFromNow />
285-
</div>
286-
<div>{notification.content}</div>
287-
<hr></hr>
288-
</ListItem>
289-
))}
290-
</List>
291-
</Drawer>
292-
<ToastContainer
293-
draggable
294-
rtl={false}
295-
pauseOnHover
296-
closeOnClick
297-
autoClose={5000}
298-
pauseOnFocusLoss
299-
newestOnTop={false}
300-
position="top-right"
301-
hideProgressBar={false}
302-
/>
256+
</LoadingOverlay>
257+
<Drawer
258+
anchor={"right"}
259+
open={notificationDrawer}
260+
PaperProps={{ style: { position: "absolute", zIndex: "5000" } }}
261+
BackdropProps={{ style: { position: "absolute", zIndex: "5000" } }}
262+
ModalProps={{
263+
container: document.getElementById("ticket-shadow"),
264+
style: { position: "absolute", zIndex: "5000" },
265+
}}
266+
variant="temporary"
267+
onClose={this.toggleDrawer}
268+
>
269+
<List className="list">
270+
{notifications &&
271+
notifications.map((notification, index) => (
272+
<ListItem
273+
key={index}
274+
style={{
275+
display: "flex",
276+
flexDirection: "column",
277+
alignItems: "flex-start",
278+
}}
279+
>
280+
<div>{notification.tag}</div>
281+
<div>{notification.heading}</div>
282+
<div>
283+
<Moment date={notification.createdAt} durationFromNow />
284+
</div>
285+
<div>{notification.content}</div>
286+
<hr></hr>
287+
</ListItem>
288+
))}
289+
</List>
290+
</Drawer>
291+
<ToastContainer
292+
draggable
293+
rtl={false}
294+
pauseOnHover
295+
closeOnClick
296+
autoClose={5000}
297+
pauseOnFocusLoss
298+
newestOnTop={false}
299+
position="top-right"
300+
hideProgressBar={false}
301+
/>
302+
</div>
303303
</div>
304-
</div>
304+
</>
305305
);
306306
}
307307
}

src/user/Admin/Tickets/TicketDashboard.scss

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,6 @@
33
height: 100vh;
44

55
font-family: Muli, sans-serif;
6-
.navigation {
7-
background: #f5f5f5;
8-
flex-grow: 1;
9-
border-right: solid 1px #dfe9f1;
10-
position: fixed;
11-
top: 0px;
12-
bottom: 0px;
13-
left: 0px;
14-
overflow-y: scroll;
15-
}
166
.ticket-details {
177
._loading_overlay_wrapper {
188
height: 100%;
@@ -36,7 +26,7 @@
3626
.ticket-description {
3727
display: flex;
3828
flex-direction: column;
39-
height: 100vh;
29+
min-height: 100vh;
4030
overflow-y: hidden;
4131
.dashboard-title {
4232
font-family: Inter;
@@ -97,3 +87,12 @@
9787
flex-grow: 0;
9888
}
9989
}
90+
91+
@media (min-width: 320px) and (max-width: 1024px){
92+
.ticket{
93+
.ticket-details {
94+
margin-left: 0;
95+
}
96+
}
97+
}
98+

0 commit comments

Comments
 (0)