diff --git a/public/aster.png b/public/aster.png index dc4b257..f2b3c68 100644 Binary files a/public/aster.png and b/public/aster.png differ diff --git a/public/image.png b/public/image.png index 6f42e5c..ee6e4de 100644 Binary files a/public/image.png and b/public/image.png differ diff --git a/public/imagewbg.png b/public/imagewbg.png new file mode 100644 index 0000000..b35d2e9 Binary files /dev/null and b/public/imagewbg.png differ diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..6ff1c8a --- /dev/null +++ b/shell.nix @@ -0,0 +1,22 @@ +{ + nixpkgs ? fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.05", + pkgs ? import nixpkgs { config = {}; overlays = []; } +}: + +pkgs.mkShellNoCC { + packages = with pkgs; [ + cowsay + + bun + nodePackages.typescript + nodePackages.typescript-language-server + nodePackages.prettier + emmet-ls + ]; + + # Hook to install requirements when entering the shell + shellHook = '' + cowsay "Nix Shell Activated!" + ''; +} + diff --git a/src/app.css b/src/app.css index 922a70e..4b455a9 100644 --- a/src/app.css +++ b/src/app.css @@ -1,10 +1,10 @@ -@import url("https://fonts.googleapis.com/css2?family=Geist:wght@100..900&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap"); @tailwind base; @tailwind components; @tailwind utilities; * { - font-family: "Geist", sans-serif; + font-family: "Inter", sans-serif; } h1 { @@ -27,9 +27,6 @@ body { @apply w-full md:w-3/5 lg:w-1/2 leading-9 text-neutral-200 text-[16px] md:text-[18px]; } -.main { - @apply p-8; -} ol { @apply list-decimal ml-4; @@ -50,7 +47,3 @@ a { .team-avatar { @apply transition-transform duration-200 hover:scale-110; } - -.mdx-content > * { - @apply my-6; -} diff --git a/src/app.tsx b/src/app.tsx index b301570..750f30a 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -9,33 +9,9 @@ export default function App() { base={import.meta.env.SERVER_BASE_URL} root={(props) => (
-
-
- - Flora logo - - - blog - -
- - github - -
-
}>{props.children} -
-
-
- - floraorg - - {/* idk change this, built with ❤️ by ___ maybe */} - built with ❤️ -
-
)}> diff --git a/src/components/Art.tsx b/src/components/Art.tsx index b429b2f..c89b6f8 100644 --- a/src/components/Art.tsx +++ b/src/components/Art.tsx @@ -1,4 +1,4 @@ -import {Component, createSignal, onMount} from "solid-js"; +import { Component, createSignal, onMount } from "solid-js"; interface AsciiArtComponentProps { imagePath: string; @@ -13,11 +13,17 @@ const AsciiArtComponent: Component = (props) => { const img = new Image(); img.src = props.imagePath; img.onload = () => { - setAsciiArt(imageToAscii(img, props.maxWidth ?? 500, props.maxHeight ?? 1000)); + setAsciiArt( + imageToAscii(img, props.maxWidth ?? 500, props.maxHeight ?? 1000), + ); }; }); - const imageToAscii = (img: HTMLImageElement, maxWidth: number, maxHeight: number) => { + const imageToAscii = ( + img: HTMLImageElement, + maxWidth: number, + maxHeight: number, + ) => { const chars = ["@", "#", "S", "%", "?", "*", "+", ";", ":", ",", "."]; const canvas = document.createElement("canvas"); const width = Math.min(img.width, maxWidth); @@ -39,7 +45,8 @@ const AsciiArtComponent: Component = (props) => { if (a === 0) { art += " "; } else { - art += chars[Math.floor(((r + g + b) / 3 / 255) * (chars.length - 1))]; + art += + chars[Math.floor(((r + g + b) / 3 / 255) * (chars.length - 1))]; } } art += "\n"; @@ -48,7 +55,7 @@ const AsciiArtComponent: Component = (props) => { }; return ( -
+ 
{asciiArt()}
); diff --git a/src/components/Projects.tsx b/src/components/Projects.tsx deleted file mode 100644 index 41b7cc5..0000000 --- a/src/components/Projects.tsx +++ /dev/null @@ -1,34 +0,0 @@ -export default function Projects() { - return ( -
-
-
- Aster project preview -
-
-

⭐ aster

- - wip - -
-

a much more easy to use and painless alternative to the default youtube studio.

-
-
-
-
-
- Orchid project preview -
-
-

🌺 orchid

- - visit beta! - -
-

a meme and pfp editor packed with features, built to run on low end devices.

-
-
-
-
- ); -} diff --git a/src/entry-server.tsx b/src/entry-server.tsx index eb1d31f..7fc4dea 100644 --- a/src/entry-server.tsx +++ b/src/entry-server.tsx @@ -1,9 +1,9 @@ // @refresh reload -import {createHandler, StartServer} from "@solidjs/start/server"; +import { createHandler, StartServer } from "@solidjs/start/server"; export default createHandler(() => ( ( + document={({ assets, children, scripts }) => ( @@ -17,19 +17,25 @@ export default createHandler(() => ( - + - + {assets} - +
{children}
{scripts} diff --git a/src/routes/blog/(blog).mdx b/src/routes/blog/(blog).mdx deleted file mode 100644 index 5d0caaf..0000000 --- a/src/routes/blog/(blog).mdx +++ /dev/null @@ -1 +0,0 @@ -1. [Hello World](/blog/hello) diff --git a/src/routes/blog/hello.mdx b/src/routes/blog/hello.mdx deleted file mode 100644 index 612d51c..0000000 --- a/src/routes/blog/hello.mdx +++ /dev/null @@ -1,3 +0,0 @@ -# hello - -we assure this will be full of some text soon™ diff --git a/src/routes/index.mdx b/src/routes/index.mdx deleted file mode 100644 index f127ca1..0000000 --- a/src/routes/index.mdx +++ /dev/null @@ -1,14 +0,0 @@ -import Projects from "../components/Projects"; -import Team from "../components/Team"; - -# flora - -we build practical web tools that solve _real_ problems, transforming creative ideas into useful digital solutions for everyday challenges. - -## projects - - -## team - - -

if you would like to work with us, dm your resume or github to [@namishh_](https://x.com/namishh_) or [@rexmkv](https://x.com/rexmkv) on x.

diff --git a/src/routes/index.tsx b/src/routes/index.tsx new file mode 100644 index 0000000..18c083a --- /dev/null +++ b/src/routes/index.tsx @@ -0,0 +1,46 @@ +import Art from "../components/Art.tsx"; + +export default function Home() { + return ( +
+
+ +
+ logo +

Flora

+
+

+ Flora is a team of developers aiming to create practical and useful + solutions for real problems. +

+
+ Our current projects:{" "} +
+ orchid + +
{" "} + and{" "} +
+ aster + +
+ {"."} +
+
+

+ Founded by nam and{" "} + rex. Follow us on{" "} + github. +

+
+
+ ); +}