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

fix: footer brand image, fix: claims page #3

Merged
merged 1 commit into from
Jan 15, 2025
Merged

fix: footer brand image, fix: claims page #3

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 packages/dappkit
Open in desktop
Submodule dappkit updated 1 files
+3 −7 src/components/primitives/Collapsible.tsx
2 changes: 1 addition & 1 deletion src/components/layout/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function Footer() {
<Group className="gap-xl*2 lg:ml-xl*2 items-center">
<Button to="/" look="soft" className="hidden md:flex">
<Image
className="w-[125px] lg:w-[165px]"
imgClassName="!w-[140px] md:!w-[200px] max-h-[2.5rem]"
alt={`${merklConfig.appName} logo`}
src={mode !== "dark" ? merklConfig.images.logoDark : merklConfig.images.logoLight}
/>
Expand Down
58 changes: 30 additions & 28 deletions src/components/layout/LayerMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,36 @@ export const LayerMenu: FC<{
<div className="layermenu z-50 min-w-64 bg-main-2 flex flex-col">
<main className="flex-1 overflow-y-scroll w-full">
<ul className="min-w-max list-none flex gap-lg flex-col">
{Object.entries(nav).map(([key, value]) => (
<li key={value.key} className="flex-col gap-md flex">
{value.external ? (
<a
href={value.route}
target="_blank"
rel="noopener noreferrer"
onClick={() => window.open(value.route, "_blank", "noopener noreferrer")}
className={`dim flex items-center gap-md ${["faq"].includes(key) ? "uppercase" : "capitalize"}`}>
<Icon remix={value.icon} className="text-xl text-main-11" />
<Text size="lg" bold className="text-main-12">
{key}
</Text>
</a>
) : (
<NavLink
onClick={() => setOpen(false)}
to={value.route}
className={`dim flex items-center gap-md ${["faq"].includes(key) ? "uppercase" : "capitalize"}`}>
<Icon remix={value.icon} className="text-xl text-main-11" />
<Text size="lg" bold className="text-main-12">
{key}
</Text>
</NavLink>
)}
<Divider />
</li>
))}
{Object.entries(nav)
.filter(([_, value]) => value)
.map(([key, value]) => (
<li key={value.key} className="flex-col gap-md flex">
{value.external ? (
<a
href={value.route}
target="_blank"
rel="noopener noreferrer"
onClick={() => window.open(value.route, "_blank", "noopener noreferrer")}
className={`dim flex items-center gap-md ${["faq"].includes(key) ? "uppercase" : "capitalize"}`}>
<Icon remix={value.icon} className="text-xl text-main-11" />
<Text size="lg" bold className="text-main-12">
{key}
</Text>
</a>
) : (
<NavLink
onClick={() => setOpen(false)}
to={value.route}
className={`dim flex items-center gap-md ${["faq"].includes(key) ? "uppercase" : "capitalize"}`}>
<Icon remix={value.icon} className="text-xl text-main-11" />
<Text size="lg" bold className="text-main-12">
{key}
</Text>
</NavLink>
)}
<Divider />
</li>
))}
</ul>
</main>
<footer className="mt-lg">
Expand Down
1 change: 1 addition & 0 deletions src/modules/claim/claim.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { api } from "../../api";
import { fetchWithLogs } from "../../api/utils";
import merklConfig from "../../config";

export abstract class ClaimsService {
static async #fetch<R, T extends { data: R; status: number; response: Response }>(
Expand Down
Loading