Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SvelteKit component refactor #520

Merged
merged 4 commits into from
Apr 22, 2024
Merged

SvelteKit component refactor #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76d94a5
Refactor Logo.stories into /common
allanlasser Apr 22, 2024
93e3faa
Refactor layouts into lib/components/layouts
allanlasser Apr 22, 2024
d55fcd2
Fix import
allanlasser Apr 22, 2024
04618c9
Fix import
allanlasser Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ib/components/stories/Logo.stories.svelte → ...onents/common/stories/Logo.stories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script context="module" lang="ts">
import { Story } from "@storybook/addon-svelte-csf";
import Logo from "../common/Logo.svelte";
import Logo from "../Logo.svelte";

export const meta = {
title: "Components / Common / Logo",
Expand Down
0 src/lib/components/ContentLayout.svelte → ...b/components/layouts/ContentLayout.svelte
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions src/lib/components/MainLayout.svelte → src/lib/components/layouts/MainLayout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
import { getContext } from "svelte";
import { SidebarCollapse16, SidebarExpand16 } from "svelte-octicons";

import Button from "./common/Button.svelte";
import Flex from "./common/Flex.svelte";
import SignedIn from "./common/SignedIn.svelte";
import UserMenu from "./navigation/UserMenu.svelte";
import OrgMenu from "./navigation/OrgMenu.svelte";
import Button from "../common/Button.svelte";
import Flex from "../common/Flex.svelte";
import SignedIn from "../common/SignedIn.svelte";
import UserMenu from "../navigation/UserMenu.svelte";
import OrgMenu from "../navigation/OrgMenu.svelte";

import { SIGN_IN_URL } from "@/config/config";
import Breadcrumbs from "./navigation/Breadcrumbs.svelte";
import LanguageMenu from "./navigation/LanguageMenu.svelte";
import HelpMenu from "./navigation/HelpMenu.svelte";
import Breadcrumbs from "../navigation/Breadcrumbs.svelte";
import LanguageMenu from "../navigation/LanguageMenu.svelte";
import HelpMenu from "../navigation/HelpMenu.svelte";

export let modal: boolean = false;

Expand Down
14 changes: 7 additions & 7 deletions ...ponents/stories/MainLayout.stories.svelte → ...layouts/stories/MainLayout.stories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
import Button from "$lib/components/common/Button.svelte";
import SidebarItem from "$lib/components/sidebar/SidebarItem.svelte";

import documents from "../../api/fixtures/documents/documents.json";
import Flex from "../common/Flex.svelte";
import SidebarGroup from "../sidebar/SidebarGroup.svelte";
import Action from "../common/Action.svelte";
import documents from "../../../api/fixtures/documents/documents.json";
import Flex from "../../common/Flex.svelte";
import SidebarGroup from "../../sidebar/SidebarGroup.svelte";
import Action from "../../common/Action.svelte";
import Pin from "@/common/Pin.svelte";
import ResultsList from "../documents/ResultsList.svelte";
import ResultsList from "../../documents/ResultsList.svelte";
import ContentLayout from "../ContentLayout.svelte";
import PageToolbar from "../common/PageToolbar.svelte";
import Search from "../inputs/Search.svelte";
import PageToolbar from "../../common/PageToolbar.svelte";
import Search from "../../inputs/Search.svelte";

import { addons } from "@/test/handlers/addons";

Expand Down
4 changes: 2 additions & 2 deletions src/routes/app/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
total,
visible,
} from "$lib/components/documents/ResultsList.svelte";
import ContentLayout from "$lib/components/ContentLayout.svelte";
import MainLayout from "$lib/components/layouts/MainLayout.svelte";
import ContentLayout from "$lib/components/layouts/ContentLayout.svelte";
import PageToolbar from "$lib/components/common/PageToolbar.svelte";
import Search from "$lib/components/inputs/Search.svelte";
import Empty from "$lib/components/common/Empty.svelte";
import Button from "$lib/components/common/Button.svelte";
import MainLayout from "$lib/components/MainLayout.svelte";
import SignedIn from "$lib/components/common/SignedIn.svelte";
import Actions from "./sidebar/Actions.svelte";
import AddOns from "./sidebar/AddOns.svelte";
Expand Down
5 changes: 2 additions & 3 deletions src/routes/app/add-ons/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
import Search from "@/lib/components/inputs/Search.svelte";
import Pin from "@/common/icons/Pin.svelte";
import Star from "@/common/icons/Star.svelte";
import Credit from "@/common/icons/Credit.svelte";
import ContentLayout from "$lib/components/ContentLayout.svelte";
import ContentLayout from "$lib/components/layouts/ContentLayout.svelte";
import Empty from "$lib/components/common/Empty.svelte";
import MainLayout from "$lib/components/MainLayout.svelte";
import MainLayout from "$lib/components/layouts/MainLayout.svelte";
import PageToolbar from "$lib/components/common/PageToolbar.svelte";
import Error from "@/lib/components/common/Error.svelte";
import ListItem from "$lib/components/addons/AddOnListItem.svelte";
Expand Down
2 changes: 1 addition & 1 deletion src/routes/app/add-ons/[owner]/[repo]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import MainLayout from "@/lib/components/MainLayout.svelte";
import MainLayout from "@/lib/components/layouts/MainLayout.svelte";

export let data;
</script>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/app/upload/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import "@/style/kit.css";

import MainLayout from "@/lib/components/MainLayout.svelte";
import MainLayout from "@/lib/components/layouts/MainLayout.svelte";
import SignedIn from "@/lib/components/common/SignedIn.svelte";

import Documents from "../sidebar/Documents.svelte";
Expand Down
2 changes: 1 addition & 1 deletion src/routes/documents/[id]-[slug]/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import type { Project } from "$lib/api/types";

import MainLayout from "$lib/components/MainLayout.svelte";
import MainLayout from "$lib/components/layouts/MainLayout.svelte";
import SignedIn from "$lib/components/common/SignedIn.svelte";

// sidebars
Expand Down
Loading