Skip to content

Commit

Permalink
Merge pull request #764 from KBVE/dev
Browse files Browse the repository at this point in the history
Staging refs/heads/main into Main
  • Loading branch information
h0lybyte authored Aug 14, 2023
2 parents 42bc7b5 + bea9918 commit a692eac
Show file tree
Hide file tree
Showing 36 changed files with 661 additions and 57 deletions.
38 changes: 26 additions & 12 deletions .astro/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,13 @@ declare module 'astro:content' {
collection: "application";
data: InferEntrySchema<"application">
} & { render(): Render[".mdx"] };
"pocketbase/pocketbase.mdx": {
id: "pocketbase/pocketbase.mdx";
slug: "pocketbase";
body: string;
collection: "application";
data: InferEntrySchema<"application">
} & { render(): Render[".mdx"] };
"portainer.mdx": {
id: "portainer.mdx";
slug: "portainer";
Expand Down Expand Up @@ -1433,6 +1440,13 @@ declare module 'astro:content' {
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"08-13.md": {
id: "08-13.md";
slug: "08-13";
body: string;
collection: "journal";
data: InferEntrySchema<"journal">
} & { render(): Render[".md"] };
"asset.mdx": {
id: "asset.mdx";
slug: "asset";
Expand Down Expand Up @@ -1967,15 +1981,15 @@ declare module 'astro:content' {
} & { render(): Render[".mdx"] };
};
"theory": {
"bizops.mdx": {
id: "bizops.mdx";
"bizops/bizops.mdx": {
id: "bizops/bizops.mdx";
slug: "bizops";
body: string;
collection: "theory";
data: InferEntrySchema<"theory">
} & { render(): Render[".mdx"] };
"deadcode.mdx": {
id: "deadcode.mdx";
"deadcode/deadcode.mdx": {
id: "deadcode/deadcode.mdx";
slug: "deadcode";
body: string;
collection: "theory";
Expand Down Expand Up @@ -2134,29 +2148,29 @@ declare module 'astro:content' {
} & { render(): Render[".mdx"] };
};
"website": {
"about.mdx": {
id: "about.mdx";
"about/about.mdx": {
id: "about/about.mdx";
slug: "about";
body: string;
collection: "website";
data: InferEntrySchema<"website">
} & { render(): Render[".mdx"] };
"c.mdx": {
id: "c.mdx";
"c/c.mdx": {
id: "c/c.mdx";
slug: "c";
body: string;
collection: "website";
data: InferEntrySchema<"website">
} & { render(): Render[".mdx"] };
"discord.mdx": {
id: "discord.mdx";
"discord/discord.mdx": {
id: "discord/discord.mdx";
slug: "discord";
body: string;
collection: "website";
data: InferEntrySchema<"website">
} & { render(): Render[".mdx"] };
"events.mdx": {
id: "events.mdx";
"events/events.mdx": {
id: "events/events.mdx";
slug: "events";
body: string;
collection: "website";
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
"pihole",
"plex",
"plyr",
"Pocketbase",
"portainer",
"preact",
"Prefs",
Expand Down
1 change: 0 additions & 1 deletion src/components/Element/Video/Video.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const { src, id, description, iframe } = Astro.props;
<div class={!description ? "pb2" : "pb1"}>
<VideoComponent iframe={iframe} src={src} id={id} />
<div class="tar">
<span class="f-d3 text-blue">{description}</span>
</div>
</div>

1 change: 1 addition & 0 deletions src/components/Element/Video/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const VideoComponent = ({
}
frameBorder="0"
className={iframeClass}
title="YT Video"
/>
</div>
</>
Expand Down
3 changes: 3 additions & 0 deletions src/components/Library/MDX/mermaid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ export const mermaid: RemarkPlugin<[]> = () => tree => {
// @ts-ignore
node.type = "html"
node.value = dedent`
<style>
#flowchart-link { stroke:#fff !important; fill:#f00 !important; stroke-width:3px !important; }
</style>
<div class="mermaid" data-content="${escapeHtml(node.value)}">
<p>Loading graph...</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Widget/Discord.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const Discord = ({width = string, height = string}) => {
return (

<div>
<iframe src="https://discord.com/widget?id=342732838598082562&theme=dark" width={width || 350} height={height || 500} allowtransparency="true" frameBorder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts" />
<iframe src="https://discord.com/widget?id=342732838598082562&theme=dark" width={width || 350} height={height || 500} allowtransparency="true" frameBorder="0" sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts" title="Discord Iframe" />
</div>

);
Expand Down
13 changes: 10 additions & 3 deletions src/components/Widget/MDXJS.astro
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
---
const { transparent = false } = Astro.props;
let className = 'shadow-2xl p-4 bg-offset rounded-3xl';
if(transparent)
{
className = 'shadow-2xl p-4 bg-[#ffffff26] rounded-3xl hover:bg-offset ease-in-out';
}
---
<div class="w-96 relative md:w-full m-4">
<div class="shadow-2xl p-4 bg-offset rounded-3xl">
<div class="w-96 relative md:w-full p-4">
<div class={className}>
<div
class="prose max-w-none prose-td:text-secondary prose-tr:text-primary prose-tr:border-b-indigo-500/10 prose-p:text-secondary prose-a:text-primary prose-code:text-primary prose-code:before:content-none prose-code:after:content-none prose-headings:text-primary prose-ul:text-secondary">
class="prose max-w-none prose-li:text-secondary prose-td:text-secondary prose-tr:text-primary prose-tr:border-b-indigo-500/10 prose-p:text-secondary prose-a:text-primary prose-code:text-primary prose-code:before:content-none prose-code:after:content-none prose-headings:text-primary prose-ul:text-secondary">
<slot />
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion src/components/Widget/Widget.astro
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
const {img, minHeight = '200' } = Astro.props;
const {img, minHeight = '200', skeleton = true } = Astro.props;
---
<div class="flex flex-wrap">
<div class="w-full px-1">
Expand All @@ -18,6 +18,7 @@ const {img, minHeight = '200' } = Astro.props;

<span class="absolute top-0 left-0 w-full h-full bg-center bg-cover bg-gradient-to-tl from-gray-900 to-slate-800 opacity-80" />

{skeleton && (
<div class="grid h-full justify-center py-10" id="skeleton" >
<div class="flex flex-col m-8 rounded shadow-md w-60 sm:w-80 animate-pulse h-96 min-h-fit">
<div class="h-48 rounded-t bg-gray-700"></div>
Expand All @@ -28,6 +29,7 @@ const {img, minHeight = '200' } = Astro.props;
</div>
</div>
</div>
)}


<div class={`relative z-10 flex flex-col flex-auto h-full p-4 min-h-[${minHeight}px]`}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Widget/YT.astro
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ const { url } = Astro.props;
<!--! [END] -->

<!--* [@DisplayVideo] -->
<div class="widget_react_youtube" url={url}></div>
<div class="widget_react_youtube" url?={url}></div>
52 changes: 26 additions & 26 deletions src/content/.obsidian/workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"state": {
"type": "markdown",
"state": {
"file": "journal/08-12.md",
"file": "journal/08-13.md",
"mode": "source",
"source": false
}
Expand Down Expand Up @@ -93,7 +93,7 @@
"state": {
"type": "backlink",
"state": {
"file": "journal/08-12.md",
"file": "journal/08-13.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
Expand All @@ -110,7 +110,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "journal/08-12.md",
"file": "journal/08-13.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
Expand All @@ -133,7 +133,7 @@
"state": {
"type": "outline",
"state": {
"file": "journal/08-12.md"
"file": "journal/08-13.md"
}
}
}
Expand All @@ -157,24 +157,33 @@
},
"active": "1e65db65e2721f35",
"lastOpenFiles": [
"website/github/github.mdx",
"website/github",
"website/github.mdx",
"legal/disclaimer.mdx",
"journal/08-11.md",
"theory/deadcode/deadcode.mdx",
"theory/deadcode",
"theory/bizops/_graph/market-research-model.mdx",
"theory/bizops/model.mdx",
"theory/bizops/_graph/business-model.mdx",
"theory/bizops/_graph/llc-formation-model.mdx",
"theory/bizops/_graph/region-model.mdx",
"theory/bizops/_graph/business-model.md",
"theory/bizops/_graph/member-model.mdx",
"theory/bizops/_notes/notes.md",
"theory/bizops/_graph/glob.astro",
"theory/bizops/_graph",
"theory/bizops/_notes/glob.astro",
"application/pocketbase/_journal/j1.md",
"application/pocketbase/_notes/pocketbase_docker.md",
"application/pocketbase/_notes/pocketbase_notes.md",
"application/pocketbase/_data/_backups/pocketbase_backups.md",
"application/pocketbase/_data/_notes/pocketbase_notes.md",
"application/pocketbase/_data/pocketbase_notes.md",
"journal/08-12.md",
"journal/08-13.md",
"journal/08-11.md",
"journal/08-10.md",
"journal/08-09.md",
"application/n8n/_notes/n8n-supabase.md",
"application/n8n/_notes/supabase-cache.md",
"application/n8n/_examples/supabase",
"application/n8n/_examples/supabase-cache.md",
"application/n8n/_examples",
"application/n8n/n8n.mdx",
"application/n8n/obs.mdx",
"application/n8n/_notes/obs.mdx",
"application/n8n/_notes",
"application/n8n",
"journal/08-08.md",
"journal/08-07.md",
"application/obs/_notes/voicemeter.md",
Expand All @@ -183,15 +192,6 @@
"journal/08-05.md",
"journal/08-04.md",
"tags/auth/auth-notes.md",
"tags/auth/auth_notes.md",
"journal/08-03.md",
"journal/07-31.md",
"journal/08-02.md",
"journal/07-29.md",
"journal/07-28.md",
"journal/07-30.md",
"journal/08-01.md",
"journal/05-10.md",
"journal/07-23.md"
"tags/auth/auth_notes.md"
]
}
13 changes: 13 additions & 0 deletions src/content/application/pocketbase/_journal/glob.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
// Journal Factory
const journals = await Astro.glob('./**/*.md*');
---
<div>
{journals.map((journal) => (
<article>
<h2>{journal.frontmatter.title}</h2>
<p>{journal.frontmatter.description}</p>
<journal.Content />
</article>
))}
</div>
12 changes: 12 additions & 0 deletions src/content/application/pocketbase/_journal/j1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: J1
description: Configuring a live instances of Pocketbase!
date: 2023-08-13
---

#### PB Adventure

The plan is to document the setup and journey of getting pocket base up and running!
Right now I am looking at the development side, including making sure that the database can be backed up.
One of my other concerns would be the security of the data and the files, what if someone uploads a bad item, like a shell script!
Or even worse, what happens if a backup does not recover automatically!
13 changes: 13 additions & 0 deletions src/content/application/pocketbase/_notes/glob.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
// Notes Factory
const notes = await Astro.glob('./*.md*');
---
<div>
{notes.map((note) => (
<article>
<h2>{note.frontmatter.title}</h2>
<p>{note.frontmatter.description}</p>
<note.Content />
</article>
))}
</div>
8 changes: 8 additions & 0 deletions src/content/application/pocketbase/_notes/pocketbase_notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
title: Notes
description: These are the general notes for Pocketbase!
---

#### What is Pocketbase?

Have you wondered what Pocketbase is?
Loading

0 comments on commit a692eac

Please sign in to comment.