sangelo/website
sangelo/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Project Refactoring and some Cleanup #1

Merged
sangelo merged 3 commits from scroll-cleanup into main 2024-03-12 19:47:04 +00:00
Conversation 0 Commits 3 Files changed 18 +133 -197
18 changed files with 133 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit da885bec57 - Show all commits

31
src/routes/About.svelte → src/lib/components/About.svelte
View file

@ -1,30 +1,5 @@
<script lang="ts">
import { goto } from '$app/navigation';
function smoothScrollTo(elementId: string) {
const element = document.getElementById(elementId);
if (element) {
element.scrollIntoView({
behavior: 'smooth'
});
}
}
function redirectToHome() {
// goto('/');
smoothScrollTo('home');
}
function handleKeydown(event: KeyboardEvent) {
// Trigger redirection on Enter key or Space bar
if (event.key === 'Enter' || event.key === ' ') {
redirectToHome();
}
}
function openWebsite(url: string) {
goto(url);
}
import { smoothScrollTo, handleKeydown } from '$lib/index';
</script>
<div id="about" class="section">
@ -38,7 +13,7 @@
fill="none"
xmlns="http://www.w3.org/2000/svg"
tabindex="0"
on:click={redirectToHome}
on:click={() => smoothScrollTo('home')}
on:keydown={handleKeydown}
>
<mask
@ -79,5 +54,5 @@
</div>
<style lang="scss">
@import '../styles/about.scss';
@import '$styles/about.scss';
</style>

32
src/routes/Home.svelte → src/lib/components/Home.svelte
View file

@ -1,32 +1,6 @@
<script lang='ts'>
import { goto } from '$app/navigation';
import IconChevronDown from 'svelte-material-icons/ChevronDown.svelte';
function smoothScrollTo(elementId: string) {
const element = document.getElementById(elementId);
if (element) {
element.scrollIntoView({
behavior: 'smooth'
});
}
}
function redirectToHome() {
// goto('/');
smoothScrollTo('home');
}
function handleKeydown(event: KeyboardEvent) {
// Trigger redirection on Enter key or Space bar
if (event.key === 'Enter' || event.key === ' ') {
redirectToHome();
}
}
function openWebsite(url: string) {
goto(url);
}
import { smoothScrollTo, handleKeydown } from '$lib/index';
</script>
<div id="home" class="section">
@ -80,6 +54,6 @@
</div>
<style lang="scss">
@import '../styles/index.scss';
@import '../styles/home.scss';
@import '$styles/index.scss';
@import '$styles/home.scss';
</style>

0
src/routes/Modal.svelte → src/lib/components/Modal.svelte
View file

0
src/routes/Navbar.svelte → src/lib/components/Navbar.svelte
View file

47
src/routes/Projects.svelte → src/lib/components/Projects.svelte
View file

@ -1,14 +1,16 @@
<script lang="ts">
import { goto } from '$app/navigation';
import Modal from './Modal.svelte';
import DashinitModal from './modals/dashinit.svelte';
import SangeFaultModal from './modals/sangefault.svelte';
import ExploreCraftModal from './modals/explorecraft.svelte';
import UtilityClientModal from './modals/utilityclient.svelte';
import SangeloSpaceModal from './modals/sangelospace.svelte';
import LunivityModal from './modals/lunivity.svelte';
import MoreProjectsModal from './modals/more.svelte';
// import type { SvelteComponent } from 'svelte';
import { smoothScrollTo, handleKeydown } from '$lib/index';
// Modal
import Modal from '$lib/components/Modal.svelte';
import DashinitModal from '$lib/modals/dashinit.svelte';
import SangeFaultModal from '$lib/modals/sangefault.svelte';
import ExploreCraftModal from '$lib/modals/explorecraft.svelte';
import UtilityClientModal from '$lib/modals/utilityclient.svelte';
import SangeloSpaceModal from '$lib/modals/sangelospace.svelte';
import LunivityModal from '$lib/modals/lunivity.svelte';
import MoreProjectsModal from '$lib/modals/more.svelte';
let showModal = false;
let selectedModule: any = null;
@ -22,27 +24,6 @@
showModal = false;
}
function smoothScrollTo(elementId: string) {
const element = document.getElementById(elementId);
if (element) {
element.scrollIntoView({
behavior: 'smooth'
});
}
}
function redirectToHome() {
// goto('/');
smoothScrollTo('home');
}
function handleKeydown(event: KeyboardEvent) {
// Trigger redirection on Enter key or Space bar
if (event.key === 'Enter' || event.key === ' ') {
redirectToHome();
}
}
</script>
<div id="projects" class="section">
@ -56,7 +37,7 @@
fill="none"
xmlns="http://www.w3.org/2000/svg"
tabindex="0"
on:click={redirectToHome}
on:click={() => smoothScrollTo('home')}
on:keydown={handleKeydown}
>
<mask
@ -119,5 +100,5 @@
</div>
<style lang="scss">
@import '../styles/projects.scss';
@import '$styles/projects.scss';
</style>

87
src/routes/Socials.svelte → src/lib/components/Socials.svelte
View file

@ -1,7 +1,8 @@
<script lang="ts">
import { onMount } from 'svelte';
import { goto } from '$app/navigation';
import { slide } from 'svelte/transition';
import { smoothScrollTo, handleKeydown, openWebsite } from '$lib/index';
import { emojis } from '$lib/emojis';
// Icons
import IconDiscord from 'svelte-material-icons/Discord.svelte';
@ -14,93 +15,27 @@
import IconMastodon from 'svelte-material-icons/Mastodon.svelte';
import IconSteam from 'svelte-material-icons/Steam.svelte';
// Initialisations
let showMore = false;
const emojis = [
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ☕️',
'with 🍵',
'with 🍪',
'with 💤',
'on a 💻',
'in 🏫',
'at 🏠',
'with passion',
'with <img src="/assets/emojis/vscodium.png" alt="VSCodium" style="height: 18px;"/>',
'with <img src="/assets/emojis/stackoverflow.png" alt="StackOverflow" style="height: 18px;"/>',
'with <img src="/assets/emojis/svelte.png" alt="Svelte" style="height: 18px;" />'
];
let emoji = '';
// Functions
function changeEmoji() {
export function changeEmoji() {
emoji = emojis[Math.floor(Math.random() * emojis.length)];
}
function toggleShowMore() {
export function toggleShowMore() {
showMore = !showMore;
}
onMount(() => {
changeEmoji();
});
function smoothScrollTo(elementId: string) {
const element = document.getElementById(elementId);
if (element) {
element.scrollIntoView({
behavior: 'smooth'
});
}
}
function redirectToHome() {
// goto('/');
smoothScrollTo('home');
}
function handleKeydownHome(event: KeyboardEvent) {
// Trigger redirection on Enter key or Space bar
if (event.key === 'Enter' || event.key === ' ') {
redirectToHome();
}
}
function handleKeydownToggleMore(event: KeyboardEvent) {
export function handleKeydownToggleMore(event: KeyboardEvent) {
// Trigger redirection on Enter key or Space bar
if (event.key === 'Enter' || event.key === ' ') {
toggleShowMore();
}
}
function openWebsite(url: string) {
goto(url);
}
onMount(() => {
changeEmoji();
});
</script>
<div id="socials" class="section">
@ -299,8 +234,8 @@
fill="none"
xmlns="http://www.w3.org/2000/svg"
tabindex="0"
on:click={redirectToHome}
on:keydown={handleKeydownHome}
on:click={() => smoothScrollTo('home')}
on:keydown={handleKeydown}
>
<mask
id="mask0_1404_2"
@ -336,5 +271,5 @@
</div>
<style lang="scss">
@import '../styles/socials.scss';
@import '$styles/socials.scss';
</style>

37
src/lib/emojis.ts Normal file
View file

@ -0,0 +1,37 @@
// Initialisations
export const emojis = [
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ❤️',
'with ☕️',
'with 🍵',
'with 🍪',
'with 💤',
'on a 💻',
'in 🏫',
'at 🏠',
'with passion',
'with <img src="/assets/emojis/vscodium.png" alt="VSCodium" style="height: 18px;"/>',
'with <img src="/assets/emojis/stackoverflow.png" alt="StackOverflow" style="height: 18px;"/>',
'with <img src="/assets/emojis/svelte.png" alt="Svelte" style="height: 18px;" />'
];

29
src/lib/index.ts
View file

@ -1 +1,28 @@
// place files you want to import through the `$lib` alias in this folder.
// index.ts
import { goto } from '$app/navigation';
export function smoothScrollTo(elementId: string) {
const element = document.getElementById(elementId);
if (element) {
element.scrollIntoView({
behavior: 'smooth'
});
}
}
// export function redirectToHome() {
// // goto('/');
// smoothScrollTo('home');
// }
export function handleKeydown(event: KeyboardEvent) {
// Trigger redirection on Enter key or Space bar
if (event.key === 'Enter' || event.key === ' ') {
smoothScrollTo('home');
}
}
export function openWebsite(url: string) {
goto(url);
}

4
src/routes/modals/dashinit.svelte → src/lib/modals/dashinit.svelte
View file

@ -37,6 +37,6 @@
</content>
<style lang="scss">
@import '../../styles/modal.scss';
@import '../../styles/mobile/modal-mobile.scss';
@import '$styles/modal.scss';
@import '$styles/mobile/modal-mobile.scss';
</style>

4
src/routes/modals/explorecraft.svelte → src/lib/modals/explorecraft.svelte
View file

@ -37,6 +37,6 @@
</content>
<style lang="scss">
@import '../../styles/modal.scss';
@import '../../styles/mobile/modal-mobile.scss';
@import '$styles/modal.scss';
@import '$styles/mobile/modal-mobile.scss';
</style>

4
src/routes/modals/lunivity.svelte → src/lib/modals/lunivity.svelte
View file

@ -37,6 +37,6 @@
</content>
<style lang="scss">
@import '../../styles/modal.scss';
@import '../../styles/mobile/modal-mobile.scss';
@import '$styles/modal.scss';
@import '$styles/mobile/modal-mobile.scss';
</style>

12
src/routes/modals/more.svelte → src/lib/modals/more.svelte
View file

@ -1,10 +1,4 @@
<script lang="ts">
import Modal from '../Modal.svelte';
import DashinitModal from './dashinit.svelte';
import SangeFaultModal from './sangefault.svelte';
import ExploreCraftModal from './explorecraft.svelte';
import UtilityClientModal from './utilityclient.svelte';
import SangeloSpaceModal from './sangelospace.svelte'
import IconCobweb from 'svelte-material-icons/SpiderWeb.svelte';
import IconArchive from 'svelte-material-icons/ArchiveOutline.svelte';
@ -132,7 +126,7 @@
</content>
<style lang="scss">
@import '../../styles/modal.scss';
@import '../../styles/mobile/modal-mobile.scss';
@import '../../styles/modal-more.scss';
@import '$styles/modal.scss';
@import '$styles/mobile/modal-mobile.scss';
@import '$styles/modal-more.scss';
</style>

4
src/routes/modals/sangefault.svelte → src/lib/modals/sangefault.svelte
View file

@ -37,6 +37,6 @@
</content>
<style lang="scss">
@import '../../styles/modal.scss';
@import '../../styles/mobile/modal-mobile.scss';
@import '$styles/modal.scss';
@import '$styles/mobile/modal-mobile.scss';
</style>

4
src/routes/modals/sangelospace.svelte → src/lib/modals/sangelospace.svelte
View file

@ -37,6 +37,6 @@
</content>
<style lang="scss">
@import '../../styles/modal.scss';
@import '../../styles/mobile/modal-mobile.scss';
@import '$styles/modal.scss';
@import '$styles/mobile/modal-mobile.scss';
</style>

4
src/routes/modals/utilityclient.svelte → src/lib/modals/utilityclient.svelte
View file

@ -37,6 +37,6 @@
</content>
<style lang="scss">
@import '../../styles/modal.scss';
@import '../../styles/mobile/modal-mobile.scss';
@import '$styles/modal.scss';
@import '$styles/mobile/modal-mobile.scss';
</style>

2
src/routes/+layout.svelte
View file

@ -1,6 +1,6 @@
<script>
import '../app.scss';
import Navbar from './Navbar.svelte';
import Navbar from '$lib/components/Navbar.svelte';
import { fly } from 'svelte/transition';
export let data;

10
src/routes/+page.svelte
View file

@ -1,9 +1,9 @@
<script lang="ts">
import Home from './Home.svelte';
import About from './About.svelte';
import Projects from './Projects.svelte';
import Socials from './Socials.svelte';
import Home from '$lib/components/Home.svelte';
import About from '$lib/components/About.svelte';
import Projects from '$lib/components/Projects.svelte';
import Socials from '$lib/components/Socials.svelte';
</script>
@ -15,5 +15,5 @@
</div>
<style lang="scss">
@import '../styles/index.scss';
@import '$styles/index.scss';
</style>

15
svelte.config.js
View file

@ -8,6 +8,13 @@ const config = {
// for more information about preprocessors
preprocess: [vitePreprocess({})],
onwarn: (warning, handler) => {
if (warning.code === 'css-unused-selector') {
return;
}
handler(warning);
},
kit: {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
// If your environment is not supported or you settled on a specific environment, switch out the adapter.
@ -20,7 +27,13 @@ const config = {
fallback: undefined,
precompress: false,
strict: true
})
}),
alias: {
$routes: "src/routes",
$components: "src/components",
$styles: "src/styles"
},
}
};