Merge branch 'main' into feature/continuous-integration

XPRTZ · Jun 4, 2024 · 6151546 · 6151546
2 parents 6997134 + 31bebf4
commit 6151546
Show file tree

Hide file tree

Showing 22 changed files with 575 additions and 448 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,6 +1,4 @@
 # Ignore artifacts:
 build
 coverage
-
-# Ignore archive
-**/archive/**/*
+dist
diff --git a/apps/cloud/astro.config.mjs b/apps/cloud/astro.config.mjs
@@ -1,8 +1,11 @@
-import { defineConfig } from 'astro/config';
+import { defineConfig } from "astro/config";
 
 import tailwind from "@astrojs/tailwind";
+import sitemap from "@astrojs/sitemap";
+import react from "@astrojs/react";
 
 // https://astro.build/config
 export default defineConfig({
-  integrations: [tailwind()]
-});
+  site: "https://cloud.xprtz.net",
+  integrations: [tailwind(), sitemap(), react()],
+});
diff --git a/apps/cloud/package.json b/apps/cloud/package.json
@@ -11,9 +11,17 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.7.0",
+    "@astrojs/react": "^3.4.0",
+    "@astrojs/sitemap": "^3.1.5",
     "@astrojs/tailwind": "^5.1.0",
+    "@headlessui/react": "^2.0.4",
+    "@heroicons/react": "^2.1.3",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "@xprtz/ui": "link:../../libs/ui",
     "astro": "^4.9.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "tailwindcss": "^3.4.3"
   },
   "author": "Alex Schouls"

diff --git a/apps/cloud/src/images/logo.svg b/apps/cloud/src/images/logo.svg
diff --git a/apps/cloud/src/layouts/layout.astro b/apps/cloud/src/layouts/layout.astro
@@ -0,0 +1,19 @@
+---
+import { BaseHead, Footer, Header } from '@xprtz/ui'
+import Logo from '../images/logo.svg'
+const { title, description } = Astro.props;
+---
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <BaseHead title={title} description={description} />
+  </head>
+  <body class="container mx-auto px-4 sm:px-6 lg:px-8">
+    <Header Logo={Logo.src} client:load/>
+    <main>
+      <slot />
+    </main>
+    <Footer />
+  </body>
+</html>
diff --git a/apps/cloud/src/pages/index.astro b/apps/cloud/src/pages/index.astro
@@ -1,17 +1,12 @@
 ---
-import { Component } from "@xprtz/ui";
+import Layout from "../layouts/layout.astro";
+import { Hero, Features, Testimonials, BlogListing, Team } from "@xprtz/ui";
 ---
 
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <meta name="viewport" content="width=device-width" />
-    <meta name="generator" content={Astro.generator} />
-    <title>Astro</title>
-  </head>
-  <body>
-    <h1>Astro</h1>
-    <Component />
-  </body>
-</html>
+<Layout title="XPRTZ.cloud" description="Dé plek voor Cloud experts!">
+  <Hero />
+  <Features />
+	<Testimonials />
+	<BlogListing />
+	<Team />
+</Layout>
diff --git a/apps/cloud/tailwind.config.mjs b/apps/cloud/tailwind.config.mjs
@@ -5,23 +5,23 @@ export default {
     "./../../libs/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}",
   ],
   theme: {
-    colors: {
-      primary: {
-        50: "#f0f9ff",
-        100: "#dff2ff",
-        200: "#b9e6fe",
-        300: "#7bd4fe",
-        400: "#34befc",
-        500: "#0aa7ed",
-        600: "#0085cb",
-        700: "#00649b",
-        800: "#055a87",
-        900: "#0a4a70",
-        950: "#072f4a",
+    extend: {
+      colors: {
+        primary: {
+          50: "#f0f9ff",
+          100: "#dff2ff",
+          200: "#b9e6fe",
+          300: "#7bd4fe",
+          400: "#34befc",
+          500: "#0aa7ed",
+          600: "#0085cb",
+          700: "#00649b",
+          800: "#055a87",
+          900: "#0a4a70",
+          950: "#072f4a",
+        },
       },
     },
-    extend: {},
   },
   plugins: [],
 };
-
diff --git a/apps/cloud/tsconfig.json b/apps/cloud/tsconfig.json
@@ -1,3 +1,3 @@
 {
   "extends": "astro/tsconfigs/strict"
-}
+}
diff --git a/apps/dotnet/astro.config.mjs b/apps/dotnet/astro.config.mjs
@@ -6,5 +6,5 @@ import react from "@astrojs/react";
 // https://astro.build/config
 export default defineConfig({
   site: "https://xprtz.net",
-  integrations: [tailwind(), sitemap(), react()]
-});
+  integrations: [tailwind(), sitemap(), react()],
+});
diff --git a/apps/dotnet/tailwind.config.mjs b/apps/dotnet/tailwind.config.mjs
@@ -25,4 +25,3 @@ export default {
   },
   plugins: [],
 };
-
diff --git a/apps/dotnet/tsconfig.json b/apps/dotnet/tsconfig.json
@@ -4,4 +4,4 @@
     "jsx": "react-jsx",
     "jsxImportSource": "react"
   }
-}
+}
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -5,7 +5,7 @@ import eslintConfigPrettier from "eslint-config-prettier";
 
 export default [
   {
-    ignores: ["archive/**/*"],
+    ignores: ["**/dist/**/*"],
   },
   {
     languageOptions: {

diff --git a/libs/ui/index.ts b/libs/ui/index.ts
@@ -21,5 +21,5 @@ export {
   Testimonials,
   BlogListing,
   JobListings,
-  Team
-}
+  Team,
+};
diff --git a/libs/ui/src/BlogListing.tsx b/libs/ui/src/BlogListing.tsx
@@ -1,76 +1,81 @@
 const posts = [
   {
     id: 1,
-    title: 'Boost your conversion rate',
-    href: '#',
+    title: "Boost your conversion rate",
+    href: "#",
     description:
-      'Illo sint voluptas. Error voluptates culpa eligendi. Hic vel totam vitae illo. Non aliquid explicabo necessitatibus unde. Sed exercitationem placeat consectetur nulla deserunt vel. Iusto corrupti dicta.',
+      "Illo sint voluptas. Error voluptates culpa eligendi. Hic vel totam vitae illo. Non aliquid explicabo necessitatibus unde. Sed exercitationem placeat consectetur nulla deserunt vel. Iusto corrupti dicta.",
     imageUrl:
-      'https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80',
-    date: 'Mar 16, 2020',
-    datetime: '2020-03-16',
-    category: { title: 'Marketing', href: '#' },
+      "https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80",
+    date: "Mar 16, 2020",
+    datetime: "2020-03-16",
+    category: { title: "Marketing", href: "#" },
     author: {
-      name: 'Michael Foster',
-      role: 'Co-Founder / CTO',
-      href: '#',
+      name: "Michael Foster",
+      role: "Co-Founder / CTO",
+      href: "#",
       imageUrl:
-        'https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
+        "https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80",
     },
   },
   {
     id: 2,
-    title: 'Boost your conversion rate #2',
-    href: '#',
+    title: "Boost your conversion rate #2",
+    href: "#",
     description:
-      'Illo sint voluptas. Error voluptates culpa eligendi. Hic vel totam vitae illo. Non aliquid explicabo necessitatibus unde. Sed exercitationem placeat consectetur nulla deserunt vel. Iusto corrupti dicta.',
+      "Illo sint voluptas. Error voluptates culpa eligendi. Hic vel totam vitae illo. Non aliquid explicabo necessitatibus unde. Sed exercitationem placeat consectetur nulla deserunt vel. Iusto corrupti dicta.",
     imageUrl:
-      'https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80',
-    date: 'Mar 16, 2020',
-    datetime: '2020-03-16',
-    category: { title: 'Marketing', href: '#' },
+      "https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80",
+    date: "Mar 16, 2020",
+    datetime: "2020-03-16",
+    category: { title: "Marketing", href: "#" },
     author: {
-      name: 'Michael Foster',
-      role: 'Co-Founder / CTO',
-      href: '#',
+      name: "Michael Foster",
+      role: "Co-Founder / CTO",
+      href: "#",
       imageUrl:
-        'https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
+        "https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80",
     },
   },
   {
     id: 3,
-    title: 'Boost your conversion rate #3',
-    href: '#',
+    title: "Boost your conversion rate #3",
+    href: "#",
     description:
-      'Illo sint voluptas. Error voluptates culpa eligendi. Hic vel totam vitae illo. Non aliquid explicabo necessitatibus unde. Sed exercitationem placeat consectetur nulla deserunt vel. Iusto corrupti dicta.',
+      "Illo sint voluptas. Error voluptates culpa eligendi. Hic vel totam vitae illo. Non aliquid explicabo necessitatibus unde. Sed exercitationem placeat consectetur nulla deserunt vel. Iusto corrupti dicta.",
     imageUrl:
-      'https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80',
-    date: 'Mar 16, 2020',
-    datetime: '2020-03-16',
-    category: { title: 'Marketing', href: '#' },
+      "https://images.unsplash.com/photo-1496128858413-b36217c2ce36?ixlib=rb-4.0.3&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=3603&q=80",
+    date: "Mar 16, 2020",
+    datetime: "2020-03-16",
+    category: { title: "Marketing", href: "#" },
     author: {
-      name: 'Michael Foster',
-      role: 'Co-Founder / CTO',
-      href: '#',
+      name: "Michael Foster",
+      role: "Co-Founder / CTO",
+      href: "#",
       imageUrl:
-        'https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
+        "https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80",
     },
   },
-]
+];
 
 export default function BlogListing() {
   return (
     <div className="bg-white py-24 sm:py-32">
       <div className="mx-auto max-w-7xl px-6 lg:px-8">
-      <div className="mx-auto max-w-xl text-center">
-          <h2 className="text-lg font-semibold leading-8 tracking-tight text-primary-600">Blog</h2>
+        <div className="mx-auto max-w-xl text-center">
+          <h2 className="text-lg font-semibold leading-8 tracking-tight text-primary-600">
+            Blog
+          </h2>
           <p className="mt-2 text-3xl font-bold tracking-tight text-gray-900 sm:text-4xl">
             Word slimmer door het lezen van onze blog
           </p>
         </div>
         <div className="mx-auto mt-16 grid max-w-2xl grid-cols-1 gap-x-8 gap-y-20 lg:mx-0 lg:max-w-none lg:grid-cols-3">
           {posts.map((post) => (
-            <article key={post.id} className="flex flex-col items-start justify-between">
+            <article
+              key={post.id}
+              className="flex flex-col items-start justify-between"
+            >
               <div className="relative w-full">
                 <img
                   src={post.imageUrl}
@@ -98,10 +103,16 @@ export default function BlogListing() {
                       {post.title}
                     </a>
                   </h3>
-                  <p className="mt-5 line-clamp-3 text-sm leading-6 text-gray-600">{post.description}</p>
+                  <p className="mt-5 line-clamp-3 text-sm leading-6 text-gray-600">
+                    {post.description}
+                  </p>
                 </div>
                 <div className="relative mt-8 flex items-center gap-x-4">
-                  <img src={post.author.imageUrl} alt="" className="h-10 w-10 rounded-full bg-gray-100" />
+                  <img
+                    src={post.author.imageUrl}
+                    alt=""
+                    className="h-10 w-10 rounded-full bg-gray-100"
+                  />
                   <div className="text-sm leading-6">
                     <p className="font-semibold text-gray-900">
                       <a href={post.author.href}>
@@ -117,11 +128,14 @@ export default function BlogListing() {
           ))}
         </div>
         <div className="mt-8 flex border-t border-gray-100 pt-8">
-              <a href="#" className="text-sm font-semibold leading-6 text-primary-600 hover:text-primary-500">
-                View all posts <span aria-hidden="true">&rarr;</span>
-              </a>
-            </div>
+          <a
+            href="#"
+            className="text-sm font-semibold leading-6 text-primary-600 hover:text-primary-500"
+          >
+            View all posts <span aria-hidden="true">&rarr;</span>
+          </a>
+        </div>
       </div>
     </div>
-  )
+  );
 }
diff --git a/libs/ui/src/Container.tsx b/libs/ui/src/Container.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode } from 'react';
+import React, { type ReactNode } from "react";
 
 interface ContainerProps {
   children: ReactNode;