Skip to content

Commit

Permalink
fix: update translations and images
Browse files Browse the repository at this point in the history
  • Loading branch information
ivopr committed Jun 6, 2023
1 parent d2c21cc commit 22f02a1
Show file tree
Hide file tree
Showing 12 changed files with 131 additions and 115 deletions.
7 changes: 3 additions & 4 deletions apps/client/locales/en-US/navigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@
"title": "Dynamics",
"models": {
"apo": "APO",
"acpype": "ACPYPE with Amber",
"prodrg": "PRODRG with GROMOS",
"prodrg-disabled": "This dynamic has been temporarily disabled as we migrate the generation model to be on par with ACPYPE and APO dynamics."
"acpype": "Protein + Ligand (prepared in ACPYPE)",
"prodrg": "Protein + Ligand (prepared in PRODRG)"
}
},
"preparation": {
"title": "Dynamics Preparation",
"title": "Ligand Preparation",
"models": {
"acpype": "ACPYPE Ligand Generator"
}
Expand Down
2 changes: 1 addition & 1 deletion apps/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"github-slugger": "^2.0.0",
"handlebars": "^4.7.7",
"lucide-react": "^0.206.0",
"next": "13.4.1",
"next": "13.4.4",
"next-auth": "^4.22.1",
"next-contentlayer": "^0.3.2",
"next-progress": "^2.3.1",
Expand Down
Binary file removed apps/client/public/ufcspa.png
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added apps/client/src/assets/ufcspa.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/client/src/components/general/blur-image/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function BlurImage({ className, ...rest }: ImageProps) {
return (
<div
className={cnMerge(
"relative mx-auto flex overflow-hidden rounded-xl bg-white/[2%] after:pointer-events-none after:absolute after:inset-0 after:z-10 after:rounded-xl after:border after:border-primary-200/10 after:content-['']",
"relative mx-auto flex overflow-hidden rounded-xl bg-zinc-950/[2%] after:pointer-events-none after:absolute after:inset-0 after:z-10 after:rounded-xl after:border after:border-primary-200/70 after:content-[''] dark:bg-white/[2%] dark:after:border-primary-200/10",
isLoading ? "animate-pulse" : "",
className
)}
Expand Down
92 changes: 58 additions & 34 deletions apps/client/src/components/general/sidebar/content.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { useEffect, useState } from "react";
import { Beaker, Crown, Info, LayoutDashboard } from "lucide-react";
import dynamic from "next/dynamic";
import NextLink from "next/link";
import { useSession } from "next-auth/react";
import useTranslation from "next-translate/useTranslation";

import Fiocruz from "@app/assets/fiocruz.png";
import FiocruzRO from "@app/assets/fiocruz-ro.png";
import FiocruzWhite from "@app/assets/fiocruz-white.png";
import LABIOQUIM from "@app/assets/labioquim.png";
import UFCSPA from "@app/assets/ufcspa.png";
import { BlurImage } from "@app/components/general/blur-image";
import { useTheme } from "@app/context/ThemeContext";

import { cnMerge } from "@app/utils/cnMerge";
const SidebarItem = dynamic(
() =>
import("@app/components/general/sidebar/item").then((m) => m.SidebarItem),
Expand All @@ -29,6 +35,7 @@ export function SidebarContent() {
const { theme } = useTheme();
const { data: session, status } = useSession();
const { t } = useTranslation();

const initialNavigationArray: NavigationSection[] = [
{
title: "navigation:system.title",
Expand All @@ -50,6 +57,7 @@ export function SidebarContent() {
]
}
];

const authenticatedNavigationArray: NavigationSection[] = [
{
title: "navigation:dynamic.title",
Expand Down Expand Up @@ -84,6 +92,7 @@ export function SidebarContent() {
]
}
];

const adminNavigationSection: NavigationItem = {
label: "navigation:admin.title",
Icon: Crown,
Expand All @@ -107,6 +116,7 @@ export function SidebarContent() {
}
]
};

const [navigationItems, setNavigationItems] = useState<NavigationSection[]>(
initialNavigationArray
);
Expand Down Expand Up @@ -169,39 +179,53 @@ export function SidebarContent() {
</div>
))}
</ul>
<div className="my-5 grid gap-2 px-2">
<BlurImage
alt="LABIOQUIM"
className="w-full p-2"
height={0}
src="/labioquim.png"
unoptimized
width={0}
/>
<BlurImage
alt="Fiocruz Rondônia"
className="w-full p-2"
height={0}
src="/fiocruz-ro.png"
unoptimized
width={0}
/>
<BlurImage
alt="Fiocruz"
className="w-full p-2"
height={0}
src={theme === "light" ? "/fiocruz.png" : "/fiocruz-white.png"}
unoptimized
width={0}
/>
<BlurImage
alt="UFCSPA"
className="w-full p-2"
height={0}
src="/ufcspa.png"
unoptimized
width={0}
/>
<div className="my-5 grid grid-flow-col grid-rows-2 gap-2 px-2">
<NextLink
href="https://www.rondonia.fiocruz.br/laboratorios/bioinformatica-e-quimica-medicinal/"
target="_blank"
rel="noopener noreferrer"
>
<BlurImage
alt=""
className="h-full w-full object-contain"
src={LABIOQUIM}
/>
</NextLink>
<NextLink
href="https://www.rondonia.fiocruz.br/"
target="_blank"
rel="noopener noreferrer"
>
<BlurImage
alt=""
className="h-full w-full object-contain"
src={FiocruzRO}
/>
</NextLink>
<NextLink
href="https://portal.fiocruz.br"
target="_blank"
rel="noopener noreferrer"
>
<BlurImage
alt=""
className={cnMerge("h-full w-full object-contain", {
"px-0.5": theme === "light"
})}
src={theme === "light" ? Fiocruz : FiocruzWhite}
/>
</NextLink>
<NextLink
href="https://www.ufcspa.edu.br/"
target="_blank"
rel="noopener noreferrer"
>
<BlurImage
alt=""
className="h-full w-full object-contain px-0.5"
src={UFCSPA}
/>
</NextLink>
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/components/general/sidebar/desktop.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function DesktopSidebar() {
return (
<aside
id="desktopSidebar"
className="z-30 hidden w-72 flex-shrink-0 overflow-y-auto bg-white transition-all duration-150 dark:bg-zinc-900 lg:mr-0.5 lg:block"
className="z-30 hidden w-96 flex-shrink-0 overflow-y-auto bg-white transition-all duration-150 dark:bg-zinc-900 lg:mr-0.5 lg:block"
>
<SidebarContent />
</aside>
Expand Down

0 comments on commit 22f02a1

Please sign in to comment.