diff --git a/deploy.ts b/deploy.ts index a152d639..58549233 100644 --- a/deploy.ts +++ b/deploy.ts @@ -16,7 +16,7 @@ dotenv.config(); const count = getAccountCount(); console.log(`Found ${count} accounts. Deploying...`); -for (let i = 2; i <= count; i++) { +for (let i = 1; i <= count; i++) { for (const region of getRegions()) { setEnvForKey(i); console.log(`Deploying to ${region} in account ${i}`); diff --git a/icons/PrivateContributionsIcon.tsx b/icons/PrivateContributionsIcon.tsx index ccb6245c..78da0438 100644 --- a/icons/PrivateContributionsIcon.tsx +++ b/icons/PrivateContributionsIcon.tsx @@ -1,23 +1,9 @@ import type { SVGProps } from "react"; export const PrivateContributionsIcon = (props: SVGProps) => ( - - - - - - - - - + + ); diff --git a/icons/UserIcon.tsx b/icons/UserIcon.tsx index 66f26904..dbf85b0a 100644 --- a/icons/UserIcon.tsx +++ b/icons/UserIcon.tsx @@ -7,7 +7,7 @@ export const UserIcon: React.FC> = (props) => ( > ); diff --git a/public/book.svg b/public/book.svg index 09ab1d7b..b334702c 100644 --- a/public/book.svg +++ b/public/book.svg @@ -1,3 +1,3 @@ - + diff --git a/public/calculator.svg b/public/calculator.svg index 79856fb6..2b1f34b1 100644 --- a/public/calculator.svg +++ b/public/calculator.svg @@ -1,10 +1,10 @@ - + - + diff --git a/public/calendar.svg b/public/calendar.svg index c5bbe7f0..8011396c 100644 --- a/public/calendar.svg +++ b/public/calendar.svg @@ -1,3 +1,3 @@ - + diff --git a/public/chat.svg b/public/chat.svg index bba0d036..41d3059e 100644 --- a/public/chat.svg +++ b/public/chat.svg @@ -1,10 +1,10 @@ - + - + diff --git a/public/detective.svg b/public/detective.svg index 07a87c5b..c2bc8758 100644 --- a/public/detective.svg +++ b/public/detective.svg @@ -1,3 +1,3 @@ - + diff --git a/public/eyeball.svg b/public/eyeball.svg index f7f439f1..27c4fedc 100644 --- a/public/eyeball.svg +++ b/public/eyeball.svg @@ -1,3 +1,3 @@ - + diff --git a/public/key.svg b/public/key.svg index a23176a4..cb87c517 100644 --- a/public/key.svg +++ b/public/key.svg @@ -1,3 +1,3 @@ - + diff --git a/public/mail.svg b/public/mail.svg index 8ce6a061..2cd29fd0 100644 --- a/public/mail.svg +++ b/public/mail.svg @@ -1,3 +1,3 @@ - + diff --git a/public/open-source.svg b/public/open-source.svg index 0620a613..605f5683 100644 --- a/public/open-source.svg +++ b/public/open-source.svg @@ -1,3 +1,3 @@ - + diff --git a/public/trophy.svg b/public/trophy.svg index bfc38c69..6877c948 100644 --- a/public/trophy.svg +++ b/public/trophy.svg @@ -1,3 +1,3 @@ - + diff --git a/vite/About/About.tsx b/vite/About/About.tsx index fe40e391..1b215097 100644 --- a/vite/About/About.tsx +++ b/vite/About/About.tsx @@ -1,5 +1,4 @@ import { YEAR_TO_REVIEW } from "../../src/helpers/year"; -import { Stars } from "../Home/Stars"; import { RadialGradient } from "../RadialGradient"; import { AboutItem } from "./AboutItem"; import { DesktopHeader } from "./DesktopHeader"; @@ -16,7 +15,6 @@ const About = () => { return (
-
diff --git a/vite/About/AboutItem.tsx b/vite/About/AboutItem.tsx index 3253448d..558ba64a 100644 --- a/vite/About/AboutItem.tsx +++ b/vite/About/AboutItem.tsx @@ -1,16 +1,23 @@ +import { Box, BoxInner } from "../Box/Box"; import type { AboutItemContent } from "./content"; import styles from "./styles.module.css"; export const AboutItem: React.FC<{ item: AboutItemContent }> = ({ item }) => { return ( -
-
- {item.icon && } - {item.step &&

{item.step}.

} -

{item.title}

-
- {item.description &&

{item.description}

} - {item.node} -
+ + +
+
+ {item.icon && } + {item.step && ( +

{item.step}.

+ )} +

{item.title}

+
+ {item.description &&

{item.description}

} + {item.node} +
+ + ); }; diff --git a/vite/About/content.tsx b/vite/About/content.tsx index a5510006..19f5e95b 100644 --- a/vite/About/content.tsx +++ b/vite/About/content.tsx @@ -178,7 +178,6 @@ export const content: Array = [ {YEAR_TO_REVIEW}?

- Developers:
Check out{" "} Remotion diff --git a/vite/About/styles.module.css b/vite/About/styles.module.css index 3235c4ed..2ad80d65 100644 --- a/vite/About/styles.module.css +++ b/vite/About/styles.module.css @@ -32,8 +32,6 @@ } .aboutDescription { - color: #ebeaee; - font-family: Mona Sans; font-size: 16px; font-style: normal; @@ -49,8 +47,7 @@ align-items: flex-start; gap: 24px; border-radius: 8px; - border: 2px solid #20222f; - background: #171823; + background: var(--pane-bg); font-weight: 500; @media only screen and (min-width: 40em) { padding: 32px; @@ -62,7 +59,7 @@ } .aboutItemTitle { - color: white; + color: var(--pane-text); font-size: 20px; font-weight: 600; line-height: normal; diff --git a/vite/Box/Box.tsx b/vite/Box/Box.tsx index f6f50be4..b2a43a69 100644 --- a/vite/Box/Box.tsx +++ b/vite/Box/Box.tsx @@ -13,3 +13,9 @@ export const Box: React.FC<{
); }; + +export const BoxInner: React.FC<{ + readonly children: React.ReactNode; +}> = ({ children }) => { + return
{children}
; +}; diff --git a/vite/Box/styles.module.css b/vite/Box/styles.module.css index 91620d9c..f7142219 100644 --- a/vite/Box/styles.module.css +++ b/vite/Box/styles.module.css @@ -1,12 +1,18 @@ .box { - background: #191c29eb; - border: 1px solid rgba(255, 255, 255, 0.1); backdrop-filter: blur(5px); - overflow: visible; width: calc(100% - 24px); max-width: 1000px; - border-radius: 10px; + border-radius: 25px; height: fit-content; + padding: 15px; + background-color: rgba(255, 255, 255, 0.1); + border: 1px solid rgba(255, 255, 255, 0.1); + color: var(--pane-text); +} + +.boxinner { + background: var(--pane-bg); + border-radius: 10px; } /* @@ -15,10 +21,9 @@ .headerTopContainer { display: none; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); - padding: 8px 6px; + padding: 0px 0px; + padding-bottom: 12px; align-items: center; - background: rgba(255, 255, 255, 0.03); @media only screen and (min-width: 40em) { display: flex; diff --git a/vite/Button/styles.module.css b/vite/Button/styles.module.css index e398053e..50b40c03 100644 --- a/vite/Button/styles.module.css +++ b/vite/Button/styles.module.css @@ -38,7 +38,7 @@ font-weight: bold; appearance: none; cursor: pointer; - color: rgb(165, 198, 227); + color: var(--pane-text); } .invalidInput { diff --git a/vite/Home.tsx b/vite/Home.tsx index 0a32144f..6995d2e3 100644 --- a/vite/Home.tsx +++ b/vite/Home.tsx @@ -1,17 +1,13 @@ import { useState } from "react"; -import { HomeForeground } from "./Home/HomeForeground"; import { Navbar } from "./Home/Navbar"; -import { Planet } from "./Home/Planet"; // import { HomeForeground } from "./Home/HomeForeground"; // import { Navbar } from "./Home/Navbar"; // import { Planet } from "./Home/Planet"; -import { Stars } from "./Home/Stars"; import { HomeBox } from "./HomeBox/HomeBox"; -import { Octocat } from "./Octocat"; // import { HomeBox } from "./HomeBox/HomeBox"; -import { HomeBackground } from "./Home/HomeBackground"; import { RadialGradient } from "./RadialGradient"; import styles from "./styles.module.css"; +import "./variables.css"; const Home = () => { const [userNotFound, setUserNotFound] = useState(false); @@ -19,11 +15,6 @@ const Home = () => { return (
- - - - -
diff --git a/vite/HomeBox/BoxHighlight.tsx b/vite/HomeBox/BoxHighlight.tsx new file mode 100644 index 00000000..396852f3 --- /dev/null +++ b/vite/HomeBox/BoxHighlight.tsx @@ -0,0 +1,42 @@ +import React from "react"; +import { AbsoluteFill } from "remotion"; + +export const BoxHighlight: React.FC = () => { + return ( + + + + ); +}; + +export const PinkHighlightBox: React.FC = () => { + return ( + +
+ + ); +}; diff --git a/vite/HomeBox/HomeBox.tsx b/vite/HomeBox/HomeBox.tsx index dc052ebe..e2bc9204 100644 --- a/vite/HomeBox/HomeBox.tsx +++ b/vite/HomeBox/HomeBox.tsx @@ -1,22 +1,22 @@ import React from "react"; -import { ShineEffect } from "../../remotion/ShineEffect"; -import { Box } from "../Box/Box"; +import { Box, BoxInner } from "../Box/Box"; +import { BoxHighlight, PinkHighlightBox } from "./BoxHighlight"; import { HomeBoxBottom } from "./HomeBoxBottom"; import { HomeBoxTop } from "./HomeBoxTop"; -import styles from "./styles.module.css"; export const HomeBox: React.FC<{ readonly userNotFound: boolean; readonly setUserNotFound: React.Dispatch>; }> = (props) => { return ( - - + + + + - + + + ); }; diff --git a/vite/HomeBox/styles.module.css b/vite/HomeBox/styles.module.css index 65889e06..758d7c9d 100644 --- a/vite/HomeBox/styles.module.css +++ b/vite/HomeBox/styles.module.css @@ -27,18 +27,12 @@ } } -.homeBoxWrapper { - @media only screen and (min-width: 40em) { - } -} - .title { font-size: 32px; font-weight: 700; line-height: 1.1; margin-bottom: 12px; - background: linear-gradient(270.02deg, #ddd 20.63%, #fff 99.87%); - filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); + background: linear-gradient(90.02deg, var(--pane-text) 80.63%, #000 99.87%); background-clip: text; -webkit-background-clip: text; -webkit-text-fill-color: transparent; diff --git a/vite/HomeLink/index.tsx b/vite/HomeLink/index.tsx index f43ca69f..4ad48155 100644 --- a/vite/HomeLink/index.tsx +++ b/vite/HomeLink/index.tsx @@ -4,7 +4,11 @@ import styles from "./styles.module.css"; export const HomeLink: React.FC<{ readonly label: string; - readonly icon: (params: { height: number; width: number; color: string }) => ReactNode; + readonly icon: (params: { + height: number; + width: number; + color: string; + }) => ReactNode; readonly href: string; }> = ({ label, icon, href }) => { return ( diff --git a/vite/HomeLink/styles.module.css b/vite/HomeLink/styles.module.css index fad5cc46..83569a6c 100644 --- a/vite/HomeLink/styles.module.css +++ b/vite/HomeLink/styles.module.css @@ -4,7 +4,7 @@ gap: 8px; font-size: 15px; text-decoration: none; - color: rgb(210, 211, 214); + color: white; transition: opacity 0.2s ease-in-out, background-color 0.1s ease-in-out, @@ -18,6 +18,5 @@ } .container:hover { - background-color: rgba(255, 255, 255, 0.05); - color: white; + background-color: rgba(0, 0, 0, 0.15); } diff --git a/vite/Input/Input.tsx b/vite/Input/Input.tsx index 0dbaaecb..c94af15f 100644 --- a/vite/Input/Input.tsx +++ b/vite/Input/Input.tsx @@ -19,6 +19,7 @@ export const Input: React.FC<{ ].join(" ")} disabled={disabled} name="title" + autoFocus value={text} onChange={(v) => setText(v.target.value)} placeholder={placeHolder} diff --git a/vite/Input/styles.module.css b/vite/Input/styles.module.css index fce76f9f..f3c723f6 100644 --- a/vite/Input/styles.module.css +++ b/vite/Input/styles.module.css @@ -1,12 +1,12 @@ .input { padding: 0 16px; - border: 1px solid rgba(255, 255, 255, 0.1); + border: 2px solid rgba(255, 255, 255, 0.1); border-radius: 5px; - background-color: rgba(255, 255, 255, 0.1); + background-color: white; display: flex; align-items: center; - caret-color: white; - color: white; + caret-color: var(--input-color); + color: inherit; flex: 1; font-size: 18px; font-weight: bold; @@ -22,12 +22,12 @@ } .input:focus { - border-color: var(--button-border-color); + border-color: var(--input-color); outline: none; } .input::placeholder { - color: rgba(255, 255, 255, 0.7); + color: rgba(0, 0, 0, 0.7); opacity: 0.4; } diff --git a/vite/RadialGradient.tsx b/vite/RadialGradient.tsx index 1eabcf41..6e2290c0 100644 --- a/vite/RadialGradient.tsx +++ b/vite/RadialGradient.tsx @@ -7,7 +7,7 @@ export const RadialGradient: React.FC = () => { style={{ zIndex: -1, background: - "radial-gradient(121.11% 121.11% at 47.08% 100%, #0F102E 0%, #000 100%)", + "linear-gradient(180deg, #060842 0%, #474280 50%, #396A91 100%)", }} /> ); diff --git a/vite/SignInWithGitHub.tsx b/vite/SignInWithGitHub.tsx index 15ecfabf..e81825b2 100644 --- a/vite/SignInWithGitHub.tsx +++ b/vite/SignInWithGitHub.tsx @@ -15,7 +15,7 @@ export const SignInWithGitHub: React.FC = () => { style={{ marginRight: 8, verticalAlign: "middle", marginTop: -3 }} > diff --git a/vite/VideoPage/Actions/FurtherActions.tsx b/vite/VideoPage/Actions/FurtherActions.tsx index 2f0e8852..c3a1ed25 100644 --- a/vite/VideoPage/Actions/FurtherActions.tsx +++ b/vite/VideoPage/Actions/FurtherActions.tsx @@ -24,7 +24,7 @@ export const FurtherActions: React.FC = () => { ( - + )} label="Unlock private metrics" /> diff --git a/vite/VideoPage/Actions/styles.module.css b/vite/VideoPage/Actions/styles.module.css index 162e5716..be30fd37 100644 --- a/vite/VideoPage/Actions/styles.module.css +++ b/vite/VideoPage/Actions/styles.module.css @@ -41,7 +41,7 @@ } .furtherActionsTitle { - color: rgba(231, 231, 231, 1); + color: var(--pane-text); font-size: 14px; margin-bottom: 24px; font-weight: 500; @@ -61,7 +61,7 @@ display: flex; gap: 12px; align-items: center; - color: white; + color: var(--pane-text); transition: font-weight 0.2s ease-in-out; &:hover { diff --git a/vite/VideoPage/Background/index.tsx b/vite/VideoPage/Background/index.tsx index 1928264f..c402e33c 100644 --- a/vite/VideoPage/Background/index.tsx +++ b/vite/VideoPage/Background/index.tsx @@ -11,7 +11,7 @@ export const VideoPageBackground = () => { style={{ overflow: "hidden", background: - "radial-gradient(121.11% 121.11% at 47.08% 0%, #0F102E 0%, #000 100%)", + "radial-gradient(121.11% 121.11% at 47.08% 0%, #396A91 0%, #000 80%)", zIndex: -1, }} > diff --git a/vite/VideoPage/Player/styles.module.css b/vite/VideoPage/Player/styles.module.css index 158c0d86..a6ba4beb 100644 --- a/vite/VideoPage/Player/styles.module.css +++ b/vite/VideoPage/Player/styles.module.css @@ -1,4 +1,5 @@ .playerradius { + border-top-left-radius: 10px; border-bottom-left-radius: 10px; } diff --git a/vite/VideoPage/VideoBox.tsx b/vite/VideoPage/VideoBox.tsx index 639ee347..9dee5ca6 100644 --- a/vite/VideoPage/VideoBox.tsx +++ b/vite/VideoPage/VideoBox.tsx @@ -4,7 +4,8 @@ import React, { useRef, useState } from "react"; import ReactDOM from "react-dom"; import type { z } from "zod"; import type { Rocket, compositionSchema } from "../../src/config"; -import { Box } from "../Box/Box"; +import { Box, BoxInner } from "../Box/Box"; +import { BoxHighlight, PinkHighlightBox } from "../HomeBox/BoxHighlight"; import { useUserVideo } from "../context"; import { MobileActionsContainer } from "./MobileActionsContainer"; import { PlayerContainer } from "./Player/Player"; @@ -46,7 +47,9 @@ export const VideoBox: React.FC<{ ) : null, modalElement, )} - + + + -
- - - -
+ +
+ + + +
+ ); diff --git a/vite/styles.module.css b/vite/styles.module.css index 955a119a..44822be3 100644 --- a/vite/styles.module.css +++ b/vite/styles.module.css @@ -34,7 +34,7 @@ } .gradientText2 { - background: linear-gradient(270.02deg, #7172fd 3.63%, #0ee1eb 99.87%); + background: linear-gradient(270.02deg, #d9d9ff 3.63%, #fff 99.87%); font-size: 24px; margin: 0; background-clip: text; diff --git a/vite/variables.css b/vite/variables.css new file mode 100644 index 00000000..3567e4a7 --- /dev/null +++ b/vite/variables.css @@ -0,0 +1,7 @@ +:root { + --pane-bg-opaque: #e6e1fc; + --pane-bg: #e6e1fcd8; + --pane-text: #01064a; + --input-color: #2980dc; + --pane-separator-color: #bfbaec; +}