Merge remote-tracking branch 'origin/token-vendor' into nadai/token-v…

…endor-update

.github/workflows/deploy.yml

@@ -0,0 +1,27 @@
+name: Build and Deploy to Droplet
+
+on:
+  push:
+    branches:
+      - main 
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Build and deploy app on server
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.DROPLET_IP }}
+          username: ${{ secrets.DROPLET_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd /var/www/speedrunstark
+            git pull origin main
+            pm2 stop speedrunstark
+            yarn install
+            cd packages/nextjs
+            yarn build
+            pm2 restart speedrunstark
+            pm2 save

.yarnrc.yml

@@ -1,11 +1,11 @@
+compressionLevel: mixed
+
 enableColors: true
 
+enableGlobalCache: false
+
 nmHoistingLimits: workspaces
 
 nodeLinker: node-modules
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
-
 yarnPath: .yarn/releases/yarn-3.2.3.cjs

packages/nextjs/.env

@@ -0,0 +1 @@
+NEXT_PUBLIC_PROVIDER_URL=https://starknet-sepolia.infura.io/v3/47279f22f9954d6facd977b57c932b6a

packages/nextjs/app/debug/_components/contract/ContractReadMethods.tsx

@@ -1,10 +1,7 @@
 import { Abi } from "abi-wan-kanabi";
 import {
-  AbiFunction,
   Contract,
   ContractName,
-  GenericContract,
-  InheritedFunctions,
   getFunctionsByStateMutability,
 } from "~~/utils/scaffold-stark/contract";
 import { ReadOnlyFunctionForm } from "./ReadOnlyFunctionForm";

packages/nextjs/app/debug/_components/contract/ContractUI.tsx

@@ -123,4 +123,4 @@ export const ContractUI = ({
       </div>
     </div>
   );
-};
+};

packages/nextjs/app/debug/_components/contract/ContractVariables.tsx

@@ -1,10 +1,7 @@
 import { Abi } from "abi-wan-kanabi";
 import {
-  AbiFunction,
   Contract,
   ContractName,
-  GenericContract,
-  InheritedFunctions,
   getFunctionsByStateMutability,
 } from "~~/utils/scaffold-stark/contract";
 import { DisplayVariable } from "./DisplayVariable";

packages/nextjs/app/debug/_components/contract/WriteOnlyFunctionForm.tsx

@@ -1,12 +1,8 @@
 "use client";
 
 import { useEffect, useState } from "react";
-// import { Abi, AbiFunction } from "abitype";
-// import { Address, TransactionReceipt } from "viem";
-// import { useContractWrite, useNetwork, useWaitForTransaction } from "wagmi";
 import {
   ContractInput,
-  //   TxReceipt,
   getFunctionInputKey,
   getInitialFormState,
   getParsedContractFunctionArgs,
@@ -31,16 +27,14 @@ type WriteOnlyFunctionFormProps = {
   abiFunction: AbiFunction;
   onChange: () => void;
   contractAddress: Address;
-  //   inheritedFrom?: string;
 };
 
 export const WriteOnlyFunctionForm = ({
   abi,
   abiFunction,
   onChange,
   contractAddress,
-}: //   inheritedFrom,
-WriteOnlyFunctionFormProps) => {
+}: WriteOnlyFunctionFormProps) => {
   const [form, setForm] = useState<Record<string, any>>(() =>
     getInitialFormState(abiFunction),
   );
@@ -135,7 +129,6 @@ WriteOnlyFunctionFormProps) => {
       >
         <p className="font-medium my-0 break-words text-function">
           {abiFunction.name}
-          {/* <InheritanceTooltip inheritedFrom={undefined} /> */}
         </p>
         {inputs}
         <div className="flex justify-between gap-2">
@@ -167,7 +160,7 @@ WriteOnlyFunctionFormProps) => {
         </div>
       </div>
       {zeroInputs && txResult ? (
-        <div className="flex-grow basis-0">
+        <div className="flex-grow basis-0 ">
           <TxReceipt txResult={txResult} />
         </div>
       ) : null}

packages/nextjs/app/token-vendor/page.tsx

@@ -228,4 +228,4 @@ const TokenVendor: NextPage = () => {
   );
 };
 
-export default TokenVendor;
+export default TokenVendor;

packages/nextjs/components/Footer.tsx

@@ -107,4 +107,4 @@ export const Footer = () => {
       </div>
     </div>
   );
-};
+};

packages/nextjs/components/Header.tsx

@@ -6,9 +6,9 @@ import Link from "next/link";
 import { usePathname } from "next/navigation";
 import {
   Bars3Icon,
-  BoltIcon,
   BugAntIcon,
   CircleStackIcon,
+  BoltIcon,
 } from "@heroicons/react/24/outline";
 import { useOutsideClick } from "~~/hooks/scaffold-stark";
 import { CustomConnectButton } from "~~/components/scaffold-stark/CustomConnectButton";
@@ -18,7 +18,7 @@ import { devnet } from "@starknet-react/chains";
 import { SwitchTheme } from "./SwitchTheme";
 import { useAccount, useProvider } from "@starknet-react/core";
 
-type HeaderMenuLink = {
+export type HeaderMenuLink = {
   label: string;
   href: string;
   icon?: React.ReactNode;
@@ -85,13 +85,14 @@ export const HeaderMenuLinks = () => {
 export const Header = () => {
   const [isDrawerOpen, setIsDrawerOpen] = useState(false);
   const burgerMenuRef = useRef<HTMLDivElement>(null);
+
   useOutsideClick(
     burgerMenuRef,
     useCallback(() => setIsDrawerOpen(false), []),
   );
+
   const { targetNetwork } = useTargetNetwork();
   const isLocalNetwork = targetNetwork.id === devnet.id;
-
   const { provider } = useProvider();
   const { address, status } = useAccount();
   const [isDeployed, setIsDeployed] = useState(true);
@@ -112,9 +113,8 @@ export const Header = () => {
         <div className="lg:hidden dropdown" ref={burgerMenuRef}>
           <label
             tabIndex={0}
-            className={`ml-1 btn btn-ghost ${
-              isDrawerOpen ? "hover:bg-secondary" : "hover:bg-transparent"
-            }`}
+            className={`ml-1 btn btn-ghost ${isDrawerOpen ? "hover:bg-secondary" : "hover:bg-transparent"
+              }`}
             onClick={() => {
               setIsDrawerOpen((prevIsOpenState) => !prevIsOpenState);
             }}
@@ -143,7 +143,7 @@ export const Header = () => {
               alt="SE2 logo"
               className="cursor-pointer"
               fill
-              src="/logo.svg"
+              src="/challenge-icon-starknet.svg"
             />
           </div>
           <div className="flex flex-col">
@@ -171,4 +171,4 @@ export const Header = () => {
       </div>
     </div>
   );
-};
+};

packages/nextjs/components/HeaderLogo.tsx

@@ -0,0 +1,24 @@
+import SpeedStarknetIcon from "~~/components/icons/SpeedStarknetIcon";
+
+const HeaderLogo = () => {
+  return (
+    <svg
+      width="180"
+      height="62"
+      viewBox="0 0 755 154"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <SpeedStarknetIcon />
+      <image
+        id="image0_249_271"
+        width="100"
+        height="140"
+        xlinkHref="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEwAAABoCAYAAABbqhYLAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAVDSURBVHgB7Z1NbBtFFMf/69pJIA7xoV8IETvnEikSFT0FOb2hVsI3LlVp7g1SJE5ElBS4t1WRWiGkWkEIIQ64RrQcgLjqAQ4gRajhgJC8AVJVQlSbxIZEcrKdafwxu7V3/brr7m79flLivPFOvPrb7+2bmedZDU+AZDK3AJjvUfpUKtc1hJAYGBIsGBEWjEgcPpBMvr6kach0et40zRSInPvI/E21P7/89uC9u3/49gabJnQRJ6dBxBfBpFjiBDLwl7RqxAYGh8Rr+CnYY8EuSYQFI6KNjOTOiBjzZqvJvFWpFBecOsmYZWvKgsayeOm5hnH4hfHRqddmvlAPuPPL9wnVXiuvxDaMf+Ajxt55tDBNba5aLSw7dYrXY0+20aBpMR3uZOENo1IplBrGG7Nmeh+wox7w5SfvDqK3yAtRVm0Qsdj14sQuSYQFIyLTipL4MDYbTHM3tTf2c8L5mqxpWl64+mrn56Gr9o8/fAZtR0uAwMmTxzAxMQ4vLC5+d2lt7V+jYddq1vNqxyMD3McZKLf5t9NqjHJjaCiXicfNMghcufIWTp06Do+MizdXp3RglyTCghF5ZGgk4ovMkfLwwO4uDPjMiRPHkEoNN+10+iCCIBSTdN3EsBs3PsTU1EvwGY5hvYYFI+LL9E4QrG+K8dVmy06NAKMjzn1W71rt8p8gE1nBbv0M/Pp7y371ZfFz1LnPp19bbRHAx8SDDgLskkRYMCKhcUn7+NJtyvuZwb241WCoi8mglC3GrW+CTCgXSyViktIywuc8LKKwYERYMCKRzcPcWBXTl8WitW12Fp55agWTGL7PmbBLkmHBiITYJTVLociRI2MXxMMkuuTQIeD0afQvYnV+yfSfDIiwSxJhwYiEdixpR7hPVjxklCZZQJN16CKLSi7BmYIYS/Yg+QghQsC8S3xaQg9glyTCghEJbR4mXGpBta8VUNP/blXB/HUPEy8e7tz//jrS5y6b82rb+bOwF7zkqfNhYR5LWgpixNVpW/xqFt3dNzDgJNhmFWlx/Du25mdtdgm8CNJbWDAioXHJep4VKupDp4zSZIRCsPqJ9SRv8sgZWGNpiV2SCAtGJBCXrH9ZS62Jz8D98v68avy//bAYpWN18tZ22+d0m53pYopHV/42Ahl81wO8GrN0kUA6lkSLJPRbkVdNwQPvn9WGbechi/gyDl1mZEW42sAuSYQFI8KCEXmq1yXdcIub7eBPGBEWjAgLRiSQGCZiR0nkQGr8SNnn4MUx5G/8PwkCC/rqTGc9284iArBLEmHBiIQlD5OLqTOIAKEQrL76nEcEYJckEpmhUSyGfWJ6J/DzjYxgx19BXMwIDsADC/BOZASbOopQwDGMCAtGJLQuKXedUu2LF79KHTgwiqCJzLfZ/MCPrU7ZJYmwYET6ak5fbiii2ltbBR1E+iqG2anVtHGqaOySRFgwIiwYERaMCAtGhAUjwoIRiWziKrdB3tlBodPziQSyYr3zGnwmypm+4ZR0xuM5HT2AXZIIC0YkEJccHs5Napp5oWHv3/8cyuVFyzG3b9+x2MXiT3NXr37T3LpdxCjHbdxv3vzA9a4McrcosSYKCoEMvpPJXFaE7Wa1ztjYQaysfOzWbVpW/aBL2lRqt4O3w+o1LBiRUKQVGxv/ydoKtx0AdNDQxc95W5vHXdxDEsPkPYaq1eveNsfvArnVgK2JY1ivYcGIBBLD5K0kEgnLl576Y3eSqMG7OwUAC0akrxZy7ePT+fn8pEhxMg07HseyYRQc42lktsPyA/fFYffbC7FLEmHBiLBgRB4AP47oKIsr3jYAAAAASUVORK5CYII="
+        transform="translate(580, 0)"
+      />
+    </svg>
+  );
+};
+
+export default HeaderLogo;

packages/nextjs/components/MenuItem/MenuItem.tsx

@@ -0,0 +1,29 @@
+import Link from "next/link";
+import React from "react";
+import { HeaderMenuLink } from "~~/components/Header";
+
+interface MenuItemProps {
+  link: HeaderMenuLink;
+  isActive: boolean;
+}
+
+const MenuItem: React.FC<MenuItemProps> = ({ link, isActive }) => {
+  return (
+    <li key={link.href}>
+      <Link
+        href={link.href}
+        passHref
+        className={`${
+          isActive
+            ? "!bg-base-300 !text-base-100 active:bg-base-300 shadow-md text-base-100"
+            : ""
+        } hover:bg-base-300 hover:text-base-100`}
+      >
+        {link.icon}
+        <span>{link.label}</span>
+      </Link>
+    </li>
+  );
+};
+
+export default MenuItem;

packages/nextjs/components/SwitchTheme.tsx

@@ -47,4 +47,4 @@ export const SwitchTheme = ({ className }: { className?: string }) => {
       }
     </div>
   );
-};
+};