Merge pull request #593 from KBVE/beta

Pulling refs/heads/beta into Main
KBVE · Jun 13, 2023 · e25cd31 · e25cd31
2 parents 3bacb7f + 248800f
commit e25cd31
Show file tree

Hide file tree

Showing 17 changed files with 361 additions and 505 deletions.
diff --git a/.astro/types.d.ts b/.astro/types.d.ts
@@ -916,6 +916,20 @@ declare module 'astro:content' {
   collection: "journal";
   data: InferEntrySchema<"journal">
 } & { render(): Render[".md"] };
+"06-11.md": {
+	id: "06-11.md";
+  slug: "06-11";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
+"06-12.md": {
+	id: "06-12.md";
+  slug: "06-12";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
 "asset.mdx": {
 	id: "asset.mdx";
   slug: "asset";
@@ -1109,6 +1123,13 @@ declare module 'astro:content' {
   collection: "recipe";
   data: InferEntrySchema<"recipe">
 } & { render(): Render[".mdx"] };
+"mcconaughey-diet.mdx": {
+	id: "mcconaughey-diet.mdx";
+  slug: "mcconaughey-diet";
+  body: string;
+  collection: "recipe";
+  data: InferEntrySchema<"recipe">
+} & { render(): Render[".mdx"] };
 };
 "releases": {
 "1.md": {
@@ -1287,6 +1308,13 @@ declare module 'astro:content' {
   collection: "theory";
   data: InferEntrySchema<"theory">
 } & { render(): Render[".mdx"] };
+"swartz-guerilla-manifesto.mdx": {
+	id: "swartz-guerilla-manifesto.mdx";
+  slug: "swartz-guerilla-manifesto";
+  body: string;
+  collection: "theory";
+  data: InferEntrySchema<"theory">
+} & { render(): Render[".mdx"] };
 };
 "tools": {
 "conch.mdx": {

diff --git a/package.json b/package.json
@@ -14,8 +14,8 @@
   },
   "devDependencies": {
     "@types/eslint": "^8.40.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.9",
+    "@typescript-eslint/eslint-plugin": "^5.59.11",
+    "@typescript-eslint/parser": "^5.59.11",
     "astro-eslint-parser": "^0.14.0",
     "eslint": "^8.42.0",
     "eslint-config-airbnb-base": "^15.0.0",
@@ -49,7 +49,7 @@
     "@lottiefiles/react-lottie-player": "^3.5.3",
     "@mdi/js": "^7.2.96",
     "@mui/icons-material": "^5.11.16",
-    "@mui/material": "^5.13.4",
+    "@mui/material": "^5.13.5",
     "@nanostores/react": "^0.7.1",
     "@tailwindcss/aspect-ratio": "^0.4.2",
     "@tailwindcss/forms": "^0.5.3",
@@ -67,7 +67,7 @@
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
     "micromodal": "^0.4.10",
-    "million": "^2.4.4",
+    "million": "^2.4.5",
     "nanostores": "^0.9.1",
     "react": "^18.2.0",
     "react-cookie": "^4.1.1",

diff --git a/src/components/Library/Profile/ReactLogout.jsx b/src/components/Library/Profile/ReactLogout.jsx
@@ -0,0 +1,39 @@
+//?     [Logout] - React Logout - Going to keep this very simple for now.
+//*     [IMPORT]
+import React, { useEffect, useState } from 'react';
+import { user$, logout } from '@lib/appwrite';
+import { useStore } from '@nanostores/react';
+
+const ReactLogout = () => {
+	const $user = useStore(user$);
+
+	const [____warning, setWarning] = useState(false);
+
+	const UserGuest = () => {
+		return (
+			<>
+				<div className="mt-24 space-y-12">
+					<div className="space-y-12">Warning!</div>
+					You are not logged in buddy!
+				</div>
+			</>
+		);
+	};
+
+	const UserLogout = () => {
+		if ($user?.name) {
+			logout();
+		} else {
+			setWarning(true);
+			window.location.href = '/account/login';
+		}
+	};
+
+	useEffect(() => {
+		UserLogout();
+	}, []);
+
+	return <>{____warning && UserGuest()}</>;
+};
+
+export default ReactLogout;
diff --git a/src/components/Library/Profile/ReactProfile.jsx b/src/components/Library/Profile/ReactProfile.jsx
@@ -49,7 +49,7 @@ const ReactProfile = () => {
 					src={
 						$user?.email
 							? Gravatar({ email: $user?.email })
-							: 'https://source.unsplash.com/75x75/?portrait'
+							: 'https://source.unsplash.com/192x192/?portrait'
 					}
 					alt=""
 					className="self-center flex-shrink-0 w-48 h-48 border rounded-full md:justify-self-start bg-gray-500 border-gray-700"

diff --git a/src/components/Library/appwrite.ts b/src/components/Library/appwrite.ts
@@ -102,7 +102,7 @@ export const logout = async () => {
 		if (session?.$id) {
 			await appwriteAccount.deleteSession(session?.$id);
 			isLoggedIn.set(undefined);
-			window.location.href = "/";
+			window.location.href = "/account/login";
 		}
 	} catch (error) {
 		const appwriteError = error as AppwriteException;

diff --git a/src/components/Widget/Profile.astro b/src/components/Widget/Profile.astro
@@ -1,4 +1,5 @@
 ---
+//<!--!			[DELETE] - Slated to be deleted after Q3 2023.
 //<!--*         Generic KBVE Profile --!>
 //<!--!         No Errors!
 //<!--TODO      Integrate with AppWrite

diff --git a/src/content/.obsidian/workspace.json b/src/content/.obsidian/workspace.json
@@ -8,43 +8,18 @@
         "type": "tabs",
         "children": [
           {
-            "id": "e5ddacef612a3415",
+            "id": "1a0f6c1e75a595c2",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "crypto/btc.mdx",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "8b6629e62c49575e",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "project/roguejester.mdx",
-                "mode": "preview",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "791a858604c73675",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "journal/06-10.md",
+                "file": "journal/06-12.md",
                 "mode": "source",
                 "source": false
               }
             }
           }
-        ],
-        "currentTab": 2
+        ]
       }
     ],
     "direction": "vertical"
@@ -119,7 +94,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "journal/06-10.md",
+                "file": "journal/06-12.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -136,7 +111,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "journal/06-10.md",
+                "file": "journal/06-12.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -159,7 +134,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "journal/06-10.md"
+                "file": "journal/06-12.md"
               }
             }
           }
@@ -181,13 +156,16 @@
       "command-palette:Open command palette": false
     }
   },
-  "active": "3afb4e43388f73a5",
+  "active": "1a0f6c1e75a595c2",
   "lastOpenFiles": [
-    "crypto/btc.mdx",
     "project/roguejester.mdx",
+    "crypto/btc.mdx",
+    "journal/06-12.md",
+    "journal/06-11.md",
+    "recipe/mcconaughey-diet.mdx",
+    "journal/06-10.md",
     "project/rsps.mdx",
     "project/discord-sh.mdx",
-    "journal/06-10.md",
     "news/release-rigor.mdx",
     "music/adtr-albums.mdx",
     "blog/theorycraft.mdx",
@@ -199,8 +177,6 @@
     "journal/06-04.md",
     "tools/cv.mdx",
     "project/galaxia.mdx",
-    "project/cv.mdx",
-    "project/cityvote.mdx",
     "journal/06-03.md",
     "journal/06-02.md",
     "journal/05-31.md",
@@ -216,8 +192,6 @@
     "journal/2023-05-25.md",
     "journal/05-23.md",
     "journal/05-22.md",
-    "journal/05-21.md",
-    "journal/05-20.md",
-    "journal/05-19.md"
+    "journal/05-21.md"
   ]
 }
diff --git a/src/content/application/authelia.mdx b/src/content/application/authelia.mdx
@@ -20,8 +20,6 @@ import TabData from "@w/TabData.astro";
 import YT from "@w/YT.astro";
 import N from "@n/N.astro";
 
-<TabMenu first="general" data={["cheatsheet", "system", "errors", "media", "notes"]}>
-  <TabData tail="block" data="general">
 
 ## Information
 
@@ -64,42 +62,26 @@ Autheila is like a smart and helpful friend who protects your toys and makes it
 
 There are different methods to install Authelia, depending on your preferences and environment.
 
-</TabData>
-
-<TabData data="cheatsheet">
 
 ## Cheatsheet
 
 Autheila
 
-</TabData>
-
-<TabData data="system">
-
 ## System
 
 System resources, information and general help.
 
 
-</TabData>
-
-<TabData data="errors">
-
 ## Errors
 
 Common errors within Authelia that our team has ran across.
 
-</TabData>
-
-<TabData data="media">
 
 ## Videos
 
 Authelia videos that will help you with installing, updating and other things.
 
-</TabData>
 
-<TabData data="notes">
 
 ## Notes
 
@@ -119,6 +101,3 @@ Notes on Authelia
 - Authelia operates under the Apache 2.0 license.
 
 <N ns="ads" template="mdx2" id="ezoic" />
-
-</TabData>
-</TabMenu>
diff --git a/src/content/crypto/btc.mdx b/src/content/crypto/btc.mdx
@@ -18,57 +18,43 @@ tags:
 
 import Details from "@w/Details.astro";
 import TradingView from "@w/TradingView.astro";
-import TabMenu from "@w/TabMenu.astro";
-import TabData from "@w/TabData.astro";
 
 
-<TabMenu first="chart" data={["settings", "options", "exchange", "reports", "notes"]}>
-
-<TabData tail="block" data="chart">
-
 ## Information
 
 Bitcoin is the first cryptocurrency based upon a SHA-256 blockchain.
+The concept was created in 2008 by Satoshi Nakamoto's white paper, which was a document that outlined a decentralized digital currency that operated through a peer-to-peer network.
+The blockchain-based currency was launched in 2009 through a gensis block with a public and open source codebase.
+Further blocks within the chain are created through mining, which is a process of hashing data under the term of `proof-of-work`.
 
 ## Charts
 
 <TradingView data="bitstamp:BTCUSD" />
-
-</TabData>
-
-<TabData data="settings">
 
 ## Settings
-
-</TabData>
-  <TabData data="options">
 
 ## Options
 
-</TabData>
-  <TabData data="exchange">
-
 ## Exchanges
-</TabData>
-  <TabData data="reports">
-
+
 ## Reports
 
 Analysis and reports related to bitcoin!
 
-</TabData>
-
-<TabData data="notes">
+- - -
 
 ## Notes
 
 These are the collection of notes for the BTC MDX Document.
+The original white paper can be found here [bitcoin.pdf](https://bitcoin.org/bitcoin.pdf).
+For those interested some of the older source code, here is the commit for [BitCoin v0.1.5 alpha](https://github.com/bitcoin/bitcoin/tree/4405b78d6059e536c36974088a8ed4d9f0f29898).
+`It has been over a decade, I feel old!` - Can't wait to come back to this quote when I am an old man.
 
 ### Log
 
 - [x] Add Charts for BTCUSD
-- [ ] Add tabs with charts!
-- [ ] Multi Currency support for Charts?
+- [ ] Add tabs with charts! - We will push this update back.
+- [ ] Multi Currency support for Charts? - The tradingview charts provide enough additional options for now.
 
 #### Journal
 
@@ -78,6 +64,3 @@ These are the collection of notes for the BTC MDX Document.
   - Testing the charts for BTC
 
 </Details>
-
-</TabData>
-</TabMenu>