From 8e72c9b6fed3a65102f0d8b3eb325b9941084ef6 Mon Sep 17 00:00:00 2001 From: Arnold Chand Date: Tue, 14 Mar 2023 11:37:05 -0400 Subject: [PATCH 01/68] feat: add username to contrib file --- contributors.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contributors.yml b/contributors.yml index 35299062..fb157c54 100644 --- a/contributors.yml +++ b/contributors.yml @@ -1,3 +1,4 @@ - royanger - nchudleigh -- emalineg \ No newline at end of file +- emalineg +- creativenull From f7a513cd8443732284886f26f6562bdbd914dd81 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 14 Mar 2023 19:05:52 -0700 Subject: [PATCH 02/68] favicon size to meet guidelines for serp display --- index.html | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 13447d29..5f280382 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ Astrostation - Aesthetic Online Pomodoro Timer for Improved Productivity @@ -13,10 +13,8 @@ name="description" content="A sleek and user-friendly aesthetic online Pomodoro Timer app for desktop and mobile browsers. Manage your time effectively and focus on studying, writing, or coding tasks. Try it now and experience improved productivity." /> - - - - + - + @@ -78,3 +70,4 @@ + From ea83544e3f99c8b6250f4170ad3e6f138d851de8 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 14 Mar 2023 19:07:25 -0700 Subject: [PATCH 03/68] revised meta data --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 5f280382..89e3d487 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ "@type": "Organization", "name": "MelkeyOSS", "url": "https://github.com/MelkeyOSS/astrostation/blob/main/contributors.yml", - "dateCreated": "2022-09-20", + "dateCreated": "2022-06-01", }, "headline": "Astrostation - Aesthetic Online Pomodoro Timer for Improved Productivity", "inLanguage": "en", From 2e02068746f4173ad18b4361e61dbaeec4678ceb Mon Sep 17 00:00:00 2001 From: EmalineG Date: Wed, 15 Mar 2023 19:41:38 -0700 Subject: [PATCH 04/68] 144x144 favicon for serp --- assets/images/index/favicon144x144.png | Bin 0 -> 13409 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/images/index/favicon144x144.png diff --git a/assets/images/index/favicon144x144.png b/assets/images/index/favicon144x144.png new file mode 100644 index 0000000000000000000000000000000000000000..6bd65aa3ffd4afb3e9f8b286894290eae8462a49 GIT binary patch literal 13409 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%0DSV>YnxF9N4m% z6;%rt%)-e7BP>aF?vM+s;cU7B@MqeRtmoR>=5;2^4ER|X>Pr{+ceyuN+G;2xR6(+R zX4T{xP#5|)yVG8lB(a{O(c)b+$LSBo2{h|7O5hZZ`t#Zj?N_`0EGEz~Tn;dq1Oj?4 zyn`l&ZFmzTh;km1%?ngO543wT7^5CrA z49Q(#`fXNF05TK4S(q`idH)MjYIBmGXn&B>NhyzlOY)cLtg+MktVW=l$Yn!w zW$;G?$&?@Uq``0=dr)F>E%>ITfVCik=@<|zr2h}r@kKHuQpqg){K4Z^6YeH-M;0WN zli9X}EP|2xJUDlK*tM*qVVfX7>zaHg8+wQ{y4j13K$^)fblKJ@;*T0Et`pIw#h(bH za2SC)4LZX=?X14L{qW*VwV5YMQg{;ac3eyzH3s*!Ni}a13B&HEQ936UYh?@ybenWcESIeoQ^s(aOI$l)-64g>RbK9qG48^5zkNmWk z6rQqv#!<&Zgp=K~V-H~?*^l9ejG^b-AWoF?VobC5FCp=F+q^Z%R;*vk^{5RxKf!uB zS_9X=5%bflMW|Jc4&CZctM$YZd=>>KHwZYOg>2x#2_~yL$s-q+9O&@r87}BnrZk+w zpQqv*;mdJw&L9*cyGT$4@*E9l5A{6dh?c;)GQh)y(I@S!$11K%Us@4_} z#S34lRQU?;{GRXzH~7S`?v)m*Fi-%1caMK?+*eyxSCR0opQ4mF;Pm!LSsByOH%c(bD%M3jP^RU_`N_)hcks;zBa8*5R%uv(+8nM z@k%1VQ{?t zJF(PpfBW40u*$Aw(lOQ*cHFa32Bm>n-IR>e;~YUPK!%PTCAHOk7{1xKBe&|so5-q9 zb~gx8g<^DQOxljFFeOx>oKxfbF?)48T)nD=&XfX_{2G+e2aSt92*g6EQK;$)*dZR< z?02Kp*=2?*6RH&*)vYMlux(Bl&fU8Vv23kekhx-5O&v#N?&^UjFG|>0& PpMYdPDoNIg8-@Ho|K}~+ literal 0 HcmV?d00001 From dd72e8f890a2d8df345cae12dd77ac18a594627f Mon Sep 17 00:00:00 2001 From: Amokstakov Date: Wed, 15 Mar 2023 23:00:53 -0700 Subject: [PATCH 05/68] adding melkey --- contributors.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.yml b/contributors.yml index 5de0d7c3..df0fb6f4 100644 --- a/contributors.yml +++ b/contributors.yml @@ -3,3 +3,4 @@ - emalineg - Samathingamajig - eraychumak +- melkeydev From 32527ee30bef9ed3d1108409f2f400306f1e96ae Mon Sep 17 00:00:00 2001 From: mastermajorman Date: Thu, 16 Mar 2023 18:21:51 -0400 Subject: [PATCH 06/68] Add Major to contributors list --- contributors.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.yml b/contributors.yml index 4d6d925b..297283fe 100644 --- a/contributors.yml +++ b/contributors.yml @@ -1,6 +1,7 @@ - creativenull - emalineg - eraychumak +- mastermajorman - melkeydev - nchudleigh - royanger From 2291101905406bdef036f28980735469383111b4 Mon Sep 17 00:00:00 2001 From: Emaline <93755103+emalineg@users.noreply.github.com> Date: Mon, 20 Mar 2023 02:16:49 +0000 Subject: [PATCH 07/68] test --- package-lock.json | 56 ++++++++++++++++++------------- src/App.tsx | 2 ++ src/pages/InfoSectionHomePage.tsx | 6 ++++ 3 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 src/pages/InfoSectionHomePage.tsx diff --git a/package-lock.json b/package-lock.json index 899279d6..14fac92a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,19 @@ { "name": "client", - "version": "1.0.3", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "client", - "version": "1.0.3", + "version": "1.1.0", "dependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", + "@floating-ui/core": "^1.2.2", "@floating-ui/react-dom": "^1.0.0", "clsx": "^1.2.1", + "csstype": "^3.1.1", "dotenv": "^16.0.0", "ethers": "^5.6.2", "rc-slider": "^10.0.0-alpha.4", @@ -1257,9 +1259,9 @@ } }, "node_modules/@floating-ui/core": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.1.tgz", - "integrity": "sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.4.tgz", + "integrity": "sha512-SQOeVbMwb1di+mVWWJLpsUTToKfqVNioXys011beCAhyOIFtS+GQoW4EQSneuxzmQKddExDwQ+X0hLl4lJJaSQ==" }, "node_modules/@floating-ui/dom": { "version": "1.0.3", @@ -1632,13 +1634,19 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001312", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", - "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "version": "1.0.30001468", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001468.tgz", + "integrity": "sha512-zgAo8D5kbOyUcRAgSmgyuvBkjrGk5CGYG5TYgFdpQv+ywcyEpo1LOWoG8YmoflGnh+V+UsNuKYedsoYs0hzV5A==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ] }, "node_modules/chalk": { "version": "2.4.2", @@ -1745,9 +1753,9 @@ } }, "node_modules/csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, "node_modules/debug": { "version": "4.3.3", @@ -4735,9 +4743,9 @@ } }, "@floating-ui/core": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.1.tgz", - "integrity": "sha512-bO37brCPfteXQfFY0DyNDGB3+IMe4j150KFQcgJ5aBP295p9nBGeHEs/p0czrRbtlHq4Px/yoPXO/+dOCcF4uA==" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.2.4.tgz", + "integrity": "sha512-SQOeVbMwb1di+mVWWJLpsUTToKfqVNioXys011beCAhyOIFtS+GQoW4EQSneuxzmQKddExDwQ+X0hLl4lJJaSQ==" }, "@floating-ui/dom": { "version": "1.0.3", @@ -5037,9 +5045,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001312", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", - "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==" + "version": "1.0.30001468", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001468.tgz", + "integrity": "sha512-zgAo8D5kbOyUcRAgSmgyuvBkjrGk5CGYG5TYgFdpQv+ywcyEpo1LOWoG8YmoflGnh+V+UsNuKYedsoYs0hzV5A==" }, "chalk": { "version": "2.4.2", @@ -5122,9 +5130,9 @@ "dev": true }, "csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, "debug": { "version": "4.3.3", diff --git a/src/App.tsx b/src/App.tsx index ef06c742..2dda88dd 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,7 @@ import { useEffect } from "react"; import { Backgrounds } from "@Components/Backgrounds/utils"; import { HomePage } from "@Pages/Homepage"; +import { InfoSectionHomePage } from "@Pages/InfoSectionHomePage" import { SideNav } from "@Components/Nav/SideNav"; import { useDarkToggleStore, @@ -59,6 +60,7 @@ function App() { + ); diff --git a/src/pages/InfoSectionHomePage.tsx b/src/pages/InfoSectionHomePage.tsx new file mode 100644 index 00000000..b7055f9c --- /dev/null +++ b/src/pages/InfoSectionHomePage.tsx @@ -0,0 +1,6 @@ +export const InfoSectionHomePage = ({ }: { }) => { + + return ( +

test

+ ); +}; \ No newline at end of file From cdcad5461558cca43bececd9c6be83afa8c94a0c Mon Sep 17 00:00:00 2001 From: EmalineG Date: Mon, 20 Mar 2023 00:14:58 -0700 Subject: [PATCH 08/68] first draft seo copy --- src/App.tsx | 8 +- .../HomePage/Astrostation.tsx} | 4 +- .../HomePage/InfoSectionHomePage.tsx | 134 ++++++++++++++++++ src/pages/InfoSectionHomePage.tsx | 6 - 4 files changed, 140 insertions(+), 12 deletions(-) rename src/{pages/Homepage.tsx => components/HomePage/Astrostation.tsx} (98%) create mode 100644 src/components/HomePage/InfoSectionHomePage.tsx delete mode 100644 src/pages/InfoSectionHomePage.tsx diff --git a/src/App.tsx b/src/App.tsx index 2dda88dd..c94913c1 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,7 @@ import { useEffect } from "react"; import { Backgrounds } from "@Components/Backgrounds/utils"; -import { HomePage } from "@Pages/Homepage"; -import { InfoSectionHomePage } from "@Pages/InfoSectionHomePage" +import { Astrostation } from "@Root/src/components/HomePage/Astrostation"; +import { InfoSection } from "@Root/src/components/HomePage/InfoSectionHomePage" import { SideNav } from "@Components/Nav/SideNav"; import { useDarkToggleStore, @@ -59,8 +59,8 @@ function App() { > - - + + ); diff --git a/src/pages/Homepage.tsx b/src/components/HomePage/Astrostation.tsx similarity index 98% rename from src/pages/Homepage.tsx rename to src/components/HomePage/Astrostation.tsx index 44b8fb9d..d666dfcb 100644 --- a/src/pages/Homepage.tsx +++ b/src/components/HomePage/Astrostation.tsx @@ -34,10 +34,10 @@ import { Sticky } from "@Components/Sticky/Sticky"; import { Quotes } from "@App/components/Quotes/Quotes"; import useMediaQuery from "@Utils/hooks/useMediaQuery"; import { TwitchStream } from "@Components/Twitch/TwitchStream"; -import { UnsplashFooter } from "../components/Nav/UnsplashFooter"; +import { UnsplashFooter } from "../Nav/UnsplashFooter"; import clsx from "clsx"; -export const HomePage = ({ backgrounds }: { backgrounds: any }) => { +export const Astrostation = ({ backgrounds }: { backgrounds: any }) => { const { isMusicToggled, isMusicShown } = useToggleMusic(); const { isTimerToggled, isTimerShown } = useToggleTimer(); const { isTasksToggled, isTasksShown } = useToggleTasks(); diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx new file mode 100644 index 00000000..b739446c --- /dev/null +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -0,0 +1,134 @@ +export const InfoSection = ({}: {}) => { + return ( +
+
+

What is Astrostation?

+

+ Astrostation is a free-to-use desktop/mobile app designed to help with time + management and productivity. The main feature is a Pomodoro timer, a + time management method created by{" "} + + Francesco Cirillo,{" "} + + however, Astrostation's uniqueness lies in its capacity to allow you + to build your own personal aesthetic into the app, using our numerous + widgets and customizable settings. Ideal for studying or working on + projects, Astrostation is the go-to focus app tailored to meet your + needs. +

+ +

+ {" "} + Benefits of an Online Pomodoro Timer?{" "} +

+

+ An online Pomodoro timer like Astrostation can help you manage your + time more effectively by breaking your work into focused sessions. + This technique typically involves working for 25-minute intervals, + followed by short breaks. +

+

+ According to{" "} + + LifeHack.org + + , this method allows you to: +

+
    +
  • Set time for distractions
    • +
  • Limit open-ended work
    • +
  • Turn your work into a game
    • +
  • Move away from procrastination
    • +
+ +

How to use our Pomodoro Timer

+
    +
  • Click "Add Task" in your "Task Tracker" widget
    • +
  • Type in the task you need to complete
    • +
  • + Set the "Pomodoro Count" for how long you would like to focus on it + at a time (1 pomodoro = 25 minutes) +
    • +
  • Press "Save" then click "Start" on the timer widget
    • +
+

+ Work uninterrupted until the timer goes off, then take a short break + before starting the next session! Repeat this cycle until your task is + complete. +

+ +

+ Extremely Customizable +

+ +
    +
  • + Time settings: Change the default + time set for a short break, long break, and Pomodoro. +
    • +
  • + Sound settings: Adjust the alarm + volume and sound, with options that include retro bells, flute, and + piano. +
    • +
  • + Dashboard settings: Determine + the grid size and lock widgets in place. With all these + customization options, our Pomodoro app is the perfect tool for + anyone looking to increase their productivity and stay on track. +
    • +
+

The Aesthetic Widgets of Astrostation

+ +
    +
  • Choose between various aesthetically pleasing backgrounds!
    • +
  • Tune into our Lofi Wifi Station with 4 different channels!
    • +
  • Listen to your go-to Spotify playlist with our Spotify widget
    • +
  • + Use the Twitch widget to support your favorite streamer while you + study! +
    • +
  • Use our quote widget to display inspirational quotes
    • +
  • + Need to remember something? There’s a sticky note widget for that! +
    • +
+ +

+ Other ways to stay focused while studying{" "} +

+

+ In addition to using a Pomodoro timer like Astrostation, there are + other strategies you can try out to stay focused while studying! +

+ +
    +
  • Prepare yourself your favorite tea to enjoy while studying
    • +
  • + Break your work into smaller, manageable tasks, and prioritize them + based on importance +
    • +
  • + Eliminate distractions, such as turning off your phone or blocking + distracting websites +
    • +
  • Make sure you’re getting enough sleep
    • +
  • Make sure you’re drinking at least 12-16 cups of water a day
    • +
+ +

Contribute to the app

+

+ Did you know Astrostation is now open source? That means our source + code is public and any developer can develop and suggest new features. +

+

Check out the Github repository here!

+
+
+ ); + }; \ No newline at end of file diff --git a/src/pages/InfoSectionHomePage.tsx b/src/pages/InfoSectionHomePage.tsx deleted file mode 100644 index b7055f9c..00000000 --- a/src/pages/InfoSectionHomePage.tsx +++ /dev/null @@ -1,6 +0,0 @@ -export const InfoSectionHomePage = ({ }: { }) => { - - return ( -

test

- ); -}; \ No newline at end of file From ede22963586cf56459b6239d6100e503367deb77 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Mon, 20 Mar 2023 00:29:49 -0700 Subject: [PATCH 09/68] text-color --- .../HomePage/InfoSectionHomePage.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index b739446c..32cc2a4c 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -1,10 +1,10 @@ export const InfoSection = ({}: {}) => { return ( -
+
-

What is Astrostation?

+

What is Astrostation?

- Astrostation is a free-to-use desktop/mobile app designed to help with time + Astrostation is a free-to-use desktop/mobile app designed to help with time management and productivity. The main feature is a Pomodoro timer, a time management method created by{" "} { > Francesco Cirillo,{" "} - however, Astrostation's uniqueness lies in its capacity to allow you + however, Astrostation's uniqueness lies in its capacity to allow you to build your own personal aesthetic into the app, using our numerous widgets and customizable settings. Ideal for studying or working on - projects, Astrostation is the go-to focus app tailored to meet your + projects, Astrostation is the go-to focus app tailored to meet your needs.

@@ -25,7 +25,7 @@ export const InfoSection = ({}: {}) => { Benefits of an Online Pomodoro Timer?{" "}

- An online Pomodoro timer like Astrostation can help you manage your + An online Pomodoro timer like Astrostation can help you manage your time more effectively by breaking your work into focused sessions. This technique typically involves working for 25-minute intervals, followed by short breaks. @@ -84,7 +84,7 @@ export const InfoSection = ({}: {}) => { anyone looking to increase their productivity and stay on track. -

The Aesthetic Widgets of Astrostation

+

The Aesthetic Widgets of Astrostation

  • Choose between various aesthetically pleasing backgrounds!
    • @@ -104,7 +104,7 @@ export const InfoSection = ({}: {}) => { Other ways to stay focused while studying{" "}

    - In addition to using a Pomodoro timer like Astrostation, there are + In addition to using a Pomodoro timer like Astrostation, there are other strategies you can try out to stay focused while studying!

    @@ -124,7 +124,7 @@ export const InfoSection = ({}: {}) => {

    Contribute to the app

    - Did you know Astrostation is now open source? That means our source + Did you know Astrostation is now open source? That means our source code is public and any developer can develop and suggest new features.

    Check out the Github repository here!

    From c262d230b404e4e7988d60e84d948c0d7236433b Mon Sep 17 00:00:00 2001 From: EmalineG Date: Mon, 20 Mar 2023 00:53:36 -0700 Subject: [PATCH 10/68] =?UTF-8?q?=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HomePage/InfoSectionHomePage.tsx | 59 +++++++++---------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 32cc2a4c..8e4f6c38 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -2,22 +2,34 @@ export const InfoSection = ({}: {}) => { return (
    -

    What is Astrostation?

    +

    What is Astrostation?

    - Astrostation is a free-to-use desktop/mobile app designed to help with time - management and productivity. The main feature is a Pomodoro timer, a - time management method created by{" "} + Astrostation is a versatile, free-to-use desktop and mobile app designed to enhance time management and productivity. + It is centered on the highly effective Pomodoro technique, a popular concentration improvement strategy developed by {" "} - Francesco Cirillo,{" "} + Francesco Cirillo.{" "} - however, Astrostation's uniqueness lies in its capacity to allow you - to build your own personal aesthetic into the app, using our numerous - widgets and customizable settings. Ideal for studying or working on - projects, Astrostation is the go-to focus app tailored to meet your - needs. + What sets Astrostation apart is its ability to let users personalize the app's aesthetic with a wide array of widgets and customizable settings. + Perfect for studying or tackling projects, Astrostation is the ultimate focus app, crafted to cater to your individual needs. +

    + +

    How to use our Pomodoro Timer

    +
      +
    • Click "Add Task" in your "Task Tracker" widget
      • +
    • Type in the task you need to complete
      • +
    • + Set the "Pomodoro Count" for how long you would like to focus on it + at a time (1 pomodoro = 25 minutes) +
      • +
    • Press "Save" then click "Start" on the timer widget
      • +
    +

    + Work uninterrupted until the timer goes off, then take a short break + before starting the next session! Repeat this cycle until your task is + complete.

    @@ -25,7 +37,7 @@ export const InfoSection = ({}: {}) => { Benefits of an Online Pomodoro Timer?{" "}

    - An online Pomodoro timer like Astrostation can help you manage your + An online Pomodoro timer like Astrostation can help you manage your time more effectively by breaking your work into focused sessions. This technique typically involves working for 25-minute intervals, followed by short breaks. @@ -47,21 +59,6 @@ export const InfoSection = ({}: {}) => {

  • Move away from procrastination
-

How to use our Pomodoro Timer

-
    -
  • Click "Add Task" in your "Task Tracker" widget
    • -
  • Type in the task you need to complete
    • -
  • - Set the "Pomodoro Count" for how long you would like to focus on it - at a time (1 pomodoro = 25 minutes) -
    • -
  • Press "Save" then click "Start" on the timer widget
    • -
-

- Work uninterrupted until the timer goes off, then take a short break - before starting the next session! Repeat this cycle until your task is - complete. -

Extremely Customizable @@ -84,7 +81,7 @@ export const InfoSection = ({}: {}) => { anyone looking to increase their productivity and stay on track. -

The Aesthetic Widgets of Astrostation

+

The ✨ Aesthetic ✨ Widgets of Astrostation

  • Choose between various aesthetically pleasing backgrounds!
    • @@ -104,7 +101,7 @@ export const InfoSection = ({}: {}) => { Other ways to stay focused while studying{" "}

    - In addition to using a Pomodoro timer like Astrostation, there are + In addition to using a Pomodoro timer like Astrostation, there are other strategies you can try out to stay focused while studying!

    @@ -124,10 +121,10 @@ export const InfoSection = ({}: {}) => {

    Contribute to the app

    - Did you know Astrostation is now open source? That means our source - code is public and any developer can develop and suggest new features. + Did you know Astrostation is now open source? That means our source + code is public and any developer can submit new features.

    -

    Check out the Github repository here!

    +

    Check out the Github repository here!

); From 89b1ab561404ed3aa05a2ae7669877cd96c7799b Mon Sep 17 00:00:00 2001 From: EmalineG Date: Mon, 20 Mar 2023 02:00:41 -0700 Subject: [PATCH 11/68] mr --- src/components/HomePage/InfoSectionHomePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 8e4f6c38..a8e5c61e 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -1,7 +1,7 @@ export const InfoSection = ({}: {}) => { return (
-
+

What is Astrostation?

Astrostation is a versatile, free-to-use desktop and mobile app designed to enhance time management and productivity. From d73398bb6d470e2c1e66139e0f35bdf6ae0ee98e Mon Sep 17 00:00:00 2001 From: EmalineG Date: Mon, 20 Mar 2023 03:21:57 -0700 Subject: [PATCH 12/68] footer --- .../HomePage/InfoSectionHomePage.tsx | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index a8e5c61e..90281dbb 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -126,6 +126,39 @@ export const InfoSection = ({}: {}) => {

Check out the Github repository here!

+
); }; \ No newline at end of file From b74b34930ce1df099386f5cf72b409269f3c8f3f Mon Sep 17 00:00:00 2001 From: EmalineG Date: Mon, 20 Mar 2023 03:26:00 -0700 Subject: [PATCH 13/68] aa --- src/components/HomePage/InfoSectionHomePage.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 90281dbb..3654d0a1 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -135,18 +135,15 @@ export const InfoSection = ({}: {}) => { Privacy Policy + >Privacy Policy {" - "}License + >{" - "}License {" - "}Github + >{" - "}Github From 8055302886ce05b877dcc81e46423dc047abe2a8 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 21 Mar 2023 01:21:46 -0700 Subject: [PATCH 14/68] basic toggle functionality --- package-lock.json | 11 +++++++++ package.json | 1 + src/App.tsx | 10 +++++--- src/components/HomePage/Astrostation.tsx | 10 +++++++- .../HomePage/InfoSectionHomePage.tsx | 23 +++++++++++++------ src/components/SeoToggle/SeoToggle.tsx | 15 ++++++++++++ src/interfaces.ts | 9 ++++++++ src/store.ts | 17 ++++++++++++++ 8 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 src/components/SeoToggle/SeoToggle.tsx diff --git a/package-lock.json b/package-lock.json index 14fac92a..9b1a7df1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,6 +29,7 @@ "react-tsparticles": "^2.1.0", "react-youtube": "^7.13.1", "sass": "^1.49.8", + "scroll-snap": "^4.0.3", "tsparticles": "^2.1.0", "tsparticles-engine": "^2.1.0", "uuid": "^8.3.2", @@ -3256,6 +3257,11 @@ "resolved": "https://registry.npmjs.org/scroll/-/scroll-3.0.1.tgz", "integrity": "sha512-pz7y517OVls1maEzlirKO5nPYle9AXsFzTMNJrRGmT951mzpIBy7sNHOg5o/0MQd/NqliCiWnAi0kZneMPFLcg==" }, + "node_modules/scroll-snap": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/scroll-snap/-/scroll-snap-4.0.3.tgz", + "integrity": "sha512-7am2JXqY/0jHN9+3b2zhZtm55NmzEQhZTXZBIdC/fVb6aVN5nonjbRpf+OghU9LhguJB+rq5ty9SmQcYzMvMxw==" + }, "node_modules/scrollparent": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz", @@ -6153,6 +6159,11 @@ "resolved": "https://registry.npmjs.org/scroll/-/scroll-3.0.1.tgz", "integrity": "sha512-pz7y517OVls1maEzlirKO5nPYle9AXsFzTMNJrRGmT951mzpIBy7sNHOg5o/0MQd/NqliCiWnAi0kZneMPFLcg==" }, + "scroll-snap": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/scroll-snap/-/scroll-snap-4.0.3.tgz", + "integrity": "sha512-7am2JXqY/0jHN9+3b2zhZtm55NmzEQhZTXZBIdC/fVb6aVN5nonjbRpf+OghU9LhguJB+rq5ty9SmQcYzMvMxw==" + }, "scrollparent": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/scrollparent/-/scrollparent-2.0.1.tgz", diff --git a/package.json b/package.json index eaf1c8bb..eef8a767 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "react-tsparticles": "^2.1.0", "react-youtube": "^7.13.1", "sass": "^1.49.8", + "scroll-snap": "^4.0.3", "tsparticles": "^2.1.0", "tsparticles-engine": "^2.1.0", "uuid": "^8.3.2", diff --git a/src/App.tsx b/src/App.tsx index c94913c1..1ee4d289 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -7,12 +7,14 @@ import { useDarkToggleStore, useFirstTimeUserStore, useBreakStarted, + useSeoVisibilityStore, } from "@Store"; import { Toaster } from "react-hot-toast"; import { version } from "@Root/package.json"; import { Walkthrough } from "@Components/Walkthrough/Walkthrough"; import useSetDefault from "@App/utils/hooks/useSetDefault"; import clsx from "clsx"; +import createScrollSnap from 'scroll-snap' enum backgrounds { CITY, @@ -31,13 +33,15 @@ function App() { const { isFirstTimeUser } = useFirstTimeUserStore(); const { breakStarted } = useBreakStarted(); const setDefault = useSetDefault(); + const { isSeoVisible, setSeoVisibility } = useSeoVisibilityStore(); + const scrollSnapElement = document.getElementById('container') useEffect(() => { if (isDark) { document.documentElement.classList.add("dark"); } else { document.documentElement.classList.remove("dark"); - } + } }, [isDark]); useEffect(() => { @@ -59,8 +63,8 @@ function App() { > - - + setSeoVisibility(!isSeoVisible)} backgrounds={backgrounds} /> +
); diff --git a/src/components/HomePage/Astrostation.tsx b/src/components/HomePage/Astrostation.tsx index d666dfcb..df529bd7 100644 --- a/src/components/HomePage/Astrostation.tsx +++ b/src/components/HomePage/Astrostation.tsx @@ -16,6 +16,7 @@ import { usePosTwitch, useGrid, useSetBackground, + useSeoVisibilityStore } from "@Store"; import { Player } from "@Components/Player/Player"; import { Timer } from "@Components/Timer/Timer"; @@ -35,9 +36,12 @@ import { Quotes } from "@App/components/Quotes/Quotes"; import useMediaQuery from "@Utils/hooks/useMediaQuery"; import { TwitchStream } from "@Components/Twitch/TwitchStream"; import { UnsplashFooter } from "../Nav/UnsplashFooter"; +import { SeoToggle } from "../SeoToggle/SeoToggle"; + + import clsx from "clsx"; -export const Astrostation = ({ backgrounds }: { backgrounds: any }) => { +export const Astrostation = ({ backgrounds, onButtonClick }: { backgrounds: any, onButtonClick }) => { const { isMusicToggled, isMusicShown } = useToggleMusic(); const { isTimerToggled, isTimerShown } = useToggleTimer(); const { isTasksToggled, isTasksShown } = useToggleTasks(); @@ -45,6 +49,7 @@ export const Astrostation = ({ backgrounds }: { backgrounds: any }) => { const { isStickyNoteShown } = useToggleStickyNote(); const { isQuoteToggled, isQuoteShown } = useToggleQuote(); const { isTwitchToggled, isTwitchShown } = useToggleTwitch(); + const { isSeoVisible, setSeoVisibility } = useSeoVisibilityStore(); // Position hooks const { taskPosX, taskPosY, setTaskPos } = usePosTask(); @@ -108,6 +113,9 @@ export const Astrostation = ({ backgrounds }: { backgrounds: any }) => {
+ +
+
{!isDesktop ? (
diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 3654d0a1..4539a8cd 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -1,5 +1,12 @@ -export const InfoSection = ({}: {}) => { +import { IoCloseSharp } from "react-icons/io5" +import { useSeoVisibilityStore } from "@Store" + +export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { + const { setSeoVisibility } = useSeoVisibilityStore(); + return ( +
+ {isSeoVisible && (

What is Astrostation?

@@ -125,10 +132,9 @@ export const InfoSection = ({}: {}) => { code is public and any developer can submit new features.

Check out the Github repository here!

-
-
- + + +
  • @@ -157,5 +163,8 @@ export const InfoSection = ({}: {}) => {
- ); - }; \ No newline at end of file +
+ )}; +
+ ); + }; diff --git a/src/components/SeoToggle/SeoToggle.tsx b/src/components/SeoToggle/SeoToggle.tsx new file mode 100644 index 00000000..8fc4c480 --- /dev/null +++ b/src/components/SeoToggle/SeoToggle.tsx @@ -0,0 +1,15 @@ +import { FaInfo } from "react-icons/fa"; + +export const SeoToggle = ({ onClick }: {onClick}) => { + return( +
+ +
+ ) +}; \ No newline at end of file diff --git a/src/interfaces.ts b/src/interfaces.ts index 9c9f63f0..a341cbc2 100644 --- a/src/interfaces.ts +++ b/src/interfaces.ts @@ -258,3 +258,12 @@ export interface ISideNavOrderStore { sideNavOrder: number[]; setSideNavOrder: (sideNavOrder: number[]) => void; } + +export interface ISeoContent { + isSeoVisible: boolean; + setSeoVisibility: (isSeoVisible: boolean) => void; +} + +export interface ISeoToggle { + onButtonClick: () => void; +} \ No newline at end of file diff --git a/src/store.ts b/src/store.ts index aebef196..44004363 100644 --- a/src/store.ts +++ b/src/store.ts @@ -37,7 +37,9 @@ import { IGrid, ILockWidgets, ISideNavOrderStore, + ISeoContent, } from "./interfaces"; +import { InfoSection } from "./components/HomePage/InfoSectionHomePage"; /** * Grid Store @@ -767,3 +769,18 @@ export const useSideNavOrderStore = create( { name: "side_nav_order" } ) ); + +/** + * Toggle SEO Content + * --- + * Handles storing SEO content visibility + */ +export const useSeoVisibilityStore = create( + persist( + (set, _) => ({ + isSeoVisible: true, + setSeoVisibility: (isSeoVisible) => set({ isSeoVisible}), + }), + { name: "state_seo_visibility" } + ) +); \ No newline at end of file From 15c5909e6646dc5f9bc9026dd9e7d04452841db0 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 21 Mar 2023 01:49:15 -0700 Subject: [PATCH 15/68] fixed footer, still spacing at end --- src/components/HomePage/InfoSectionHomePage.tsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 4539a8cd..6f9ab88f 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -132,9 +132,10 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { code is public and any developer can submit new features.

Check out the Github repository here!

+
+
- -
  • @@ -145,14 +146,13 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { {" - "}License + >{" - "}License {" - "}Github
-
© 2023 Copyright:{" "} @@ -162,9 +162,10 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { >Astrostation
- - + + + )}; - + ); }; From 8650e39c8b14f59d79b575e56a0623eb5f243710 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 21 Mar 2023 02:53:44 -0700 Subject: [PATCH 16/68] fixed tag formatting --- .../HomePage/InfoSectionHomePage.tsx | 320 +++++++++--------- 1 file changed, 159 insertions(+), 161 deletions(-) diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 6f9ab88f..5adb6072 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -6,166 +6,164 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { return (
- {isSeoVisible && ( -
-
-

What is Astrostation?

-

- Astrostation is a versatile, free-to-use desktop and mobile app designed to enhance time management and productivity. - It is centered on the highly effective Pomodoro technique, a popular concentration improvement strategy developed by {" "} - - Francesco Cirillo.{" "} - - What sets Astrostation apart is its ability to let users personalize the app's aesthetic with a wide array of widgets and customizable settings. - Perfect for studying or tackling projects, Astrostation is the ultimate focus app, crafted to cater to your individual needs. -

+ {isSeoVisible && + ( +
+
+

What is Astrostation?

+

+ Astrostation is a versatile, free-to-use desktop and mobile app designed to enhance time management and productivity. + It is centered on the highly effective Pomodoro technique, a popular concentration improvement strategy developed by {" "} + + Francesco Cirillo.{" "} + + What sets Astrostation apart is its ability to let users personalize the app's aesthetic with a wide array of widgets and customizable settings. + Perfect for studying or tackling projects, Astrostation is the ultimate focus app, crafted to cater to your individual needs. +

-

How to use our Pomodoro Timer

-
    -
  • Click "Add Task" in your "Task Tracker" widget
    • -
  • Type in the task you need to complete
    • -
  • - Set the "Pomodoro Count" for how long you would like to focus on it - at a time (1 pomodoro = 25 minutes) -
    • -
  • Press "Save" then click "Start" on the timer widget
    • -
-

- Work uninterrupted until the timer goes off, then take a short break - before starting the next session! Repeat this cycle until your task is - complete. -

- -

- {" "} - Benefits of an Online Pomodoro Timer?{" "} -

-

- An online Pomodoro timer like Astrostation can help you manage your - time more effectively by breaking your work into focused sessions. - This technique typically involves working for 25-minute intervals, - followed by short breaks. -

-

- According to{" "} - - LifeHack.org - - , this method allows you to: -

-
    -
  • Set time for distractions
    • -
  • Limit open-ended work
    • -
  • Turn your work into a game
    • -
  • Move away from procrastination
    • -
- - -

- Extremely Customizable -

- -
    -
  • - Time settings: Change the default - time set for a short break, long break, and Pomodoro. -
    • -
  • - Sound settings: Adjust the alarm - volume and sound, with options that include retro bells, flute, and - piano. -
    • -
  • - Dashboard settings: Determine - the grid size and lock widgets in place. With all these - customization options, our Pomodoro app is the perfect tool for - anyone looking to increase their productivity and stay on track. -
    • -
-

The ✨ Aesthetic ✨ Widgets of Astrostation

- -
    -
  • Choose between various aesthetically pleasing backgrounds!
    • -
  • Tune into our Lofi Wifi Station with 4 different channels!
    • -
  • Listen to your go-to Spotify playlist with our Spotify widget
    • -
  • - Use the Twitch widget to support your favorite streamer while you - study! -
    • -
  • Use our quote widget to display inspirational quotes
    • -
  • - Need to remember something? There’s a sticky note widget for that! -
    • -
- -

- Other ways to stay focused while studying{" "} -

-

- In addition to using a Pomodoro timer like Astrostation, there are - other strategies you can try out to stay focused while studying! -

- -
    -
  • Prepare yourself your favorite tea to enjoy while studying
    • -
  • - Break your work into smaller, manageable tasks, and prioritize them - based on importance -
    • -
  • - Eliminate distractions, such as turning off your phone or blocking - distracting websites -
    • -
  • Make sure you’re getting enough sleep
    • -
  • Make sure you’re drinking at least 12-16 cups of water a day
    • -
- -

Contribute to the app

-

- Did you know Astrostation is now open source? That means our source - code is public and any developer can submit new features. -

-

Check out the Github repository here!

-
-
+

How to use our Pomodoro Timer

+
    +
  • Click "Add Task" in your "Task Tracker" widget
    • +
  • Type in the task you need to complete
    • +
  • + Set the "Pomodoro Count" for how long you would like to focus on it + at a time (1 pomodoro = 25 minutes) +
    • +
  • Press "Save" then click "Start" on the timer widget
    • +
+

+ Work uninterrupted until the timer goes off, then take a short break + before starting the next session! Repeat this cycle until your task is + complete. +

+ +

+ {" "} + Benefits of an Online Pomodoro Timer?{" "} +

+

+ An online Pomodoro timer like Astrostation can help you manage your + time more effectively by breaking your work into focused sessions. + This technique typically involves working for 25-minute intervals, + followed by short breaks. +

+

+ According to{" "} + + LifeHack.org + + , this method allows you to: +

+
    +
  • Set time for distractions
    • +
  • Limit open-ended work
    • +
  • Turn your work into a game
    • +
  • Move away from procrastination
    • +
+ + +

+ Extremely Customizable +

+ +
    +
  • + Time settings: Change the default + time set for a short break, long break, and Pomodoro. +
    • +
  • + Sound settings: Adjust the alarm + volume and sound, with options that include retro bells, flute, and + piano. +
    • +
  • + Dashboard settings: Determine + the grid size and lock widgets in place. With all these + customization options, our Pomodoro app is the perfect tool for + anyone looking to increase their productivity and stay on track. +
    • +
+

The ✨ Aesthetic ✨ Widgets of Astrostation

+ +
    +
  • Choose between various aesthetically pleasing backgrounds!
    • +
  • Tune into our Lofi Wifi Station with 4 different channels!
    • +
  • Listen to your go-to Spotify playlist with our Spotify widget
    • +
  • + Use the Twitch widget to support your favorite streamer while you + study! +
    • +
  • Use our quote widget to display inspirational quotes
    • +
  • + Need to remember something? There’s a sticky note widget for that! +
    • +
+ +

+ Other ways to stay focused while studying{" "} +

+

+ In addition to using a Pomodoro timer like Astrostation, there are + other strategies you can try out to stay focused while studying! +

+ +
    +
  • Prepare yourself your favorite tea to enjoy while studying
    • +
  • + Break your work into smaller, manageable tasks, and prioritize them + based on importance +
    • +
  • + Eliminate distractions, such as turning off your phone or blocking + distracting websites +
    • +
  • Make sure you’re getting enough sleep
    • +
  • Make sure you’re drinking at least 12-16 cups of water a day
    • +
+ +

Contribute to the app

+

+ Did you know Astrostation is now open source? That means our source + code is public and any developer can submit new features. +

+

Check out the Github repository here!

+
+ + +
+ - -
- © 2023 Copyright:{" "} - Astrostation -
-
- - - - )}; - - ); - }; + )}; + + ); + }; From f33a45538b60859b03bddd3eb40af3646f387fb9 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 21 Mar 2023 19:34:35 -0700 Subject: [PATCH 17/68] ternary function for overflow --- src/App.tsx | 7 +++---- src/components/HomePage/InfoSectionHomePage.tsx | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 1ee4d289..0c04d361 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -33,8 +33,7 @@ function App() { const { isFirstTimeUser } = useFirstTimeUserStore(); const { breakStarted } = useBreakStarted(); const setDefault = useSetDefault(); - const { isSeoVisible, setSeoVisibility } = useSeoVisibilityStore(); - const scrollSnapElement = document.getElementById('container') + const { isSeoVisible, setSeoVisibility, isOverflowHidden } = useSeoVisibilityStore(); useEffect(() => { if (isDark) { @@ -55,9 +54,9 @@ function App() { <> {isFirstTimeUser && } -
diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 5adb6072..66b9e580 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -134,7 +134,8 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => {

Check out the Github repository here!

-
+ From eb6a223a0493c162934a60b14a14011a39ac6a0a Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 21 Mar 2023 19:34:58 -0700 Subject: [PATCH 18/68] rip scrollsnap --- src/App.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index 0c04d361..3520dce6 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,7 +14,6 @@ import { version } from "@Root/package.json"; import { Walkthrough } from "@Components/Walkthrough/Walkthrough"; import useSetDefault from "@App/utils/hooks/useSetDefault"; import clsx from "clsx"; -import createScrollSnap from 'scroll-snap' enum backgrounds { CITY, From 08e5c5db73f21cad7f8c7f7b7ef110de9c8157f7 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Tue, 21 Mar 2023 19:37:45 -0700 Subject: [PATCH 19/68] removed unused variable --- src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index 3520dce6..e23441cc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -32,7 +32,7 @@ function App() { const { isFirstTimeUser } = useFirstTimeUserStore(); const { breakStarted } = useBreakStarted(); const setDefault = useSetDefault(); - const { isSeoVisible, setSeoVisibility, isOverflowHidden } = useSeoVisibilityStore(); + const { isSeoVisible, setSeoVisibility } = useSeoVisibilityStore(); useEffect(() => { if (isDark) { From 35fd14b53d8a3fceb2bee15d44a38a87ac775846 Mon Sep 17 00:00:00 2001 From: rondDev Date: Wed, 22 Mar 2023 04:01:06 +0100 Subject: [PATCH 20/68] uhh --- src/App.tsx | 2 +- src/components/Crypto/Donation.tsx | 2 +- src/components/HomePage/InfoSectionHomePage.tsx | 2 +- src/components/SeoToggle/SeoToggle.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 3520dce6..e23441cc 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -32,7 +32,7 @@ function App() { const { isFirstTimeUser } = useFirstTimeUserStore(); const { breakStarted } = useBreakStarted(); const setDefault = useSetDefault(); - const { isSeoVisible, setSeoVisibility, isOverflowHidden } = useSeoVisibilityStore(); + const { isSeoVisible, setSeoVisibility } = useSeoVisibilityStore(); useEffect(() => { if (isDark) { diff --git a/src/components/Crypto/Donation.tsx b/src/components/Crypto/Donation.tsx index 36c12a0d..be79032a 100644 --- a/src/components/Crypto/Donation.tsx +++ b/src/components/Crypto/Donation.tsx @@ -13,7 +13,7 @@ export const CryptoDonationButton = () => { onClose={() => setIsCryptoModalOpen(false)} /> -
+
From 86a4a38d37ecb8075fc1f75f104e35d269c8d804 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Wed, 22 Mar 2023 01:23:40 -0700 Subject: [PATCH 22/68] Moved to --- src/App.tsx | 4 ++-- src/components/HomePage/Astrostation.tsx | 5 ++--- src/components/HomePage/InfoSectionHomePage.tsx | 13 ++++++++----- src/components/SeoToggle/SeoToggle.tsx | 6 +++--- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index e23441cc..2ee2996c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -61,8 +61,8 @@ function App() { > - setSeoVisibility(!isSeoVisible)} backgrounds={backgrounds} /> - + + setSeoVisibility(!isSeoVisible)} isSeoVisible={isSeoVisible}/>
); diff --git a/src/components/HomePage/Astrostation.tsx b/src/components/HomePage/Astrostation.tsx index df529bd7..cb2a546d 100644 --- a/src/components/HomePage/Astrostation.tsx +++ b/src/components/HomePage/Astrostation.tsx @@ -41,7 +41,7 @@ import { SeoToggle } from "../SeoToggle/SeoToggle"; import clsx from "clsx"; -export const Astrostation = ({ backgrounds, onButtonClick }: { backgrounds: any, onButtonClick }) => { +export const Astrostation = ({ backgrounds }: { backgrounds: any }) => { const { isMusicToggled, isMusicShown } = useToggleMusic(); const { isTimerToggled, isTimerShown } = useToggleTimer(); const { isTasksToggled, isTasksShown } = useToggleTasks(); @@ -49,7 +49,7 @@ export const Astrostation = ({ backgrounds, onButtonClick }: { backgrounds: any, const { isStickyNoteShown } = useToggleStickyNote(); const { isQuoteToggled, isQuoteShown } = useToggleQuote(); const { isTwitchToggled, isTwitchShown } = useToggleTwitch(); - const { isSeoVisible, setSeoVisibility } = useSeoVisibilityStore(); + // Position hooks const { taskPosX, taskPosY, setTaskPos } = usePosTask(); @@ -113,7 +113,6 @@ export const Astrostation = ({ backgrounds, onButtonClick }: { backgrounds: any,
-
{!isDesktop ? ( diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index d56a0f8f..46a3a64e 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -1,15 +1,15 @@ import { IoCloseSharp } from "react-icons/io5" import { useSeoVisibilityStore } from "@Store" +import { SeoToggle } from "../SeoToggle/SeoToggle"; -export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { - const { setSeoVisibility } = useSeoVisibilityStore(); +export const InfoSection = ({ onButtonClick, isSeoVisible}: { onButtonClick, isSeoVisible }) => { return (
{isSeoVisible && (
-
+

What is Astrostation?

Astrostation is a versatile, free-to-use desktop and mobile app designed to enhance time management and productivity. @@ -114,7 +114,7 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => {

    -
  • Prepare yourself your favorite tea to enjoy while studying
    • +
  • Prepare yourself your favorite snack to enjoy while studying
  • Break your work into smaller, manageable tasks, and prioritize them based on importance @@ -133,6 +133,9 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { code is public and any developer can submit new features.

    Check out the Github repository here!

    +
    + +
@@ -159,7 +162,7 @@ export const InfoSection = ({isSeoVisible}: {isSeoVisible}) => { href="https://twitter.com/melkeydev" >Astrostation
- +
diff --git a/src/components/SeoToggle/SeoToggle.tsx b/src/components/SeoToggle/SeoToggle.tsx index 9fcac943..ae102940 100644 --- a/src/components/SeoToggle/SeoToggle.tsx +++ b/src/components/SeoToggle/SeoToggle.tsx @@ -10,13 +10,13 @@ export const SeoToggle = ({ onClick }: {onClick}) => { }; return( -
+
) From 68afd766511a1b4a22c6f13971e7ec578c99939f Mon Sep 17 00:00:00 2001 From: EmalineG Date: Wed, 22 Mar 2023 01:39:40 -0700 Subject: [PATCH 23/68] added tutorial for --- src/App.tsx | 4 ++-- src/components/HomePage/Astrostation.tsx | 2 -- src/components/SeoToggle/SeoToggle.tsx | 2 +- src/components/Walkthrough/Walkthrough.tsx | 5 +++++ src/store.ts | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 2ee2996c..5f2c4310 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,7 +1,7 @@ import { useEffect } from "react"; import { Backgrounds } from "@Components/Backgrounds/utils"; -import { Astrostation } from "@Root/src/components/HomePage/Astrostation"; -import { InfoSection } from "@Root/src/components/HomePage/InfoSectionHomePage" +import { Astrostation } from "@Root/src/components/Homepage/Astrostation"; +import { InfoSection } from "@Root/src/components/Homepage/InfoSectionHomePage" import { SideNav } from "@Components/Nav/SideNav"; import { useDarkToggleStore, diff --git a/src/components/HomePage/Astrostation.tsx b/src/components/HomePage/Astrostation.tsx index cb2a546d..079c3943 100644 --- a/src/components/HomePage/Astrostation.tsx +++ b/src/components/HomePage/Astrostation.tsx @@ -16,7 +16,6 @@ import { usePosTwitch, useGrid, useSetBackground, - useSeoVisibilityStore } from "@Store"; import { Player } from "@Components/Player/Player"; import { Timer } from "@Components/Timer/Timer"; @@ -36,7 +35,6 @@ import { Quotes } from "@App/components/Quotes/Quotes"; import useMediaQuery from "@Utils/hooks/useMediaQuery"; import { TwitchStream } from "@Components/Twitch/TwitchStream"; import { UnsplashFooter } from "../Nav/UnsplashFooter"; -import { SeoToggle } from "../SeoToggle/SeoToggle"; import clsx from "clsx"; diff --git a/src/components/SeoToggle/SeoToggle.tsx b/src/components/SeoToggle/SeoToggle.tsx index ae102940..bc8116ca 100644 --- a/src/components/SeoToggle/SeoToggle.tsx +++ b/src/components/SeoToggle/SeoToggle.tsx @@ -14,7 +14,7 @@ export const SeoToggle = ({ onClick }: {onClick}) => { diff --git a/src/components/Walkthrough/Walkthrough.tsx b/src/components/Walkthrough/Walkthrough.tsx index 203fdea4..ca929f2c 100644 --- a/src/components/Walkthrough/Walkthrough.tsx +++ b/src/components/Walkthrough/Walkthrough.tsx @@ -42,6 +42,11 @@ export const Walkthrough = () => { target: ".chooseBackgroundButton", content: "Not feeling this background? Switch it up!", }, + { + target: ".seoToggle", + content: "After learning more about Astrostation, you can hide this section for full immersion.", + + }, { target: ".donateButton", content: diff --git a/src/store.ts b/src/store.ts index 44004363..941425cf 100644 --- a/src/store.ts +++ b/src/store.ts @@ -39,7 +39,7 @@ import { ISideNavOrderStore, ISeoContent, } from "./interfaces"; -import { InfoSection } from "./components/HomePage/InfoSectionHomePage"; +import { InfoSection } from "./components/Homepage/InfoSectionHomePage"; /** * Grid Store From 5308c72244bfeb8a78cf2120b8a05142fb7dc738 Mon Sep 17 00:00:00 2001 From: EmalineG Date: Wed, 22 Mar 2023 02:35:44 -0700 Subject: [PATCH 24/68] TYPESAFE REACT REFS FOR SCROLLING --- src/App.tsx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 5f2c4310..9c585bde 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,6 +14,8 @@ import { version } from "@Root/package.json"; import { Walkthrough } from "@Components/Walkthrough/Walkthrough"; import useSetDefault from "@App/utils/hooks/useSetDefault"; import clsx from "clsx"; +import { useRef } from "react"; + enum backgrounds { CITY, @@ -33,6 +35,17 @@ function App() { const { breakStarted } = useBreakStarted(); const setDefault = useSetDefault(); const { isSeoVisible, setSeoVisibility } = useSeoVisibilityStore(); + const astroStationRef = useRef(null); + + const handleButtonClick = () => { + if (astroStationRef.current) { + astroStationRef.current.scrollIntoView({ behavior: "smooth" }); + } + setTimeout(() => { + setSeoVisibility(!isSeoVisible); + }, 700); + + }; useEffect(() => { if (isDark) { @@ -49,6 +62,7 @@ function App() { } }, []); + return ( <> {isFirstTimeUser && } @@ -61,8 +75,9 @@ function App() { > - - setSeoVisibility(!isSeoVisible)} isSeoVisible={isSeoVisible}/> + + +
); From 8725e7b7809becb40b4b9afba4ab09b591e3d74d Mon Sep 17 00:00:00 2001 From: EmalineG Date: Wed, 22 Mar 2023 02:42:55 -0700 Subject: [PATCH 25/68] scrollbar-hide --- src/App.tsx | 2 +- src/index.css | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index 9c585bde..3bff386c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -69,7 +69,7 @@ function App() {
diff --git a/src/index.css b/src/index.css index 664072d5..c8873e95 100644 --- a/src/index.css +++ b/src/index.css @@ -2,3 +2,14 @@ @tailwind base; @tailwind components; @tailwind utilities; + +/* For Webkit-based browsers (Chrome, Safari and Opera) */ +.scrollbar-hide::-webkit-scrollbar { + display: none; +} + +/* For IE, Edge and Firefox */ +.scrollbar-hide { + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ +} \ No newline at end of file From 4c0a848da2bede540823e286165eb0a58f8fd87e Mon Sep 17 00:00:00 2001 From: EmalineG Date: Wed, 22 Mar 2023 02:49:10 -0700 Subject: [PATCH 26/68] Footer styling --- src/components/SeoToggle/SeoToggle.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/SeoToggle/SeoToggle.tsx b/src/components/SeoToggle/SeoToggle.tsx index bc8116ca..4ae569ee 100644 --- a/src/components/SeoToggle/SeoToggle.tsx +++ b/src/components/SeoToggle/SeoToggle.tsx @@ -10,7 +10,7 @@ export const SeoToggle = ({ onClick }: {onClick}) => { }; return( -
+
diff --git a/src/components/SeoToggle/SeoToggle.tsx b/src/components/Common/Buttons/SeoToggle.tsx similarity index 91% rename from src/components/SeoToggle/SeoToggle.tsx rename to src/components/Common/Buttons/SeoToggle.tsx index 4ae569ee..3319b992 100644 --- a/src/components/SeoToggle/SeoToggle.tsx +++ b/src/components/Common/Buttons/SeoToggle.tsx @@ -1,7 +1,7 @@ import { FaInfo } from "react-icons/fa"; import React, { useState } from 'react'; -export const SeoToggle = ({ onClick }: {onClick}) => { +export const SeoToggle = ({ onClick }: { onClick }) => { const [isBgTransparent, setIsBgTransparent] = useState(false); const handleClick = () => { diff --git a/src/components/HomePage/Astrostation.tsx b/src/components/HomePage/Astrostation.tsx index 079c3943..1e373b82 100644 --- a/src/components/HomePage/Astrostation.tsx +++ b/src/components/HomePage/Astrostation.tsx @@ -35,11 +35,11 @@ import { Quotes } from "@App/components/Quotes/Quotes"; import useMediaQuery from "@Utils/hooks/useMediaQuery"; import { TwitchStream } from "@Components/Twitch/TwitchStream"; import { UnsplashFooter } from "../Nav/UnsplashFooter"; - - import clsx from "clsx"; +import React from 'react'; -export const Astrostation = ({ backgrounds }: { backgrounds: any }) => { +export const Astrostation = React.forwardRef((props, ref) => { + const { backgrounds } = props; const { isMusicToggled, isMusicShown } = useToggleMusic(); const { isTimerToggled, isTimerShown } = useToggleTimer(); const { isTasksToggled, isTasksShown } = useToggleTasks(); @@ -66,7 +66,7 @@ export const Astrostation = ({ backgrounds }: { backgrounds: any }) => { const { grid } = useGrid(); return ( -
+
{isBackground == backgrounds.UNSPLASH && }
@@ -213,4 +213,4 @@ export const Astrostation = ({ backgrounds }: { backgrounds: any }) => { )}
); -}; +}); diff --git a/src/components/HomePage/InfoSectionHomePage.tsx b/src/components/HomePage/InfoSectionHomePage.tsx index 46a3a64e..30f9331c 100644 --- a/src/components/HomePage/InfoSectionHomePage.tsx +++ b/src/components/HomePage/InfoSectionHomePage.tsx @@ -1,6 +1,6 @@ import { IoCloseSharp } from "react-icons/io5" import { useSeoVisibilityStore } from "@Store" -import { SeoToggle } from "../SeoToggle/SeoToggle"; +import { SeoToggle } from "../Common/Buttons/SeoToggle"; export const InfoSection = ({ onButtonClick, isSeoVisible}: { onButtonClick, isSeoVisible }) => { @@ -137,9 +137,9 @@ export const InfoSection = ({ onButtonClick, isSeoVisible}: { onButtonClick, isS
-