Skip to content
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

Hotfix: Dark Mode Enhancements and User Deletion Image Update #389

Merged
merged 1 commit into from
Oct 15, 2024
Merged

Hotfix: Dark Mode Enhancements and User Deletion Image Update #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 backend/src/modules/users/repositories/userAdminRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default class UserAdminRepository {
email_address: `deleted_${rand}@gmail.com`,
username: `deleted_${rand}`,
image_url:
"https://plvofqwscloxamqxcxhz.supabase.co/storage/v1/object/public/user/profile_pictures/default.png",
"/images/default.png",
fullname: "deleted_user",
user_score: 0,
location_id: null,
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/OrganizationTabs/MembersTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export default function MembersTab({ organization, members, setMembers }: Member
{members.data.map((member) => (
<div
key={member.user_id}
className="flex items-center justify-between p-2 hover:bg-gray-100 cursor-pointer rounded-md transition-colors duration-200"
className="flex items-center justify-between p-2 hover:bg-gray-100 dark:hover:bg-grey cursor-pointer rounded-md transition-colors duration-200"
onClick={() => handleRowClick(member.user_id)}
>
<div className="flex items-center space-x-4">
Expand Down
38 changes: 19 additions & 19 deletions frontend/components/Sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,27 +359,27 @@ const Sidebar: React.FC<SidebarProps> = ({ isOpen, onClose }) => {
{user && (
<div className={styles.userAccount}>
{showLogout && (
<div className={styles.logoutOverlay}>
<ul className={styles.sidebarLinks}>
<li>
<Link href="/login" onClick={() => signOutWithToast(toast)}>
<LogoutIcon />
Logout
</Link>
</li>
</ul>
</div>
<div className={`${styles.logoutOverlay} dark:border-gray-400 hover:bg-gray-200 dark:hover:bg-black dark:bg-background dark:text-white`}>
<ul className={styles.sidebarLinks}>
<li>
<Link className="dark:border-none hover:bg-gray-200 dark:hover:bg-black focus:ring-green-200 dark:bg-background dark:text-white p-0 m-0" href="/login" onClick={() => signOutWithToast(toast)}>
<LogoutIcon />
Logout
</Link>
</li>
</ul>
</div>
)}
<div className={styles.userProfile} onClick={toggleLogout}>
<Avatar>
<AvatarImage src={user.image_url} />
<AvatarFallback>{user.fullname[0].toUpperCase()}</AvatarFallback>
</Avatar>
<div className={`w-[70%] overflow-hidden overflow-ellipsis ${styles.userDetail}`}>
<h3 className="inline">{user.fullname}</h3>
<br />
<span>@{user.username}</span>
</div>
<Avatar>
<AvatarImage src={user.image_url} />
<AvatarFallback>{user.fullname[0].toUpperCase()}</AvatarFallback>
</Avatar>
<div className={`w-[70%] overflow-hidden overflow-ellipsis ${styles.userDetail}`}>
<h3 className="inline">{user.fullname}</h3>
<br />
<span>@{user.username}</span>
</div>
</div>
</div>
)}
Expand Down
4 changes: 2 additions & 2 deletions frontend/styles/Custom.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
top: -50px; /* Adjust this value as needed */
width: 100%;
background-color: white;
border: 1px solid #ccc;
border: 2px solid #ccc;
border-radius: 15px; /* Rounded corners */
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
z-index: 10;
Expand All @@ -137,7 +137,7 @@
}

.logoutOverlay li {
padding: 10px;
padding: 0;
}

.logoutOverlay li a {
Expand Down
Loading