Skip to content

Commit 3094f8b

Browse files
authored
Merge pull request #67 from etinaude/urlFilters
Url filters
2 parents 32dd38f + 061b22b commit 3094f8b

33 files changed

Lines changed: 196 additions & 145 deletions

bun.lockb

31.9 KB
Binary file not shown.

package.json

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
{
2-
"name": "portfolio",
3-
"version": "0.0.1",
4-
"private": true,
5-
"type": "module",
6-
"scripts": {
7-
"dev": "vite dev",
8-
"build": "NODE_ENV=production vite build",
9-
"preview": "vite preview",
10-
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
11-
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
12-
"lint": "prettier --plugin-search-dir . --check . && eslint .",
13-
"format": "prettier --plugin-search-dir . --write ."
14-
},
15-
"devDependencies": {
16-
"@sveltejs/adapter-auto": "^2.1.1",
17-
"@sveltejs/adapter-netlify": "^2.0.8",
18-
"@sveltejs/kit": "^1.30.4",
19-
"@typescript-eslint/eslint-plugin": "^5.62.0",
20-
"@typescript-eslint/parser": "^5.62.0",
21-
"eslint": "^8.57.1",
22-
"eslint-config-prettier": "^8.10.0",
23-
"eslint-plugin-svelte": "^2.45.1",
24-
"prettier": "^2.8.8",
25-
"prettier-plugin-svelte": "^2.10.1",
26-
"sass": "^1.80.3",
27-
"svelte": "^4.2.19",
28-
"svelte-check": "^3.8.6",
29-
"tslib": "^2.8.0",
30-
"typescript": "^5.6.3",
31-
"vite": "^4.5.5",
32-
"vite-plugin-minify": "^1.5.2",
33-
"vite-plugin-optimize-css-modules": "^1.1.0",
34-
"vite-plugin-pwa": "^0.16.7"
35-
},
36-
"dependencies": {
37-
"@fontsource/fira-mono": "^5.1.0",
38-
"@novacbn/svelte-image-crop": "github:novacbn/svelte-image-crop#0.0.2",
39-
"browser-image-compression": "^2.0.2",
40-
"cookie": "^0.5.0",
41-
"firebase": "^10.14.1",
42-
"saos": "^1.3.1",
43-
"sharp": "^0.33.5",
44-
"svelte-device-info": "^1.0.6",
45-
"svelte-easy-crop": "^3.0.0",
46-
"svelte-gestures": "^1.5.2",
47-
"vanilla-tilt": "^1.8.1"
48-
}
2+
"name": "portfolio",
3+
"version": "0.0.1",
4+
"private": true,
5+
"type": "module",
6+
"scripts": {
7+
"dev": "vite dev",
8+
"build": "NODE_ENV=production vite build",
9+
"preview": "vite preview",
10+
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
11+
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
12+
"lint": "prettier --plugin-search-dir . --check . && eslint .",
13+
"format": "prettier --plugin-search-dir . --write ."
14+
},
15+
"devDependencies": {
16+
"@sveltejs/adapter-auto": "^2.1.1",
17+
"@sveltejs/adapter-netlify": "^2.0.8",
18+
"@sveltejs/kit": "^1.30.4",
19+
"@typescript-eslint/eslint-plugin": "^5.62.0",
20+
"@typescript-eslint/parser": "^5.62.0",
21+
"eslint": "^8.57.1",
22+
"eslint-config-prettier": "^8.10.0",
23+
"eslint-plugin-svelte": "^2.45.1",
24+
"prettier": "^2.8.8",
25+
"prettier-plugin-svelte": "^2.10.1",
26+
"sass": "^1.80.3",
27+
"svelte": "^4.2.19",
28+
"svelte-check": "^3.8.6",
29+
"tslib": "^2.8.0",
30+
"typescript": "^5.6.3",
31+
"vite": "^5.0.0",
32+
"vite-plugin-minify": "^2.0.0",
33+
"vite-plugin-optimize-css-modules": "^1.2.0",
34+
"vite-plugin-pwa": "^0.21.1"
35+
},
36+
"dependencies": {
37+
"@fontsource/fira-mono": "^5.1.0",
38+
"@novacbn/svelte-image-crop": "github:novacbn/svelte-image-crop#0.0.2",
39+
"browser-image-compression": "^2.0.2",
40+
"cookie": "^0.5.0",
41+
"firebase": "^10.14.1",
42+
"saos": "^1.3.1",
43+
"sharp": "^0.33.5",
44+
"svelte-device-info": "^1.0.6",
45+
"svelte-easy-crop": "^3.0.0",
46+
"svelte-gestures": "^1.5.2",
47+
"vanilla-tilt": "^1.8.1"
48+
}
4949
}

src/lib/components/Banner.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
</div>
2626

2727
<style lang="scss">
28-
@import '../styles/root.scss';
28+
@use 'src/lib/styles/mixins.scss' as *;
29+
@use 'src/lib/styles/variables.scss' as *;
2930
3031
.banner {
3132
@include transition-long;

src/lib/components/ChanglingText.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
<h2 class="change-text">Programmer</h2>
5959

6060
<style lang="scss">
61-
@import '../styles/root.scss';
61+
@use 'src/lib/styles/mixins.scss' as *;
62+
@use 'src/lib/styles/variables.scss' as *;
6263
6364
.change-text {
6465
color: $light;

src/lib/components/HeroImage.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
</section>
6464

6565
<style lang="scss">
66-
@import './../styles/root.scss';
66+
@use 'src/lib/styles/mixins.scss' as *;
67+
@use 'src/lib/styles/variables.scss' as *;
6768
6869
#base {
6970
width: 100vw;

src/lib/components/contact/Contact.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
<Banner bind:this={banner} />
2121

2222
<style lang="scss">
23-
@import './../../styles/root.scss';
23+
@use 'src/lib/styles/mixins.scss' as *;
24+
@use 'src/lib/styles/variables.scss' as *;
2425
2526
.contacts {
26-
--background: #222;
27+
--background: $primary;
2728
width: min(100%, 1200px);
2829
2930
display: flex;

src/lib/components/contact/LinksComp.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
</div>
3333

3434
<style lang="scss">
35-
@import './../../styles/root.scss';
35+
@use 'src/lib/styles/mixins.scss' as *;
36+
@use 'src/lib/styles/variables.scss' as *;
3637
.list {
3738
display: flex;
3839
flex-wrap: wrap;

src/lib/components/contact/MiniProfile.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
{/if}
4141

4242
<style lang="scss">
43-
@import './../../styles/root.scss';
43+
@use 'src/lib/styles/mixins.scss' as *;
44+
@use 'src/lib/styles/variables.scss' as *;
4445
4546
h2 {
4647
text-align: center;

src/lib/components/layout/Cursor.svelte

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
</div>
1515

1616
<style lang="scss">
17-
@import './../../styles/root.scss';
17+
@use 'src/lib/styles/mixins.scss' as *;
18+
@use 'src/lib/styles/variables.scss' as *;
1819
1920
.outer {
2021
@include flex-center;

src/lib/components/layout/Header.svelte

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
leftLink = homeLink;
3737
rightLink = projectsLink;
3838
}
39+
40+
// get tags from url
41+
const urlParams = new URLSearchParams(window.location.search);
42+
let tag = urlParams.get('tag') || '';
43+
44+
homeLink.url = `/?tag=${tag}`;
45+
projectsLink.url = `/projects?tag=${tag}`;
46+
contactLink.url = `/contact?tag=${tag}`;
3947
});
4048
</script>
4149

@@ -78,7 +86,8 @@
7886
</header>
7987

8088
<style lang="scss">
81-
@import './../../styles/root.scss';
89+
@use 'src/lib/styles/mixins.scss' as *;
90+
@use 'src/lib/styles/variables.scss' as *;
8291
8392
header {
8493
display: flex;

0 commit comments

Comments
 (0)