Skip to content

Test deploy bytunki #83

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

Open
Supersol7 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Test deploy bytunki #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e99902e
resolving tunki's merge conflicts
bartdev3 Mar 13, 2024
ec1dd25
provider fix
bartdev3 Mar 13, 2024
2da009d
darktheme fix - not finished
bartdev3 Mar 13, 2024
6c1714f
Update navigation-bar.tsx
Tunki1201 Mar 13, 2024
3e89ca3
typo in classNames
luxejs Mar 14, 2024
d73ada1
webp-test
luxejs Mar 14, 2024
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
22 changes: 19 additions & 3 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"format": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",
"lint": "next lint"
},
"dependencies": {
Expand All @@ -32,6 +33,7 @@
"moralis": "^2.23.2",
"next": "14.0.1",
"next-auth": "^4.24.5",
"prettier": "^3.2.5",
"react": "^18",
"react-dom": "^18",
"react-flow-renderer": "^10.3.17",
Expand All @@ -41,11 +43,13 @@
"react-icons": "^5.0.1",
"react-notifications": "^1.7.4",
"react-paginate": "8.1.3",
"react-redux": "^9.1.0",
"react-redux": "^8.1.3",
"react-qr-code": "^2.0.12",

"reactflow": "^11.10.4",
"redux": "^5.0.1",
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^3.1.0",
"redux-thunk": "2.4.2",
"rxjs": "^7.8.1",
"stripe": "^14.12.0",
"viem": "^1.13.1",
Expand All @@ -65,5 +69,17 @@
"typescript": "^5",
"webpack-bundle-analyzer": "^4.4.2",
"webpackbar": "^5.0.0-3"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
}
Binary file added frontend/public/gif/cubes/commune-single-block_blue.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/gif/cubes/commune-single-block_gray.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/gif/cubes/commune-single-block_green.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/gif/cubes/commune-single-block_purple.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/gif/cubes/commune-single-block_red.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/gif/cubes/commune-single-block_white.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/gif/cubes/commune-single-block_yellow.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 10 additions & 8 deletions frontend/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import ThemeProvider from '@/context/toggle-theme-provider';

import './globals.css';
import 'reactflow/dist/style.css';
import { Provider } from 'react-redux';
import { store } from '@/store/index';

const { chains, publicClient } = configureChains(
[mainnet, polygon, optimism, arbitrum, base, zora, sepolia, goerli],
Expand Down Expand Up @@ -89,14 +91,14 @@ export default function RootLayout({
<body>
<WagmiConfig config={wagmiConfig}>
<RainbowKitProvider chains={chains} coolMode theme={darkTheme()}>
{/* <Provider store={store}> */}
<ThemeProvider>
{/* <Banner /> */}
<NavigationBar />
{children}
<Footer />
</ThemeProvider>
{/* </Provider> */}
<Provider store={store}>
<ThemeProvider>
{/* <Banner /> */}
<NavigationBar />
{children}
<Footer />
</ThemeProvider>
</Provider>
</RainbowKitProvider>
</WagmiConfig>
</body>
Expand Down
59 changes: 29 additions & 30 deletions frontend/src/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use client';
import classNames from 'classnames';
import HomepageHeader from '@/components/templates/homepage-header';
import BlueGifImage from '../../public/gif/cubes/commune-single-block_blue.gif'

import Image from 'next/image'
import classes from "./home.module.css";


Expand Down Expand Up @@ -32,7 +31,7 @@ function WelcomeSection() {
<div className="flex flex-col items-center justify-center text-transparent hover:dark:text-white hover:text-black duration-300 font-sans font-semibold text-lg ">
<a href="#blue" className="hover:no-underline">
<img
src="./gif/cubes/commune-single-block_blue.gif"
src="/gif/cubes/commune-single-block_blue.webp"
className="lg:w-[200px] lg:h-[200px] lg:hover:w-[300px] lg:hover:h-[300px] duration-300"
/>
</a>
Expand All @@ -41,7 +40,7 @@ function WelcomeSection() {
<div className="flex flex-col items-center justify-center text-transparent hover:dark:text-white hover:text-black duration-300 font-sans font-semibold text-lg ">
<a href="#green" className="hover:no-underline">
<img
src="./gif/cubes/commune-single-block_green.gif"
src="/gif/cubes/commune-single-block_green.webp"
className="lg:w-[200px] lg:h-[200px] lg:hover:w-[300px] lg:hover:h-[300px] duration-300"
/>
</a>
Expand All @@ -50,7 +49,7 @@ function WelcomeSection() {
<div className="flex flex-col items-center justify-center text-transparent hover:dark:text-white hover:text-black duration-300 font-sans font-semibold text-lg ">
<a href="#yellow" className="hover:no-underline">
<img
src="./gif/cubes/commune-single-block_yellow.gif"
src="/gif/cubes/commune-single-block_yellow.webp"

className="lg:w-[200px] lg:h-[200px] lg:hover:w-[300px] lg:hover:h-[300px] duration-300"
/>
Expand All @@ -60,7 +59,7 @@ function WelcomeSection() {
<div className="flex flex-col items-center justify-center text-transparent hover:dark:text-white hover:text-black duration-300 font-sans font-semibold text-lg ">
<a href="#red" className="hover:no-underline">
<img
src="./gif/cubes/commune-single-block_red.gif"
src="/gif/cubes/commune-single-block_red.webp"

className="lg:w-[200px] lg:h-[200px] lg:hover:w-[300px] lg:hover:h-[300px] duration-300"
/>
Expand All @@ -70,7 +69,7 @@ function WelcomeSection() {
<div className="flex flex-col items-center justify-center text-transparent hover:dark:text-white hover:text-black duration-300 font-sans font-semibold text-lg ">
<a href="#pink" className="hover:no-underline">
<img
src="./gif/cubes/commune-single-block_purple.gif"
src="/gif/cubes/commune-single-block_purple.webp"
className="lg:w-[200px] lg:h-[200px] lg:hover:w-[300px] lg:hover:h-[300px] duration-300"
/>
</a>
Expand All @@ -79,7 +78,7 @@ function WelcomeSection() {
<div className="flex flex-col items-center justify-center text-transparent hover:dark:text-white hover:text-black duration-300 font-sans font-semibold text-lg ">
<a href="#black" className="hover:no-underline">
<img
src="./gif/cubes/commune-single-block_gray.gif"
src="/gif/cubes/commune-single-block_gray.webp"

className="lg:w-[200px] lg:h-[200px] lg:hover:w-[300px] lg:hover:h-[300px] duration-300"
/>
Expand All @@ -89,7 +88,7 @@ function WelcomeSection() {
<div className="flex flex-col items-center justify-center text-transparent hover:dark:text-white hover:text-black duration-300 font-sans font-semibold text-lg ">
<a href="#white" className="hover:no-underline">
<img
src="./gif/cubes/commune-single-block_white.gif"
src="/gif/cubes/commune-single-block_white.webp"

className="lg:w-[200px] lg:h-[200px] lg:hover:w-[300px] lg:hover:h-[300px] duration-300"
/>
Expand Down Expand Up @@ -117,7 +116,7 @@ function SectionWrapper({
return (
<div id={id} className=''>
<div className="py-10 px-5 my-5 ">
<div className={`${backgroundClassName} mt-10 flex lg:flex-row flex-col items-center justify-center gap-10 rounded-3xl hover-effect w-[95%] mx-auto dark:bg-black`} style={{ boxShadow: `1px 6px 50px 10px ${id}` }}>
<div className={`${backgroundClassName} mt-10 flex lg:flex-row flex-col items-center justify-center gap-10 rounded-3xl hover-effect w-[95%] mx-auto dark:bg-[#161616]`} style={{ boxShadow: `1px 6px 50px 10px ${id}` }}>
<div className=" flex-none lg:-mr-4 m-10 mt-20">
<img
className="w-[200px] h-[200px] duration-300"
Expand All @@ -140,7 +139,7 @@ export default function Home() {
<WelcomeSection />
<SectionWrapper
id="blue"
imageUrl="./gif/cubes/commune-single-block_blue.gif"
imageUrl="/gif/cubes/commune-single-block_blue.webp"
backgroundClassName="bg-white"
>
<div className=' text-black '>
Expand All @@ -151,7 +150,7 @@ export default function Home() {
<div className='flex flex-col space-y-10'>
<div className=' flex md:flex-row sm:flex-col sm:space-y-4 text-center items-center justify-center'>
<div className=' my-auto mx-auto w-[30rem] h-[30rem] px-3 '>
<img src="./img/frontpage/1.png" className='mt-5 h-[27rem]' />
<img src="/img/frontpage/1.png" className='mt-5 h-[27rem]' />
</div>
<div className=' w-[30rem] mx-auto my-auto font-semibold text-lg'>
<ul className='text-left list-disc dark:text-white'>
Expand All @@ -169,7 +168,7 @@ export default function Home() {
</ul>
</div>
<div className='my-auto mx-auto'>
<img src="./img/frontpage/_5.png" className='my-auto w-[30rem] h-[30rem] p-2' />
<img src="/img/frontpage/_5.png" className='my-auto w-[30rem] h-[30rem] p-2' />
</div>
</div>
</div>
Expand All @@ -178,7 +177,7 @@ export default function Home() {
</SectionWrapper>
<SectionWrapper
id="green"
imageUrl="./gif/cubes/commune-single-block_green.gif"
imageUrl="/gif/cubes/commune-single-block_green.webp"
// backgroundClassName="dark:bg-gradient-to-b from-green-300 to-[#7ceb87] bg-[linear-gradient(180deg,#ffffff,#c3f7c8)]"
backgroundClassName="bg-white"
>
Expand Down Expand Up @@ -219,16 +218,16 @@ export default function Home() {

<div className='flex md:flex-row flex-col md:space-x-4 sm:items-center sm:justify-center'>
<div className='w-[35rem] h-[35rem] px-3 '>
<img src="./img/frontpage/3.png" className='mt-[7.25rem]' />
<img src="/img/frontpage/3.png" className='mt-[7.25rem]' />
</div>

<div className=' flex flex-col space-y-2'>
<div className='w-[30rem] my-auto px-3 '>
<img src="./img/frontpage/4.png" className='py-4' />
<img src="/img/frontpage/4.png" className='py-4' />
</div>

<div className='w-[30rem] my-auto px-3 '>
<img src="./img/frontpage/5.png" className='py-4' />
<img src="/img/frontpage/5.png" className='py-4' />
</div>
</div>
</div>
Expand All @@ -238,7 +237,7 @@ export default function Home() {
</SectionWrapper>
<SectionWrapper
id="yellow"
imageUrl="./gif/cubes/commune-single-block_yellow.gif"
imageUrl="/gif/cubes/commune-single-block_yellow.webp"
// backgroundClassName="dark:dark:bg-gradient-to-b from-yellow-300 to-[#fff7a1] bg-[linear-gradient(180deg,#ffffff,#fff7a1)] rounded-lg shadow-xl"
backgroundClassName="bg-white"
>
Expand Down Expand Up @@ -270,7 +269,7 @@ export default function Home() {
</div>

<div className='mx-auto my-auto w-[80%]'>
<img src="./img/frontpage/9.png" className='mt-5' />
<img src="/img/frontpage/9.png" className='mt-5' />
</div>
</div>

Expand All @@ -279,7 +278,7 @@ export default function Home() {
</SectionWrapper>
<SectionWrapper
id="red"
imageUrl="./gif/cubes/commune-single-block_red.gif"
imageUrl="/gif/cubes/commune-single-block_red.webp"
// backgroundClassName="dark:bg-gradient-to-b from-red-300 to-[#ff8f8f] bg-[linear-gradient(180deg,#ffffff,#ff8f8f)] rounded-lg shadow-xl"
backgroundClassName="bg-white"
>
Expand All @@ -302,7 +301,7 @@ export default function Home() {
</div>

<div className='mx-auto my-auto w-[50%]'>
<img src="./img/frontpage/8.png" className='mt-5' />
<img src="/img/frontpage/8.png" className='mt-5' />
</div>
</div>

Expand All @@ -313,7 +312,7 @@ export default function Home() {
</SectionWrapper>
<SectionWrapper
id="pink"
imageUrl="./gif/cubes/commune-single-block_purple.gif"
imageUrl="/gif/cubes/commune-single-block_purple.webp"
// backgroundClassName="dark:bg-gradient-to-b from-pink-300 to-[#ffd6f5] bg-[linear-gradient(180deg,#ffffff,#ffd6f5)] rounded-lg shadow-xl"
backgroundClassName="bg-white"
>
Expand All @@ -335,7 +334,7 @@ export default function Home() {
</div>

<div className='w-[30rem] px-3 '>
<img src="./img/frontpage/7.1.png" className='mt-5' />
<img src="/img/frontpage/7.1.png" className='mt-5' />
</div>
</div>

Expand All @@ -350,7 +349,7 @@ export default function Home() {
</div>

<div className='w-[30rem] px-3 '>
<img src="./img/frontpage/7.2.png" className='mt-5' />
<img src="/img/frontpage/7.2.png" className='mt-5' />
</div>
</div>

Expand All @@ -361,7 +360,7 @@ export default function Home() {
</SectionWrapper>
<SectionWrapper
id="black"
imageUrl="./gif/cubes/commune-single-block_gray.gif"
imageUrl="/gif/cubes/commune-single-block_gray.webp"
// backgroundClassName="dark:bg-[#1b1b1d] bg-[#ffffff] rounded-lg shadow-xl"
backgroundClassName="bg-white"
>
Expand All @@ -373,7 +372,7 @@ export default function Home() {

<div className=' flex md:flex-row sm:flex-col sm:space-y-4 text-center items-center justify-center '>
<div className=' my-auto mx-auto '>
<img src="./img/frontpage/6.png" className='my-auto w-[40rem]' />
<img src="/img/frontpage/6.png" className='my-auto w-[40rem]' />
</div>
<div className=' w-[30rem] mx-auto my-auto font-semibold '>
<ul className=' text-left space-y-10 list-disc'>
Expand All @@ -392,7 +391,7 @@ export default function Home() {
</SectionWrapper>
<SectionWrapper
id="white"
imageUrl="./gif/cubes/commune-single-block_white.gif"
imageUrl="/gif/cubes/commune-single-block_white.webp"
// backgroundClassName="dark:bg-[linear-gradient(180deg,#ffffff,#ffffff)] bg-[linear-gradient(180deg,#1b1b1d,#1b1b1d)] rounded-lg shadow-xl"
backgroundClassName="bg-white"
>
Expand All @@ -405,7 +404,7 @@ export default function Home() {

<div>
<div className='z-40 absolute bg-gray-100 rounded-lg w-[17rem] h-[17rem] border-2 border-violet-500 border-solid shadow-md px-3 '>
<img src="./img/frontpage/commune_network.png" className='mt-5' />
<img src="/img/frontpage/commune_network.png" className='mt-5' />
</div>
<div className=' z-30 mt-5 ml-5 absolute bg-gray-100 rounded-lg w-[17rem] h-[17rem] border-2 border-blue-400 border-solid shadow-md px-3'></div>
<div className=' mt-10 ml-10 absolute bg-gray-100 rounded-lg w-[17rem] h-[17rem] border-2 border-green-400 border-solid shadow-md px-3'></div>
Expand All @@ -414,7 +413,7 @@ export default function Home() {

<div className='hidden lg:block xl:block '>
<div className='z-40 absolute bg-gray-100 rounded-lg w-[17rem] h-[17rem] border-2 border-pink-400 border-solid shadow-md px-3 '>
<img src="./img/frontpage/without_commune.png" className='mt-5' />
<img src="/img/frontpage/without_commune.png" className='mt-5' />
</div>
<div className=' z-30 mt-5 ml-5 absolute bg-gray-100 rounded-lg w-[17rem] h-[17rem] border-2 border-blue-400 border-solid shadow-md px-3'></div>
<div className=' mt-10 ml-10 absolute bg-gray-100 rounded-lg w-[17rem] h-[17rem] border-2 border-red-400 border-solid shadow-md px-3'></div>
Expand All @@ -427,7 +426,7 @@ export default function Home() {
<div className=' -mt-2 flex justify-center rounded-xl lg:mb-4'>
<a href='https://ai-secure.github.io/DMLW2022/assets/papers/7.pdf' className=' hover:no-underline '>
<div className='flex flex-row bg-[#FF8F8F] hover:bg-[#FF8F8F] dark:bg-[#FF8F8F] dark:hover:bg-[#fc9494] text-white font-bold py-2 px-4 mt-10 rounded-lg shadow-md hover:shadow-xl duration-300 '>
<img src="./svg/Drive.svg" className="mr-2 w-7 h-7" />
<img src="/svg/Drive.svg" className="mr-2 w-7 h-7" />
Read Whitepaper
</div>
</a>
Expand Down
11 changes: 8 additions & 3 deletions frontend/src/app/profile/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ import React from 'react';
import LogoImage from '../../../public/gif/logo/CubesShufflingGIF.gif'
import Image from "next/image";
import { useRouter } from 'next/navigation';
import { useSelector } from 'react-redux';


const ProfilePage = () => {

const router = useRouter()

const address = useSelector(({ transactionRecord: { address } }) => address)


const handleUserProfile = () => {
router.push('/settings/profile');
}
Expand All @@ -17,9 +22,9 @@ const ProfilePage = () => {
<div className='w-[40%] bg-gray-400 dark:bg-[#212324] dark:text-white flex flex-col items-center justify-start'>
<Image src={LogoImage} alt="image" width={400} height={400}
className="cursor-pointer mt-5" />
<h1 className='mt-4'>
Alan Guerrero
</h1>
<h3 className='mt-4'>
{address}
</h3>
<div className='flex mt-4'>
<button className='gap-2 border-[rgb(229 231 235)] inline-flex cursor-pointer items-center justify-center rounded-[0.5rem] border-[1px] p-2 hover:scale-105' onClick={handleUserProfile}>
Edit profile
Expand Down
Loading