Skip to content

Commit aff85db

Browse files
authored
Merge pull request #173 from uwblueprint/F25/sayi/import-fixes
Fix import errors
2 parents 3f6e0b8 + dae2d29 commit aff85db

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

frontend/starter_code_reference/pages/DeleteUserModal.tsx renamed to frontend/src/features/user-profile/components/DeleteUserModal.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React, { FC, useContext } from "react";
2-
import PopupModal from "../common/PopupModal";
3-
import UserAPIClient from "../../APIClients/UserAPIClient";
42
import { useToast } from "@chakra-ui/react";
5-
import AuthContext from "../../contexts/AuthContext";
6-
import AUTHENTICATED_USER_KEY from "../../constants/AuthConstants";
3+
import PopupModal from "../../../components/common/PopupModal";
4+
import UserAPIClient from "../../../APIClients/UserAPIClient";
5+
import AuthContext from "../../../contexts/AuthContext";
6+
import AUTHENTICATED_USER_KEY from "../../../constants/AuthConstants";
77

88
interface DeleteUserModalProps {
99
isOpen: boolean; // Whether the modal should be visible
@@ -50,14 +50,12 @@ const DeleteUserModal: FC<DeleteUserModalProps> = ({
5050
return (
5151
<PopupModal
5252
open={isOpen}
53-
title={"Delete User?"}
54-
message={
55-
"Are you sure you want to delete this user? This process cannot be undone."
56-
}
57-
primaryButtonText={"Delete"}
53+
title="Delete User?"
54+
message="Are you sure you want to delete this user? This process cannot be undone."
55+
primaryButtonText="Delete"
5856
onPrimaryClick={handlePrimaryButtonClick}
59-
primaryButtonColor={"red"}
60-
secondaryButtonText={"Cancel"}
57+
primaryButtonColor="red"
58+
secondaryButtonText="Cancel"
6159
onSecondaryClick={handleSecondaryButtonClick}
6260
/>
6361
);

frontend/src/features/user-profile/pages/AdminViewEditUserProfilePage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import SingleSelect from "../../../components/common/SingleSelect";
88
import MultiSelect from "../../../components/common/MultiSelect";
99
import Button from "../../../components/common/Button";
1010
import UserAPIClient from "../../../APIClients/UserAPIClient";
11-
import { UserRoles } from "../../../constants/UserConstants";
11+
import UserRoles from "../../../constants/UserConstants";
1212
import { AnimalTag } from "../../../types/TaskTypes";
1313
import ColourStarIcon from "../../../components/common/ColourStarIcon";
1414
import NavBar from "../../../components/common/navbar/NavBar";
15-
import DeleteUserModal from "../../../../starter_code_reference/pages/DeleteUserModal";
15+
import DeleteUserModal from "../components/DeleteUserModal";
1616

1717
interface FormData {
1818
firstName: string;

0 commit comments

Comments
 (0)