From 8be8810c1b8ce2f3e2eb65b436c42de0a4356b20 Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Sat, 12 Aug 2023 22:08:35 -0400 Subject: [PATCH 1/3] Sync the Notes - General Updates across the board --- .astro/types.d.ts | 12 ++++---- src/components/Widget/MDXJS.astro | 2 +- src/content/journal/08-12.md | 5 +++- src/content/website/{ => about}/about.mdx | 3 +- src/content/website/{ => c}/c.mdx | 3 +- src/content/website/{ => discord}/discord.mdx | 3 +- src/content/website/github/github.mdx | 13 ++++++++- src/layouts/Mage.astro | 29 +++++++++++++++++++ 8 files changed, 58 insertions(+), 12 deletions(-) rename src/content/website/{ => about}/about.mdx (97%) rename src/content/website/{ => c}/c.mdx (92%) rename src/content/website/{ => discord}/discord.mdx (94%) create mode 100644 src/layouts/Mage.astro diff --git a/.astro/types.d.ts b/.astro/types.d.ts index 7a1d711c82..05d5affd00 100644 --- a/.astro/types.d.ts +++ b/.astro/types.d.ts @@ -2134,22 +2134,22 @@ 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"; diff --git a/src/components/Widget/MDXJS.astro b/src/components/Widget/MDXJS.astro index 7563a88d06..de5d6c496c 100644 --- a/src/components/Widget/MDXJS.astro +++ b/src/components/Widget/MDXJS.astro @@ -1,6 +1,6 @@ --- --- -
+
diff --git a/src/content/journal/08-12.md b/src/content/journal/08-12.md index 77bf196824..475e072b29 100644 --- a/src/content/journal/08-12.md +++ b/src/content/journal/08-12.md @@ -15,7 +15,10 @@ tags: - 12:31am - I spent most of the day setting up and understanding the core concepts of Supabase! The holy trinity is almost ready to be pushed out to the masses, I suppose the next step will be to test case a couple different instances, including the mobile platform. - 1:27am - Played a quick match as Shaco support before he gets that long awaited nerf. Okay we know that the session does not preflight, thus we might not need the cache at the general `getProfile`, I suppose we could rename that function to `getUser` and rename `pullProfile` to the `getProfile`. I was under the impression that the session would query against the Supabase but it does not and utilizes the JWT to get the information, which is what we want it to do anyway. - 7:56am - Going through some of the current active tickets and trying to tackle a couple minor problems here and there. I want to reduce the amount of tickets that we have active from the `40` to a mid `20` range by the end of this month! -- 8:49am - I think I need some early morning caffeine pumped into my blood flow! Before I head over to get some much needed cafe, I am going to take a look at the structure of mdx -> astro, with the hopes of just making it even more stupid simple. Basically going to migrate all of the website into its own internal content style structure and then have it all render through the contents folder? Maybe not all of the content but at least some of the main structures. This might seem a bit too much of a hassle but I think it might be worth it in the long run because then I could isolate each of the components within their own documentation too. All of this is to prepare for the i18n, which will be another beast in its own realm. +- 8:49am - I think I need some early morning caffeine pumped into my blood flow! Before I head over to get some much needed cafe, I am going to take a look at the structure of mdx -> astro, with the hopes of just making it even more stupid simple. Basically going to migrate all of the website into its own internal content style structure and then have it all render through the contents folder? Maybe not all of the content but at least some of the main structures. This might seem a bit too much of a hassle but I think it might be worth it in the long run because then I could isolate each of the components within their own documentation too. All of this is to prepare for the i18n, which will be another beast in its own realm. +- 11:14pm - I believe I might have to create a general flow chart or guide on the tri-force approach to the API! There are a couple areas where I am running into issues, including the general authentication flow, but there might be a couple ways around it that we could implement, but we would have to be very careful upon how we approach it. +- 12:19pm - Finished double checking the backup system and general updates! It seems that one of the instances failed to update but that might have been because it needed to update twice? Maybe after running updates, I should have it double check and make sure that no additional updates are required, but it was a bit strange. It could have been also that the VM was not restarted in a while? Hmm, I placed the information as a note under the vault warden but in the future I want to make sure that it does not happen again... actually I am pretty sure it will happen again. +- 12:21pm - I am typing these notes currently as, err my brain is processing them, so think of these notes as a form of my mind. I am streaming my mind via my heads onto this digital screen, it is for the matrix. Okay so I am thinking that as I am about to deploy this Tri-force API, I would need to make sure that never finish updating the theme on KBVE, as with any crazy person. The new , errr, new new theme would be hmm uhh, Ghost! Yeah I think going with a shadow money wizard gang style theme would be perfect. I suppose I could call the theme Mage instead of Ghost. ## Quote diff --git a/src/content/website/about.mdx b/src/content/website/about/about.mdx similarity index 97% rename from src/content/website/about.mdx rename to src/content/website/about/about.mdx index 332c179ecb..7d22ae30da 100644 --- a/src/content/website/about.mdx +++ b/src/content/website/about/about.mdx @@ -1,10 +1,11 @@ --- status: true -layout: ../../layouts/theme/mdx.astro +layout: ../../../layouts/MDX.astro title: KBVE About img: https://images.unsplash.com/photo-1607004468138-e7e23ea26947?fit=crop&w=1400&h=700&q=75 description: KBVE Programming, Dev and Gaming Community is a collection of programmers, gamers and memers that enjoy a nice glass of memes. icon: about +slug: about tags: - community - about diff --git a/src/content/website/c.mdx b/src/content/website/c/c.mdx similarity index 92% rename from src/content/website/c.mdx rename to src/content/website/c/c.mdx index 2a02c472db..fdeb777dea 100644 --- a/src/content/website/c.mdx +++ b/src/content/website/c/c.mdx @@ -1,9 +1,10 @@ --- status: true -layout: ../../layouts/theme/mdx.astro +layout: ../../../layouts/MDX.astro title: KBVE C description: KBVE Community icon: community +slug: c tags: - community - concept diff --git a/src/content/website/discord.mdx b/src/content/website/discord/discord.mdx similarity index 94% rename from src/content/website/discord.mdx rename to src/content/website/discord/discord.mdx index 0435e3da08..db274d28e8 100644 --- a/src/content/website/discord.mdx +++ b/src/content/website/discord/discord.mdx @@ -1,7 +1,8 @@ --- status: true -layout: ../../layouts/theme/mdx.astro +layout: ../../../layouts/MDX.astro title: KBVE Discord +slug: discord img: https://images.unsplash.com/photo-1614680376739-414d95ff43df?fit=crop&w=1400&h=700&q=75 description: Join our beauteous Discord server! Experience the joy of the KBVE community with shit ton on memes, convos and more! Join today to start your journey with the KBVE community. icon: about diff --git a/src/content/website/github/github.mdx b/src/content/website/github/github.mdx index 4bb29ba75f..2a9f7334f8 100644 --- a/src/content/website/github/github.mdx +++ b/src/content/website/github/github.mdx @@ -1,6 +1,6 @@ --- status: true -layout: ../../../layouts/Account.astro +layout: ../../../layouts/Mage.astro title: KBVE Github description: KBVE Github Page! All the information for our current github adventures! img: https://images.unsplash.com/photo-1641386337567-c824f91bea87?fit=crop&w=1400&h=700&q=75 @@ -11,6 +11,17 @@ tags: - events --- +import Details from '@w/Details.astro'; +import Widget from "@w/Widget.astro"; +import MDXJS from '@w/MDXJS.astro'; +import Login from "@w/Login.astro"; + + + + + ## Github The layout needs to be shifted to our new theme but I will do that later on, as I am still thinking through exactly how I want to do the next theme rotation. + + diff --git a/src/layouts/Mage.astro b/src/layouts/Mage.astro new file mode 100644 index 0000000000..10127e8f17 --- /dev/null +++ b/src/layouts/Mage.astro @@ -0,0 +1,29 @@ +--- +import '@styles/index.css'; // Import Style.css +import Header from '@l/Header.astro'; // Header +//? [DATA] +const { + content, + title, + description, + image = '/assets/img/social.png', +} = Astro.props; // Import Astro.props +const url = new URL(Astro.url.pathname, Astro.site); +--- + + + + +
+ + + + +
+ + + +
+ + From 0823ff06a0670bdf62725e0b423cd624199e241a Mon Sep 17 00:00:00 2001 From: h0lybyte <5599058+h0lybyte@users.noreply.github.com> Date: Sun, 13 Aug 2023 21:08:55 -0400 Subject: [PATCH 2/3] Sync --- .astro/types.d.ts | 18 ++- .vscode/settings.json | 1 + src/components/Library/MDX/mermaid.ts | 3 + src/components/Widget/Discord.jsx | 2 +- src/components/Widget/MDXJS.astro | 2 +- src/components/Widget/Widget.astro | 4 +- src/content/.obsidian/workspace.json | 48 ++++---- .../pocketbase/_journal/glob.astro | 13 +++ .../application/pocketbase/_journal/j1.md | 12 ++ .../application/pocketbase/_notes/glob.astro | 13 +++ .../pocketbase/_notes/pocketbase_notes.md | 8 ++ .../application/pocketbase/pocketbase.mdx | 109 ++++++++++++++++++ src/content/journal/08-12.md | 2 + src/content/journal/08-13.md | 34 ++++++ src/content/theory/bizops.mdx | 35 +++++- src/content/website/discord/discord.mdx | 18 +++ src/content/website/{ => events}/events.mdx | 3 +- src/content/website/github/github.mdx | 2 +- src/layouts/KBVE.astro | 2 +- src/layouts/Mage.astro | 4 +- src/layouts/Menu.astro | 2 +- 21 files changed, 298 insertions(+), 37 deletions(-) create mode 100644 src/content/application/pocketbase/_journal/glob.astro create mode 100644 src/content/application/pocketbase/_journal/j1.md create mode 100644 src/content/application/pocketbase/_notes/glob.astro create mode 100644 src/content/application/pocketbase/_notes/pocketbase_notes.md create mode 100644 src/content/application/pocketbase/pocketbase.mdx create mode 100644 src/content/journal/08-13.md rename src/content/website/{ => events}/events.mdx (97%) diff --git a/.astro/types.d.ts b/.astro/types.d.ts index 05d5affd00..17bdcd4327 100644 --- a/.astro/types.d.ts +++ b/.astro/types.d.ts @@ -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"; @@ -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"; @@ -2155,8 +2169,8 @@ declare module 'astro:content' { 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"; diff --git a/.vscode/settings.json b/.vscode/settings.json index 01f36cb0e3..c1663163d5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -89,6 +89,7 @@ "pihole", "plex", "plyr", + "Pocketbase", "portainer", "preact", "Prefs", diff --git a/src/components/Library/MDX/mermaid.ts b/src/components/Library/MDX/mermaid.ts index d4f197d24e..48e83e3685 100644 --- a/src/components/Library/MDX/mermaid.ts +++ b/src/components/Library/MDX/mermaid.ts @@ -19,6 +19,9 @@ export const mermaid: RemarkPlugin<[]> = () => tree => { // @ts-ignore node.type = "html" node.value = dedent` +

Loading graph...

diff --git a/src/components/Widget/Discord.jsx b/src/components/Widget/Discord.jsx index 37afe2b200..fe64f14317 100644 --- a/src/components/Widget/Discord.jsx +++ b/src/components/Widget/Discord.jsx @@ -3,7 +3,7 @@ const Discord = ({width = string, height = string}) => { return (
-