diff --git a/__tests__/home/home.test.js b/__tests__/home/home.test.js
index a6a6f751..36084aa2 100644
--- a/__tests__/home/home.test.js
+++ b/__tests__/home/home.test.js
@@ -186,20 +186,20 @@ describe('Home Page', () => {
expect(syncExternalAccountsUpdate).toBeTruthy();
});
it('should display the task requests button', async () => {
- await page.goto('http://localhost:8000/?dev=true');
+ await page.goto('http://localhost:8000');
await page.waitForNetworkIdle();
const taskRequestsButton = await page.$('#task-requests-link');
expect(taskRequestsButton).toBeTruthy();
});
it('should go to the task requests page', async () => {
- await page.goto('http://localhost:8000/?dev=true');
+ await page.goto('http://localhost:8000');
await page.waitForNetworkIdle();
const taskRequestsButton = await page.$('#task-requests-link');
await taskRequestsButton.click();
await page.waitForNetworkIdle();
const newUrl = page.url();
- expect(newUrl).toContain('/taskRequests');
+ expect(newUrl).toContain('/task-requests');
});
it('should call the right api endpoint when Sync External Accounts button is clicked', async () => {
let isRightUrlCalled = false;
diff --git a/__tests__/taskRequests/taskRequest.test.js b/__tests__/task-requests/task-request.test.js
similarity index 97%
rename from __tests__/taskRequests/taskRequest.test.js
rename to __tests__/task-requests/task-request.test.js
index 3750b7e8..56c983e4 100644
--- a/__tests__/taskRequests/taskRequest.test.js
+++ b/__tests__/task-requests/task-request.test.js
@@ -28,9 +28,8 @@ describe('Task Requests', () => {
page.on('request', (request) => {
if (
request.url() === `${API_BASE_URL}/taskRequests` ||
- request.url() === `${API_BASE_URL}/taskRequests?dev=true` ||
request.url() ===
- `${API_BASE_URL}/taskRequests?size=20&q=status%3Apending+sort%3Acreated-asc&dev=true`
+ `${API_BASE_URL}/taskRequests?size=20&q=status%3Apending+sort%3Acreated-asc`
) {
request.respond({
status: 200,
@@ -44,7 +43,7 @@ describe('Task Requests', () => {
});
} else if (
request.url() ===
- `${API_BASE_URL}/taskRequests?size=20&q=status%3Aapproved++sort%3Acreated-asc&dev=true`
+ `${API_BASE_URL}/taskRequests?size=20&q=status%3Aapproved++sort%3Acreated-asc`
) {
const list = [];
for (let i = 0; i < 20; i++) {
@@ -55,14 +54,14 @@ describe('Task Requests', () => {
contentType: 'application/json',
body: JSON.stringify({
data: list,
- next: '/taskRequests?size=20&q=status%3Aapproved++sort%3Acreated-asc&dev=true',
+ next: '/taskRequests?size=20&q=status%3Aapproved++sort%3Acreated-asc',
}),
});
} else {
request.continue();
}
});
- await page.goto(`${SITE_URL}/taskRequests`);
+ await page.goto(`${SITE_URL}/task-requests`);
await page.waitForNetworkIdle();
});
@@ -107,7 +106,7 @@ describe('Task Requests', () => {
expect(
await modal.evaluate((el) => el.classList.contains('hidden')),
).toBe(false);
- await page.mouse.click(20, 20);
+ await page.mouse.click(200, 200);
expect(
await modal.evaluate((el) => el.classList.contains('hidden')),
).toBe(true);
@@ -227,7 +226,7 @@ describe('createCustomElement', () => {
page = await browser.newPage();
- await page.goto(`${SITE_URL}/taskRequests`);
+ await page.goto(`${SITE_URL}/task-requests`);
await page.waitForNetworkIdle();
});
diff --git a/__tests__/taskRequests/taskRequestDetails.test.js b/__tests__/task-requests/task-requestDetails.test.js
similarity index 97%
rename from __tests__/taskRequests/taskRequestDetails.test.js
rename to __tests__/task-requests/task-requestDetails.test.js
index b29ce8c0..51d24f2e 100644
--- a/__tests__/taskRequests/taskRequestDetails.test.js
+++ b/__tests__/task-requests/task-requestDetails.test.js
@@ -30,7 +30,7 @@ describe('Task request details page', () => {
}
});
await page.goto(
- 'http://localhost:8000/taskRequests/details/?id=dM5wwD9QsiTzi7eG7Oq5',
+ 'http://localhost:8000/task-requests/details/?id=dM5wwD9QsiTzi7eG7Oq5',
);
});
@@ -123,7 +123,7 @@ describe('Task request details page with status creation', () => {
}
});
await page.goto(
- 'http://localhost:8000/taskRequests/details/?id=uC0IUpkFMx393XjnKx4w',
+ 'http://localhost:8000/task-requests/details/?id=uC0IUpkFMx393XjnKx4w',
);
});
diff --git a/index.html b/index.html
index 2006ca09..2dc7bf2b 100644
--- a/index.html
+++ b/index.html
@@ -140,7 +140,7 @@
Task Requests
diff --git a/script.js b/script.js
index 2ced456a..a1c87ef6 100644
--- a/script.js
+++ b/script.js
@@ -19,8 +19,7 @@ const syncIdle7dUsersUpdate = document.getElementById(
);
const repoSyncStatusUpdate = document.getElementById(SYNC_REPO_STATUS_UPDATE);
const params = new URLSearchParams(window.location.search);
-const taskRequestsLink =
- params.get('dev') === 'true' && document.getElementById(TASK_REQUESTS_LINK);
+const taskRequestsLink = document.getElementById(TASK_REQUESTS_LINK);
const syncNicknamesStatusUpdate = document.getElementById(
SYNC_NICKNAMES_STATUS_UPDATE,
diff --git a/taskRequests/assets/RDSLogo.png b/task-requests/assets/RDSLogo.png
similarity index 100%
rename from taskRequests/assets/RDSLogo.png
rename to task-requests/assets/RDSLogo.png
diff --git a/taskRequests/assets/funnel.svg b/task-requests/assets/funnel.svg
similarity index 100%
rename from taskRequests/assets/funnel.svg
rename to task-requests/assets/funnel.svg
diff --git a/taskRequests/assets/sort-down.svg b/task-requests/assets/sort-down.svg
similarity index 100%
rename from taskRequests/assets/sort-down.svg
rename to task-requests/assets/sort-down.svg
diff --git a/taskRequests/assets/sort-menu.svg b/task-requests/assets/sort-menu.svg
similarity index 100%
rename from taskRequests/assets/sort-menu.svg
rename to task-requests/assets/sort-menu.svg
diff --git a/taskRequests/assets/sort-up.svg b/task-requests/assets/sort-up.svg
similarity index 100%
rename from taskRequests/assets/sort-up.svg
rename to task-requests/assets/sort-up.svg
diff --git a/taskRequests/constants.js b/task-requests/constants.js
similarity index 100%
rename from taskRequests/constants.js
rename to task-requests/constants.js
diff --git a/taskRequests/details/index.html b/task-requests/details/index.html
similarity index 92%
rename from taskRequests/details/index.html
rename to task-requests/details/index.html
index 24f3c236..0a42b3a4 100644
--- a/taskRequests/details/index.html
+++ b/task-requests/details/index.html
@@ -11,14 +11,14 @@
href="https://fonts.googleapis.com/css2?family=Inter:wght@100;400;700;800&display=swap"
rel="stylesheet"
/>
-
+
Task Requests | Real Dev Squad
-
-
+
+
-
+
-
-
+
+
-
+
@@ -60,7 +60,7 @@ 
diff --git a/taskRequests/script.js b/task-requests/script.js
similarity index 99%
rename from taskRequests/script.js
rename to task-requests/script.js
index c8e2c26c..365bde4c 100644
--- a/taskRequests/script.js
+++ b/task-requests/script.js
@@ -21,7 +21,6 @@ let isDataLoading = false;
let selectedSortButton = null;
const filterStates = {
- dev: true,
status: Status.PENDING,
order: CREATED_TIME,
size: DEFAULT_PAGE_SIZE,
@@ -98,7 +97,7 @@ function getRemainingCount(requestors) {
}
}
function openTaskDetails(id) {
- const url = new URL(`/taskRequests/details`, window.location.href);
+ const url = new URL(`/task-requests/details`, window.location.href);
url.searchParams.append('id', id);
window.location.href = url;
diff --git a/taskRequests/style.css b/task-requests/style.css
similarity index 96%
rename from taskRequests/style.css
rename to task-requests/style.css
index 1acdf0de..8d5ae76c 100644
--- a/taskRequests/style.css
+++ b/task-requests/style.css
@@ -56,6 +56,7 @@ body {
max-width: 1440px;
margin: 0 auto;
padding: 2.5rem;
+ position: relative;
}
.container__filters {
margin: 1rem 0;
@@ -140,12 +141,11 @@ body {
border-radius: 0.31rem;
flex-direction: column;
align-items: center;
- padding: 10px;
- padding-bottom: 1rem;
+ padding: 1rem;
+ padding-bottom: 1.5rem;
z-index: 2;
position: absolute;
- top: 11.25rem;
- right: 1rem;
+ top: 5.5rem;
background-color: var(--white);
}
@@ -163,6 +163,7 @@ body {
.selected {
background-color: var(--dark-gray-color);
}
+
.sort-container:hover {
background-color: var(--color-gray-light);
}
@@ -181,12 +182,10 @@ body {
border-radius: 0.31rem;
flex-direction: column;
align-items: center;
- padding: 10px;
- padding-bottom: 1rem;
- z-index: 1;
+ padding: 1rem;
+ padding-bottom: 1.5rem;
position: absolute;
- top: 11.25rem;
- right: 1rem;
+ top: 5.5rem;
background-color: var(--white);
}
@@ -279,16 +278,14 @@ body {
font-weight: 600;
text-align: center;
font-size: 1.5rem;
- margin: 2rem;
- width: 100vw;
+ width: 100%;
+ position: absolute;
}
.taskRequest__message--error {
color: var(--color-error);
font-weight: 600;
text-align: center;
font-size: 1.5rem;
- margin: 2rem;
- width: 100vw;
}
.taskRequest__card {
cursor: pointer;
@@ -394,7 +391,7 @@ body {
.filter-modal,
.sort-modal {
- top: 10.5rem;
+ top: 4.5rem;
}
.funnel-icon {
margin: auto;
@@ -408,7 +405,7 @@ body {
.filter-modal,
.sort-modal {
- top: 10rem;
+ top: 4rem;
}
}
@media (max-width: 1439px) {
diff --git a/taskRequests/util.js b/task-requests/util.js
similarity index 100%
rename from taskRequests/util.js
rename to task-requests/util.js