code refactor

This commit is contained in:
Jonas_Jones 2023-07-24 15:28:39 +02:00
parent c10e75ac36
commit d63ed25e1a
13 changed files with 386 additions and 405 deletions

View file

@ -1,4 +1,4 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
</head>
</head>

View file

@ -1,9 +1,8 @@
<div class="footer">
<p>Website by Jonas_Jones 2021 - 2023</p>
</div>
<style>
.footer {
height: 1rem;
background-color: #000;

View file

@ -32,8 +32,6 @@
<p id="lastfm_artist"></p>
</div>
</div>
<div class="navigation-menu {showMenu ? 'show' : ''}">
<!-- svelte-ignore a11y-click-events-have-key-events -->
<div class="hamburger-menu close-button {showMenu ? 'open' : ''}" on:click={toggleMenu}>
@ -49,9 +47,9 @@
</div>
</div>
<div class="unsupported"><TooSmallDimsOverlay /></div>
<div class="unsupported">
<TooSmallDimsOverlay />
</div>
<script>
let showMenu = false;
@ -60,20 +58,20 @@
showMenu = !showMenu;
}
import TooSmallDimsOverlay from './TooSmallDimsOverlay.svelte';
import TooSmallDimsOverlay from './TooSmallDimsOverlay.svelte';
let navLinks = [
{ name: 'Home', url: '/' },
{ name: 'Projects', url: '/projects'},
{ name: 'For The Based™', url: '/based'},
{ name: 'Status', url: '/status'},
{ name: 'About', url: '/about' }
];
let navLinks = [
{ name: 'Home', url: '/' },
{ name: 'Projects', url: '/projects'},
{ name: 'For The Based™', url: '/based'},
{ name: 'Status', url: '/status'},
{ name: 'About', url: '/about' }
];
// @ts-ignore
let miscLinks = [
{ name: 'For The Based&trade;', url: '/based'}
]
// @ts-ignore
let miscLinks = [
{ name: 'For The Based&trade;', url: '/based'}
]
const fetch_url = "https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=Jonas_Jones&api_key=57c0ca64285c7ca676bb8c2acf320f41&format=json&limit=1"
/**
@ -97,37 +95,36 @@
//let song_title = truncateString("WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWw");
let artist = truncateString(data.recenttracks.track[0].artist['\#text']);
try {
// @ts-ignore
document.getElementById("lastfm_title").innerHTML = song_title;
// @ts-ignore
document.getElementById("lastfm_artist").innerHTML = artist;
// @ts-ignore
document.getElementById("lastfm_logo").style.backgroundImage = `url(${album_cover})`;
try {
// @ts-ignore
document.getElementById("lastfm_title").innerHTML = song_title;
// @ts-ignore
document.getElementById("lastfm_artist").innerHTML = artist;
// @ts-ignore
document.getElementById("lastfm_logo").style.backgroundImage = `url(${album_cover})`;
} catch (error) {}
} catch (error) {}
try {
let is_playing = data.recenttracks.track[0]['\@attr'].nowplaying;
if (is_playing == "true") {
// @ts-ignore
document.getElementById("lastfm_logo_overlay").src="/equalizer.gif";
} else {
try {
let is_playing = data.recenttracks.track[0]['\@attr'].nowplaying;
if (is_playing == "true") {
// @ts-ignore
document.getElementById("lastfm_logo_overlay").src="/equalizer.gif";
} else {
// @ts-ignore
document.getElementById("lastfm_logo_overlay").src="/pause-icon-256.png";
}
} catch (error) {
try {
// @ts-ignore
document.getElementById("lastfm_logo_overlay").src="/pause-icon-256.png";
}
} catch (error) {
try {
// @ts-ignore
document.getElementById("lastfm_logo_overlay").src="/pause-icon-256.png";
} catch (error) {}
}
} catch (error) {}
}
}
fetchLastFmData();
setInterval(fetchLastFmData, 15000);
</script>
<style>
.hamburger-menu {
position: relative;

View file

@ -1,47 +1,47 @@
<script>
let mouseX = 0;
let mouseY = 0;
let mouseX = 0;
let mouseY = 0;
/**
* @param {{ clientX: number; clientY: number; }} event
*/
function handleMouseMove(event) {
mouseX = event.clientX;
mouseY = event.clientY;
}
</script>
/**
* @param {{ clientX: number; clientY: number; }} event
*/
function handleMouseMove(event) {
mouseX = event.clientX;
mouseY = event.clientY;
}
</script>
<style>
@import '../routes/+page.css';
.container {
min-height: 100vh;
position: relative;
overflow: hidden; /* Ensure the background image does not overflow */
}
<style>
@import '../routes/+page.css';
.container {
min-height: 100vh;
position: relative;
overflow: hidden; /* Ensure the background image does not overflow */
}
.parallax-background {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url('/ricky.webp');
background-repeat: no-repeat;
background-size: cover;
background-position: center center;
@media only screen and (min-width: 768px) {
transform: translateX(calc(-1 * var(--mouse-x) / 50)) translateY(calc(-1 * var(--mouse-y) / 50));
}
z-index: -1; /* Place the background behind other content */
}
</style>
.parallax-background {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: url('/ricky.webp');
background-repeat: no-repeat;
background-size: cover;
background-position: center center;
@media only screen and (min-width: 768px) {
transform: translateX(calc(-1 * var(--mouse-x) / 50)) translateY(calc(-1 * var(--mouse-y) / 50));
}
z-index: -1; /* Place the background behind other content */
}
</style>
<main class="container" on:mousemove={handleMouseMove}>
<div class="parallax-background" style="--mouse-x: {mouseX}px; --mouse-y: {mouseY}px;">
<img src="/ricky.webp" width="102%" height="101%" alt="Parallax Background" class="parallax-image">
<main class="container" on:mousemove={handleMouseMove}>
<div class="parallax-background" style="--mouse-x: {mouseX}px; --mouse-y: {mouseY}px;">
<img src="/ricky.webp" width="102%" height="101%" alt="Parallax Background" class="parallax-image">
</div>
<!-- Your main content goes here -->
<slot></slot>
</main>
</div>
<!-- Your main content goes here -->
<slot></slot>
</main>

View file

@ -1,33 +1,34 @@
<style>
.overlay {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background-color: rgba(0, 0, 0, 0.25);
display: flex;
justify-content: center;
align-items: center;
z-index: 9999;
}
@media (min-width: 299.99px) {
.overlay {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background-color: rgba(0, 0, 0, 0.25);
display: flex;
justify-content: center;
align-items: center;
z-index: 9999;
display: none;
}
}
@media (min-width: 299.99px) {
.overlay {
display: none;
}
}
.notice {
background-color: #1f1f1f;
padding: 20px;
border-radius: 8px 8px 0 0;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
text-align: center;
}
.notice {
background-color: #1f1f1f;
padding: 20px;
border-radius: 8px 8px 0 0;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
text-align: center;
}
</style>
<div class="overlay">
<div class="notice">
<p>Your screen resolution isn't supported by this website. if You're on a computer, try zooming out or resizing the window.</p>
</div>
<div class="notice">
<p>Your screen resolution isn't supported by this website. if You're on a computer, try zooming out or resizing the window.</p>
</div>
</div>

View file

@ -19,8 +19,8 @@
const taeyong = document.querySelector('.taeyong');
taeyong.style.display = 'none';
}
</script>
<ParallaxBg>
<NavBar />
<Padding />
@ -40,10 +40,6 @@
/>
</div>
</center>
<style>
@import '+page.css';
</style>
<Footer />
</ParallaxBg>
<div class="taeyong">

View file

@ -12,36 +12,30 @@
<img src="/root_logo.webp" alt="My Picture" class="picture">
</div>
</div>
<div class="line">
<hr>
</div>
<div class="line-content">
<p>Idk how this dot got here but im leaving it.</p>
</div>
<div class="social-media">
<div class="line">
<hr>
</div>
<div class="line-content">
<p>Idk how this dot got here but im leaving it.</p>
</div>
<div class="social-media">
<div class="row">
<a href="https://github.com/J-onasJones"><i class="fab fa-github"></i></a>
<a href="https://www.youtube.com/channel/UCVIxvKBIMSMgurYS8pK7fSg"><i class="fab fa-youtube"></i></a>
<a href="https://discord.gg/V2EsuUVmWh"><i class="fab fa-discord"></i></a>
<a href="https://github.com/J-onasJones"><i class="fab fa-github"></i></a>
<a href="https://www.youtube.com/channel/UCVIxvKBIMSMgurYS8pK7fSg"><i class="fab fa-youtube"></i></a>
<a href="https://discord.gg/V2EsuUVmWh"><i class="fab fa-discord"></i></a>
</div>
<div class="row">
<a href="https://www.reddit.com/u/Jonas_Jones_"><i class="fab fa-reddit"></i></a>
<a href="https://twitter.com/Jonas_Jones_"><i class="fab fa-twitter"></i></a>
<a href="https://www.instagram.com/_jonas_jones_"><i class="fab fa-instagram"></i></a>
<a href="https://www.reddit.com/u/Jonas_Jones_"><i class="fab fa-reddit"></i></a>
<a href="https://twitter.com/Jonas_Jones_"><i class="fab fa-twitter"></i></a>
<a href="https://www.instagram.com/_jonas_jones_"><i class="fab fa-instagram"></i></a>
</div>
</div>
</ParallaxBg>
<Footer />
<script>
import Navbar from '../components/NavBar.svelte';
import Footer from '../components/Footer.svelte';
import ParallaxBg from '../components/ParallaxBg.svelte';
import Padding from '../components/padding.svelte';
</script>
<style>
@import '+page.css';
</style>
<script>
import Navbar from '../components/NavBar.svelte';
import Footer from '../components/Footer.svelte';
import ParallaxBg from '../components/ParallaxBg.svelte';
import Padding from '../components/padding.svelte';
</script>

View file

@ -1,8 +1,8 @@
<script>
import Footer from "../../components/Footer.svelte";
import NavBar from "../../components/NavBar.svelte";
import ParallaxBg from "../../components/ParallaxBg.svelte";
import Padding from "../../components/padding.svelte";
import NavBar from "../../components/NavBar.svelte";
import ParallaxBg from "../../components/ParallaxBg.svelte";
import Padding from "../../components/padding.svelte";
</script>
<ParallaxBg>
<title>About</title>
@ -23,7 +23,6 @@ import Padding from "../../components/padding.svelte";
TL;DR: I asked ChatGPT. <br>
Also, I like K-Pop.
</p>
<h1>Greatest Acomplishment</h1>
<p>A severity 7.5/10 rated CVE I received for a humble project of mine as the second ever CVE in Minecraft Modding history!</p>
<a href="https://nvd.nist.gov/vuln/detail/CVE-2022-39221">CVE-2022-39221</a>

View file

@ -4,6 +4,7 @@
import ParallaxBg from "../../components/ParallaxBg.svelte";
import Padding from "../../components/padding.svelte";
</script>
<ParallaxBg>
<NavBar />
<title>For the Based</title>
@ -19,13 +20,10 @@
<span class="terminal_user__dollar__text">$</span>
<input title="terminal-input" type="text" id="terminal-input" autocomplete="off" spellcheck="false" autocapitalize="none" class="sc-ilhmMj iNZnsg" value="">
</div>
</div>
<Footer />
</ParallaxBg>
<style>
@import '+page.css';
.terminal_user {

View file

@ -1,228 +1,225 @@
<script lang="ts">
import FontAwesome from "../../components/FontAwesome.svelte";
import Footer from "../../components/Footer.svelte";
import Footer from "../../components/Footer.svelte";
import NavBar from "../../components/NavBar.svelte";
import ParallaxBg from "../../components/ParallaxBg.svelte";
import Padding from "../../components/padding.svelte";
import projects from "./projects.json";
import projects from "./projects.json";
var searchResults = projects;
var searchtext = '';
var searchcategory = '';
var searchlanguage = '';
var searchstatus = '';
function handleSearchText(event) {
searchtext = event.target.value.toLowerCase();
handleSearch()
}
function handleSearchCategory(event) {
searchcategory = event.target.value.toLowerCase();
handleSearch()
}
function handleSearchLang(event) {
searchlanguage = event.target.value.toLowerCase();
handleSearch()
}
function handleSearchStatus(event) {
searchstatus = event.target.value.toLowerCase();
handleSearch()
}
var searchResults = projects;
var searchtext = '';
var searchcategory = '';
var searchlanguage = '';
var searchstatus = '';
function handleSearchText(event) {
searchtext = event.target.value.toLowerCase();
handleSearch()
}
function handleSearchCategory(event) {
searchcategory = event.target.value.toLowerCase();
handleSearch()
}
function handleSearchLang(event) {
searchlanguage = event.target.value.toLowerCase();
handleSearch()
}
function handleSearchStatus(event) {
searchstatus = event.target.value.toLowerCase();
handleSearch()
}
function handleSearch() {
// set searchResults by filtering with searchtext, searchcategory, and searchlanguage
searchResults = projects.filter(project => {
var text = project.title.toLowerCase() + project.description.toLowerCase();
var category = project.categories.join(' ').toLowerCase();
var language = project.languages.join(' ').toLowerCase();
var status = project.status.toLowerCase();
return text.includes(searchtext) && category.includes(searchcategory) && language.includes(searchlanguage) && status.includes(searchstatus);
});
}
function handleSearch() {
// set searchResults by filtering with searchtext, searchcategory, and searchlanguage
searchResults = projects.filter(project => {
var text = project.title.toLowerCase() + project.description.toLowerCase();
var category = project.categories.join(' ').toLowerCase();
var language = project.languages.join(' ').toLowerCase();
var status = project.status.toLowerCase();
return text.includes(searchtext) && category.includes(searchcategory) && language.includes(searchlanguage) && status.includes(searchstatus);
});
}
</script>
<style>
/* Import Font Awesome for social media icons */
@import url('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css');
.container {
width: 90%;
}
.container {
width: 90%;
}
.project-container {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));
gap: 20px;
width: 100%;
}
.project-container {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(450px, 1fr));
gap: 20px;
width: 100%;
}
.project {
transition: background-color 0.3s;
transition: filter 0.3s;
position: relative;
padding: 20px;
border-radius: 8px;
overflow: hidden;
cursor: pointer;
padding-bottom: 50px;
}
.project {
transition: background-color 0.3s;
transition: filter 0.3s;
position: relative;
padding: 20px;
border-radius: 8px;
overflow: hidden;
cursor: pointer;
padding-bottom: 50px;
}
.project-bg {
width: 100%;
height: 100%;
object-fit: cover;
position: absolute;
top: 0;
left: 0;
z-index: -1;
background-color: black;
}
.project-bg {
width: 100%;
height: 100%;
object-fit: cover;
position: absolute;
top: 0;
left: 0;
z-index: -1;
background-color: black;
}
.project-bg img {
width: 100%;
height: 100%;
object-fit: cover;
mask-image: linear-gradient(to right, rgba(0, 0, 0, 0.918), rgba(0, 0, 0, 0));
transition: 0.3s;
}
.project-bg img {
width: 100%;
height: 100%;
object-fit: cover;
mask-image: linear-gradient(to right, rgba(0, 0, 0, 0.918), rgba(0, 0, 0, 0));
transition: 0.3s;
}
.project:hover img {
-webkit-filter: blur(5px);
filter: blur(5px);
}
.project:hover img {
-webkit-filter: blur(5px);
filter: blur(5px);
}
.project-title {
font-size: 20px;
font-weight: bold;
margin-bottom: 10px;
text-align: left;
}
.project-title {
font-size: 20px;
font-weight: bold;
margin-bottom: 10px;
text-align: left;
}
.project-status {
font-size: 20px;
font-weight: bold;
margin-bottom: 10px;
margin-left: 10px;
margin-right: 10px;
padding: 2px;
padding-left: 5px;
padding-right: 5px;
border: 3px solid #dcdcdc;
border-radius: 3px;
}
.project-status {
font-size: 20px;
font-weight: bold;
margin-bottom: 10px;
margin-left: 10px;
margin-right: 10px;
padding: 2px;
padding-left: 5px;
padding-right: 5px;
border: 3px solid #dcdcdc;
border-radius: 3px;
}
.project-version {
font-size: 20px;
font-weight: bold;
color: white;
margin-bottom: 10px;
margin-left: 10px;
margin-right: 10px;
margin-top: -4px;
padding: 2px;
border: 3px solid #dcdcdc;
border-radius: 100px;
float: right;
}
.project-version {
font-size: 20px;
font-weight: bold;
color: white;
margin-bottom: 10px;
margin-left: 10px;
margin-right: 10px;
margin-top: -4px;
padding: 2px;
border: 3px solid #dcdcdc;
border-radius: 100px;
float: right;
}
.project-description {
margin-top: 20px;
margin-bottom: 10px;
margin-right: 12px;
text-align: right;
}
.project-description {
margin-top: 20px;
margin-bottom: 10px;
margin-right: 12px;
text-align: right;
}
.project-links {
display: flex;
justify-content: space-between;
align-items: center;
position: absolute;
bottom: 20px;
}
.project-links {
display: flex;
justify-content: space-between;
align-items: center;
position: absolute;
bottom: 20px;
}
.project-link {
display: inline-block;
margin-left: 10px;
color: #333;
text-decoration: none;
transition: color 0.3s;
}
.project-link {
display: inline-block;
margin-left: 10px;
color: #333;
text-decoration: none;
transition: color 0.3s;
}
.project-link:hover {
color: #666;
}
.project-link:hover {
color: #666;
}
.download-button {
margin-left: 10px;
color: white;
transition: color 0.3s;
background-color: rgb(25, 25, 100);
border-radius: 5px;
padding: 5px;
padding-left: 10px;
padding-right: 10px;
text-decoration: none;
border: 3px solid rgb(0, 0, 100);
position: absolute;
bottom: 20px;
right: 20px;
}
.search-bar {
margin-bottom: 20px;
background-color: rgba(0, 0, 0, 0.678);
padding: 10px;
.download-button {
margin-left: 10px;
color: white;
transition: color 0.3s;
background-color: rgb(25, 25, 100);
border-radius: 5px;
}
padding: 5px;
padding-left: 10px;
padding-right: 10px;
text-decoration: none;
border: 3px solid rgb(0, 0, 100);
position: absolute;
bottom: 20px;
right: 20px;
}
.search-bar input {
background-color: transparent;
border: none;
outline: none;
color: white;
font-size: 20px;
.search-bar {
margin-bottom: 20px;
background-color: rgba(0, 0, 0, 0.678);
padding: 10px;
border-radius: 5px;
}
.search-bar input {
background-color: transparent;
border: none;
outline: none;
color: white;
font-size: 20px;
width: 100%;
padding-left: 10px;
padding-right: 10px;
text-align: center;
}
.search-bar select {
background-color: transparent;
border: none;
outline: none;
color: white;
font-size: 20px;
padding-left: 10px;
padding-right: 10px;
}
.smaller-screen {
display: none;
}
@media only screen and (max-width: 620px) {
.project-container {
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
}
.container {
width: 100%;
padding-left: 10px;
padding-right: 10px;
text-align: center;
margin: 0;
padding: 0;
}
.search-bar select {
background-color: transparent;
border: none;
outline: none;
color: white;
font-size: 20px;
padding-left: 10px;
padding-right: 10px;
}
.smaller-screen {
display: none;
display: block;
}
@media only screen and (max-width: 620px) {
.project-container {
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
}
.container {
width: 100%;
margin: 0;
padding: 0;
}
.smaller-screen {
display: block;
}
}
</style>
}
</style>
<FontAwesome />
<ParallaxBg>
@ -278,56 +275,55 @@ function handleSearch() {
<a style="float: right;margin-right: 10px;margin-top: 10px;">{searchResults.length} results</a>
</div>
<div class="project-container">
{#each searchResults as project}
<div class="project">
<!-- svelte-ignore a11y-missing-attribute -->
<h2 class="project-title">{project.title}<br class="smaller-screen"><br class="smaller-screen"><a class="project-status" style="color: {project.statuscolor};border-color:{project.statuscolor}">{project.status}</a><a class="project-version">{project.version}</a></h2>
<p class="project-description">{project.description}</p>
<div class="project-bg">
<img src="/project-banners/{project.backgroud}" alt=" " />
</div>
<Padding />
<Padding />
<div class="project-links">
<div>
{#each Object.entries(project.links) as [platform, link]}
<a
class="project-link"
href={link}
target="_blank"
rel="noopener noreferrer"
>
{#if platform === "GH"}
<i class="fa fa-github" aria-hidden="true"></i>
{:else if platform === "WB"}
<i class="fa fa-globe" aria-hidden="true"></i>
{:else if platform === "YT"}
<i class="fa fa-youtube" aria-hidden="true"></i>
{:else if platform === "TW"}
<i class="fa fa-twitter" aria-hidden="true"></i>
{:else if platform === "DC"}
<i class="fa fa-discord" aria-hidden="true"></i>
{:else if platform === "PT"}
<i class="fa fa-patreon" aria-hidden="true"></i>
{:else if platform === "SP"}
<i class="fa fa-spotify" aria-hidden="true"></i>
{:else if platform === "IG"}
<i class="fa fa-instagram" aria-hidden="true"></i>
{:else}
{platform}
{/if}
</a>
{/each}
</div>
</div>
<div>
<a class="download-button" href="/projects/{project.title}">More Info</a>
{#each searchResults as project}
<div class="project">
<!-- svelte-ignore a11y-missing-attribute -->
<h2 class="project-title">{project.title}<br class="smaller-screen"><br class="smaller-screen"><a class="project-status" style="color: {project.statuscolor};border-color:{project.statuscolor}">{project.status}</a><a class="project-version">{project.version}</a></h2>
<p class="project-description">{project.description}</p>
<div class="project-bg">
<img src="/project-banners/{project.backgroud}" alt=" " />
</div>
<Padding />
<Padding />
<div class="project-links">
<div>
{#each Object.entries(project.links) as [platform, link]}
<a
class="project-link"
href={link}
target="_blank"
rel="noopener noreferrer"
>
{#if platform === "GH"}
<i class="fa fa-github" aria-hidden="true"></i>
{:else if platform === "WB"}
<i class="fa fa-globe" aria-hidden="true"></i>
{:else if platform === "YT"}
<i class="fa fa-youtube" aria-hidden="true"></i>
{:else if platform === "TW"}
<i class="fa fa-twitter" aria-hidden="true"></i>
{:else if platform === "DC"}
<i class="fa fa-discord" aria-hidden="true"></i>
{:else if platform === "PT"}
<i class="fa fa-patreon" aria-hidden="true"></i>
{:else if platform === "SP"}
<i class="fa fa-spotify" aria-hidden="true"></i>
{:else if platform === "IG"}
<i class="fa fa-instagram" aria-hidden="true"></i>
{:else}
{platform}
{/if}
</a>
{/each}
</div>
</div>
<div>
<a class="download-button" href="/projects/{project.title}">More Info</a>
</div>
{/each}
</div>
<Padding />
{/each}
</div>
<Padding />
</div>
<Footer />
<Footer />
</ParallaxBg>

View file

@ -1,9 +1,10 @@
<script>
import Footer from "../../components/Footer.svelte";
import NavBar from "../../components/NavBar.svelte";
import ParallaxBg from "../../components/ParallaxBg.svelte";
import Padding from "../../components/padding.svelte";
import NavBar from "../../components/NavBar.svelte";
import ParallaxBg from "../../components/ParallaxBg.svelte";
import Padding from "../../components/padding.svelte";
</script>
<ParallaxBg>
<title>Status</title>
<div class="container">