Skip to content

Commit a3047b4

Browse files
authored
Make reject button smaller and fix modal action buttons state on /applications page (#806)
* Make accept button bigger and handle action buttons status wise * Add/remove application status message through js
1 parent 38c8afe commit a3047b4

File tree

3 files changed

+69
-10
lines changed

3 files changed

+69
-10
lines changed

applications/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ <h2>Status</h2>
7777
</button>
7878
<div class="application-details-main"></div>
7979
<div class="application-details-actions">
80-
<button class="application-details-reject">Reject</button>
8180
<button class="application-details-accept">Accept</button>
81+
<p class="application-details-reject">Reject</p>
8282
</div>
8383
</div>
8484
<main class="application-container"></main>

applications/script.js

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ const applicationContainer = document.querySelector('.application-container');
3333
const clearButton = document.getElementById('clear-button');
3434
const lastElementContainer = document.getElementById('page_bottom_element');
3535

36+
const applicationDetailsActionsContainer = document.querySelector(
37+
'.application-details-actions',
38+
);
39+
3640
const urlParams = new URLSearchParams(window.location.search);
3741
let applicationId = urlParams.get('id');
3842

@@ -81,6 +85,18 @@ function closeApplicationDetails() {
8185
applicationDetailsModal.classList.add('hidden');
8286
backDropBlur.style.display = 'none';
8387
document.body.style.overflow = 'auto';
88+
const applicationAcceptedMsg = document.querySelector(
89+
'.application-details-accepted-msg',
90+
);
91+
const applicationRejectedMsg = document.querySelector(
92+
'.application-details-rejected-msg',
93+
);
94+
if (applicationAcceptedMsg) {
95+
applicationAcceptedMsg.remove();
96+
}
97+
if (applicationRejectedMsg) {
98+
applicationRejectedMsg.remove();
99+
}
84100
removeQueryParamInUrl('id');
85101
}
86102

@@ -187,18 +203,34 @@ function openApplicationDetails(application) {
187203
applicationDetailsMain.appendChild(applicationSection);
188204

189205
if (application.status === 'rejected') {
190-
applicationRejectButton.disabled = true;
191-
applicationRejectButton.style.cursor = 'not-allowed';
192-
applicationRejectButton.classList.add('disable-button');
206+
applicationAcceptButton.classList.add('hidden');
207+
applicationRejectButton.classList.add('hidden');
208+
const applicationDetailsRejectedMsg = createElement({
209+
type: 'p',
210+
attributes: {
211+
class: 'application-details-rejected-msg',
212+
},
213+
innerText: 'Application is already rejected',
214+
});
215+
applicationDetailsActionsContainer.append(applicationDetailsRejectedMsg);
193216
} else if (application.status === 'accepted') {
194-
applicationAcceptButton.disabled = true;
195-
applicationAcceptButton.style.cursor = 'not-allowed';
196-
applicationAcceptButton.classList.add('disable-button');
217+
applicationAcceptButton.classList.add('hidden');
218+
applicationRejectButton.classList.add('hidden');
219+
const applicationDetailsAcceptedMsg = createElement({
220+
type: 'p',
221+
attributes: {
222+
class: 'application-details-accepted-msg',
223+
},
224+
innerText: 'Application was already accepted',
225+
});
226+
applicationDetailsActionsContainer.append(applicationDetailsAcceptedMsg);
197227
} else {
198228
applicationRejectButton.disabled = false;
199229
applicationRejectButton.style.cursor = 'pointer';
200230
applicationRejectButton.classList.remove('disable-button');
231+
applicationRejectButton.classList.remove('hidden');
201232

233+
applicationAcceptButton.classList.remove('hidden');
202234
applicationAcceptButton.disabled = false;
203235
applicationAcceptButton.style.cursor = 'pointer';
204236
applicationAcceptButton.classList.remove('disable-button');

applications/style.css

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,15 @@ body {
343343
display: flex;
344344
align-items: flex-start;
345345
height: 8%;
346-
justify-content: space-around;
346+
align-items: center;
347347
padding: 10px;
348348
padding-bottom: 16px;
349+
padding-left: 30px;
350+
padding-right: 30px;
349351
}
350352

351353
.application-details .application-details-actions .application-details-reject,
352354
.application-details .application-details-actions .application-details-accept {
353-
width: 44%;
354355
cursor: pointer;
355356
border: none;
356357
height: 95%;
@@ -362,11 +363,37 @@ body {
362363
}
363364

364365
.application-details .application-details-actions .application-details-reject {
365-
background: var(--red-color);
366+
color: var(--red-color);
367+
height: auto;
368+
background-color: white;
369+
margin-left: auto;
370+
margin-right: auto;
371+
text-decoration: underline;
366372
}
367373

368374
.application-details .application-details-actions .application-details-accept {
369375
background: var(--color-primary);
376+
width: 50%;
377+
}
378+
379+
.application-details-actions .hidden {
380+
display: none;
381+
}
382+
383+
.application-details-accepted-msg,
384+
.application-details-rejected-msg {
385+
font-weight: bold;
386+
font-size: 18px;
387+
width: 100%;
388+
text-align: center;
389+
}
390+
391+
.application-details-accepted-msg {
392+
color: var(--color-green);
393+
}
394+
395+
.application-details-rejected-msg {
396+
color: var(--red-color);
370397
}
371398

372399
.unauthorized-text {

0 commit comments

Comments
 (0)