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

Jump to bottom

Fake pr, messing with SC #24

Closed
wants to merge 2 commits into from
Closed

Fake pr, messing with SC #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bb5229
Remove unusual column type from availability.entity.ts
friedbyalice May 12, 2024
fa99532
Use user's propic (if available) in navbar
friedbyalice May 12, 2024
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: 0 additions & 2 deletions api/src/availability/availability.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
} from '../../../shared/src/availability';
import { User } from 'src/users/user.entity';
import { TimeSlot } from 'src/timeslots/timeslot.entity';
import { DbAwareColumn } from 'src/utils/db-aware-column';

@Entity()
export class Availability implements AvailabilityInterface {
Expand All @@ -24,7 +23,6 @@ export class Availability implements AvailabilityInterface {
@Column({ name: 'last_modified' })
lastModified: Date;

@DbAwareColumn(() => TimeSlot, { name: 'time_slot' })
@ManyToOne(() => TimeSlot, (timeSlot) => timeSlot.availabilities)
timeSlot: Relation<TimeSlot>;

Expand Down
18 changes: 0 additions & 18 deletions api/src/utils/db-aware-column.ts
View file
Open in desktop

This file was deleted.

37 changes: 26 additions & 11 deletions frontend/src/components/HKNavbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,31 @@ import LoadingSpinner from "./LoadingSpinner";
const HKNavbar = () => {
const { isLoading, isAuthenticated, user } = useAuth0();

const LoggedUserMenu = () => (
<div id="profile-nav-dropdown">
<NavDropdown
title={
(user.picture && (
<img
className="thumbnail-image"
src={user.picture}
width="65"
height="65"
alt="user pic"
style={{ borderRadius: "50%" }}
/>
)) || <i class="bi bi-person-circle fs-4 me-2" />
}
>
<NavDropdown.ItemText>
{user.name ? user.name : user.email}
</NavDropdown.ItemText>
<NavDropdown.Divider />
<LogoutButton />
</NavDropdown>
</div>
);

return (
<Container fluid>
<Row>
Expand Down Expand Up @@ -45,17 +70,7 @@ const HKNavbar = () => {
) : !isAuthenticated ? (
<LoginButton />
) : (
<div id="profile-nav-dropdown">
<NavDropdown
title={<i class="bi bi-person-circle fs-4 me-2"></i>}
>
<NavDropdown.ItemText>
{user.name ? user.name : user.email}
</NavDropdown.ItemText>
<NavDropdown.Divider />
<LogoutButton />
</NavDropdown>
</div>
<LoggedUserMenu />
)}
</Col>
</Navbar>
Expand Down