@turnipxenon/pineapple 2.4.76 → 2.4.78

package/src/lib/template/seaweed/entries/WorkExperience.svelte

@@ -1,116 +1,116 @@
-<script lang="ts">
-	import SocialSection from "$pkg/components/SocialSection.svelte";
-	import Card from "$pkg/components/Card.svelte";
-	import { Accordion, AccordionItem } from "@skeletonlabs/skeleton";
-	import ElementVisibilityDetector from "$pkg/components/ElementVisbilityDetector.svelte";
-	import type { EntryProps } from "$pkg/template/seaweed/entries/EntryProps";
-
-	export let entryProps: EntryProps;
-	export let isVisible: boolean;
-	let { email, letChaos, linkedinSlug, name } = entryProps;
-</script>
-
-<div class="experience-and-about-div">
-
-	<div class="greater-about-div">
-
-		<Card includeDataNoSnippet={false}>
-			<section class="section-card" slot="content">
-
-				<h1>About</h1>
-
-				<p>
-					Hi! My name is {name}! I work as a software developer. Outside of that, I like making games, and
-					trying to do everything in between required to make one. I have some showcased below, our visit
-					my itch.io page for more of them.
-				</p>
-				<!-- todo: link the degree details idk -->
-				<p>
-					I also graduated with BS Computing Science, Specializing in Software Practice, and a
-					certificate in Computer Game Development at University of Alberta.
-				</p>
-				{#if entryProps.seaweedTemplateData.shouldAddFunNote}
-					<p>
-						I'm inspired by games like Harvest Moon: Friends of Mineral Town, Rune Factory 4, Theatrhythm,
-						Bravely Default: Flying Fairy, Boku no Natsuyasumi 2, and A Short Hike.
-					</p>
-				{/if}
-
-				<!-- todo: maybe put cute stuff here -->
-				<!--						</ToggleableContent>-->
-			</section>
-		</Card>
-
-		<Card>
-			<section class="section-card" slot="content">
-				<SocialSection email={email} linkedinSlug={linkedinSlug}></SocialSection>
-				<ElementVisibilityDetector bind:isVisible={isVisible}>
-				</ElementVisibilityDetector>
-			</section>
-		</Card>
-
-	</div>
-
-	<Card>
-		<section class="section-card" slot="content">
-			<h1>Experience</h1>
-
-			<h2>Highlight</h2>
-			<p>I like French Fries</p>
-
-			<h2>Software Engineer</h2>
-			<div class="two-column-separated">
-				<div>July 2023 – January 2024</div>
-				<div style="text-align: end">Control, Remote</div>
-			</div>
-			<ul>
-				<li>
-					Developed things
-				</li>
-				<li>
-					Woah
-				</li>
-			</ul>
-			<br>
-
-			<h2>Software Engineer Intern</h2>
-			<div class="two-column-separated">
-				<div>May 2022 – Aug 2022</div>
-				<div style="text-align: end">Pou Company</div>
-			</div>
-			<ul>
-				<li>
-					Stuff
-				</li>
-				<li>
-					Golang
-				</li>
-			</ul>
-			<br>
-			<!-- todo: turn off flashing when accordion is expanded -->
-			<Accordion>
-				<AccordionItem>
-					<div slot="summary">
-						<h2 class="accordion-header">More experience</h2>
-					</div>
-					<svelte:fragment slot="content">
-						<section class="more-section">
-							<h2>Software Engineer Intern</h2>
-							<div class="two-column-separated">
-								<div>May 2021 – Dec 2021</div>
-								<div style="text-align: end">Testing</div>
-							</div>
-							<ul>
-								<li>
-									Amazing
-								</li>
-							</ul>
-							<br>
-						</section>
-					</svelte:fragment>
-				</AccordionItem>
-			</Accordion>
-		</section>
-	</Card>
-
+<script lang="ts">
+	import SocialSection from "$pkg/components/SocialSection.svelte";
+	import Card from "$pkg/components/Card.svelte";
+	import { Accordion, AccordionItem } from "@skeletonlabs/skeleton";
+	import ElementVisibilityDetector from "$pkg/components/ElementVisbilityDetector.svelte";
+	import type { EntryProps } from "$pkg/template/seaweed/entries/EntryProps";
+
+	export let entryProps: EntryProps;
+	export let isVisible: boolean;
+	let { email, letChaos, linkedinSlug, name } = entryProps;
+</script>
+
+<div class="experience-and-about-div">
+
+	<div class="greater-about-div">
+
+		<Card includeDataNoSnippet={false}>
+			<section class="section-card" slot="content">
+
+				<h1>About</h1>
+
+				<p>
+					Hi! My name is {name}! I work as a software developer. Outside of that, I like making games, and
+					trying to do everything in between required to make one. I have some showcased below, our visit
+					my itch.io page for more of them.
+				</p>
+				<!-- todo: link the degree details idk -->
+				<p>
+					I also graduated with BS Computing Science, Specializing in Software Practice, and a
+					certificate in Computer Game Development at University of Alberta.
+				</p>
+				{#if entryProps.seaweedTemplateData.shouldAddFunNote}
+					<p>
+						I'm inspired by games like Harvest Moon: Friends of Mineral Town, Rune Factory 4, Theatrhythm,
+						Bravely Default: Flying Fairy, Boku no Natsuyasumi 2, and A Short Hike.
+					</p>
+				{/if}
+
+				<!-- todo: maybe put cute stuff here -->
+				<!--						</ToggleableContent>-->
+			</section>
+		</Card>
+
+		<Card>
+			<section class="section-card" slot="content">
+				<SocialSection email={email} linkedinSlug={linkedinSlug}></SocialSection>
+				<ElementVisibilityDetector bind:isVisible={isVisible}>
+				</ElementVisibilityDetector>
+			</section>
+		</Card>
+
+	</div>
+
+	<Card>
+		<section class="section-card" slot="content">
+			<h1>Experience</h1>
+
+			<h2>Highlight</h2>
+			<p>I like French Fries</p>
+
+			<h2>Software Engineer</h2>
+			<div class="two-column-separated">
+				<div>July 2023 – January 2024</div>
+				<div style="text-align: end">Control, Remote</div>
+			</div>
+			<ul>
+				<li>
+					Developed things
+				</li>
+				<li>
+					Woah
+				</li>
+			</ul>
+			<br>
+
+			<h2>Software Engineer Intern</h2>
+			<div class="two-column-separated">
+				<div>May 2022 – Aug 2022</div>
+				<div style="text-align: end">Pou Company</div>
+			</div>
+			<ul>
+				<li>
+					Stuff
+				</li>
+				<li>
+					Golang
+				</li>
+			</ul>
+			<br>
+			<!-- todo: turn off flashing when accordion is expanded -->
+			<Accordion>
+				<AccordionItem>
+					<div slot="summary">
+						<h2 class="accordion-header">More experience</h2>
+					</div>
+					<svelte:fragment slot="content">
+						<section class="more-section">
+							<h2>Software Engineer Intern</h2>
+							<div class="two-column-separated">
+								<div>May 2021 – Dec 2021</div>
+								<div style="text-align: end">Testing</div>
+							</div>
+							<ul>
+								<li>
+									Amazing
+								</li>
+							</ul>
+							<br>
+						</section>
+					</svelte:fragment>
+				</AccordionItem>
+			</Accordion>
+		</section>
+	</Card>
+
 </div>

package/src/lib/template/seaweed/entry_order_config/EntryOrderConfig.svelte

@@ -2,9 +2,7 @@
 	import {
 		type ComponentMeta,
 		type EntryGroup,
-		GetAllEntryFromGlobal,
-		GetEntryFromGlobal,
-		type SeaweedTemplateData,
+		type SeaweedTemplateData
 	} from "$pkg/template/seaweed/SeaweedTemplateData";
 	import { removeProxyWrapperOnString } from "./EntryOrderConfig";
 	import ComboBoxWithButton from "$pkg/components/combo_box/ComboBoxWithButton.svelte";
@@ -16,6 +14,8 @@
 	export let seaweedEntries: EntryGroup[];
 	export let orderUrl: string;
 	export let updateUrl: (data: SeaweedTemplateData) => void;
+	export let getAllEntryFromGlobal: () => Map<string, ComponentMeta>;
+	export let getEntryFromGlobal: (s: string) => ComponentMeta | undefined;
 
 	const updateOrderQuery = () => {
 		orderUrl = "order=" + seaweedEntries.map(g => {
@@ -29,7 +29,7 @@
 
 	const addEntry = (group: EntryGroup): ((selected: string) => void) => {
 		return (selected: string) => {
-			const c = GetEntryFromGlobal(selected);
+			const c = getEntryFromGlobal(selected);
 			if (c) {
 				group.items.push(c);
 				seaweedEntries = seaweedEntries;
@@ -111,7 +111,7 @@
 		};
 	};
 
-	const allDefaultEntries = Array.from(GetAllEntryFromGlobal().keys());
+	const allDefaultEntries = Array.from(getAllEntryFromGlobal().keys());
 </script>
 
 <br>

package/src/lib/template/seaweed/index.ts

@@ -1,4 +1,4 @@
-export { default as SeaweedTemplate } from "./SeaweedTemplate.svelte";
-export * from "./SeaweedTemplateData";
-export * from "./SeaweedTemplateData";
-export * from "./entries/EntryProps";
+export { default as SeaweedTemplate } from "./SeaweedTemplate.svelte";
+export * from "./SeaweedTemplateData";
+export * from "./SeaweedTemplateData";
+export * from "./entries/EntryProps";

package/src/routes/(pineapple)/pineapple/(extra-pages)/page1/+page.svelte

@@ -1,8 +1,9 @@
-<script>
-	import { Card } from "$pkg";
+<script lang="ts">
+	import pageMeta from "./meta.json";
 	import { page } from "$app/stores";
+	import BlogTemplate from "$pkg/components/BlogTemplate.svelte";
 </script>
 
-<Card>
-	<h1 slot="content" class="default-card">{$page.url}</h1>
-</Card>
+<BlogTemplate pageMeta={pageMeta}>
+	<p>{$page.url}</p>
+</BlogTemplate>

package/src/routes/(pineapple)/pineapple/(extra-pages)/page2/+page.svelte

@@ -1,8 +1,9 @@
-<script>
-	import { Card } from "$pkg";
+<script lang="ts">
+	import pageMeta from "./meta.json";
 	import { page } from "$app/stores";
+	import BlogTemplate from "$pkg/components/BlogTemplate.svelte";
 </script>
 
-<Card>
-	<h1 slot="content" class="default-card">{$page.url}</h1>
-</Card>
+<BlogTemplate pageMeta={pageMeta}>
+	<p>{$page.url}</p>
+</BlogTemplate>

package/src/routes/(pineapple)/pineapple/(extra-pages)/page3/page5/+page.svelte

@@ -1,8 +1,9 @@
-<script>
-	import { Card } from "$pkg";
+<script lang="ts">
+	import pageMeta from "./meta.json";
 	import { page } from "$app/stores";
+	import BlogTemplate from "$pkg/components/BlogTemplate.svelte";
 </script>
 
-<Card>
-	<h1 slot="content" class="default-card">{$page.url}</h1>
-</Card>
+<BlogTemplate pageMeta={pageMeta}>
+	<p>{$page.url}</p>
+</BlogTemplate>

package/src/routes/(seaweed)/portfolio/+page.svelte

@@ -2,6 +2,7 @@
 	import SeaweedTemplate from "$pkg/template/seaweed/SeaweedTemplate.svelte";
 	import {
 		AllGroupedEntriesProjectFirst,
+		GetAllEntryFromGlobal,
 		GetEntryFromGlobal,
 		seaweedTemplateData
 	} from "$pkg/template/seaweed/SeaweedTemplateData";
@@ -10,6 +11,7 @@
 
 <!--todo: maybe add check that this is always false? -->
 <SeaweedTemplate
+	getAllEntryFromGlobal={GetAllEntryFromGlobal}
 	seaweedTemplateData={seaweedTemplateData}
 	projectFirstGroupedEntries={AllGroupedEntriesProjectFirst}
 	getEntryFromGlobal={GetEntryFromGlobal}

package/vite.config.ts

@@ -3,5 +3,5 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
 	plugins: [sveltekit()],
-	assetsInclude: ["**/*.yarn", "**/*.json"]
+	assetsInclude: ["**/*.yarn"]
 });

package/docs/Workflow.md

@@ -1,5 +0,0 @@
-# Workflow
-
-- When making new changes, update the number in the package.json on the dependent codebase.
-- Run `npm update-pineapple` to update afterwards
-- To update all repos, run `./dev/update_all_repos.sh`