Skip to content

Commit b2f9dd7

Browse files
kevinkacekevinkace
committed
remove addBase
1 parent c15c063 commit b2f9dd7

16 files changed

Lines changed: 36 additions & 60 deletions

File tree

‎create-redirects.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@ const template =
1212
// This file is auto-generated. Do not edit directly.
1313
// see: ./create-redirects.js
1414
15-
import { addBase } from '$lib';
1615
import Wrapper from '$lib/components/Wrapper.svelte';
1716
1817
</script>
1918
2019
<svelte:head>
21-
<meta http-equiv="refresh" content="0; url={addBase('{to}')}" />
20+
<meta http-equiv="refresh" content="0; url={to}" />
2221
<title>Redirecting...</title>
2322
</svelte:head>
2423
2524
<Wrapper>
2625
<h1>Redirecting...</h1>
27-
<p>If you are not redirected automatically, please click <a href={addBase("{to}")}>here</a>.</p>
26+
<p>If you are not redirected automatically, please click <a href={to}>here</a>.</p>
2827
</Wrapper>
2928
3029
<style>

‎src/lib/components/Button.svelte‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
<script lang="ts">
2-
import { addBase } from "$lib/index.ts";
3-
42
let {
53
href,
64
children,
@@ -22,7 +20,7 @@
2220
}
2321
</script>
2422

25-
<a href={addBase(href)} class={cssClass} data-test={dataTest}>
23+
<a href={href} class={cssClass} data-test={dataTest}>
2624
{@render children()}
2725
{#if arrow}
2826
→

‎src/lib/components/Carousel.svelte‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<script lang="ts">
22
import emblaCarouselSvelte from 'embla-carousel-svelte';
3-
import Autoplay from 'embla-carousel-autoplay'
4-
import { addBase } from '$lib';
3+
import Autoplay from 'embla-carousel-autoplay'
54
65
let options = { loop: false }
76
let plugins = [Autoplay()]
@@ -13,7 +12,7 @@
1312
<div class="embla__container">
1413
{#each imgs as img}
1514
<div class="embla__slide">
16-
<img src={addBase(img)} alt="Carousel" />
15+
<img src={img} alt="Carousel" />
1716
</div>
1817
{/each}
1918
</div>

‎src/lib/components/Header.svelte‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
22
import { page } from '$app/stores';
3-
import { addBase } from '$lib';
43
54
import { m } from '$lib/paraglide/messages.js';
65
@@ -48,8 +47,8 @@
4847
</script>
4948

5049
<header data-test="site-header">
51-
<a href={addBase('/')} class="logo-link" data-test="site-logo-link">
52-
<img class="logo" src={addBase("/layout/header/logo.min.png")} alt="">
50+
<a href={'/'} class="logo-link" data-test="site-logo-link">
51+
<img class="logo" src={"/layout/header/logo.min.png"} alt="">
5352

5453
{#if currentUrl === '/'}
5554
<h1 class="logotype">{m['common.scn']()}</h1>
@@ -63,15 +62,15 @@
6362

6463
showNav = !showNav;
6564
}}>
66-
<img src={addBase("/layout/nav-hamburger.svg")} alt={m['common.toggle_nav']()}>
65+
<img src={"/layout/nav-hamburger.svg"} alt={m['common.toggle_nav']()}>
6766
</button>
6867
</header>
6968

7069
<nav class="nav" data-test="site-nav">
7170
<div class="nav-items" class:show-nav={showNav}>
7271
{#each navItems as {href, label}}
7372
<a
74-
href={addBase(href)}
73+
href={href}
7574
class="nav-link"
7675
class:active={href === currentUrl}
7776
onclick={(e) => {

‎src/lib/components/Partners.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
22
import { m } from '$lib/paraglide/messages.js';
3-
import { addBase } from '$lib';
43
</script>
54

65
<h2>
@@ -11,4 +10,4 @@
1110
{m['pages.home.partners.paragraphs.0']()}
1211
</p>
1312

14-
<img src={addBase("/pages/home/scn-partner-logos.min.png")} loading="lazy" alt={m['pages.home.partners.alt']()} />
13+
<img src={"/pages/home/scn-partner-logos.min.png"} loading="lazy" alt={m['pages.home.partners.alt']()} />

‎src/lib/components/Socials.svelte‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
22
import { m } from "$lib/paraglide/messages.js";
3-
import { addBase } from "$lib";
43
54
// type can be "light" or "dark"
65
@@ -43,7 +42,7 @@
4342
<div class={cssClass}>
4443
{#each socials as { href, cta, src }}
4544
<a {href} data-test={`social-${cta.toLowerCase()}`}>
46-
<img src={addBase(src[type])} alt={cta} />
45+
<img src={src[type]} alt={cta} />
4746
</a>
4847
{/each}
4948
</div>

‎src/lib/index.ts‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/routes/+error.svelte‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<script lang="ts">
22
import { page } from '$app/state';
33
4-
import { addBase } from '$lib';
5-
64
import { m } from '$lib/paraglide/messages.js';
75
import Wrapper from '$lib/components/Wrapper.svelte';
86
import PageTitle from '$lib/components/Page-Title.svelte';
@@ -19,21 +17,23 @@
1917
description : m['pages.error.500.description'](),
2018
cta : m['pages.error.500.cta']()
2119
}
22-
}
20+
};
21+
22+
let { status = 404 as 404 | 500 } = $props();
2323
</script>
2424

25-
<PageTitle title={errors[page.status].title} />
25+
<PageTitle title={errors[status].title} />
2626

2727
<Wrapper>
2828
<h1>
29-
{page.status} {errors[page.status].title}
29+
{status} {errors[status].title}
3030
</h1>
3131
<p>
32-
{errors[page.status].description}
32+
{errors[status].description}
3333
</p>
3434
<p>
35-
<a href={addBase('/')} class="button">
36-
{errors[page.status].cta}
35+
<a href={'/'} class="button">
36+
{errors[status].cta}
3737
</a>
3838
</p>
3939
</Wrapper>

‎src/routes/+page.svelte‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import Panel from '$lib/components/Panel.svelte';
1010
import PageTitle from '$lib/components/Page-Title.svelte';
1111
12-
import { addBase } from '$lib';
13-
1412
const overview = [
1513
m['pages.home.overview.paragraphs.0'](),
1614
m['pages.home.overview.paragraphs.1'](),
@@ -48,7 +46,7 @@
4846
<Wrapper>
4947
<section class="center" data-test="home-hero">
5048
<Button
51-
href={addBase(m['pages.home.hero.href']())}
49+
href={m['pages.home.hero.href']()}
5250
type="wide"
5351
arrow={true}
5452
dataTest="home-hero-cta"
@@ -59,7 +57,7 @@
5957

6058
<section data-test="home-building-image">
6159
<img
62-
src={addBase(m['pages.home.building.src']())}
60+
src={m['pages.home.building.src']()}
6361
alt={m['pages.home.building.alt']()}
6462
/>
6563
</section>
@@ -77,7 +75,7 @@
7775
<div class="flex-right">
7876
<Button
7977
type="small"
80-
href={addBase(m['pages.home.overview.about.href']())}
78+
href={m['pages.home.overview.about.href']()}
8179
arrow={true}
8280
dataTest="home-overview-cta"
8381
>
@@ -94,7 +92,7 @@
9492

9593
<div class="button-row">
9694
{#each buttons as { href, cta, dataTest } }
97-
<Button href={addBase(href)} arrow={true} dataTest={dataTest}>
95+
<Button href={href} arrow={true} dataTest={dataTest}>
9896
{cta}
9997
</Button>
10098
{/each}

‎src/routes/about-us/+page.svelte‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
2-
import { m } from "$lib/paraglide/messages.js";
3-
import { addBase } from "$lib";
2+
import { m } from "$lib/paraglide/messages.js";
43
54
import Wrapper from "$lib/components/Wrapper.svelte";
65
import Button from "$lib/components/Button.svelte";
@@ -66,7 +65,7 @@
6665
<p>{@html paragraph}</p>
6766
{/each}
6867

69-
<img src={addBase(section.img.src)} alt={section.img.alt} />
68+
<img src={section.img.src} alt={section.img.alt} />
7069
</Panel>
7170
</section>
7271
{/each}

0 commit comments

Comments
 (0)