Merge pull request #596 from KBVE/dev-v1

Pulling refs/heads/dev-v1 into alpha
KBVE · Jun 16, 2023 · 38d1f35 · 38d1f35
2 parents 51ba168 + 1deb334
commit 38d1f35
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 55 deletions.
diff --git a/.astro/types.d.ts b/.astro/types.d.ts
@@ -930,6 +930,27 @@ declare module 'astro:content' {
   collection: "journal";
   data: InferEntrySchema<"journal">
 } & { render(): Render[".md"] };
+"06-13.md": {
+	id: "06-13.md";
+  slug: "06-13";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
+"06-14.md": {
+	id: "06-14.md";
+  slug: "06-14";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
+"06-15.md": {
+	id: "06-15.md";
+  slug: "06-15";
+  body: string;
+  collection: "journal";
+  data: InferEntrySchema<"journal">
+} & { render(): Render[".md"] };
 "asset.mdx": {
 	id: "asset.mdx";
   slug: "asset";

diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "kbve": "yarn-upgrade-all && astro sync && astro build && astro dev --host"
   },
   "devDependencies": {
-    "@types/eslint": "^8.40.1",
+    "@types/eslint": "^8.40.2",
     "@typescript-eslint/eslint-plugin": "^5.59.11",
     "@typescript-eslint/parser": "^5.59.11",
     "astro-eslint-parser": "^0.14.0",
@@ -26,7 +26,7 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-tsdoc": "^0.2.17",
-    "sass": "^1.63.3",
+    "sass": "^1.63.4",
     "svgo": "2.8.0",
     "yarn-upgrade-all": "^0.7.2"
   },
@@ -59,22 +59,22 @@
     "@types/react-router-dom": "^5.3.3",
     "alpinejs": "^3.12.2",
     "appwrite": "^11.0.0",
-    "astro": "^2.6.3",
+    "astro": "^2.6.4",
     "astro-compress": "^1.1.47",
     "crypto-js": "^4.1.1",
     "dompurify": "^3.0.3",
     "interweave": "^13.1.0",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
     "micromodal": "^0.4.10",
-    "million": "^2.4.5",
-    "nanostores": "^0.9.1",
+    "million": "^2.4.6-beta.2",
+    "nanostores": "^0.9.2",
     "react": "^18.2.0",
     "react-cookie": "^4.1.1",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.44.3",
     "react-icons": "^4.9.0",
-    "react-router-dom": "^6.12.1",
+    "react-router-dom": "^6.13.0",
     "react-unity-webgl": "^9.4.2",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-external-links": "^2.1.0",

diff --git a/src/components/Tools/Webmaster/index.jsx → ...onents/Tools/Webmaster/ReactWebmaster.jsx b/src/components/Tools/Webmaster/index.jsx → ...onents/Tools/Webmaster/ReactWebmaster.jsx
@@ -1,12 +1,12 @@
-//!     [Webmaster] : Tools Module
 //?     Webmaster Tools to make it easier to manage your website(s).
 
+import React from "react";
 import DOMPurify from "dompurify";
 
-// Functions Below by Kory Becker
+//* Functions Below by Kory Becker
 
 function getHostName(url) {
-  var match = url.match(/:\/\/(www[0-9]?\.)?(.[^/:]+)/i);
+  const match = url.match(/:\/\/(www[0-9]?\.)?(.[^/:]+)/i);
   if (
     match != null &&
     match.length > 2 &&
@@ -19,31 +19,31 @@ function getHostName(url) {
   }
 }
 function getDomain(url) {
-  var hostName = getHostName(url);
-  var domain = hostName;
+  const hostName = getHostName(url);
+  let domain = hostName;
 
   if (hostName != null) {
-    var parts = hostName.split(".").reverse();
+    const parts = hostName.split(".").reverse();
 
     if (parts != null && parts.length > 1) {
-      domain = parts[1] + "." + parts[0];
+      domain = `${parts[1]}.${parts[0]}`;
 
-      if (hostName.toLowerCase().indexOf(".co.uk") != -1 && parts.length > 2) {
-        domain = parts[2] + "." + domain;
+      if (hostName.toLowerCase().indexOf(".co.uk") !== -1 && parts.length > 2) {
+        domain = `${parts[2]}.${domain}`;
       }
     }
   }
 
   return domain;
 }
 
-const Webmaster = ({ dork = "" }) => {
+const ReactWebmaster = ({ dork = "" }) => {
   const [domain, setDomain] = useState(null);
 
   useEffect(() => {
     const sanitizeData = async () => {
       const _url = getDomain(dork);
-      var clean = DOMPurify.sanitize(_url, {
+      const clean = DOMPurify.sanitize(_url, {
         USE_PROFILES: { html: false, mathMl: false, svg: false },
       });
       setDomain(clean);
@@ -60,4 +60,4 @@ const Webmaster = ({ dork = "" }) => {
   }
 };
 
-export default Webmaster;
+export default ReactWebmaster;
diff --git a/src/content/.obsidian/workspace.json b/src/content/.obsidian/workspace.json
@@ -13,7 +13,7 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "journal/06-13.md",
+                "file": "journal/06-15.md",
                 "mode": "source",
                 "source": false
               }
@@ -94,7 +94,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "journal/06-13.md",
+                "file": "journal/06-15.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -111,7 +111,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "journal/06-13.md",
+                "file": "journal/06-15.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -134,7 +134,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "journal/06-13.md"
+                "file": "journal/06-15.md"
               }
             }
           }
@@ -158,8 +158,9 @@
   },
   "active": "1a0f6c1e75a595c2",
   "lastOpenFiles": [
+    "journal/06-14.md",
+    "journal/06-15.md",
     "journal/06-12.md",
-    "journal/06-13.md",
     "project/roguejester.mdx",
     "crypto/btc.mdx",
     "journal/06-11.md",
@@ -192,7 +193,6 @@
     "journal/05-24.md",
     "journal/2023-05-25.md",
     "journal/05-23.md",
-    "journal/05-22.md",
-    "journal/05-21.md"
+    "journal/05-22.md"
   ]
 }
diff --git a/src/content/journal/06-13.md b/src/content/journal/06-13.md
@@ -16,9 +16,10 @@ tags:
 - 9:00am - Today's market is going to be interesting, I really hope to see a dip but it could go any direction based off of what the feds say!
 - 10:00am - I started to watch the apple tv show, Silo and damn it is giving me some interesting game development vibes and concepts. The show is really well written so far and I am enjoying all the characters so far! I blew through the first couple episodes without even realizing it.
 - 11:00am - Going to take a nap for a while, I been up all night programming.
+- 2:00pm - Decided to take a quick break and visit a car dealership for my mom's new car. We are looking at a 2021 or newer model of an Acura MDX. The current price point is around $48,000 for their `Tech` package. Personally I would want them to switch over to electric but they are still on the fence with it. The 2024 models that we want have a mild waiting period of about 4 months and pre-owned that are certified are around $41,000. I am going to continue to search through different offers, I might just offer around $35,000 and see if they have anything within their system that fits the price point. I will take a model with a couple thousand miles on it, if I can get it at a decent rate. 
 - 4:30pm - Looks like my SPY put has expired and my TSLA puts are going to expire as well. I am thinking of rolling them into next week and collect that $1000~ premium. I might also sell another couple cover calls on TSLA going into next week, if this run continues.
 - 5:00pm - Going to get a bit deeper into the development cycle of RogueJester, but I am definitely feeling a bit of project overload already. I might have to switch up my work station and maybe migrate over to a coffee shop or café. A part of me is thinking of just driving to the beach and working from a boardwalk for a couple hours. 
-- 5:30pm - Appwrite Integration has replaced the Strapi Integration! Now I am going to test case some basic examples and see if I can 
+- 5:30pm - Appwrite Integration has replaced the Strapi Integration! Now I am going to test case some basic examples and see if I can play. One of the issues that I am currently facing is the Coroutine / Asynchronous problem but there are enough reference points to resolve it. 
 
 ## Quote
 

diff --git a/src/content/journal/06-14.md b/src/content/journal/06-14.md
@@ -0,0 +1,32 @@
+---
+layout: ../../layouts/theme/mdx.astro
+title: "June : 14"
+category: Daily
+date: 2023-06-14
+client: Self
+img: https://images.unsplash.com/photo-1685630248371-9d42fd97f52f?fit=crop&q=85&w=1400&h=700
+description: Daily Log for June, 14 of each year.
+tags:
+- daily
+---
+
+## Notes
+
+- 6:00am - Rise and Shine! Today will be an amazing day! I did not get as much sleep as I had hoped but I am feeling empowered and ready to tackle the world! 
+- 8:00am - Going to take a break from the internet for a while, time to touch some grass.
+- 2:00pm - Back from my break, time to get to work. I believe today's goal will be to get OneJS operational within the main branch of RogueJester and then start to fix up the UI/UX of the game, with something that will be a bit smoother on the eyes. 
+- 3:00pm - Had to put the development stuff on hold because I need to call the Medicare office for my family friend. I need to figure out what type of insurance she has through Medicare? I am taking on this task as a test case / edge case for future problems that I might have to deal with. The queue is way too long, the hold music is painful and it feels like torture when calling Medicare aka the `1-800-633-4227`. 
+- 3:30pm - Turns out that we need to find her comprehensive supplemental insurance through the private market. This type of insurance would cover the 20% of the medical bill that Medicare does not cover, but there is a monthly cost for this type of private insurance. I will have to go through the existing providers and see which one would be the best for her.
+- 6:40pm - Updated the OneJS and Heathen SteamWorks into the dev-holy branch, now I am going to chill out and play some sessions of League.
+- 9:30pm - Did a bit of cleaning, removed a decent amount of bulk waste from the shed, basement and the guest room. Now I back to the basic of Unity while I train up my OSRS account!
+
+## Quote
+
+> I cannot make my days longer, so I strive to make them better.
+> — <cite>Henry David Thoreau</cite>
+
+---
+
+## Tasks
+
+- [ ]
diff --git a/src/content/journal/06-15.md b/src/content/journal/06-15.md
@@ -0,0 +1,31 @@
+---
+layout: ../../layouts/theme/mdx.astro
+title: "June : 15"
+category: Daily
+date: 2023-06-15
+client: Self
+img: https://images.unsplash.com/photo-1684166220037-d94a15745f9b?fit=crop&q=85&w=1400&h=700
+description: Daily Log for June, 15 of each year.
+tags:
+- daily
+---
+
+## Notes
+
+### 2023
+- 9:00am - Will SPY keep going up? Damn I am printing money from these covered cash puts. I was hoping to grab an assignment yesterday when I was selling the $434/435 but it closed at $437.
+- 10:0am - Going to take a quick break from the Internet and spend some time in the real world.
+- 7:25pm - Stream Darts , the Always Sunny in Discord Edition. The concept is a high thought that we are test casing right now. The first duelist were @ziggy and @mrock, they did a rock paper scissors to determine who would go first.
+- 7:57pm - The match is getting hot and heavy! As we cross intermission, @Ziggy is at 318 and @Mrock is at 225. Its been a close match but @Ziggy has been slowly gaining a massive lead over @Mrock. The crowd has been going `wild!`, almost as if they were infused with Alex Jones' special water.
+- 7:58pm - Going to start the Webmaster react form from scratch again, hopefully I can get it out and ready by tonight. @Ziggy is now at 415 and @Mrock is 303! So close, and damn @Ziggy hits a 2, now at 417! @Mrock is closing in at 345!. OH NO! @Ziggy scores a double one, sitting at 419! @Ziggy wins with a 424! @mrock finishes with a 348! Great game boys!
+
+## Quote
+
+> A man cannot be said to succeed in this life who does not satisfy one friend.
+> — <cite>Henry David Thoreau</cite>
+
+---
+
+## Tasks
+
+- [ ]
diff --git a/yarn.lock b/yarn.lock
@@ -1598,10 +1598,10 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/eslint@^8.40.1":
-  version "8.40.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.1.tgz#92edc592c3575b52a8e790cd5ec04efe28f3d24c"
-  integrity sha512-vRb792M4mF1FBT+eoLecmkpLXwxsBHvWWRGJjzbYANBM6DtiJc6yETyv4rqDA6QNjF1pkj1U7LMA6dGb3VYlHw==
+"@types/eslint@^8.40.2":
+  version "8.40.2"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.40.2.tgz#2833bc112d809677864a4b0e7d1de4f04d7dac2d"
+  integrity sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
@@ -2125,10 +2125,10 @@ astro-eslint-parser@^0.14.0:
     espree "^9.0.0"
     semver "^7.3.8"
 
-astro@^2.6.3:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/astro/-/astro-2.6.3.tgz#6bb5737ab946a2c7c8f02fc7ce812b8abd01222a"
-  integrity sha512-gJoBX+t11qAeYDjterGEaQZx7qqlGOigWhE0zkcEBv4zy7l4IpKx6nGGUNzD/l8x6WomZxkdZROsOsiEaWSJmQ==
+astro@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/astro/-/astro-2.6.4.tgz#37880a65cca438971643fd6473e7fe8ae2578f11"
+  integrity sha512-YM5H9SLHflxCB/3H8S2Bi+1Lbwn/MA9Vl/eOZmkCT491gvBsyuKCTsoUas6fwggeKn+fIR2XpdYd2F+unQve3g==
   dependencies:
     "@astrojs/compiler" "^1.4.0"
     "@astrojs/internal-helpers" "^0.1.0"
@@ -5242,10 +5242,10 @@ micromodal@^0.4.10:
   resolved "https://registry.yarnpkg.com/micromodal/-/micromodal-0.4.10.tgz#d6f59c21d2f4a5af480f65909eb9608a1d558c73"
   integrity sha512-BUrEnzMPFBwK8nOE4xUDYHLrlGlLULQVjpja99tpJQPSUEWgw3kTLp1n1qv0HmKU29AiHE7Y7sMLiRziDK4ghQ==
 
-million@^2.4.5:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/million/-/million-2.4.5.tgz#108ed0c0258ee74331b7e60cfea830c7b10553f9"
-  integrity sha512-3hQHs6+/X8rmM4gSOfiPlgTNjf2OsBMu4R+jARIBtKrI+Nt1iTFeyiNWYfC75BkAM4i25CXsCrlqBUQJ0H7+tw==
+million@^2.4.6-beta.2:
+  version "2.4.6-beta.2"
+  resolved "https://registry.yarnpkg.com/million/-/million-2.4.6-beta.2.tgz#05558d90984670b96d963936413b0379ec4cf336"
+  integrity sha512-UTUIfDZLBx1WG+nsBjeJGPPH0rR4b3yGPe4iZ2GOGpwUbrp0UjxRZeEQSFsaYctn9PPTId2Huowb9kQ5BQcj/A==
   dependencies:
     "@babel/core" "^7.21.0"
     "@babel/plugin-syntax-jsx" "^7.21.4"
@@ -5348,10 +5348,10 @@ nanoid@^3.3.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
-nanostores@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/nanostores/-/nanostores-0.9.1.tgz#70cc1672b5f7ca7016ab93a72037759c98b65a0a"
-  integrity sha512-DmAL3oTieICqnl2XVq5wegFE7EXIoPnIv1CNWNGEhXpwrHk7Prctch4/nX5x95i95WHdesI5sPeoNAUFpFsGtg==
+nanostores@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/nanostores/-/nanostores-0.9.2.tgz#bd1d1792bc79168f6b331e3e61cfbf05e451e010"
+  integrity sha512-wfKlqLGtOYV9+qzGveqDOSWZUBgTeMr/g+JzfV/GofXQ//0wp0cgHF+QBVlmNH/JW9YA9QN+vR6N0vpniPpARA==
 
 napi-build-utils@^1.0.1:
   version "1.0.2"
@@ -5993,18 +5993,18 @@ react-is@^18.2.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-react-router-dom@^6.12.1:
-  version "6.12.1"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.12.1.tgz#601fe7eb493071a33dc7573a20b920324a834606"
-  integrity sha512-POIZN9UDKWwEDga054LvYr2KnK8V+0HR4Ny4Bwv8V7/FZCPxJgsCjYxXGxqxzHs7VBxMKZfgvtKhafuJkJSPGA==
+react-router-dom@^6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.13.0.tgz#6651f456bb2af42ef14f6880123b1f575539e81f"
+  integrity sha512-6Nqoqd7fgwxxVGdbiMHTpDHCYPq62d7Wk1Of7B82vH7ZPwwsRaIa22zRZKPPg413R5REVNiyuQPKDG1bubcOFA==
   dependencies:
     "@remix-run/router" "1.6.3"
-    react-router "6.12.1"
+    react-router "6.13.0"
 
-react-router@6.12.1:
-  version "6.12.1"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.12.1.tgz#9e4126aa1139ec6b5d347e19576d5e940cd46362"
-  integrity sha512-evd/GrKJOeOypD0JB9e1r7pQh2gWCsTbUfq059Wm1AFT/K2MNZuDo19lFtAgIhlBrp0MmpgpqtvZC7LPAs7vSw==
+react-router@6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.13.0.tgz#7e4427a271dae0cafbdb88c56ccbd9b1434ee93f"
+  integrity sha512-Si6KnfEnJw7gUQkNa70dlpI1bul46FuSxX5t5WwlUBxE25DAz2BjVkwaK8Y2s242bQrZPXCpmwLPtIO5pv4tXg==
   dependencies:
     "@remix-run/router" "1.6.3"
 
@@ -6373,10 +6373,10 @@ sass-formatter@^0.7.5:
   dependencies:
     suf-log "^2.5.3"
 
-sass@^1.63.3:
-  version "1.63.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.3.tgz#527746aa43bf2e4eac1ab424f67f6f18a081061a"
-  integrity sha512-ySdXN+DVpfwq49jG1+hmtDslYqpS7SkOR5GpF6o2bmb1RL/xS+wvPmegMvMywyfsmAV6p7TgwXYGrCZIFFbAHg==
+sass@^1.63.4:
+  version "1.63.4"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.4.tgz#caf60643321044c61f6a0fe638a07abbd31cfb5d"
+  integrity sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"