From 3627d11fc9343a46586171ac302d19471bd9e201 Mon Sep 17 00:00:00 2001 From: awex Date: Wed, 2 Jun 2021 11:25:29 -0400 Subject: [PATCH] A bit of an overhaul - Built in the MCW - Updated some links to direct to awexxx.xyz - Changed around the CSS --- .gitignore | 1 + about.html | 4 +- assets/css/style.css | 385 +++++++++++++++++++--------------------- assets/js/hiveLookup.js | 8 +- assets/js/medalclips.js | 2 + assets/js/q.js | 20 +++ hivemc.html | 11 +- index.html | 36 +--- mcw.html | 162 +++++++++++++++++ 9 files changed, 382 insertions(+), 247 deletions(-) create mode 100644 .gitignore create mode 100644 assets/js/q.js create mode 100644 mcw.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7d31e6b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +assets/js/newHiveLookup.js \ No newline at end of file diff --git a/about.html b/about.html index efe40b5..5a5d9b7 100644 --- a/about.html +++ b/about.html @@ -20,9 +20,9 @@

Awexx


diff --git a/assets/css/style.css b/assets/css/style.css index 6b29bd1..64e3461 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -1,210 +1,193 @@ -/*Universal*/ - +/* Univ Attributes */ #logo{ - float:center; -} - -hr{ - width:100px; - border-color:black; - -} - -.center { - display:block; - margin:0 auto; - margin-left: auto; - margin-right: auto; - width:20%; - padding-top:20px; -} - -#center { - display:block; - margin:0 auto; - margin-left: auto; - margin-right: auto; - width:30%; -} - -body{ - background-color:#e0e0e0; - text-align:center; -} - - h1{ + float:center; + } + + hr{ + width:100px; + border-color:black; + + } + + .center { + display:block; + margin:0 auto; + margin-left: auto; + margin-right: auto; + width:20%; + padding-top:20px; + } + + #center { + display:block; + margin:0 auto; + margin-left: auto; + margin-right: auto; + width:30%; + } + + body{ + text-align:center; + } + + h1{ + text-align:center; + color:#6b6b6b; + } + + h2{ + text-align:center; + color:#6b6b6b; + } + + h3{ + text-align:center; + color:#6b6b6b; + } + + i{ + font-size:20px; + } + + body p{ text-align:center; color:#6b6b6b; - } - - h2{ - text-align:center; - color:#6b6b6b; - } - - h3{ - text-align:center; - color:#6b6b6b; - } - - i{ font-size:20px; } + + a{ + color:black; + } + + a:hover{ + color:gray; + } - body p{ - text-align:center; - color:#6b6b6b; - font-size:20px; -} - -a{ - color:black; -} - -a:hover{ - color:white; -} - -#panel { - margin: 50px auto; - width: 300px; - padding: 30px 25px; - background: white; - border-radius: 25px; - display:none; -} - -#link { - display:none; -} - -/*Home*/ +/* Home Page Attribs */ #welcome{ - background-color:#474747; - padding-top:20px; - padding-bottom:15px; -} + background-color:#474747; + padding-top:20px; + padding-bottom:15px; + } + + #welcome h2{ + color:#c2c2c2; + } + + #welcome p{ + color:#c2c2c2; + } + + /*Socials Color Changing*/ + #medal a{ + color:orange; + text-decoration:none; + font-size:28px; + padding-right:15px; + text-align:center; + } + + #medal a:hover{ + color:white; + } + + #twitter a{ + color:#467175; + text-decoration:none; + font-size:28px; + padding-right:15px; + padding-bottom:20px; + text-align:center; + } + + #twitter a:hover{ + color:white; + } -#welcome h2{ - color:#c2c2c2; -} + /* Navigation Bar Styling */ + #navbar{ + color:#333; + } + + #navbar ul{ + padding:0px; + list-style:none; + text-align:center; + } + + #navbar li{ + display:inline; + text-align:center; + } + + #navbar a{ + color:#333; + text-decoration:none; + font-size:18px; + padding-right:15px; + text-align:center; + } -#welcome p{ - color:#c2c2c2; -} - -/*Socials Color Changing*/ -#medal a{ - color:orange; - text-decoration:none; - font-size:28px; - padding-right:15px; - text-align:center; -} - -#medal a:hover{ - color:white; -} - -#twitter a{ - color:#467175; - text-decoration:none; - font-size:28px; - padding-right:15px; - padding-bottom:20px; - text-align:center; -} - -#twitter a:hover{ - color:white; -} - -/*Navbar Attributes*/ -#navbar{ - background-color:#e0e0e0; - color:#333; -} - -#navbar ul{ - padding:0px; - list-style:none; - text-align:center; -} - -#navbar li{ - display:inline; - text-align:center; -} - -#navbar a{ - color:#333; - text-decoration:none; - font-size:18px; - padding-right:15px; - text-align:center; -} - - -/*Footer Attributes*/ -.footer-p{ - color:white; -} -.footer-basic { - padding:40px 0; - background-color:#bfbfbf; - color:#4b4c4d; -} - -.footer-basic ul { - padding:0; - list-style:none; - text-align:center; - font-size:18px; - line-height:1.6; - margin-bottom:0; -} - -.footer-basic li { - padding:0 10px; -} - -.footer-basic ul a { - color:inherit; - text-decoration:none; - opacity:0.8; -} - -.footer-basic ul a:hover { - opacity:1; -} - -.footer-basic .social { - text-align:center; - padding-bottom:25px; -} - -.footer-basic .social > a { - font-size:24px; - width:40px; - height:40px; - line-height:40px; - display:inline-block; - text-align:center; - border-radius:50%; - border:1px solid #ccc; - margin:0 8px; - color:inherit; - opacity:0.75; -} - -.footer-basic .social > a:hover { - opacity:0.9; -} - -.footer-basic .copyright { - margin-top:15px; - text-align:center; - font-size:13px; - color:black; - margin-bottom:0; -} \ No newline at end of file + /* Footer Styling */ + .footer-p{ + color:white; + } + .footer-basic { + padding:40px 0; + background-color:#454545; + color:white; + } + + .footer-basic ul { + padding:0; + list-style:none; + text-align:center; + font-size:18px; + line-height:1.6; + margin-bottom:0; + } + + .footer-basic li { + padding:0 10px; + } + + .footer-basic ul a { + color:inherit; + text-decoration:none; + opacity:0.8; + } + + .footer-basic ul a:hover { + opacity:1; + } + + .footer-basic .social { + text-align:center; + padding-bottom:25px; + } + + .footer-basic .social > a { + font-size:24px; + width:40px; + height:40px; + line-height:40px; + display:inline-block; + text-align:center; + border-radius:50%; + border:1px solid white; + margin:0 8px; + color:inherit; + opacity:0.75; + } + + .footer-basic .social > a:hover { + opacity:0.9; + } + + .footer-basic .copyright { + margin-top:15px; + text-align:center; + font-size:13px; + color:white; + margin-bottom:0; + } \ No newline at end of file diff --git a/assets/js/hiveLookup.js b/assets/js/hiveLookup.js index 3d9d667..e7e8ad9 100644 --- a/assets/js/hiveLookup.js +++ b/assets/js/hiveLookup.js @@ -3,11 +3,10 @@ // Dvlpr. Awexx // //////////////////// -const avatarURL = 'https://minotar.net/avatar/' console.log(`Initiated the Hive Lookup Script`); +const avatarURL = 'https://minotar.net/avatar/' +const playerName = document.getElementById("inputBox").value; - async function getGamesData() { - const playerName = document.getElementById("inputBox").value if (document.getElementById("gameBox").value === 'sg' || document.getElementById("gameBox").value === 'Survival Games' ) { const apiURL = `https://api.hivemc.com/v1/player/${playerName}/sg`; const data = await fetch(apiURL).then(response => response.json()); @@ -255,5 +254,4 @@ console.log(`Initiated the Hive Lookup Script`); document.querySelector("#link").innerHTML = "Raw JSON Link" var link = document.getElementById("link"); link.style.display = "block"; - } - } \ No newline at end of file + } \ No newline at end of file diff --git a/assets/js/medalclips.js b/assets/js/medalclips.js index 0842ca6..45086ff 100644 --- a/assets/js/medalclips.js +++ b/assets/js/medalclips.js @@ -6,10 +6,12 @@ const medalapi = 'https://developers.medal.tv/v1/latest?userId=215577&limit=1' async function medalClips() { + window.addEventListener('load', function () { const { contentObjects } = await fetch(medalapi, { method: 'GET', headers: { 'Authorization': 'pub_x9mjeQnqk07tEK1ge7w2xHYxTpTEbKwN', 'Content-Type': 'application/json' } }).then(response => response.json()) document.querySelector("#clip").innerHTML = contentObjects[0].embedIframeCode + }) } \ No newline at end of file diff --git a/assets/js/q.js b/assets/js/q.js new file mode 100644 index 0000000..17df1c8 --- /dev/null +++ b/assets/js/q.js @@ -0,0 +1,20 @@ +function checkparam() { + const params = new URLSearchParams(window.location.search) + // console.log(params) Only uncomment this for testing purposes. + + if (params.get('type') === 'pt') { + const pt = document.getElementById("pt"); + pt.style.display = "block"; + const embed = document.getElementById("embed"); + embed.style.display = "none"; + } + + if (params.get('status') === 'success') { + const pt = document.getElementById("pt"); + pt.style.display = "none"; + const embed = document.getElementById("embed"); + embed.style.display = "none"; + const success = document.getElementById("success"); + success.style.display = "block"; + } +} \ No newline at end of file diff --git a/hivemc.html b/hivemc.html index e89c627..d16e0a8 100644 --- a/hivemc.html +++ b/hivemc.html @@ -8,7 +8,7 @@ - + @@ -25,8 +25,8 @@

Awexx


 @@ -42,9 +42,8 @@


- - +
+



diff --git a/index.html b/index.html index af743f5..16e8fa2 100644 --- a/index.html +++ b/index.html @@ -7,9 +7,6 @@ - - - @@ -43,36 +40,9 @@

Projects

-

Medal Clip Webhook

+

Medal Clip Webhook

Being a Medal user, I've seen some Guilded or even Slack users want Medal clip sharing for their platform.
While using it directly from the app is easier, I decided to make an app that can send a webhook message to either platform with a clip link.
This can be Self Hosted, but you'll need some Node.js experience most likely.

- -

PCN Player Lookup & API

-

I am in charge of all of the updates that go to both the PCN Website and API!
- Both of which are open source, you can check out the website and API at these links.
- Here's an example of what I've built!

- -
-
-
-
-
-
-
-
-
-
-

-
- -

- - -
- -

-

Contact Me

My email is alex@plaguecraft.xyz, feel free to email me there!

@@ -88,8 +58,8 @@

Follow me on Medal!

-

- Thanks to the Medal API, this stays up to date!
+
+ My latest Medal clip ^

diff --git a/mcw.html b/mcw.html new file mode 100644 index 0000000..a00a23e --- /dev/null +++ b/mcw.html @@ -0,0 +1,162 @@ + + + + Medal.tv Clip Webhook Test + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + + + Medal.tv Clip Webhook
+ Embed - Go to Plaintext + + +
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+ +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file