Skip to content

Commit

Permalink
feat: add new copy for dashboard, and fix avatar size for groups
Browse files Browse the repository at this point in the history
  • Loading branch information
andre-code committed Dec 6, 2024
1 parent dbe4009 commit 9c19dd5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 17 deletions.
16 changes: 5 additions & 11 deletions client/src/features/dashboardV2/DashboardV2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,7 @@ function DashboardSearch() {
<Card className="bg-white">
<CardHeader>
<h3>Explore Renkulab</h3>
<p>
Discover and collaborate on innovative data science projects by
exploring Renkulab.io{" "}
</p>
<p>Explore projects on RenkuLab.</p>
</CardHeader>
<CardBody>
<SearchV2Bar />
Expand Down Expand Up @@ -323,8 +320,8 @@ function ProjectList({ data, error, isLoading }: ProjectListProps) {
</div>
) : !hasProjects ? (
<div>
Renku 2.0 Projects let you group together related resources and control
who can access them.
Collaborate on projects with anyone, with data, code, and compute together
in one place.
</div>
) : null;

Expand Down Expand Up @@ -447,7 +444,7 @@ function UserDashboard() {
</h3>
</Link>
<p className="mb-0">
<Link to={userPageUrl} className={cx("link-primary", "text-body")}>
<Link to={userPageUrl} className="link-primary">
@{userInfo.username ?? "unknown"}
</Link>
</p>
Expand Down Expand Up @@ -572,10 +569,7 @@ function GroupsList({ data, error, isLoading }: GroupListProps) {
<RtkOrNotebooksError error={error} />
</div>
) : !hasGroups ? (
<div>
Renku 2.0 Groups let you group together related projects and control who
can access them.
</div>
<div>Share and organize projects & data with your team.</div>
) : null;

const groupFooter = hasGroups ? (
Expand Down
2 changes: 1 addition & 1 deletion client/src/features/dashboardV2/DashboardV2Sessions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function ErrorState({
function NoSessionsState() {
return (
<p className="mb-0">
No running sessions. Create a project to launch a session.
No running sessions. Create or explore projects to launch a session.
</p>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function GroupShortHandDisplay({
data-cy="group-item"
>
<div className={cx("d-flex", "gap-2")}>
<UserAvatar username={group.name} size={UserAvatarSize.extraLarge} />
<UserAvatar username={group.name} size={UserAvatarSize.large} />
<div
className={cx(
"d-flex",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function ProjectShortHandDisplay({
</div>

<div className={cx("d-flex", element === "card-body" && "mt-auto")}>
<p className={cx("fst-italic", "mb-2", "text-truncate")}>
<p className={cx("mb-2", "text-truncate", "text-muted")}>
{project.description}
</p>
{project.updated_at ? (
Expand Down
7 changes: 6 additions & 1 deletion client/src/features/usersV2/show/UserAvatar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@
width: var(--size);
font-size: var(--font-size);

&.large {
&.medium {
--size: 32px;
--font-size: 16px;
}

&.large {
--size: 43px;
--font-size: 20px;
}

&.extraLarge {
--size: 56px;
--font-size: 24px;
Expand Down
1 change: 1 addition & 0 deletions client/src/features/usersV2/show/UserAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import styles from "./UserAvatar.module.scss";

export enum UserAvatarSize {
small = "small",
medium = "medium",
large = "large",
extraLarge = "extra-large",
}
Expand Down
3 changes: 1 addition & 2 deletions client/src/features/usersV2/show/UserShow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import ProjectV2ListDisplay from "../../projectsV2/list/ProjectV2ListDisplay";
import UserNotFound from "../../projectsV2/notFound/UserNotFound";
import { EntityPill } from "../../searchV2/components/SearchV2Results";
import { useGetUserByIdQuery, useGetUserQuery } from "../api/users.api";
import UserAvatar, { UserAvatarSize } from "./UserAvatar";
import UserAvatar from "./UserAvatar";

export default function UserShow() {
const { username } = useParams<{ username: string }>();
Expand Down Expand Up @@ -105,7 +105,6 @@ export default function UserShow() {
firstName={user.first_name}
lastName={user.last_name}
username={username}
size={UserAvatarSize.large}
/>
<h2 className="mb-0">{name ?? "Unknown user"}</h2>
</div>
Expand Down

0 comments on commit 9c19dd5

Please sign in to comment.