the-distro/floral.systems
1
1
Fork 1
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

feat(root page): prettify and add new home page content #7

Open
jakehamilton wants to merge 6 commits from jakehamilton/feat/home-content into main
pull from: jakehamilton/feat/home-content
merge into: the-distro:main
Conversation 0 Commits 6 Files changed 11 +467 -96
jakehamilton commented 2024-10-26 21:15:49 +00:00
Member
Copy link

This one is a bit harder to show off in single screenshots, I recommend opening the site locally to see all of these changes on the page!

However, here are a few screenshots of the updated design/content for parts that I have changed:

image

image

Note that the "Our vision for floral.systems" bit hasn't really been worked on aside from some experimentation on the title itself.

This one is a bit harder to show off in single screenshots, I recommend opening the site locally to see all of these changes on the page! However, here are a few screenshots of the updated design/content for parts that I have changed: ![image](/attachments/5973e710-8dde-49ae-98d3-2d7b23a05b29) ![image](/attachments/6d119e36-5201-4125-966e-e52b3c5b37c4) Note that the "Our vision for floral.systems" bit hasn't really been worked on aside from some experimentation on the title itself.
image.png
189 KiB
image.png
267 KiB
jakehamilton added 1 commit 2024-10-26 21:15:53 +00:00
jakehamilton added 1 commit 2024-10-26 21:41:17 +00:00
ckie requested changes 2024-10-26 22:14:47 +00:00
src/routes/+layout.svelte Outdated
@ -10,2 +10,3 @@
globalThis.PKGS = "petalpkgs";
globalThis.PKGS = "Petalpkgs";
globalThis.DISTRO = "FleurixOS";
globalThis.PKGS_COUNT = "67,589";
ckie commented 2024-10-26 21:58:50 +00:00
Member
Copy link

Let's avoiding adding more things to the global scope and start removing all of these defs soon. They were a hack for the name, and at this point an actual $lib/consts.ts is warranted if we decide we really need this, which I think we don't.

Let's avoiding adding more things to the global scope and start removing all of these defs soon. They were a hack for the name, and at this point an actual `$lib/consts.ts` is warranted if we decide we really need this, which I think we don't.
src/routes/+layout.svelte Outdated
@ -17,3 +18,3 @@
<meta property="og:type" content="website" />
<meta property="og:url" content={$page.url?.toString()} />
<meta name="theme-color" content="#136951">
<meta name="theme-color" content="#27a27b">
ckie commented 2024-10-26 21:59:08 +00:00
Member
Copy link

Nice catch!

Nice catch!
src/routes/+page.svelte Outdated
@ -62,4 +78,3 @@
/>
</div>
</div>
<div class="text-4xl flex justify-center items-center h-full">
ckie commented 2024-10-26 21:59:58 +00:00
Member
Copy link

Maybe an arrow, ref: https://matrix.to/#/!jElecDkufeieslnxJz:matrix.org/$bHWQyEFUpU_emyv9oQtfaG44Jvc7Pdm6fP4fsuzEz3o?via=lix.systems&via=matrix.org&via=ckie.dev

Maybe an arrow, ref: https://matrix.to/#/!jElecDkufeieslnxJz:matrix.org/$bHWQyEFUpU_emyv9oQtfaG44Jvc7Pdm6fP4fsuzEz3o?via=lix.systems&via=matrix.org&via=ckie.dev
jakehamilton commented 2024-11-26 11:16:37 +00:00
Author
Member
Copy link

Hmm, I can't seem to get the link to work correctly. What are you envisioning?

Hmm, I can't seem to get the link to work correctly. What are you envisioning?
src/routes/+page.svelte Outdated
@ -59,0 +64,4 @@
target="_blank"
class="hover:border-teal-200"
>
<!-- NOTE: enhanced:img breaks when creating multiple elements with the same src -->
ckie commented 2024-10-26 22:07:48 +00:00
Member
Copy link

huhh. that's pretty absurd of it. you could workaround with {#each} and a {#snippet}

{#snippet flower()}
  <enhanced:img …/>
{/snippet}

{#each range(1, 5) as i}
  {@render flower()}
{/each}
huhh. that's pretty absurd of it. you could workaround with {#each} and a {#snippet} ```svelte {#snippet flower()} <enhanced:img …/> {/snippet} {#each range(1, 5) as i} {@render flower()} {/each} ```
ckie commented 2024-10-26 22:30:03 +00:00
Member
Copy link

doing for you in #5, #6 for the flower one

doing for you in #5, #6 for the flower one
❤️ 1
src/routes/+page.svelte Outdated
@ -85,0 +119,4 @@
</LinkChip>
</div>
<div class="grid grid-cols-2 lg:grid-cols-4 place-items-center grid-flow-dense gap-4 max-w-5xl mx-auto mt-6">
<PackageTile>LLVM</PackageTile>
ckie commented 2024-10-26 21:57:44 +00:00
Member
Copy link

Nit/general: I find it unlikely we'll have PackageTiles on many pages, so a {#snippet} would be more appropriate to not pollute the $lib/components scope, which should be when you're expecting usage from multiple components.

Nit/general: I find it unlikely we'll have `PackageTile`s on many pages, so a [`{#snippet}`](https://svelte.dev/docs/svelte/snippet) would be more appropriate to not pollute the `$lib/components` scope, which should be when you're expecting usage from multiple components.
❤️ 1
jakehamilton commented 2024-11-26 11:14:28 +00:00
Author
Member
Copy link

Converting these to a snippet, thank you for letting me know!

Converting these to a snippet, thank you for letting me know!
src/routes/+page.svelte Outdated
@ -85,0 +120,4 @@
</div>
<div class="grid grid-cols-2 lg:grid-cols-4 place-items-center grid-flow-dense gap-4 max-w-5xl mx-auto mt-6">
<PackageTile>LLVM</PackageTile>
<PackageTile>GCC</PackageTile>
ckie commented 2024-10-26 22:10:12 +00:00
Member
Copy link

But we'll want to take this vague idea into docs for some featured usecases we write about, a bit like the "Learn by example." bit on bun's website. But probably more colorful.

But we'll want to take this vague idea into docs for some featured usecases we write about, a bit like the "Learn by example." bit on [bun's website](https://bun.sh/). But probably more colorful.
❤️ 1
src/routes/+page.svelte Outdated
@ -85,3 +151,3 @@
<div class="pb-60">
<h2 class="text-4xl w-fit pb-4">
A <span class="text-teal-500">reimagining</span> of the NixOS community
Our <span class="font-aladin font-bold text-teal-500">vision</span> for <span class="font-aladin fontold text-coral-970">floral.systems</span>
ckie commented 2024-10-26 22:13:46 +00:00
Member
Copy link

the font-aladin & text-coral-970 here foul skimmers.

  • a different off-black hue looks bad / inconsistent / out of the text flow.
  • aladin should be used very sparingly as its our ~'brand font'~
the `font-aladin` & `text-coral-970` here foul skimmers. - a different off-black hue looks bad / inconsistent / out of the text flow. - aladin should be used very sparingly as its our ~'brand font'~
👍 1
jakehamilton commented 2024-11-26 11:15:21 +00:00
Author
Member
Copy link

Yeah, coming back to this after a bit I am less enthused by the off-black color and heavy use of Aladin. Going to pull it back a bit before trying something else.

Yeah, coming back to this after a bit I am less enthused by the off-black color and heavy use of Aladin. Going to pull it back a bit before trying something else.
src/routes/demo1/vm.nix Outdated
@ -9,3 +9,3 @@
};
networking.firewall.allowedTCPPorts = [ 80 ];#<hidden>
networking.firewall.allowedTCPPorts = [ 80 ];/*<hidden>*/
ckie commented 2024-10-26 22:14:36 +00:00
Member
Copy link

I don't mind this but, I'm curious what your reasoning is?

I don't mind this but, I'm curious what your reasoning is?
jakehamilton commented 2024-11-26 11:18:03 +00:00
Author
Member
Copy link

Yeah this little bit is kinda of silly. I was having issues where an extra "\n" was being added and in trying to solve the issue I determined that we may want to trim text ending in arbitrary places, not always with a single new line at the end. So I swapped it to a more strict/literal "cut here" version that wouldn't impact code after the text.

Yeah this little bit is kinda of silly. I was having issues where an extra "\n" was being added and in trying to solve the issue I determined that we may want to trim text ending in arbitrary places, not always with a single new line at the end. So I swapped it to a more strict/literal "cut here" version that wouldn't impact code after the text.
jakehamilton force-pushed jakehamilton/feat/home-content from aaaa251282 to 49ee77a7ef 2024-11-26 11:20:30 +00:00 Compare
jakehamilton changed target branch from jakehamilton/feat/hero-links to main 2024-11-26 11:20:43 +00:00
jakehamilton added 1 commit 2024-11-26 11:23:37 +00:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin jakehamilton/feat/home-content:jakehamilton/feat/home-content
git checkout jakehamilton/feat/home-content

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff jakehamilton/feat/home-content
git checkout main
git merge --ff-only jakehamilton/feat/home-content
git checkout jakehamilton/feat/home-content
git rebase main
git checkout main
git merge --no-ff jakehamilton/feat/home-content
git checkout main
git merge --squash jakehamilton/feat/home-content
git checkout main
git merge --ff-only jakehamilton/feat/home-content
git checkout main
git merge jakehamilton/feat/home-content
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
ckie
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: the-distro/floral.systems#7
No description provided.
Delete branch "jakehamilton/feat/home-content"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?