Skip to content

Commit

Permalink
Minor Upgrades
Browse files Browse the repository at this point in the history
- Upgrade Astro to 2.6.4
- Daily Journal
- Started to map out the webmaster tools.
  • Loading branch information
h0lybyte committed Jun 15, 2023
1 parent b5ceb32 commit 3433f1e
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 49 deletions.
14 changes: 14 additions & 0 deletions .astro/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,20 @@ 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"] };
"asset.mdx": {
id: "asset.mdx";
slug: "asset";
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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 &&
Expand All @@ -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);
Expand All @@ -60,4 +60,4 @@ const Webmaster = ({ dork = "" }) => {
}
};

export default Webmaster;
export default ReactWebmaster;
6 changes: 4 additions & 2 deletions src/content/journal/06-14.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ tags:
- 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.
- 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

Expand Down
58 changes: 29 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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" "*"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 3433f1e

Please sign in to comment.