Skip to content

Commit

Permalink
Merge pull request #162 from privacy-scaling-explorations/fix-navigat…
Browse files Browse the repository at this point in the history
…ion-issues

fix navigation issues
  • Loading branch information
ChialiT authored May 10, 2024
2 parents c92630e + 0162fb5 commit 77315d0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion app/i18n/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const languageList: Language[] = [
{
key: "fr",
label: "Français",
enabled: false,
enabled: true,
},
{
key: "de",
Expand Down
9 changes: 4 additions & 5 deletions components/project/project-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import React from "react"
import Image from "next/image"
import { useRouter } from "next/navigation"
import Link from "next/link"
import { VariantProps, cva } from "class-variance-authority"

import { ProjectInterface, ProjectLinkWebsite } from "@/lib/types"
Expand Down Expand Up @@ -53,16 +53,15 @@ export default function ProjectCard({
lang,
}: ProjectCardProps & { lang: LocaleTypes }) {
const { t } = useTranslation(lang, "common")
const router = useRouter()

const { id, image, links, name, tldr, tags, imageAlt, projectStatus } =
project

const projectNotActive = projectStatus !== "active"

return (
<div
onClick={() => router.push(`/projects/${id}`)}
<Link
href={`/projects/${id}`}
className={cn(projectCardVariants({ showLinks, border, className }))}
>
{showBanner && (
Expand Down Expand Up @@ -124,6 +123,6 @@ export default function ProjectCard({
)}
</div>
</div>
</div>
</Link>
)
}
2 changes: 1 addition & 1 deletion config/site.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const siteConfig = {
activity:
"https://pse-team.notion.site/50dcf22c5191485e93406a902ae9e93b?v=453023f8227646dd949abc34a7a4a138&pvs=4",
report: "https://reports.pse.dev/",
firstGoodIssue: "https://pse-gfis.vercel.app",
firstGoodIssue: "https://gfi.pse.dev/",
discordAnnouncementChannel:
"https://discord.com/channels/943612659163602974/969614451089227876",
acceleratorProgram:
Expand Down
1 change: 0 additions & 1 deletion hooks/useAppSettings.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { siteConfig } from "@/config/site"
import { MainNavProps } from "@/components/main-nav"
import { useTranslation } from "@/app/i18n/client"
import { LocaleTypes, fallbackLng, languageList } from "@/app/i18n/settings"
Expand Down
8 changes: 2 additions & 6 deletions lib/fonts.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
import {
Space_Grotesk as FontDisplay,
JetBrains_Mono as FontMono,
DM_Sans as FontSans,
} from "next/font/google"

export const fontSans = FontSans({
subsets: ["latin"],
variable: "--font-sans",
weight: ["400", "500", "700"],
display: "swap",
})

export const fontDisplay = FontDisplay({
subsets: ["latin"],
variable: "--font-display",
weight: ["400", "500", "700"],
})

export const fontMono = FontMono({
subsets: ["latin"],
variable: "--font-mono",
display: "swap",
})
1 change: 1 addition & 0 deletions styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
}
html{
@apply font-sans;
text-rendering: geometricPrecision;
}
body {
@apply font-sans bg-background text-foreground;
Expand Down

0 comments on commit 77315d0

Please sign in to comment.