Skip to content

Commit

Permalink
lib reorg
Browse files Browse the repository at this point in the history
  • Loading branch information
Henahax committed Sep 11, 2024
1 parent 840cd6e commit f7a5315
Show file tree
Hide file tree
Showing 24 changed files with 32 additions and 29 deletions.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { getUTCTimeForStartOfNextDay } from '../functions.svelte';
import type { Task } from '../types';
import { getUTCTimeForStartOfNextDay } from '$lib/functions/reset/functions.svelte';
import type { Task } from '$lib/types/reset/types';
interface Props {
task: Task;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<script lang="ts">
import { getUTCTimeForStartOfNextDay, getUTCTimeForStartOfNextWeek } from '../functions.svelte';
import {
getUTCTimeForStartOfNextDay,
getUTCTimeForStartOfNextWeek
} from '$lib/functions/reset/functions.svelte';
let { interval } = $props();
let timeRemaining = $state(calculateTimeRemaining());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import ListTask from './ListTask.svelte';
import type { Category, Task } from '../types';
import type { Category, Task } from '$lib/types/reset/types';
let { category, icon }: Props = $props();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import ListCategory from './ListCategory.svelte';
import type { Interval } from '../types';
import type { Interval } from '$lib/types/reset/types';
interface Props {
interval: Interval;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import type { Task } from '../types';
import { setCookie } from '../functions.svelte';
import type { Task } from '$lib/types/reset/types';
import { setCookie } from '$lib/functions/reset/functions.svelte';
import EventTimer from './EventTimer.svelte';
interface Props {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import SettingsTask from './SettingsTask.svelte';
import type { Category } from '../types';
import type { Category } from '$lib/types/reset/types';
interface Props {
category: Category;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import SettingsCategory from './SettingsCategory.svelte';
import type { Interval } from '../types';
import type { Interval } from '$lib/types/reset/types';
interface Props {
interval: Interval;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { setCookie } from '../functions.svelte';
import type { Task } from '../types';
import { setCookie } from '$lib/functions/reset/functions.svelte';
import type { Task } from '$lib/types/reset/types';
interface Props {
task: Task;
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.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Task } from './types';
import type { Task } from '$lib/types/reset/types';

export function getUTCTimeForStartOfNextDay() {
const now = new Date();
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/routes/+layout.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { onNavigate } from '$app/navigation';
import './styles.css';
import NavItems from '$lib/NavItems.svelte';
import NavItems from '$lib/components/NavItems.svelte';
onNavigate((navigation) => {
// @ts-ignore
Expand Down
2 changes: 1 addition & 1 deletion src/routes/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import Title from '../lib/Title.svelte';
import Title from '$lib/components/Title.svelte';
let tools = [
{
name: 'Reset',
Expand Down
4 changes: 2 additions & 2 deletions src/routes/ecto/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import Title from '$lib/Title.svelte';
import salvagekits from './salvage.json';
import Title from '$lib/components/Title.svelte';
import salvagekits from '$lib/data/ecto/salvage.json';
</script>

<svelte:head>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/magicfind/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script lang="ts">
import Title from '$lib/Title.svelte';
import categories from './categories.json';
import itemList from './items.json';
import type { Item } from './types';
import Title from '$lib/components/Title.svelte';
import categories from '$lib/data/magicfind/categories.json';
import itemList from '$lib/data/magicfind/items.json';
import type { Item } from '$lib/types/magicfind/types';
let items: Item[] = $state(itemList as Item[]);
let sum: number = $derived(getSum(items));
Expand Down
18 changes: 9 additions & 9 deletions src/routes/reset/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script lang="ts">
import Title from '$lib/Title.svelte';
import type { Interval, Category, Task } from './types';
import IntervalTimer from './lib/IntervalTimer.svelte';
import ListInterval from './lib/ListInterval.svelte';
import SettingsInterval from './lib/SettingsInterval.svelte';
import intervalsData from './intervals.json';
import categoriesData from './categories.json';
import tasksData from './tasks.json';
import Title from '$lib/components/Title.svelte';
import type { Interval, Category, Task } from '$lib/types/reset/types';
import IntervalTimer from '$lib/components/reset/IntervalTimer.svelte';
import ListInterval from '$lib/components/reset/ListInterval.svelte';
import SettingsInterval from '$lib/components/reset/SettingsInterval.svelte';
import intervalsData from '$lib/data/reset/intervals.json';
import categoriesData from '$lib/data/reset/categories.json';
import tasksData from '$lib/data/reset/tasks.json';
const intervals: Interval[] = intervalsData as Interval[];
const categories: Category[] = categoriesData as Category[];
Expand Down

0 comments on commit f7a5315

Please sign in to comment.