Skip to content

Commit

Permalink
Rename src/components to src/lib (#68)
Browse files Browse the repository at this point in the history
* mv src/{components,lib}

* make upward relative imports absolute

* $src/lib -> $lib
  • Loading branch information
janosh authored Aug 20, 2022
1 parent 7de4938 commit 950ea84
Show file tree
Hide file tree
Showing 42 changed files with 48 additions and 52 deletions.
4 changes: 2 additions & 2 deletions src/components/BasePage.svelte → src/lib/BasePage.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts">
import Toc from 'svelte-toc/Toc.svelte'
import Update from '~icons/ic/update'
import Img from '../components/Img.svelte'
import type { Page } from '../types'
import { microcopy } from '../stores'
import type { Page } from '../types'
import Img from './Img.svelte'
export let page: Page
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts" context="module">
import type { Load } from '@sveltejs/kit'
import Map from '../components/Map.svelte'
import type { Chapter } from '../types'
import { fetchChapters } from '../fetch'
import { microcopy } from '../stores'
import type { Chapter } from '../types'
import Map from './Map.svelte'
export const load: Load = async () => {
const chapters = await fetchChapters()
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/routes/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import { afterNavigate } from '$app/navigation'
import Footer from '$lib/Footer.svelte'
import Header from '$lib/Header.svelte'
import '../app.css'
import Footer from '../components/Footer.svelte'
import Header from '../components/Header.svelte'
import { microcopy } from '../stores'
import type { LayoutData } from './$types'
Expand Down
2 changes: 1 addition & 1 deletion src/routes/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import ChapterMap from '$lib/ChapterMap.svelte'
import Child from '~icons/fa-solid/child'
import UserGraduate from '~icons/fa-solid/user-graduate'
import Place from '~icons/ic/place'
import ChapterMap from '../components/ChapterMap.svelte'
import { microcopy } from '../stores'
import type { PageData } from './$types'
Expand Down
2 changes: 1 addition & 1 deletion src/routes/[...slug]/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import BasePage from '../../components/BasePage.svelte'
import BasePage from '$lib/BasePage.svelte'
import type { PageData } from './$types'
export let data: PageData
Expand Down
2 changes: 1 addition & 1 deletion src/routes/[...slug]/+page.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { PageLoad } from '@sveltejs/kit'
import { error } from '@sveltejs/kit'
import { fetchPage } from '../../fetch'
import { fetchPage } from 'src/fetch'

export const load: PageLoad = async ({ params }) => {
// delegate route to static/robots.txt
Expand Down
4 changes: 2 additions & 2 deletions src/routes/auszeichnungen/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import BasePage from '$lib/BasePage.svelte'
import Img from '$lib/Img.svelte'
import PriceRibbon from '~icons/fa-solid/award'
import Calendar from '~icons/octicon/calendar'
import BasePage from '../../components/BasePage.svelte'
import Img from '../../components/Img.svelte'
import type { PageData } from './$types'
export let data: PageData
Expand Down
2 changes: 1 addition & 1 deletion src/routes/auszeichnungen/+page.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PageLoad } from '@sveltejs/kit'
import { fetchPage, fetchYamlList } from '../../fetch'
import { fetchPage, fetchYamlList } from 'src/fetch'

export const load: PageLoad = async () => {
const page = await fetchPage(`auszeichnungen`)
Expand Down
6 changes: 3 additions & 3 deletions src/routes/blog/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import PostPreview from '$src/components/PostPreview.svelte'
import Social from '$src/components/Social.svelte'
import TagList from '$src/components/TagList.svelte'
import PostPreview from '$lib/PostPreview.svelte'
import Social from '$lib/Social.svelte'
import TagList from '$lib/TagList.svelte'
import type { BlogTag } from '$src/types'
import { flip } from 'svelte/animate'
import { scale } from 'svelte/transition'
Expand Down
4 changes: 2 additions & 2 deletions src/routes/blog/[slug]/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import Img from '$src/components/Img.svelte'
import ToolTip from '$src/components/ToolTip.svelte'
import Img from '$lib/Img.svelte'
import ToolTip from '$lib/ToolTip.svelte'
import type { Post } from '$src/types'
import PersonCircle from '~icons/bi/person-circle'
import GraduationCap from '~icons/fa-solid/graduation-cap'
Expand Down
2 changes: 1 addition & 1 deletion src/routes/faq/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script lang="ts">
import Collapsible from '$lib/Collapsible.svelte'
import { flip } from 'svelte/animate'
import { scale } from 'svelte/transition'
import ChalkboardTeacher from '~icons/fa-solid/chalkboard-teacher'
Expand All @@ -9,7 +10,6 @@
import MiscellaneousServices from '~icons/ic/round-miscellaneous-services'
import SupportAgent from '~icons/ic/round-support-agent'
import SelectAll from '~icons/ic/select-all'
import Collapsible from '../../components/Collapsible.svelte'
import type { PageData } from './$types'
export let data: PageData
Expand Down
2 changes: 1 addition & 1 deletion src/routes/faq/+page.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PageLoad } from '@sveltejs/kit'
import { fetchYamlList } from '../../fetch'
import { fetchYamlList } from 'src/fetch'

export const load: PageLoad = async () => {
const faqs = await fetchYamlList(`FAQ`, `faq#`)
Expand Down
4 changes: 2 additions & 2 deletions src/routes/lernmaterial/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<script lang="ts">
import BasePage from '$lib/BasePage.svelte'
import Img from '$lib/Img.svelte'
import { flip } from 'svelte/animate'
import { scale } from 'svelte/transition'
import CardText from '~icons/bi/card-text'
Expand All @@ -11,8 +13,6 @@
import SelectAll from '~icons/ic/select-all'
import Atom from '~icons/simple-icons/atom'
import Disqus from '~icons/simple-icons/disqus'
import BasePage from '../../components/BasePage.svelte'
import Img from '../../components/Img.svelte'
import type { PageData } from './$types'
export let data: PageData
Expand Down
2 changes: 1 addition & 1 deletion src/routes/lernmaterial/+page.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PageLoad } from '@sveltejs/kit'
import { fetchPage, fetchYamlList } from '../../fetch'
import { fetchPage, fetchYamlList } from 'src/fetch'

export const load: PageLoad = async () => {
const page = await fetchPage(`lernmaterial`)
Expand Down
4 changes: 2 additions & 2 deletions src/routes/presse/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts">
import BasePage from '$lib/BasePage.svelte'
import Img from '$lib/Img.svelte'
import Place from '~icons/ic/place'
import Newspaper from '~icons/ion/newspaper'
import Calendar from '~icons/octicon/calendar'
import BasePage from '../../components/BasePage.svelte'
import Img from '../../components/Img.svelte'
import type { PageData } from './$types'
export let data: PageData
Expand Down
2 changes: 1 addition & 1 deletion src/routes/presse/+page.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PageLoad } from '@sveltejs/kit'
import { fetchPage, fetchYamlList } from '../../fetch'
import { fetchPage, fetchYamlList } from 'src/fetch'

export const load: PageLoad = async () => {
const page = await fetchPage(`presse`)
Expand Down
10 changes: 5 additions & 5 deletions src/routes/signup-pupil/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script lang="ts">
import CircleSpinner from '$lib/CircleSpinner.svelte'
import FormField from '$lib/FormField.svelte'
import Modal from '$lib/Modal.svelte'
import Plant from '~icons/ri/plant-fill'
import CircleSpinner from '../../components/CircleSpinner.svelte'
import FormField from '../../components/FormField.svelte'
import Modal from '../../components/Modal.svelte'
// to make the signup form truely adaptive to other countries, these 3 files need to be imported adaptively (same in the other form)
import { signupStore } from '../../stores'
import { signup_form_submit_handler } from '../../utils/airtable'
import { signupStore } from 'src/stores'
import { signup_form_submit_handler } from 'src/utils/airtable'
import type { PageData } from './$types'
export let data: PageData
Expand Down
8 changes: 4 additions & 4 deletions src/routes/signup-pupil/+page.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { dev } from '$app/env'
import type { PageLoad } from '@sveltejs/kit'
import { fetchChapters, parseFormData } from '../../fetch'
import { fetchChapters, parseFormData } from 'src/fetch'
// to make the signup form i18n-compatible,
// these 3 files need to be imported adaptively (same in the student form)
import messages from '../../signup-form/de/messages.yml'
import options from '../../signup-form/de/options.yml'
import raw_form from '../../signup-form/de/pupil.yml'
import messages from 'src/signup-form/de/messages.yml'
import options from 'src/signup-form/de/options.yml'
import raw_form from 'src/signup-form/de/pupil.yml'

export const load: PageLoad = async () => {
let chapters = await fetchChapters()
Expand Down
10 changes: 5 additions & 5 deletions src/routes/signup-student/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script lang="ts">
import CircleSpinner from '$lib/CircleSpinner.svelte'
import FormField from '$lib/FormField.svelte'
import Modal from '$lib/Modal.svelte'
import { signupStore } from 'src/stores'
import { signup_form_submit_handler } from 'src/utils/airtable'
import Plant from '~icons/ri/plant-fill'
import CircleSpinner from '../../components/CircleSpinner.svelte'
import FormField from '../../components/FormField.svelte'
import Modal from '../../components/Modal.svelte'
import { signupStore } from '../../stores'
import { signup_form_submit_handler } from '../../utils/airtable'
import type { PageData } from './$types'
export let data: PageData
Expand Down
8 changes: 4 additions & 4 deletions src/routes/signup-student/+page.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { dev } from '$app/env'
import type { PageLoad } from '@sveltejs/kit'
import { fetchChapters, parseFormData } from '../../fetch'
import messages from '../../signup-form/de/messages.yml'
import options from '../../signup-form/de/options.yml'
import raw_form from '../../signup-form/de/student.yml'
import { fetchChapters, parseFormData } from 'src/fetch'
import messages from 'src/signup-form/de/messages.yml'
import options from 'src/signup-form/de/options.yml'
import raw_form from 'src/signup-form/de/student.yml'

export const load: PageLoad = async () => {
let chapters = await fetchChapters()
Expand Down
6 changes: 3 additions & 3 deletions src/routes/standorte/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import BasePage from '$src/components/BasePage.svelte'
import ChapterList from '$src/components/ChapterList.svelte'
import ChapterMap from '$src/components/ChapterMap.svelte'
import BasePage from '$lib/BasePage.svelte'
import ChapterList from '$lib/ChapterList.svelte'
import ChapterMap from '$lib/ChapterMap.svelte'
import type { PageData } from './$types'
export let data: PageData
Expand Down
4 changes: 2 additions & 2 deletions src/routes/standorte/[slug]/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script lang="ts">
import BasePage from '$src/components/BasePage.svelte'
import BasePage from '$lib/BasePage.svelte'
import { microcopy } from 'src/stores'
import InfoCircle from '~icons/bi/info-circle-fill'
import Child from '~icons/fa-solid/child'
import GraduationCap from '~icons/fa-solid/graduation-cap'
import Email from '~icons/ic/email'
import { microcopy } from '../../../stores'
import type { PageData } from './$types'
export let data: PageData
Expand Down
4 changes: 0 additions & 4 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@

"forceConsistentCasingInFileNames": true,

"paths": {
"$src/*": ["./src/*"]
},

"types": ["unplugin-icons/types/svelte"]
}
}

0 comments on commit 950ea84

Please sign in to comment.