Skip to content

Commit

Permalink
Merge pull request #296 from BibliothecaDAO/main
Browse files Browse the repository at this point in the history
remove account sidebar links, update frontinus link, remove cartridge
  • Loading branch information
RedBeardEth authored Oct 11, 2024
2 parents 3a3ba37 + 96598fc commit 42cbda7
Show file tree
Hide file tree
Showing 6 changed files with 565 additions and 193 deletions.
18 changes: 9 additions & 9 deletions apps/frontinus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"start": "vinxi start"
},
"devDependencies": {
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/cli": "^5.0.3",
"@parcel/watcher": "^2.4.1",
"@realms-world/tailwind-config": "workspace:*",
"@realms-world/tsconfig": "workspace:*",
"@tanstack/router-plugin": "^1.59.0",
"@tanstack/router-plugin": "^1.64.0",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.2",
Expand All @@ -29,17 +29,17 @@
"@realms-world/utils": "workspace:*",
"@starknet-react/chains": "^3.0.0",
"@starknet-react/core": "^3.0.1",
"@tanstack/react-query": "^5.59.0",
"@tanstack/react-query-devtools": "^5.59.0",
"@tanstack/react-router": "^1.59.0",
"@tanstack/react-router-with-query": "^1.59.0",
"@tanstack/router-devtools": "^1.59.0",
"@tanstack/start": "^1.59.0",
"@tanstack/react-query": "^5.59.9",
"@tanstack/react-query-devtools": "^5.59.9",
"@tanstack/react-router": "^1.64.0",
"@tanstack/react-router-with-query": "^1.64.0",
"@tanstack/router-devtools": "^1.64.0",
"@tanstack/start": "^1.64.0",
"date-fns": "^4.1.0",
"get-starknet-core": "^3.3.3",
"graphql": "^16.9.0",
"graphql-request": "^7.1.0",
"lucide-react": "^0.447.0",
"lucide-react": "^0.451.0",
"react": "catalog:react18",
"react-dom": "catalog:react18",
"starknet": "^6.11.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export function AppSidebar() {
<SidebarLabel>Projects</SidebarLabel>
<NavProjects projects={data.projects} />
</SidebarItem>*/}
<SidebarItem className="mt-10">
{/*<SidebarItem className="mt-10">
<SidebarLabel className="text-base">Help</SidebarLabel>
<NavSecondary items={data.navSecondary} />
</SidebarItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ export const VeLords = () => {
<CardHeader>
<CardTitle className="flex items-center">
<Link
target="_blank"
className="text-flamingo underline"
href="https://dune.com/redbeard/velords"
>
Expand Down
9 changes: 4 additions & 5 deletions apps/nextjs/src/app/_components/TopNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { EthereumLoginButton } from "./wallet/EthereumLoginButton";
import { LordsDropdown } from "./wallet/LordsDropdown";
import { StarknetLoginButton } from "./wallet/StarknetLoginButton";


export const TopNav = () => {
const { toggleSidebar } = useUIStore((state) => state);
const transactionState = useStore(useTransactionManager, (state) => state);
Expand All @@ -49,7 +48,7 @@ export const TopNav = () => {
const communityLinks = [
{
title: "Frontinus House",
href: "https://frontinus.house",
href: "https://snapshot.box/#/sn:0x07bd3419669f9f0cc8f19e9e2457089cdd4804a4c41a5729ee9c7fd02ab8ab62",
target: "_blank",
icon: <RealmsL3 className="w-5 fill-current" />,
},
Expand All @@ -70,11 +69,11 @@ export const TopNav = () => {
id="topnav"
className={`fixed z-50 w-full border-b-[3px] bg-background p-3 pl-4 sm:pl-8 md:pl-32`}
>
<div className="flex justify-between w-full">
<div className="flex w-full justify-between">
<Button className="md:hidden" onClick={toggleSidebar}>
<Menu className="w-8" />
</Button>
<Crown className="sm:hidden w-14 group-hover:opacity-0" />
<Crown className="w-14 group-hover:opacity-0 sm:hidden" />
</div>
<div className="hidden w-auto justify-end sm:flex">
<div className="mr-12">
Expand Down Expand Up @@ -159,4 +158,4 @@ export const TopNav = () => {
</div>
</div>
);
};
};
4 changes: 2 additions & 2 deletions apps/nextjs/src/providers/Web3Providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ const starkConnectors = isInArgentMobileAppBrowser()
}),
]
: [
new CartridgeConnector({
/*new CartridgeConnector({
rpc: "https://api.cartridge.gg/x/starknet/mainnet",
}),
}),*/
new InjectedConnector({ options: { id: "braavos", name: "Braavos" } }),
new InjectedConnector({ options: { id: "argentX", name: "Argent X" } }),
ArgentMobileConnector.init({
Expand Down
Loading

0 comments on commit 42cbda7

Please sign in to comment.