generated from PaulRBerg/foundry-template
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
75ee642
commit e54d349
Showing
47 changed files
with
559 additions
and
12,012 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,12 @@ | ||
| { | ||
| <<<<<<< HEAD | ||
| "name": "budget-monorepo", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "index.js", | ||
| ======= | ||
| "name": "budget2", | ||
| "version": "0.1.0", | ||
| "private": true, | ||
| "dependencies": { | ||
| "@testing-library/jest-dom": "^5.16.5", | ||
| "@testing-library/react": "^13.4.0", | ||
| "@testing-library/user-event": "^13.5.0", | ||
| "@types/jest": "^29.5.0", | ||
| "@types/node": "^16.11.14", | ||
| "@types/react": "^18.0.28", | ||
| "@types/react-dom": "^18.0.11", | ||
| "react": "^18.2.0", | ||
| "react-dom": "^18.2.0", | ||
| "react-scripts": "5.0.1", | ||
| "web-vitals": "^2.1.4", | ||
| "typescript": "^4.5.4", | ||
| "react-router-dom": "^6.2.1" | ||
| }, | ||
| "devDependencies": { | ||
| "autoprefixer": "^10.4.8", | ||
| "postcss": "^8.4.16", | ||
| "tailwindcss": "^3.1.8" | ||
| }, | ||
|
|
||
| >>>>>>> Incoming | ||
| "scripts": { | ||
| <<<<<<< HEAD | ||
| "test": "echo \"Error: no test specified\" && exit 1" | ||
| ======= | ||
| "start": "react-scripts start", | ||
| "build": "react-scripts build", | ||
| "test": "react-scripts test", | ||
| "eject": "react-scripts eject" | ||
|
|
||
| >>>>>>> Incoming | ||
| }, | ||
| <<<<<<< HEAD | ||
| "keywords": [], | ||
| "author": "pythonpete32", | ||
| "license": "ISC" | ||
| ======= | ||
| "eslintConfig": { | ||
| "root": true | ||
| }, | ||
| "browserslist": { | ||
| "production": [">0.2%", "not dead", "not op_mini all"], | ||
| "development": [ | ||
| "last 1 chrome version", | ||
| "last 1 firefox version", | ||
| "last 1 safari version" | ||
| ] | ||
| } | ||
|
|
||
| >>>>>>> Incoming | ||
| } |
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import { LoadingDiv } from "@/components/framer"; | ||
| import { PayupLogo } from "@/components/icons"; | ||
|
|
||
| export default function Loading() { | ||
| return ( | ||
| <div className="flex flex-col items-center justify-center h-full pb-8"> | ||
| <LoadingDiv> | ||
| <PayupLogo /> | ||
| </LoadingDiv> | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import { BottomNav } from "@/components/bottom-nav"; | ||
| import { Navbar } from "@/components/navbar"; | ||
|
|
||
| export default function MainLayout({ | ||
| children, | ||
| }: { | ||
| children: React.ReactNode; | ||
| }) { | ||
| return ( | ||
| <> | ||
| <Navbar /> | ||
| <main className="container mx-auto max-w-7xl pt-16 px-6 flex-grow"> | ||
| {children} | ||
| </main> | ||
| <BottomNav /> | ||
| </> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { BudgetCard } from "@/components/budget-card"; | ||
|
|
||
| export default function MainPage() { | ||
| return ( | ||
| <div> | ||
| <section className="flex flex-col items-center justify-center gap-4"> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| <BudgetCard /> | ||
| </section> | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,20 @@ | ||
| import { BudgetCard } from "../components/BudgetCard"; | ||
| import { PayupLogo } from "@/components/icons"; | ||
| import { title } from "@/components/primitives"; | ||
| import { LoginButton } from "@/components/login-button"; | ||
| import { EaseInDiv } from "@/components/framer"; | ||
|
|
||
| export default function Home() { | ||
| return ( | ||
| // <section className="flex flex-col items-center justify-center gap-4"> | ||
| // <BudgetCard /> | ||
| // <BudgetCard /> | ||
| // <BudgetCard /> | ||
| // <BudgetCard /> | ||
| // <BudgetCard /> | ||
| // <BudgetCard /> | ||
| // </section> | ||
| export default async function Home() { | ||
| await new Promise((resolve) => setTimeout(resolve, 6000)); | ||
|
|
||
| <div id="NewRootRoot" className="flex flex-col w-full"> | ||
| <div className="bg-[#101010] flex flex-col justify-between h-[812px] shrink-0 items-center pt-[321px] pb-8"> | ||
| <img | ||
| src="https://file.rendit.io/n/jqavy1CcE0owESKvTO7a.svg" | ||
| alt="Logo" | ||
| id="Logo" | ||
| /> | ||
| <div className="text-sm font-['Poppins'] font-medium text-white"> | ||
| Welcome to payup mobile app | ||
| </div> | ||
| return ( | ||
| <EaseInDiv className="flex flex-col items-center justify-between h-full px-6 pt-48 py-14"> | ||
| <div className="flex flex-col items-center justify-center w-full pb-4 align-middle"> | ||
| <PayupLogo /> | ||
| <h1 className={title({ class: "mt-12" })}> Scalable Secure </h1> | ||
| <h1 className={title()}> Frictionless </h1> | ||
| <h2 className="mt-4">DAO payments without all the bloodclart votes</h2> | ||
| </div> | ||
| </div> | ||
| <LoginButton /> | ||
| </EaseInDiv> | ||
| ); | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.