Skip to content

Commit

Permalink
Merge/update development (#24)
Browse files Browse the repository at this point in the history 
* ignores .env.development and .env.production

* New hotbar, github actions and bug fixing (#23)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* Feature/landing page (#5)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Initial deployment graph app (#7)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

* Revert "Initial deploy of graph app" (#6)

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Feature/firebase (#9)

* Initial deployment graph app (#8)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* Feature/landing page (#5)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Initial deployment graph app (#7)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

* Revert "Initial deploy of graph app" (#6)

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* added google analytics to firebase configuration

* new google analytics event on search address

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Configure github actions to PR and main merge (#13)

* Initial deployment graph app (#8)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* Feature/landing page (#5)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Initial deployment graph app (#7)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

* Revert "Initial deploy of graph app" (#6)

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* added google analytics to firebase configuration

* new google analytics event on search address

* ignores .env.developement and .env.prod

* configured github action to deploy when PR merged into main and to deploy to temporary URL when PR is created

* add comments to github actions files

* set an expiration period for temporary url and fixed projectId

* new github action to deploy on merge to development environment

* rename github action file

* fixed pre build command issue

* added new comment to github actions files

* add firebase.json file

* added env variables to github actions script

* add echo command to debug

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Feature/firebase (#15)

* Initial deployment graph app (#8)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* Feature/landing page (#5)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Initial deployment graph app (#7)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

* Revert "Initial deploy of graph app" (#6)

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* added google analytics to firebase configuration

* new google analytics event on search address

* ignores .env.development and .env.production

* ignores .env.developement and .env.prod

* configured github action to deploy when PR merged into main and to deploy to temporary URL when PR is created

* add comments to github actions files

* set an expiration period for temporary url and fixed projectId

* new github action to deploy on merge to development environment

* rename github action file

* fixed pre build command issue

* added new comment to github actions files

* add firebase.json file

* added env variables to github actions script

* add echo command to debug

* removed echo command from github action

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* New hotbar and bug fixing (#22)

* Initial deployment graph app (#8)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* Feature/landing page (#5)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Initial deployment graph app (#7)

* a

* removed unused imports and comments unused variables

* Fix everything

* removed unused imports and comments unused variables

* Initial deploy of graph app (#2)

* removed unnused imports

* fixed spell errors on README

* searchbar with logo and footer v1.0

* aligned logo with search buttons and minor styling fixes

* changed analyze text, added icons to the buttons and text to footer

* fixed footer margins

* removed unused imports and comments unused variables

* removed unused imports and comments unused variables

* add github action to deploy on pull request

* fixed github actions to deploy app to firebase

* ignore -.firebase directory

* Revert "Initial deploy of graph app" (#6)

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* added google analytics to firebase configuration

* new google analytics event on search address

* ignores .env.development and .env.production

* ignores .env.developement and .env.prod

* configured github action to deploy when PR merged into main and to deploy to temporary URL when PR is created

* add comments to github actions files

* set an expiration period for temporary url and fixed projectId

* new github action to deploy on merge to development environment

* rename github action file

* fixed pre build command issue

* added new comment to github actions files

* add firebase.json file

* added env variables to github actions script

* add echo command to debug

* removed echo command from github action

* Code Organization, New Features, Bug Fixing (#14)

* Add link and layout

* Update Hotbar.tsx

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

---------

Co-authored-by: Pedro Ribeiro <[email protected]>

* Fix bugs, add social media links (#21)

* Add link and layout

* Update Hotbar.tsx

* Update Graph.tsx

* Update Hotbar.tsx

* Add social media icons

---------

Co-authored-by: Pedro Rodrigues <[email protected]>

---------

Co-authored-by: Pedro Ribeiro <[email protected]>
  • Loading branch information
@Rodriguespn @tubarao312
Rodriguespn and tubarao312 authored Jan 15, 2024
1 parent 11cad36 commit fc9a1d1
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
"prettier-plugin-tailwindcss"
]
}
}
}
1 change: 1 addition & 0 deletions src/assets/discord.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/github.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/linkedin.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/components/Graph/Graph.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ const Graph: FC = () => {
enter="transition-all duration-500 delay-500"
enterFrom="opacity-0 scale-150"
enterTo="opacity-100 scale-100"
className="h-full w-full"
>
{searchedAddresses.length > 0 && (
<GraphProvider
Expand Down
2 changes: 1 addition & 1 deletion src/components/Graph/Hotbar/Hotbar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Hotbar: FC = () => {
];

return (
<div className="mb-16 flex h-fit w-fit flex-col gap-y-1 rounded-lg bg-gray-800 p-2">
<div className="flex h-fit w-fit flex-col gap-y-1 rounded-lg bg-gray-800 p-2">
{Buttons.map((button) => {
return (
<button
Expand Down
9 changes: 7 additions & 2 deletions src/components/Graph/LandingPage/LandingPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,13 @@ import { FC } from "react";
import logo from "../../../assets/ward-logo-blue-full.svg";
import Searchbar from "./SearchBar";

// TODO - Fill this with real juicy addressess
const PossibleAddresses: string[] = [];
const PossibleAddresses: string[] = [
"0x19aa5fe80d33a56d56c78e82ea5e50e5d80b4dff",
"0x74487eed1e67f4787e8c0570e8d5d168a05254d4",
"0xd1381f89b4feea63e9c6bc97dc9fc2b0c96bf12f",
"0x3f5ce5fbfe3e9af3971dd833d26ba9b5c936f0be",
"0x12d66f87a04a9e220743712ce6d9bb1b5616b8fc",
];

interface LandingPageProps {
setSearchedAddress: (address: string) => void;
Expand Down
4 changes: 4 additions & 0 deletions src/components/Socials/Socials.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.custom-svg-color {
filter: brightness(0) saturate(100%) invert(20%) sepia(100%) saturate(7500%)
hue-rotate(345deg) brightness(100%) contrast(100%);
}
58 changes: 58 additions & 0 deletions src/components/Socials/Socials.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import { FC } from "react";
import clsx from "clsx";

import discord from "../../assets/discord.svg";
import github from "../../assets/github.svg";
import linkedin from "../../assets/linkedin.svg";

interface Social {
name: string;
Icon: string;
link: string;
}

const SocialList: Social[] = [
{
name: "Github",
Icon: github,
link: "https://github.com/WardAnalytics/WardGraph",
},
{
name: "Discord",
Icon: discord,
link: "https://discord.gg/4ZzgeUwa",
},
{
name: "LinkedIn",
Icon: linkedin,
link: "https://www.linkedin.com/company/wardanalytics/",
},
];

const SocialButton: FC<Social> = ({ name, Icon, link }) => {
return (
<a href={link} target="_blank" rel="noreferrer">
<img
src={Icon}
alt={`${name} Icon`}
className="h-8 w-8 rounded-full p-1 opacity-50 backdrop-blur-sm transition-all duration-200 hover:opacity-70"
/>
</a>
);
};

interface SocialsProps {
className?: string;
}

const Socials: FC<SocialsProps> = ({ className }) => {
return (
<div className={clsx("flex flex-row gap-x-2", className)}>
{SocialList.map((social) => {
return <SocialButton {...social} key={social.name} />;
})}
</div>
);
};

export default Socials;
3 changes: 3 additions & 0 deletions src/components/Socials/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Socials from "./Socials";

export default Socials;
2 changes: 2 additions & 0 deletions src/templates/GraphTemplate.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { FC } from "react";
import Graph from "../components/Graph";
import Socials from "../components/Socials";

const GraphTemplate: FC = () => {
return (
<div className="h-screen w-screen">
<Graph />
<Socials className="absolute bottom-0 right-0 m-4" />
</div>
);
};
Expand Down

0 comments on commit fc9a1d1

Please sign in to comment.