Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
naltatis committed Jun 13, 2024
1 parent a30454a commit 8082e9a
Show file tree
Hide file tree
Showing 17 changed files with 166 additions and 96 deletions.
1 change: 1 addition & 0 deletions public/images/tech/angular.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/html.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/htmx.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/js.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/preact.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/question.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/qwik.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/react.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/solid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/svelte.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/images/tech/vue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 20 additions & 22 deletions src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,39 @@
typeof="foaf:Image"
class="mr-4 size-10 float-left"
/>
<p class="mt-1 float-left">
the tractore store reference implementations <br />
a <a
class="bg-clip-text text-neuland"
href={"https://www.neuland-bfi.de/"}
target="_blank"
>
neuland
</a> initiative
</p>
<div class="mt-1 float-left">
<p>
the tractore store reference implementations <br />
a <a
class="bg-clip-text text-neuland"
href="https://www.neuland-bfi.de/"
target="_blank"
>
neuland
</a> initiative
</p>
<p class="mt-2">
Need help with your project? <a class="bg-clip-text text-neuland" href="mailto:[email protected]">Get in contact.</a>
</p>
</div>
<div class="text-right">
<a
class="bg-clip-text text-black"
href={"https://github.com/neuland"}
target="_blank"
>
all projects
</a><br />
<a
class="bg-clip-text text-black"
href={"https://blueprint.the-tractor.store"}
href="https://www.neuland-bfi.de/impressum"
target="_blank"
>
blue print project
legal notice
</a><br />
<a
class="bg-clip-text text-black"
href={"https://www.neuland-bfi.de/impressum"}
href="https://blueprint.the-tractor.store"
target="_blank"
>
legal notice
blueprint project
</a><br />
<a
class="bg-clip-text text-black"
href={"https://micro-frontends.org/"}
href="https://micro-frontends.org/"
target="_blank"
>
micro-frontends.org
Expand Down
14 changes: 8 additions & 6 deletions src/components/MFExample.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ const { lib3 } = Astro.props;
---

<section class="mfexample">
<div
class="absolute py-1 transform rotate-45 text-center text-xs right-[-30px] top-[10px] w-[120px] drop-shadow-sm c-border z-20"
>
{rendering}
</div>
{rendering ?
<div
class="absolute py-1 transform rotate-45 text-center text-xs right-[-30px] top-[10px] w-[120px] drop-shadow-sm c-border z-20 text-xs"
>
{rendering}
</div>
: null}

<p class="pb-3 font-bold text-xs">{title}</p>

Expand All @@ -26,7 +28,7 @@ const { lib3 } = Astro.props;
<div class="element">
<img src={lib3} typeof="foaf:Image" class="m-auto size-6" />
</div>
<div class="element integration">
<div class="element integration text-xs">
{integration}
</div>
</div>
Expand Down
50 changes: 2 additions & 48 deletions src/components/content/Hero.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@
<h1
class="pt-4 mb-10 m-auto font-bold text-text-heading text-2xl md:text-4xl"
>
<span data-annotate="underline">
<span>
a non-trivial<br /> micro frontends<br /> example project
</span>
</h1>
<p>
The Tractor Store is a template to experiment with micro frontend
architecture. Goal is to create a real world application where developers
can experiment with different integration techniques. The idea is similar
to TodoMVC or Movies, but with a <span data-annotate="highlight">
focus on micro frontends.
</span>
to TodoMVC or Movies, but with a focus on micro frontends.
</p>
</div>
<img
Expand Down Expand Up @@ -58,47 +56,3 @@
transform: translateZ(0);
}
</style>

<script type="module">
import { annotate } from "https://unpkg.com/rough-notation?module";
const observer = new IntersectionObserver(handleIntersection, {
threshold: [1],
});

Array.from(document.querySelectorAll("[data-annotate]")).forEach(
(element) => {
observer.observe(element);
}
);

function handleIntersection(entries, observer) {
entries.forEach((entry) => {
const element = entry.target;
if (entry.isIntersecting) {
showAnnotation(element);
}
});
}

function showAnnotation(element) {
const type = element.getAttribute("data-annotate");
if (!type) {
return;
}
let color = "#ebeee2";
if (document.documentElement.classList.contains("dark")) {
color = "#FF5A55";
}
annotate(element, {
type,
color,
iterations: 2,
multiline: true,
animationDuration: 3000,
animationDelay: 5000,
}).show();
element.removeAttribute("data-annotate");
}

// TODO: add dark mode colors
</script>
33 changes: 15 additions & 18 deletions src/components/content/Implementations.astro
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,27 @@ import MFExample from "../MFExample.astro";

<div class="examples">
<MFExample
title="Module Federation with ..."
lib1="images/lib.svg"
lib2="images/lib.svg"
lib3="images/lib.svg"
integration="Single SPA"
rendering="SSR"
title="Blueprint (vanilla, no frameworks)"
lib1="images/tech/html.svg"
lib2="images/tech/html.svg"
lib3="images/tech/html.svg"
integration="Modular Monolith"
/>

<MFExample
title="Svelte Example"
lib1="images/svelte.svg"
lib2="images/svelte.svg"
lib3="images/svelte.svg"
integration="SSI"
rendering="CSR"
title="Preact (universal rendering)"
lib1="images/tech/preact.svg"
lib2="images/tech/preact.svg"
lib3="images/tech/preact.svg"
integration="ESI, Web Components"
/>

<MFExample
title="React & Vue Example"
lib1="images/react.svg"
lib2="images/react.svg"
lib3="images/vue.svg"
integration="Tailor"
rendering="SSR"
title="Your implementation ..."
lib1="images/tech/question.svg"
lib2="images/tech/question.svg"
lib3="images/tech/question.svg"
integration="[...]"
/>

<div>
Expand Down
1 change: 0 additions & 1 deletion src/components/content/Similarities.astro
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<div class="mb-8">
<h3
class="font-bold text-text-heading text-2xl md:text-3xl pt-4 mb-8 w-fit overflow-hidden"
data-annotate="underline"
>
What do all implementations have in common?
</h3>
Expand Down
Loading

0 comments on commit 8082e9a

Please sign in to comment.