Skip to content

Changes page url from /taskRequests to /task-requests #655

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

Merged
iamitprakash merged 10 commits into from
Jan 1, 2024
Merged

Changes page url from /taskRequests to /task-requests #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
421d869
fix: task requests css for modals
Ajeyakrishna-k Dec 4, 2023
a59ffdd
fix: failing test
Ajeyakrishna-k Dec 4, 2023
90f8457
Merge branch 'develop' into fix/task-request-css
Ajeyakrishna-k Dec 4, 2023
0d08595
Merge branch 'develop' into fix/task-request-css
Ajeyakrishna-k Dec 22, 2023
fce902b
fix: minor css changes
Ajeyakrishna-k Dec 22, 2023
56dd16e
chore: rename taskRequest page url to task-requests
Ajeyakrishna-k Dec 22, 2023
4dca1f7
chore: removes /taskRequests page
Ajeyakrishna-k Dec 22, 2023
69c902c
chore: rename imports to task-requests
Ajeyakrishna-k Dec 22, 2023
3dcf425
chore: change href of task requests button
Ajeyakrishna-k Dec 22, 2023
144abf2
Merge remote-tracking branch 'origin/develop' into remove/taskRequest…
Ajeyakrishna-k Dec 30, 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
2 changes: 1 addition & 1 deletion __tests__/home/home.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ describe('Home Page', () => {
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;
Expand Down
4 changes: 2 additions & 2 deletions __tests__/taskRequests/taskRequest.test.js → __tests__/task-requests/task-request.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('Task Requests', () => {
request.continue();
}
});
await page.goto(`${SITE_URL}/taskRequests`);
await page.goto(`${SITE_URL}/task-requests`);
await page.waitForNetworkIdle();
});

Expand Down Expand Up @@ -227,7 +227,7 @@ describe('createCustomElement', () => {

page = await browser.newPage();

await page.goto(`${SITE_URL}/taskRequests`);
await page.goto(`${SITE_URL}/task-requests`);
await page.waitForNetworkIdle();
});

Expand Down
4 changes: 2 additions & 2 deletions ..._/taskRequests/taskRequestDetails.test.js → ...task-requests/task-requestDetails.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
);
});

Expand Down Expand Up @@ -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',
);
});

Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<a
id="task-requests-link"
class="action-button element-display-remove"
href="taskRequests"
href="task-requests"
>
Task Requests
</a>
Expand Down
0 taskRequests/assets/RDSLogo.png → task-requests/assets/RDSLogo.png
View file
Open in desktop
File renamed without changes
0 taskRequests/assets/funnel.svg → task-requests/assets/funnel.svg
View file
Open in desktop
File renamed without changes
0 taskRequests/assets/sort-down.svg → task-requests/assets/sort-down.svg
View file
Open in desktop
File renamed without changes
0 taskRequests/assets/sort-menu.svg → task-requests/assets/sort-menu.svg
View file
Open in desktop
File renamed without changes
0 taskRequests/assets/sort-up.svg → task-requests/assets/sort-up.svg
View file
Open in desktop
File renamed without changes
0 taskRequests/constants.js → task-requests/constants.js
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions taskRequests/details/index.html → task-requests/details/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
href="https://fonts.googleapis.com/css2?family=Inter:wght@100;400;700;800&display=swap"
rel="stylesheet"
/>
<link rel="stylesheet" href="/taskRequests/details/style.css" />
<link rel="stylesheet" href="/task-requests/details/style.css" />

<title>Task Requests | Real Dev Squad</title>
<script src="/helpers/loadENV.js"></script>
<script src="/taskRequests/util.js"></script>
<script src="/taskRequests/constants.js"></script>
<script src="/task-requests/util.js"></script>
<script src="/task-requests/constants.js"></script>
<script src="/utils/time/index.js"></script>
<script src="/taskRequests/details/script.js" defer></script>
<script src="/task-requests/details/script.js" defer></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/showdown/2.1.0/showdown.min.js"
integrity="sha512-LhccdVNGe2QMEfI3x4DVV3ckMRe36TfydKss6mJpdHjNFiV07dFpS2xzeZedptKZrwxfICJpez09iNioiSZ3hA=="
Expand All @@ -30,7 +30,7 @@
<div class="header">
<div class="header__contents">
<img
src="/taskRequests/assets/RDSLogo.png"
src="/task-requests/assets/RDSLogo.png"
alt="RDS logo"
height="48"
width="48"
Expand Down
0 taskRequests/details/script.js → task-requests/details/script.js
View file
Open in desktop
File renamed without changes.
0 taskRequests/details/style.css → task-requests/details/style.css
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions taskRequests/index.html → task-requests/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@
/>

<title>Task Requests | Real Dev Squad</title>
<link rel="stylesheet" href="/taskRequests/style.css" />
<link rel="stylesheet" href="/task-requests/style.css" />
<script src="/helpers/loadENV.js"></script>
<script src="/taskRequests/constants.js"></script>
<script src="/taskRequests/util.js"></script>
<script src="/task-requests/constants.js"></script>
<script src="/task-requests/util.js"></script>
<script src="/utils.js"></script>
<script src="/taskRequests/script.js" defer></script>
<script src="/task-requests/script.js" defer></script>
</head>

<body>
<div class="header">
<div class="header__contents">
<img
src="/taskRequests/assets/RDSLogo.png"
src="/task-requests/assets/RDSLogo.png"
alt="RDS logo"
height="48"
width="48"
Expand All @@ -38,7 +38,7 @@
<button class="sort-button">
<img
id="asc-sort-icon"
src="/taskRequests/assets/sort-menu.svg"
src="/task-requests/assets/sort-menu.svg"
alt="sort-icon"
/>
</button>
Expand All @@ -60,7 +60,7 @@ <h3 id="sort-dialog-label">Sort By</h3>

<img
class="funnel-icon"
src="/taskRequests/assets/funnel.svg"
src="/task-requests/assets/funnel.svg"
alt="funnel icon"
/>
</button>
Expand Down
2 changes: 1 addition & 1 deletion taskRequests/script.js → task-requests/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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;
Expand Down
0 taskRequests/style.css → task-requests/style.css
View file
Open in desktop
File renamed without changes.
0 taskRequests/util.js → task-requests/util.js
View file
Open in desktop
File renamed without changes.