Skip to content

Commit

Permalink
Merge branch 'Hayya' into Yobel
Browse files Browse the repository at this point in the history
  • Loading branch information
hayyaoe authored Nov 3, 2024
2 parents a70f60e + b6637e9 commit d81262f
Show file tree
Hide file tree
Showing 18 changed files with 569 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VITE_PINATA_JWT = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySW5mb3JtYXRpb24iOnsiaWQiOiI5ZTU3ZjdlYy1kZGUxLTRiZjYtYWQ5OS0zNGExYzQ3NWRkY2MiLCJlbWFpbCI6ImZlcm5hbmRvbG91aXM1NUBnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwicGluX3BvbGljeSI6eyJyZWdpb25zIjpbeyJkZXNpcmVkUmVwbGljYXRpb25Db3VudCI6MSwiaWQiOiJGUkExIn0seyJkZXNpcmVkUmVwbGljYXRpb25Db3VudCI6MSwiaWQiOiJOWUMxIn1dLCJ2ZXJzaW9uIjoxfSwibWZhX2VuYWJsZWQiOmZhbHNlLCJzdGF0dXMiOiJBQ1RJVkUifSwiYXV0aGVudGljYXRpb25UeXBlIjoic2NvcGVkS2V5Iiwic2NvcGVkS2V5S2V5IjoiZDc5YTUzMTA1NjljZGZlMzA5OWEiLCJzY29wZWRLZXlTZWNyZXQiOiJmMmFhM2VlZWFlMTIxZTI3NzQwZWY4ZmMyMTcwZTFhYmQ1ODk4ZjI3ODEwMTlhNGVhZjYzYzUwM2JiMDYwNDBkIiwiZXhwIjoxNzYxNDY3NTY3fQ.d3V5-DcdIi7hM-tr-nlesBuZgTEj5EEM_yAmFngQQbo
VITE_PINATA_GATEAWAY = d79a5310569cdfe3099a
VITE_IDANALYZER_API_KEY = JXy7kcF9Tlyyjes2rYmmVtQU0RR6dxck
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
<script src="https://cdn.jsdelivr.net/npm/flowbite@2.5.2/dist/flowbite.min.js"></script>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
"tailwindcss": "^3.4.14",
"vite": "^5.4.8"
}
}
}
2 changes: 2 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import { Route, Routes } from "react-router-dom";
import Footer from "./components/fixed/Footer";
import Navbar from "./components/fixed/Navbar";
Expand All @@ -21,6 +22,7 @@ function App() {
}
};


useEffect(() => {}, [connectedPrincipal]);

return (
Expand Down
Binary file added src/assets/identity_placeholder.jpg
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 src/assets/profile_placeholder.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/fixed/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ const Footer = () => {
);
};

export default Footer;
export default Footer;
34 changes: 34 additions & 0 deletions src/components/fixed/Layout.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/* eslint-disable react/prop-types */
import { useState, useEffect } from "react";
import { Outlet } from "react-router-dom";
import Navbar from "./Navbar";
import Footer from "./Footer";
import LoadingScreen from "../ui/loading-screen";
import { BackgroundBeamsWithCollision } from "../ui/background-beams-with-collision";

const Layout = ({ handleConnect, principal }) => {

const [isLoading, setIsLoading] = useState(true);

useEffect(() => {
setTimeout(() => {
setIsLoading(false);
}, 2500);
})

if (isLoading) {
return <LoadingScreen />
}

return (
<>
<Navbar handleConnect={handleConnect} principal={principal} />
<BackgroundBeamsWithCollision className="min-h-screen h-full w-full flex flex-col items-center justify-center font-poppins">
<Outlet />
</BackgroundBeamsWithCollision>
<Footer />
</>
);
};

export default Layout;
2 changes: 1 addition & 1 deletion src/components/fixed/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ const Navbar = ({ principal, handleConnect }) => {
);
};

export default Navbar;
export default Navbar;
1 change: 1 addition & 0 deletions src/components/ui/background-beams-with-collision.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ const CollisionMechanism = React.forwardRef(
CollisionMechanism.displayName = "CollisionMechanism";

const Explosion = ({ ...props }) => {

const spans = Array.from({ length: 20 }, (_, index) => ({
id: index,
initialX: 0,
Expand Down
129 changes: 129 additions & 0 deletions src/components/ui/background-lines.jsx

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/ui/text-generate-effect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ export const TextGenerateEffect = ({
</div>
</div>
);
};
};
2 changes: 1 addition & 1 deletion src/idl/service.did.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ export const idlFactory = ({ IDL }) => {
};
export const init = ({ IDL }) => {
return [];
};
};
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind utilities;
4 changes: 4 additions & 0 deletions src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import { createRoot } from 'react-dom/client'
import App from './App.jsx'
import './index.css'
import { BrowserRouter } from 'react-router-dom'
import 'aos/dist/aos.css';
import AOS from 'aos';

AOS.init();

createRoot(document.getElementById('root')).render(
<BrowserRouter>
Expand Down
1 change: 1 addition & 0 deletions src/service/connector.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import { idlFactory } from "../idl/service.did";
import { Actor, HttpAgent } from "@dfinity/agent";

Expand Down
Loading

0 comments on commit d81262f

Please sign in to comment.