From 72150cdd77c8073c2a1999f0f69d5f32d33d0b4b Mon Sep 17 00:00:00 2001 From: Madeleine Belanger Date: Mon, 20 Mar 2023 17:40:57 -0700 Subject: [PATCH 1/5] Added github button --- src/components/Nav/BottomButtons.tsx | 19 +++++++++++++++++++ src/pages/Astrostation.tsx | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/components/Nav/BottomButtons.tsx diff --git a/src/components/Nav/BottomButtons.tsx b/src/components/Nav/BottomButtons.tsx new file mode 100644 index 00000000..315237e8 --- /dev/null +++ b/src/components/Nav/BottomButtons.tsx @@ -0,0 +1,19 @@ +import {Button} from "../Common/Button" +import { AiOutlineGithub } from "react-icons/ai"; +import { WithTooltip } from "../Tooltip" + +function navigateToGithub(){ +window.open("https://github.com/MelkeyOSS/astrostation") +} +function BottomButtons(){ +return( + +
+ +
+ +)} +export default BottomButtons diff --git a/src/pages/Astrostation.tsx b/src/pages/Astrostation.tsx index 7bdee691..7bfc3f7d 100644 --- a/src/pages/Astrostation.tsx +++ b/src/pages/Astrostation.tsx @@ -36,6 +36,7 @@ import useMediaQuery from "@Utils/hooks/useMediaQuery"; import { TwitchStream } from "@Components/Twitch/TwitchStream"; import { UnsplashFooter } from "../components/Nav/UnsplashFooter"; import clsx from "clsx"; +import BottomButtons from "../components/Nav/BottomButtons" import React from "react"; export const Astrostation = React.forwardRef< @@ -117,7 +118,7 @@ export const Astrostation = React.forwardRef< -
+ {!isDesktop ? (
From bede7ff2089519d73b59b23d9e0e29475deb9d4f Mon Sep 17 00:00:00 2001 From: Madeleine Belanger Date: Wed, 22 Mar 2023 15:39:43 -0700 Subject: [PATCH 2/5] Removed wording and updated contributers list --- contributors.yml | 2 ++ src/components/Nav/BottomButtons.tsx | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contributors.yml b/contributors.yml index 2f103ddf..fd74a1c4 100644 --- a/contributors.yml +++ b/contributors.yml @@ -4,8 +4,10 @@ - justnat3 - pizzaintheoven - herropaul +- madeleine-patience - mastermajorman - melkeydev - nchudleigh - royanger - Samathingamajig + diff --git a/src/components/Nav/BottomButtons.tsx b/src/components/Nav/BottomButtons.tsx index 315237e8..4627d12d 100644 --- a/src/components/Nav/BottomButtons.tsx +++ b/src/components/Nav/BottomButtons.tsx @@ -9,9 +9,8 @@ function BottomButtons(){ return(
-
From 5199a430f691ce478f85fb522bd56b50613176f8 Mon Sep 17 00:00:00 2001 From: Madeleine Belanger Date: Wed, 22 Mar 2023 19:17:15 -0700 Subject: [PATCH 3/5] Updated bottom buttons and css variant --- src/components/Common/Button.tsx | 8 ++++---- src/components/Crypto/Donation.tsx | 8 +++++--- src/components/Crypto/Modal.tsx | 4 ++-- src/components/Nav/BottomButtons.tsx | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/components/Common/Button.tsx b/src/components/Common/Button.tsx index a75c1595..2f9868a4 100644 --- a/src/components/Common/Button.tsx +++ b/src/components/Common/Button.tsx @@ -18,12 +18,12 @@ const classes: { [key: string]: any } = { danger: "bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded", cold: "bg-blue-grey-800 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded", - crypto: - "bg-violet-700 hover:bg-violet-800 text-white font-bold py-2 px-4 rounded", - coldPrimary: "bg-blue-700 text-white font-bold py-2 px-4 rounded", + bottomButton: + "bg-violet-700 hover:bg-violet-800 text-white font-bold py-2 px-4 rounded shadow-sm focus:outline-none dark:bg-violet-700 dark:text-violet-200", + coldPrimary: "bg-blue-700 text-white font-bold py-2 px-4 rounded ", }, }; - + export const Button = ({ children, className, diff --git a/src/components/Crypto/Donation.tsx b/src/components/Crypto/Donation.tsx index be79032a..22bbc1a6 100644 --- a/src/components/Crypto/Donation.tsx +++ b/src/components/Crypto/Donation.tsx @@ -1,6 +1,7 @@ import { CryptoModal } from "./Modal"; import { FaEthereum } from "react-icons/fa"; import { useState } from "react"; +import { Button } from "../Common/Button"; export const CryptoDonationButton = () => { const [isCryptoModalOpen, setIsCryptoModalOpen] = useState(false); @@ -14,14 +15,15 @@ export const CryptoDonationButton = () => { />
- +
); diff --git a/src/components/Crypto/Modal.tsx b/src/components/Crypto/Modal.tsx index b472bf12..c548cb9b 100644 --- a/src/components/Crypto/Modal.tsx +++ b/src/components/Crypto/Modal.tsx @@ -143,7 +143,7 @@ export const CryptoModal = ({ isVisible = false, onClose }) => {
{!metaMaskConnected ? ( ) : (
From deab0644ff841121c121022c812a6981a7fd453f Mon Sep 17 00:00:00 2001 From: Madeleine Belanger Date: Thu, 23 Mar 2023 23:11:04 -0700 Subject: [PATCH 4/5] Changed size of GH logo --- src/components/Nav/BottomButtons.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Nav/BottomButtons.tsx b/src/components/Nav/BottomButtons.tsx index 5e85c9b4..47302681 100644 --- a/src/components/Nav/BottomButtons.tsx +++ b/src/components/Nav/BottomButtons.tsx @@ -1,6 +1,7 @@ import {Button} from "../Common/Button" import { AiOutlineGithub } from "react-icons/ai"; import { WithTooltip } from "../Tooltip" +import { SiGithub } from "react-icons/si"; function navigateToGithub(){ window.open("https://github.com/MelkeyOSS/astrostation") @@ -9,8 +10,8 @@ function BottomButtons(){ return(
-
From c50db8cd3eb1ddb8d22d2478154107fcc95d350f Mon Sep 17 00:00:00 2001 From: Madeleine Belanger Date: Sun, 26 Mar 2023 20:07:35 -0700 Subject: [PATCH 5/5] Changed navigate function to anchor tag + re-added space to crypto btn. --- src/components/Common/Button.tsx | 2 +- src/components/Crypto/Donation.tsx | 5 ++++- src/components/Nav/BottomButtons.tsx | 10 +++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/Common/Button.tsx b/src/components/Common/Button.tsx index 2f9868a4..5689a1cf 100644 --- a/src/components/Common/Button.tsx +++ b/src/components/Common/Button.tsx @@ -19,7 +19,7 @@ const classes: { [key: string]: any } = { "bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded", cold: "bg-blue-grey-800 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded", bottomButton: - "bg-violet-700 hover:bg-violet-800 text-white font-bold py-2 px-4 rounded shadow-sm focus:outline-none dark:bg-violet-700 dark:text-violet-200", + "bg-violet-700 hover:bg-violet-800 text-white font-bold rounded shadow-sm focus:outline-none dark:bg-violet-700 dark:text-violet-200", coldPrimary: "bg-blue-700 text-white font-bold py-2 px-4 rounded ", }, }; diff --git a/src/components/Crypto/Donation.tsx b/src/components/Crypto/Donation.tsx index 22bbc1a6..8a6a4061 100644 --- a/src/components/Crypto/Donation.tsx +++ b/src/components/Crypto/Donation.tsx @@ -17,10 +17,13 @@ export const CryptoDonationButton = () => {
diff --git a/src/components/Nav/BottomButtons.tsx b/src/components/Nav/BottomButtons.tsx index 47302681..36607398 100644 --- a/src/components/Nav/BottomButtons.tsx +++ b/src/components/Nav/BottomButtons.tsx @@ -3,16 +3,16 @@ import { AiOutlineGithub } from "react-icons/ai"; import { WithTooltip } from "../Tooltip" import { SiGithub } from "react-icons/si"; -function navigateToGithub(){ -window.open("https://github.com/MelkeyOSS/astrostation") -} function BottomButtons(){ return(
- +
)}