Skip to content

Commit

Permalink
Revert "Initial Commit and new stream update"
Browse files Browse the repository at this point in the history
This reverts commit 74340d0.
  • Loading branch information
ZakGriffith committed Aug 6, 2024
1 parent 74340d0 commit 0700119
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 15 deletions.
10 changes: 10 additions & 0 deletions packages/hardhat/contracts/SandGardenStreams.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ pragma solidity >=0.8.0 <0.9.0;

import "@openzeppelin/contracts/access/Ownable.sol";

// ___ ___ ___ ___ _ _ ___ ___ ___ ___ ___ ___ _ _
// | _ ) / __| o O O / __| / \ | \| | | \ o O O / __| / \ | _ \ | \ | __| | \| |
// | _ \ | (_ | o \__ \ | - | | .` | | |) | o | (_ | | - | | / | |) | | _| | .` |
// |___/ \___| TS__[O] |___/ |_|_| |_|\_| |___/ TS__[O] \___| |_|_| |_|_\ |___/ |___| |_|\_|
// _|"""""|_|"""""| {======|_|"""""|_|"""""|_|"""""|_|"""""| {======|_|"""""|_|"""""|_|"""""|_|"""""|_|"""""|_|"""""|
// "`-0-0-'"`-0-0-'./o--000'"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'./o--000'"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'
//
// BuidlGuidl Mercs


contract SandGardenStreams is Ownable {

struct BuilderStreamInfo {
Expand Down
18 changes: 9 additions & 9 deletions packages/nextjs/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ import { FaucetButton, RainbowKitCustomConnectButton } from "~~/components/scaff
export const Header = () => (
<>
<Head>
<title>Owners</title>
<link rel="icon" type="image/png" sizes="32x32" href="/favicon.ico" />
<title>Mercs</title>
<link rel="icon" type="image/png" sizes="32x32" href="/favicon.png" />
<meta
name="description"
content="Funding project owners with ETH streams for having an important impact in the BuidlGuidl"
content="Funding BuidlGuidl Mercs with oETH streams for quietly having important impact on Ethereum."
/>
<meta property="og:title" content="Project Owners" />
<meta property="og:title" content="Mercs" />
<meta
property="og:description"
content="Funding Owners with ETH streams for quietly having important impact in the BuidlGuidl"
content="Funding BuidlGuidl Mercs with oETH streams for quietly having important impact on Ethereum."
/>
<meta name="twitter:card" content="summary_large_image" />
<meta property="og:image" content="https://owners.buidlguidl.com/thumbnail.png" />
<meta property="twitter:image" content="https://owners.buidlguidl.com/thumbnail.png" />
<meta property="og:image" content="https://mercs.buidlguidl.com/thumbnail.png" />
<meta property="twitter:image" content="https://mercs.buidlguidl.com/thumbnail.png" />
</Head>
<div className="sticky lg:static top-0 navbar bg-base-100 min-h-0 flex-shrink-0 justify-between z-20 p-4 items-start">
<div className="flex-col items-start">
<p className="m-0 text-xl md:text-3xl font-bold text-secondary !leading-7">
<Link href="/">Project Owners</Link>
<Link href="/">Mercs</Link>
</p>
<p className="m-0 text-secondary leading-5 opacity-80">BuidlGuidl Cohort</p>
<p className="m-0 text-secondary leading-5 opacity-50"></p>
</div>
<div className="navbar-end flex-grow">
<RainbowKitCustomConnectButton />
Expand Down
6 changes: 3 additions & 3 deletions packages/nextjs/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const Home: NextPage = () => {
return (
<>
<div className="max-w-3xl px-4 py-8">
{/* <h1 className="text-4xl font-bold mb-8 text-primary-content bg-primary inline-block p-2">Owners</h1> */}
{/* <h1 className="text-4xl font-bold mb-8 text-primary-content bg-primary inline-block p-2">Mercs</h1> */}
<div>
<p className="mt-0">
Funding{" "}
<Link href="/members" className="link link-primary">
Project Owners
BuidlGuidl Mercs
</Link>{" "}
with ETH streams for owning projects or cohorts within the BuidlGuidl.
with oETH streams for quietly having important impact on Ethereum.
</p>
{/* <p>
<
Expand Down
Binary file removed packages/nextjs/public/favicon.ico
Binary file not shown.
Binary file added packages/nextjs/public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions packages/nextjs/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ module.exports = {
themes: [
{
scaffoldEth: {
primary: "#ff904c",
primary: "#FF0000",
"primary-content": "#FFFFFF",
secondary: "#fe9144",
secondary: "#D70000",
"secondary-content": "#FFFFFF",
accent: "#ff904c",
accent: "#FF6347",
"accent-content": "#FFFFFF",
neutral: "#212638",
"neutral-content": "#FFFFFF",
Expand Down

0 comments on commit 0700119

Please sign in to comment.