diff --git a/src/lib/client/base.ts b/src/lib/api/base.ts similarity index 100% rename from src/lib/client/base.ts rename to src/lib/api/base.ts diff --git a/src/lib/client/lemmy.svelte.ts b/src/lib/api/client.svelte.ts similarity index 94% rename from src/lib/client/lemmy.svelte.ts rename to src/lib/api/client.svelte.ts index 17f83b5c..0f55c1b3 100644 --- a/src/lib/client/lemmy.svelte.ts +++ b/src/lib/api/client.svelte.ts @@ -1,10 +1,10 @@ -import { profile } from '$lib/auth.svelte' +import { profile } from '$lib/app/auth.svelte' import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' import { instanceToURL } from '$lib/util.svelte' import { error } from '@sveltejs/kit' import { type GetSiteResponse } from '$lib/client/types' -import { LemmyClient } from './lemmy/lemmy' -import { PiefedClient } from './piefed/piefed' +import { LemmyClient } from './lemmy/adapter' +import { PiefedClient } from './piefed/adapter' import { DEFAULT_CLIENT_TYPE, type ClientType, BaseClient } from './base' class SiteData { diff --git a/src/lib/client/lemmy/lemmy.ts b/src/lib/api/lemmy/adapter.ts similarity index 100% rename from src/lib/client/lemmy/lemmy.ts rename to src/lib/api/lemmy/adapter.ts diff --git a/src/lib/client/lemmy/rewrite.ts b/src/lib/api/lemmy/rewrite.ts similarity index 100% rename from src/lib/client/lemmy/rewrite.ts rename to src/lib/api/lemmy/rewrite.ts diff --git a/src/lib/client/piefed/piefed.ts b/src/lib/api/piefed/adapter.ts similarity index 100% rename from src/lib/client/piefed/piefed.ts rename to src/lib/api/piefed/adapter.ts diff --git a/src/lib/client/piefed/rewrite.ts b/src/lib/api/piefed/rewrite.ts similarity index 100% rename from src/lib/client/piefed/rewrite.ts rename to src/lib/api/piefed/rewrite.ts diff --git a/src/lib/client/piefed/schema.d.ts b/src/lib/api/piefed/schema.d.ts similarity index 100% rename from src/lib/client/piefed/schema.d.ts rename to src/lib/api/piefed/schema.d.ts diff --git a/src/lib/client/types/schemas/schemas.ts b/src/lib/api/types/generated.ts similarity index 84% rename from src/lib/client/types/schemas/schemas.ts rename to src/lib/api/types/generated.ts index 6a2bd996..74f8220d 100644 --- a/src/lib/client/types/schemas/schemas.ts +++ b/src/lib/api/types/generated.ts @@ -1,3 +1,334 @@ +export interface AddAdminResponse { + admins: Array +} + +export interface AddModToCommunityResponse { + moderators: Array +} + +export interface BanFromCommunityResponse { + person_view: PersonView + banned: boolean +} + +export interface BannedPersonsResponse { + banned: Array +} + +export interface BanPersonResponse { + person_view: PersonView + banned: boolean +} + +export interface BlockCommunityResponse { + community_view: CommunityView + blocked: boolean +} +export interface BlockInstanceResponse { + blocked: boolean +} + +export interface BlockPersonResponse { + person_view: PersonView + blocked: boolean +} +export interface CaptchaResponse { + png: string + wav: string + uuid: string +} + +export interface CommentReplyResponse { + comment_reply_view: CommentReplyView +} + +export interface CommentReportResponse { + comment_report_view: CommentReportView +} + +export interface CommentResponse { + comment_view: CommentView + recipient_ids: Array +} + +export interface CommunityResponse { + community_view: CommunityView + discussion_languages: Array +} + +export interface CustomEmojiResponse { + custom_emoji: CustomEmojiView +} +export interface GenerateTotpSecretResponse { + totp_secret_url: string +} + +export interface GetCaptchaResponse { + ok?: CaptchaResponse +} + +export interface GetComment { + id: CommentId +} + +export interface GetComments { + type_?: ListingType + sort?: CommentSortType + max_depth?: number + page?: number + limit?: number + community_id?: CommunityId + community_name?: string + post_id?: PostId + parent_id?: CommentId + saved_only?: boolean + liked_only?: boolean + disliked_only?: boolean +} + +export interface GetCommentsResponse { + comments: Array +} + +export interface GetCommunity { + id?: CommunityId + name?: string +} + +export interface GetCommunityResponse { + community_view: CommunityView + site?: Site + moderators: Array + discussion_languages: Array +} + +export interface GetFederatedInstancesResponse { + federated_instances?: FederatedInstances +} + +export interface GetModlog { + mod_person_id?: PersonId + community_id?: CommunityId + page?: number + limit?: number + type_?: ModlogActionType + other_person_id?: PersonId + post_id?: PostId + comment_id?: CommentId +} + +export interface GetModlogResponse { + removed_posts: Array + locked_posts: Array + featured_posts: Array + removed_comments: Array + removed_communities: Array + banned_from_community: Array + banned: Array + added_to_community: Array + transferred_to_community: Array + added: Array + admin_purged_persons: Array + admin_purged_communities: Array + admin_purged_posts: Array + admin_purged_comments: Array + hidden_communities: Array +} + +export interface GetPersonDetails { + person_id?: PersonId + username?: string + sort?: SortType + page?: number + limit?: number + community_id?: CommunityId + saved_only?: boolean +} + +export interface GetPersonDetailsResponse { + person_view: PersonView + site?: Site + comments: Array + posts: Array + moderates: Array +} + +export interface GetPersonMentions { + sort?: CommentSortType + page?: number + limit?: number + unread_only?: boolean +} + +export interface GetPersonMentionsResponse { + mentions: Array +} + +export interface GetPost { + id?: PostId + comment_id?: CommentId +} + +export interface GetPostResponse { + post_view: PostView + community_view: CommunityView + moderators: Array + cross_posts: Array +} + +export interface GetPosts { + type_?: ListingType + sort?: SortType + page?: number + limit?: number + community_id?: CommunityId + community_name?: string + saved_only?: boolean + liked_only?: boolean + disliked_only?: boolean + show_hidden?: boolean + show_read?: boolean + show_nsfw?: boolean + page_cursor?: PaginationCursor + feed_id?: string + topic_id?: string +} + +export interface GetPostsResponse { + posts: Array + next_page: PaginationCursor +} + +export interface GetPrivateMessages { + unread_only?: boolean + page?: number + limit?: number + creator_id?: PersonId +} + +export interface GetRegistrationApplication { + person_id: PersonId +} + +export interface GetReplies { + sort?: CommentSortType + page?: number + limit?: number + unread_only?: boolean +} + +export interface GetRepliesResponse { + replies: Array +} + +export interface GetReportCount { + community_id?: CommunityId +} + +export interface GetReportCountResponse { + community_id?: CommunityId + comment_reports: number + post_reports: number + private_message_reports?: number +} +export interface GetSiteMetadata { + url: string +} + +export interface GetSiteMetadataResponse { + metadata: LinkMetadata +} + +export interface GetSiteResponse { + site_view: SiteView + admins: Array + version: string + my_user?: MyUserInfo + all_languages: Array + discussion_languages: Array + taglines: Array + custom_emojis: Array + blocked_urls: Array +} +export interface GetUnreadCountResponse { + replies: number + mentions: number + private_messages: number +} +export interface GetUnreadRegistrationApplicationCountResponse { + registration_applications: number +} + +export interface ListCommentLikesResponse { + comment_likes: Array +} + +export interface ListCommentReportsResponse { + comment_reports: Array +} + +export interface ListCommunitiesResponse { + communities: Array +} + +export interface ListMediaResponse { + images: Array +} + +export interface ListPostLikesResponse { + post_likes: Array +} + +export interface ListPostReportsResponse { + post_reports: Array +} + +export interface ListPrivateMessageReportsResponse { + private_message_reports: Array +} + +export interface ListRegistrationApplicationsResponse { + registration_applications: Array +} +export interface LoginResponse { + jwt?: string + registration_created: boolean + verify_email_sent: boolean +} + +export interface PersonMentionResponse { + person_mention_view: PersonMentionView +} + +export interface PostReportResponse { + post_report_view: PostReportView +} + +export interface PostResponse { + post_view: PostView +} + +export interface PrivateMessageReportResponse { + private_message_report_view: PrivateMessageReportView +} + +export interface PrivateMessageResponse { + private_message_view: PrivateMessageView +} + +export interface PrivateMessagesResponse { + private_messages: Array +} + +export interface RegistrationApplicationResponse { + registration_application: RegistrationApplicationView +} +export interface ResolveObjectResponse { + comment?: CommentView + post?: PostView + community?: CommunityView + person?: PersonView +} // TODO fix type ActivityId = any @@ -2063,3 +2394,22 @@ export interface AssignFlair { post_id: number flair_id_list: number[] } + +export interface SearchResponse { + type_: SearchType + comments: Array + posts: Array + communities: Array + users: Array +} + +export interface SiteResponse { + site_view: SiteView + taglines: Array +} +export interface SuccessResponse { + success: boolean +} +export interface UpdateTotpResponse { + enabled: boolean +} diff --git a/src/lib/api/types/index.ts b/src/lib/api/types/index.ts new file mode 100644 index 00000000..99735f64 --- /dev/null +++ b/src/lib/api/types/index.ts @@ -0,0 +1 @@ +export * from './generated' diff --git a/src/lib/auth.svelte.ts b/src/lib/app/auth.svelte.ts similarity index 96% rename from src/lib/auth.svelte.ts rename to src/lib/app/auth.svelte.ts index b1d160bb..c9c7d432 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/app/auth.svelte.ts @@ -2,15 +2,15 @@ import { browser } from '$app/environment' import { env } from '$env/dynamic/public' import { amModOfAny, isAdmin } from '$comp/lemmy/moderation/moderation.js' import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' -import { client, getClient, site } from '$lib/client/lemmy.svelte' +import { client, getClient, site } from '$lib/api/client.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' import { toast } from 'mono-svelte' import { writable } from 'svelte/store' -import { t } from './i18n/translations' -import { errorMessage } from './lemmy/error' -import { publishedToDate } from './components/util/date' -import type { Community, GetSiteResponse, MyUserInfo } from './client/types' -import { DEFAULT_CLIENT_TYPE, type ClientType } from './client/base' +import { t } from './i18n' +import { errorMessage } from './error' +import { publishedToDate } from '../ui/util/date' +import type { Community, GetSiteResponse, MyUserInfo } from '../api/types' +import { DEFAULT_CLIENT_TYPE, type ClientType } from '../api/base' function getFromStorage(key: string): T | undefined { if (typeof localStorage == 'undefined') return undefined diff --git a/src/lib/lemmy/error.ts b/src/lib/app/error.ts similarity index 90% rename from src/lib/lemmy/error.ts rename to src/lib/app/error.ts index c970a569..75bc4650 100644 --- a/src/lib/lemmy/error.ts +++ b/src/lib/app/error.ts @@ -1,4 +1,4 @@ -import { t } from '$lib/i18n/translations' +import { t } from '$lib/app/i18n/translations' // eslint-disable-next-line export function errorMessage(error: any, instance?: string): string { diff --git a/src/lib/i18n/ar.json b/src/lib/app/i18n/ar.json similarity index 100% rename from src/lib/i18n/ar.json rename to src/lib/app/i18n/ar.json diff --git a/src/lib/i18n/bg.json b/src/lib/app/i18n/bg.json similarity index 100% rename from src/lib/i18n/bg.json rename to src/lib/app/i18n/bg.json diff --git a/src/lib/i18n/de.json b/src/lib/app/i18n/de.json similarity index 100% rename from src/lib/i18n/de.json rename to src/lib/app/i18n/de.json diff --git a/src/lib/i18n/en.json b/src/lib/app/i18n/en.json similarity index 100% rename from src/lib/i18n/en.json rename to src/lib/app/i18n/en.json diff --git a/src/lib/i18n/es.json b/src/lib/app/i18n/es.json similarity index 100% rename from src/lib/i18n/es.json rename to src/lib/app/i18n/es.json diff --git a/src/lib/i18n/et.json b/src/lib/app/i18n/et.json similarity index 100% rename from src/lib/i18n/et.json rename to src/lib/app/i18n/et.json diff --git a/src/lib/i18n/fi.json b/src/lib/app/i18n/fi.json similarity index 100% rename from src/lib/i18n/fi.json rename to src/lib/app/i18n/fi.json diff --git a/src/lib/i18n/fr.json b/src/lib/app/i18n/fr.json similarity index 100% rename from src/lib/i18n/fr.json rename to src/lib/app/i18n/fr.json diff --git a/src/lib/i18n/he.json b/src/lib/app/i18n/he.json similarity index 100% rename from src/lib/i18n/he.json rename to src/lib/app/i18n/he.json diff --git a/src/lib/i18n/hu.json b/src/lib/app/i18n/hu.json similarity index 100% rename from src/lib/i18n/hu.json rename to src/lib/app/i18n/hu.json diff --git a/src/lib/i18n/translations.ts b/src/lib/app/i18n/index.ts similarity index 100% rename from src/lib/i18n/translations.ts rename to src/lib/app/i18n/index.ts diff --git a/src/lib/i18n/ja.json b/src/lib/app/i18n/ja.json similarity index 100% rename from src/lib/i18n/ja.json rename to src/lib/app/i18n/ja.json diff --git a/src/lib/i18n/nl.json b/src/lib/app/i18n/nl.json similarity index 100% rename from src/lib/i18n/nl.json rename to src/lib/app/i18n/nl.json diff --git a/src/lib/i18n/pl.json b/src/lib/app/i18n/pl.json similarity index 100% rename from src/lib/i18n/pl.json rename to src/lib/app/i18n/pl.json diff --git a/src/lib/i18n/pt-BR.json b/src/lib/app/i18n/pt-BR.json similarity index 100% rename from src/lib/i18n/pt-BR.json rename to src/lib/app/i18n/pt-BR.json diff --git a/src/lib/i18n/pt.json b/src/lib/app/i18n/pt.json similarity index 100% rename from src/lib/i18n/pt.json rename to src/lib/app/i18n/pt.json diff --git a/src/lib/i18n/ru.json b/src/lib/app/i18n/ru.json similarity index 100% rename from src/lib/i18n/ru.json rename to src/lib/app/i18n/ru.json diff --git a/src/lib/i18n/tok.json b/src/lib/app/i18n/tok.json similarity index 100% rename from src/lib/i18n/tok.json rename to src/lib/app/i18n/tok.json diff --git a/src/lib/i18n/tr.json b/src/lib/app/i18n/tr.json similarity index 100% rename from src/lib/i18n/tr.json rename to src/lib/app/i18n/tr.json diff --git a/src/lib/i18n/zh-Hans.json b/src/lib/app/i18n/zh-Hans.json similarity index 100% rename from src/lib/i18n/zh-Hans.json rename to src/lib/app/i18n/zh-Hans.json diff --git a/src/lib/i18n/zh-Hant.json b/src/lib/app/i18n/zh-Hant.json similarity index 100% rename from src/lib/i18n/zh-Hant.json rename to src/lib/app/i18n/zh-Hant.json diff --git a/src/lib/instance.svelte.ts b/src/lib/app/instance.svelte.ts similarity index 100% rename from src/lib/instance.svelte.ts rename to src/lib/app/instance.svelte.ts diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/app/markdown/Markdown.svelte similarity index 100% rename from src/lib/components/markdown/Markdown.svelte rename to src/lib/app/markdown/Markdown.svelte diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/app/markdown/MarkdownEditor.svelte similarity index 98% rename from src/lib/components/markdown/MarkdownEditor.svelte rename to src/lib/app/markdown/MarkdownEditor.svelte index 919dde0d..fd940087 100644 --- a/src/lib/components/markdown/MarkdownEditor.svelte +++ b/src/lib/app/markdown/MarkdownEditor.svelte @@ -1,7 +1,7 @@ + + + + diff --git a/src/lib/components/util/date.ts b/src/lib/ui/util/date.ts similarity index 100% rename from src/lib/components/util/date.ts rename to src/lib/ui/util/date.ts diff --git a/src/lib/components/util/debug/DebugObject.svelte b/src/lib/ui/util/debug/DebugObject.svelte similarity index 87% rename from src/lib/components/util/debug/DebugObject.svelte rename to src/lib/ui/util/debug/DebugObject.svelte index a4c7c78d..16c416b4 100644 --- a/src/lib/components/util/debug/DebugObject.svelte +++ b/src/lib/ui/util/debug/DebugObject.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/accounts/+page.svelte b/src/routes/accounts/+page.svelte index ef43ebfe..375deb89 100644 --- a/src/routes/accounts/+page.svelte +++ b/src/routes/accounts/+page.svelte @@ -1,16 +1,16 @@ diff --git a/src/routes/accounts/login/guest/+page.svelte b/src/routes/accounts/login/guest/+page.svelte index 97c36cce..3faf60bc 100644 --- a/src/routes/accounts/login/guest/+page.svelte +++ b/src/routes/accounts/login/guest/+page.svelte @@ -2,7 +2,7 @@ import { Button } from 'mono-svelte' import LoginPage from '../../../login/guest/+page.svelte' import { ArrowLeft, Icon } from 'svelte-hero-icons' - import { t } from '$lib/i18n/translations' + import { t } from '$lib/app/i18n' diff --git a/src/routes/activitypub/externalInteraction/+page.svelte b/src/routes/activitypub/externalInteraction/+page.svelte index 7728c981..b0e08469 100644 --- a/src/routes/activitypub/externalInteraction/+page.svelte +++ b/src/routes/activitypub/externalInteraction/+page.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/create/post/+page.svelte b/src/routes/create/post/+page.svelte index 4a3469ee..7edb958b 100644 --- a/src/routes/create/post/+page.svelte +++ b/src/routes/create/post/+page.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/inbox/+page.svelte b/src/routes/inbox/+page.svelte index 34340614..74303401 100644 --- a/src/routes/inbox/+page.svelte +++ b/src/routes/inbox/+page.svelte @@ -1,18 +1,18 @@ diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte index a2b8a851..5e8e0376 100644 --- a/src/routes/login/+page.svelte +++ b/src/routes/login/+page.svelte @@ -1,19 +1,19 @@ diff --git a/src/routes/moderation/+layout.ts b/src/routes/moderation/+layout.ts index 5b3f1567..8121ad92 100644 --- a/src/routes/moderation/+layout.ts +++ b/src/routes/moderation/+layout.ts @@ -1,4 +1,4 @@ -import { profile } from '$lib/auth.svelte' +import { profile } from '$lib/app/auth.svelte' import { error } from '@sveltejs/kit' export function load() { diff --git a/src/routes/moderation/+page.svelte b/src/routes/moderation/+page.svelte index 28520aa8..d8868d46 100644 --- a/src/routes/moderation/+page.svelte +++ b/src/routes/moderation/+page.svelte @@ -4,17 +4,17 @@ import CommonList from '$comp/ui/layout/CommonList.svelte' import { Header } from '$comp/ui/layout' import Pageination from '$comp/ui/layout/Pageination.svelte' - import Placeholder from '$comp/ui/Placeholder.svelte' - import ProgressBar from '$comp/ui/ProgressBar.svelte' - import { t } from '$lib/i18n/translations' - import { client } from '$lib/client/lemmy.svelte' + import Placeholder from '$lib/ui/info/Placeholder.svelte' + import ProgressBar from '$lib/ui/info/ProgressBar.svelte' + import { t } from '$lib/app/i18n' + import { client } from '$lib/api/client.svelte' import { searchParam } from '$lib/util.svelte.js' import { Button, Material, Select, Spinner, toast } from 'mono-svelte' import Option from 'mono-svelte/forms/select/Option.svelte' import { tick } from 'svelte' import { Check, Funnel, Icon, ShieldCheck, XMark } from 'svelte-hero-icons' import Report from './Report.svelte' - import Fixate from '$comp/ui/generic/Fixate.svelte' + import Fixate from '$lib/ui/generic/Fixate.svelte' import CommunityLink from '$comp/lemmy/community/CommunityLink.svelte' let { data = $bindable() } = $props() diff --git a/src/routes/moderation/+page.ts b/src/routes/moderation/+page.ts index e3f86437..a1a1b61b 100644 --- a/src/routes/moderation/+page.ts +++ b/src/routes/moderation/+page.ts @@ -7,7 +7,7 @@ import { generalizePostReport, generalizePrivateMessageReport, type ReportView, -} from '$comp/lemmy/moderation/report' +} from '$lib/feature/moderation/report' import { ReactiveState } from '$lib/util.svelte' import { error } from '@sveltejs/kit' diff --git a/src/routes/moderation/Report.svelte b/src/routes/moderation/Report.svelte index 9e591d3f..0491f931 100644 --- a/src/routes/moderation/Report.svelte +++ b/src/routes/moderation/Report.svelte @@ -4,10 +4,10 @@ import type { ReportView } from '$comp/lemmy/moderation/report' import { PostItem } from '$comp/lemmy/post' import UserLink from '$comp/lemmy/user/UserLink.svelte' - import Avatar from '$comp/ui/Avatar.svelte' - import { notifications, profile } from '$lib/auth.svelte.js' - import { getClient } from '$lib/client/lemmy.svelte' - import { t } from '$lib/i18n/translations' + import Avatar from '$lib/ui/generic/Avatar.svelte' + import { notifications, profile } from '$lib/app/auth.svelte.js' + import { getClient } from '$lib/api/client.svelte' + import { t } from '$lib/app/i18n' import { errorMessage } from '$lib/lemmy/error' import { Badge, Button, Label, Material, Modal, toast } from 'mono-svelte' import { CheckBadge } from 'svelte-hero-icons' diff --git a/src/routes/moderation/c/[id=integer]/+page.svelte b/src/routes/moderation/c/[id=integer]/+page.svelte index b49e9022..855a60c3 100644 --- a/src/routes/moderation/c/[id=integer]/+page.svelte +++ b/src/routes/moderation/c/[id=integer]/+page.svelte @@ -1,10 +1,10 @@ diff --git a/src/routes/modlog/+page.svelte b/src/routes/modlog/+page.svelte index 2f5e4be9..fc1c9f67 100644 --- a/src/routes/modlog/+page.svelte +++ b/src/routes/modlog/+page.svelte @@ -1,17 +1,17 @@ diff --git a/src/routes/password_change/[token]/+page.svelte b/src/routes/password_change/[token]/+page.svelte index 0eea4f35..9798589e 100644 --- a/src/routes/password_change/[token]/+page.svelte +++ b/src/routes/password_change/[token]/+page.svelte @@ -7,9 +7,9 @@ DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL, instance as currentInstance, - } from '$lib/instance.svelte.js' - import { getClient, validateInstance } from '$lib/client/lemmy.svelte' - import { t } from '$lib/i18n/translations' + } from '$lib/app/instance.svelte.js' + import { getClient, validateInstance } from '$lib/api/client.svelte' + import { t } from '$lib/app/i18n' import { Button, TextInput, toast } from 'mono-svelte' import { errorMessage } from '$lib/lemmy/error' diff --git a/src/routes/post/[instance]/+page.ts b/src/routes/post/[instance]/+page.ts index bc9667a4..4c76c9dc 100644 --- a/src/routes/post/[instance]/+page.ts +++ b/src/routes/post/[instance]/+page.ts @@ -1,5 +1,5 @@ import { resolveRoute } from '$app/paths' -import { profile } from '$lib/auth.svelte.js' +import { profile } from '$lib/app/auth.svelte.js' import { error, redirect } from '@sveltejs/kit' export function load({ params }) { diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index c3b92a52..128af0d0 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -10,16 +10,16 @@ type Tag, } from '$comp/lemmy/post' import PostItem from '$comp/lemmy/post/PostItem.svelte' - import Markdown from '$comp/markdown/Markdown.svelte' - import EndPlaceholder from '$comp/ui/EndPlaceholder.svelte' - import Expandable from '$comp/ui/Expandable.svelte' + import Markdown from '$lib/app/markdown/Markdown.svelte' + import EndPlaceholder from '$lib/ui/layout/EndPlaceholder.svelte' + import Expandable from 'mono-svelte/disclosure/Expandable.svelte' import { CommonList } from '$comp/ui/layout' - import Placeholder from '$comp/ui/Placeholder.svelte' + import Placeholder from '$lib/ui/info/Placeholder.svelte' import { publishedToDate } from '$comp/util/date.js' import FormattedNumber from '$comp/util/FormattedNumber.svelte' - import { profile } from '$lib/auth.svelte.js' - import { client } from '$lib/client/lemmy.svelte' - import { t } from '$lib/i18n/translations.js' + import { profile } from '$lib/app/auth.svelte.js' + import { client } from '$lib/api/client.svelte' + import { t } from '$lib/app/i18n/index.js' import { resumables } from '$lib/lemmy/item.js' import { settings } from '$lib/settings.svelte.js' import { Button, toast } from 'mono-svelte' diff --git a/src/routes/post/[instance]/[id=integer]/+page.ts b/src/routes/post/[instance]/[id=integer]/+page.ts index 20a00fb0..97b6747a 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.ts +++ b/src/routes/post/[instance]/[id=integer]/+page.ts @@ -1,8 +1,8 @@ import { resolveRoute } from '$app/paths' -import { profile } from '$lib/auth.svelte.js' +import { profile } from '$lib/app/auth.svelte.js' import { client } from '$lib/client/lemmy.svelte' import CommunityCard from '$comp/lemmy/community/CommunityCard.svelte' -import { feed } from '$lib/lemmy/feeds/feed.svelte.js' +import { feed } from '$lib/feature/feeds/feed.svelte.js' import { settings } from '$lib/settings.svelte' import { ReactiveState } from '$lib/util.svelte.js' import { redirect } from '@sveltejs/kit' diff --git a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte index 3aa15d2d..8acb4ff6 100644 --- a/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte +++ b/src/routes/post/[instance]/[id=integer]/CommentProvider.svelte @@ -5,14 +5,10 @@ import CommentListVirtualizer from '$comp/lemmy/comment/CommentListVirtualizer.svelte' import { buildCommentsTree } from '$comp/lemmy/comment/comments.svelte' import CommentTree from '$comp/lemmy/comment/CommentTree.svelte' - import EndPlaceholder from '$comp/ui/EndPlaceholder.svelte' - import { profile } from '$lib/auth.svelte' - import type { - CommentSortType, - CommentView, - PostView, - } from '$lib/client/types' - import { t } from '$lib/i18n/translations' + import EndPlaceholder from '$lib/ui/layout/EndPlaceholder.svelte' + import { profile } from '$lib/app/auth.svelte' + import type { CommentSortType, CommentView, PostView } from '$lib/api/types' + import { t } from '$lib/app/i18n' import { settings } from '$lib/settings.svelte' import { Button, Option, Select } from 'mono-svelte' import { onMount } from 'svelte' diff --git a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte index 489376a6..b8b04908 100644 --- a/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/confirm/+page.svelte @@ -2,12 +2,12 @@ import { goto } from '$app/navigation' import { resolveRoute } from '$app/paths' import { page } from '$app/state' - import { profile } from '$lib/auth.svelte' + import { profile } from '$lib/app/auth.svelte' import { Header } from '$comp/ui/layout' import ProfileButton from '$comp/ui/sidebar/ProfileButton.svelte' import SidebarButton from '$comp/ui/sidebar/SidebarButton.svelte' - import { t } from '$lib/i18n/translations' - import { client } from '$lib/client/lemmy.svelte' + import { t } from '$lib/app/i18n' + import { client } from '$lib/api/client.svelte' import { errorMessage } from '$lib/lemmy/error' import { toast } from 'mono-svelte' import Button from 'mono-svelte/button/Button.svelte' diff --git a/src/routes/post/[instance]/[id=integer]/confirm/+page.ts b/src/routes/post/[instance]/[id=integer]/confirm/+page.ts index d3228834..0d0c1765 100644 --- a/src/routes/post/[instance]/[id=integer]/confirm/+page.ts +++ b/src/routes/post/[instance]/[id=integer]/confirm/+page.ts @@ -1,4 +1,4 @@ -import { profile } from '$lib/auth.svelte.js' +import { profile } from '$lib/app/auth.svelte.js' import { redirect } from '@sveltejs/kit' export async function load({ params }) { diff --git a/src/routes/profile/(local_user)/blocks/+page.svelte b/src/routes/profile/(local_user)/blocks/+page.svelte index f0c718d7..86b2783a 100644 --- a/src/routes/profile/(local_user)/blocks/+page.svelte +++ b/src/routes/profile/(local_user)/blocks/+page.svelte @@ -1,18 +1,18 @@ diff --git a/src/routes/profile/(local_user)/password/2fa/+page.svelte b/src/routes/profile/(local_user)/password/2fa/+page.svelte index f58853c0..e8a5d401 100644 --- a/src/routes/profile/(local_user)/password/2fa/+page.svelte +++ b/src/routes/profile/(local_user)/password/2fa/+page.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/profile/voted/[type]/+page.svelte b/src/routes/profile/voted/[type]/+page.svelte index b545a875..4024e091 100644 --- a/src/routes/profile/voted/[type]/+page.svelte +++ b/src/routes/profile/voted/[type]/+page.svelte @@ -1,9 +1,9 @@
diff --git a/src/routes/u/[name]/+page.svelte b/src/routes/u/[name]/+page.svelte index 2548b0f1..359fb511 100644 --- a/src/routes/u/[name]/+page.svelte +++ b/src/routes/u/[name]/+page.svelte @@ -1,16 +1,16 @@
Photon instance
diff --git a/src/routes/util/photonify/+page.svelte b/src/routes/util/photonify/+page.svelte index 04f9b159..dd5a0b99 100644 --- a/src/routes/util/photonify/+page.svelte +++ b/src/routes/util/photonify/+page.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/verify_email/[token]/+page.svelte b/src/routes/verify_email/[token]/+page.svelte index bf3be61d..c64e396a 100644 --- a/src/routes/verify_email/[token]/+page.svelte +++ b/src/routes/verify_email/[token]/+page.svelte @@ -1,6 +1,6 @@ diff --git a/svelte.config.js b/svelte.config.js index b2d254d6..7cefec0a 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -32,7 +32,7 @@ const config = { }) : auto(), alias: { - 'mono-svelte': 'src/lib/mono', + 'mono-svelte': 'src/lib/ui/shared', 'svelte-hero-icons': 'node_modules/@xylightdev/svelte-hero-icons', $comp: 'src/lib/components', },