@3birds/midori-ui 0.0.50 → 0.0.52

package/dist/auth.d.ts

@@ -1,6 +1,6 @@
-export declare function signIn(email: string, password: string): Promise<boolean>;
-export declare function signUp(email: string, password: string): Promise<boolean>;
-export declare function resetPassword(email: string): Promise<boolean>;
+export declare function signIn(email: string, password: string): Promise<void>;
+export declare function signUp(email: string, password: string): Promise<void>;
+export declare function resetPassword(email: string): Promise<void>;
 export declare function signOut(): Promise<void>;
 export declare function toSigninErrorMessage(code: string): string;
 export declare function toSignupErrorMessage(code: string): string;

package/dist/auth.js

@@ -1,34 +1,27 @@
 import { signInWithEmailAndPassword, createUserWithEmailAndPassword, sendPasswordResetEmail, signOut as firebaseSignOut } from 'firebase/auth';
 import { auth } from './firebase';
-import { alert } from './alert';
 export async function signIn(email, password) {
     try {
         await signInWithEmailAndPassword(auth, email, password);
-        return true;
     }
     catch (e) {
-        alert.trigger(toSigninErrorMessage(e.code), 'error', 10000);
-        return false;
+        throw new Error(toSigninErrorMessage(e.code));
     }
 }
 export async function signUp(email, password) {
     try {
         await createUserWithEmailAndPassword(auth, email, password);
-        return true;
     }
     catch (e) {
-        alert.trigger(toSignupErrorMessage(e.code), 'error', 10000);
-        return false;
+        throw new Error(toSigninErrorMessage(e.code));
     }
 }
 export async function resetPassword(email) {
     try {
         await sendPasswordResetEmail(auth, email);
-        return true;
     }
     catch (e) {
-        alert.trigger(toResetPasswordErrorMessage(e.code), 'error', 10000);
-        return false;
+        throw new Error(toSigninErrorMessage(e.code));
     }
 }
 export async function signOut() {

package/dist/components/AdsenseAd.svelte

@@ -0,0 +1,59 @@
+<script lang="ts" module>
+	let scriptPromise: Promise<void> | undefined;
+
+	const loadAdsense = (client: string): Promise<void> => {
+		if (scriptPromise) return scriptPromise;
+
+		scriptPromise = new Promise<void>((resolve, reject) => {
+			const script = document.createElement('script');
+			script.async = true;
+			script.crossOrigin = 'anonymous';
+			script.src = `https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=${client}`;
+			script.onload = () => resolve();
+			script.onerror = () => {
+				scriptPromise = undefined; // 広告ブロッカー等で失敗しても、再試行できるようにする
+				reject(new Error('AdSense の読み込みに失敗しました'));
+			};
+			document.head.appendChild(script);
+		});
+
+		return scriptPromise;
+	};
+</script>
+
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { dev } from '$app/environment';
+	import { PUBLIC_ADSENSE_CLIENT } from '$env/static/public';
+
+	let {
+		slot = '8044265066',
+		format = 'auto',
+		responsive = 'false',
+		class: className
+	}: {
+		slot?: string;
+		format?: string;
+		responsive?: 'true' | 'false';
+		class?: string;
+	} = $props();
+
+	onMount(async () => {
+		try {
+			await loadAdsense(PUBLIC_ADSENSE_CLIENT);
+			(window.adsbygoogle = window.adsbygoogle || []).push({});
+		} catch (e) {
+			console.warn(e);
+		}
+	});
+</script>
+
+<ins
+	class="adsbygoogle {className}"
+	style="display:block"
+	data-ad-client={PUBLIC_ADSENSE_CLIENT}
+	data-ad-slot={slot}
+	data-ad-format={format}
+	data-full-width-responsive={responsive}
+	data-adtest={dev ? 'on' : undefined}
+></ins>

package/dist/components/AdsenseAd.svelte.d.ts

@@ -0,0 +1,9 @@
+type $$ComponentProps = {
+    slot?: string;
+    format?: string;
+    responsive?: 'true' | 'false';
+    class?: string;
+};
+declare const AdsenseAd: import("svelte").Component<$$ComponentProps, {}, "">;
+type AdsenseAd = ReturnType<typeof AdsenseAd>;
+export default AdsenseAd;

package/dist/components/CardSide.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Btn, closeSvg, Img, type ContentGeo } from '..';
+	import { Btn, closeSvg, Img, type ContentGeo } from '@3birds/midori-ui';
 
 	let {
 		content,
@@ -12,17 +12,19 @@
 	} = $props();
 </script>
 
-<a
-	class="card fixed right-22 bottom-4 left-4 z-20 mx-auto card-side h-32 max-w-sm rounded-3xl bg-base-100 shadow-sm card-sm sm:right-4"
-	href="/contents/{content.id}{searchParams}"
->
-	<Btn class="absolute top-2 right-2 btn-circle btn-sm" onclick={onClickClose}>
+<div class="fixed right-22 bottom-4 left-4 z-20 mx-auto h-32 max-w-sm sm:right-4">
+	<Btn class="absolute top-2 right-2 z-20 btn-circle btn-sm" onclick={onClickClose}>
 		<Img src={closeSvg} alt="削除" class="size-4" />
 	</Btn>
-	<figure class="aspect-1">
-		<Img src={content.thumbnail} alt={content.name} class="h-full w-full object-cover" />
-	</figure>
-	<div class="card-body justify-center">
-		<h2 class="card-title">{content.name}</h2>
-	</div>
-</a>
+	<a
+		class="card card-side h-full w-full rounded-3xl bg-base-100 shadow-sm card-sm"
+		href="/contents/{content.id}{searchParams}"
+	>
+		<figure class="aspect-1">
+			<Img src={content.thumbnail} alt={content.name} class="h-full w-full object-cover" />
+		</figure>
+		<div class="card-body justify-center">
+			<h2 class="card-title">{content.name}</h2>
+		</div>
+	</a>
+</div>

package/dist/components/CardSide.svelte.d.ts

@@ -1,4 +1,4 @@
-import { type ContentGeo } from '..';
+import { type ContentGeo } from '@3birds/midori-ui';
 type $$ComponentProps = {
     content: ContentGeo;
     searchParams?: string;

package/dist/components/Checkbox.svelte

@@ -0,0 +1,16 @@
+<script lang="ts">
+	let {
+		children,
+		checked = $bindable(false),
+		class: className
+	}: {
+		children: import('svelte').Snippet;
+		checked: boolean;
+		class?: string;
+	} = $props();
+</script>
+
+<label class="label">
+	<input type="checkbox" class="checkbox {className}" bind:checked />
+	{@render children()}
+</label>

package/dist/components/Checkbox.svelte.d.ts

@@ -0,0 +1,8 @@
+type $$ComponentProps = {
+    children: import('svelte').Snippet;
+    checked: boolean;
+    class?: string;
+};
+declare const Checkbox: import("svelte").Component<$$ComponentProps, {}, "checked">;
+type Checkbox = ReturnType<typeof Checkbox>;
+export default Checkbox;

package/dist/components/Pagination.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { page as pageState } from '$app/state';
 	import { Btn } from '@3birds/midori-ui';
 
 	let {
@@ -8,22 +9,23 @@
 		class: className
 	}: { value: number; per: number; deadend: boolean; class?: string } = $props();
 
-	const onClickPrev = () => {
-		value--;
-		window.scrollTo({ top: 0, behavior: 'smooth' });
-	};
+	const generatePaginationHref = (value: number): string => {
+		const searchParams: URLSearchParams = new URLSearchParams(pageState.url.searchParams);
+
+		searchParams.set('page', value.toString());
 
-	const onClickNext = () => {
-		value++;
-		window.scrollTo({ top: 0, behavior: 'smooth' });
+		return `${pageState.url.pathname}?${searchParams.toString()}`;
 	};
+
+	const prevHref = $derived(value === 1 ? '' : generatePaginationHref(value - 1));
+	const nextHref = $derived(deadend ? '' : generatePaginationHref(value + 1));
 </script>
 
 <div class="join col-span-8 col-start-3 grid grid-cols-2 {className}">
-	<Btn class="join-item rounded-r-none btn-outline" disabled={value === 1} onclick={onClickPrev}
+	<Btn class="join-item rounded-r-none btn-outline" href={prevHref} disabled={value === 1}
 		>前の{per}件</Btn
 	>
-	<Btn class="join-item rounded-l-none btn-outline" disabled={deadend} onclick={onClickNext}
+	<Btn class="join-item rounded-l-none btn-outline" disabled={deadend} href={nextHref}
 		>次の{per}件</Btn
 	>
 </div>

package/dist/constants/index.d.ts

@@ -2,8 +2,11 @@ import type { PriorityChoice } from '../types';
 import type { PointExpression } from 'leaflet';
 export declare const MAP_ATTRIBUTION: string;
 export declare const MAP_DEFAULT_ICON_SIZE: PointExpression;
+export declare const MAP_DEFAULT_MYLOCATION_ICON_SIZE: PointExpression;
 export declare const MAP_DEFAULT_ICON_ANCHOR: PointExpression;
+export declare const MAP_DEFAULT_MYLOCATION_ICON_ANCHOR: PointExpression;
 export declare const MAP_MAX_ZOOM: number;
+export declare const MAP_DEFAULT_MYLOCATION_ZOOM: number;
 export declare const MAP_DEFAULT_LATITUDE: number;
 export declare const MAP_DEFAULT_LONGITUDE: number;
 export declare const PRIORITIES: PriorityChoice[];

package/dist/constants/index.js

@@ -1,7 +1,10 @@
 export const MAP_ATTRIBUTION = '<a href="https://github.com/protomaps/basemaps">Protomaps</a> © <a href="https://openstreetmap.org">OpenStreetMap</a>';
 export const MAP_DEFAULT_ICON_SIZE = [20, 20];
+export const MAP_DEFAULT_MYLOCATION_ICON_SIZE = [18, 18];
 export const MAP_DEFAULT_ICON_ANCHOR = [10, 10];
+export const MAP_DEFAULT_MYLOCATION_ICON_ANCHOR = [9, 9];
 export const MAP_MAX_ZOOM = 20;
+export const MAP_DEFAULT_MYLOCATION_ZOOM = 15;
 export const MAP_DEFAULT_LATITUDE = 35.658;
 export const MAP_DEFAULT_LONGITUDE = 139.745;
 export const PRIORITIES = [

package/dist/index.d.ts

@@ -14,6 +14,8 @@ export { default as Img } from './components/Img.svelte';
 export { default as Map } from './components/Map.svelte';
 export { default as Range } from './components/Range.svelte';
 export { default as Textarea } from './components/Textarea.svelte';
+export { default as AdsenseAd } from './components/AdsenseAd.svelte';
+export { default as Checkbox } from './components/Checkbox.svelte';
 export { default as accountSvg } from './assets/account.svg';
 export { default as alertSvg } from './assets/alert.svg';
 export { default as calendarMonthSvg } from './assets/calendar-month.svg';
@@ -254,5 +256,5 @@ export { auth } from './firebase';
 export * as modal from './modals-context.ts';
 export * from './utils/index.ts';
 export { image } from './image.ts';
-export { MAP_ATTRIBUTION, MAP_DEFAULT_ICON_SIZE, PRIORITIES, RATING_OPTIONS, MAP_DEFAULT_ICON_ANCHOR, MAP_MAX_ZOOM, MAP_DEFAULT_LATITUDE, MAP_DEFAULT_LONGITUDE, PRIORITIES_WITHOUT_LOG, PREFECTURE_SVG, POI_ICON } from './constants/index.ts';
-export type { BtnType, InputType, AlertType, ImageType, AlertState, BreadcrumbsItem, FilterItem, Priority, PriorityChoice, ModalsContext, Data, ContentAdditionalInfo, ContentAdmin, ContentImage, ContentReview, ContentMinimal, ContentCasual, ContentFormal, ContentGeo, ContentChildren, ContentReviews, Account, Dashboard, DashboardPref } from './types/index.ts';
+export { MAP_ATTRIBUTION, MAP_DEFAULT_ICON_SIZE, PRIORITIES, RATING_OPTIONS, MAP_DEFAULT_ICON_ANCHOR, MAP_MAX_ZOOM, MAP_DEFAULT_LATITUDE, MAP_DEFAULT_LONGITUDE, PRIORITIES_WITHOUT_LOG, PREFECTURE_SVG, POI_ICON, MAP_DEFAULT_MYLOCATION_ICON_ANCHOR, MAP_DEFAULT_MYLOCATION_ICON_SIZE, MAP_DEFAULT_MYLOCATION_ZOOM } from './constants/index.ts';
+export type { BtnType, InputType, AlertType, ImageType, AlertState, BreadcrumbsItem, FilterItem, Priority, PriorityChoice, ModalsContext, Data, ContentAdditionalInfo, ContentAdmin, ContentImage, ContentReview, ContentMinimal, ContentCasual, ContentFormal, ContentGeo, ContentChildren, ContentReviews, Notice, Dashboard, DashboardPref } from './types/index.ts';

package/dist/index.js

@@ -15,6 +15,8 @@ export { default as Img } from './components/Img.svelte';
 export { default as Map } from './components/Map.svelte';
 export { default as Range } from './components/Range.svelte';
 export { default as Textarea } from './components/Textarea.svelte';
+export { default as AdsenseAd } from './components/AdsenseAd.svelte';
+export { default as Checkbox } from './components/Checkbox.svelte';
 export { default as accountSvg } from './assets/account.svg';
 export { default as alertSvg } from './assets/alert.svg';
 export { default as calendarMonthSvg } from './assets/calendar-month.svg';
@@ -255,4 +257,4 @@ export { auth } from './firebase';
 export * as modal from "./modals-context.js";
 export * from "./utils/index.js";
 export { image } from "./image.js";
-export { MAP_ATTRIBUTION, MAP_DEFAULT_ICON_SIZE, PRIORITIES, RATING_OPTIONS, MAP_DEFAULT_ICON_ANCHOR, MAP_MAX_ZOOM, MAP_DEFAULT_LATITUDE, MAP_DEFAULT_LONGITUDE, PRIORITIES_WITHOUT_LOG, PREFECTURE_SVG, POI_ICON } from "./constants/index.js";
+export { MAP_ATTRIBUTION, MAP_DEFAULT_ICON_SIZE, PRIORITIES, RATING_OPTIONS, MAP_DEFAULT_ICON_ANCHOR, MAP_MAX_ZOOM, MAP_DEFAULT_LATITUDE, MAP_DEFAULT_LONGITUDE, PRIORITIES_WITHOUT_LOG, PREFECTURE_SVG, POI_ICON, MAP_DEFAULT_MYLOCATION_ICON_ANCHOR, MAP_DEFAULT_MYLOCATION_ICON_SIZE, MAP_DEFAULT_MYLOCATION_ZOOM } from "./constants/index.js";

package/dist/types/index.d.ts

@@ -31,6 +31,7 @@ export interface Data<T> {
     status: number;
     data?: T;
     message?: string;
+    meta?: string;
 }
 export interface ContentImage {
     src: string;
@@ -119,20 +120,12 @@ export interface ContentChildren extends ContentAttribute {
 export interface ContentReviews extends ContentAttribute {
     reviews: ContentReview[];
 }
-export interface Account {
+export interface Notice {
     id: string;
-    photo?: string;
-    email: string;
-    password: string;
-    stripe_customer_id: string;
-    plan_id: string;
-    nickname: string;
-    management_condition: ManagementCondition;
-}
-interface ManagementCondition {
-    content_review_ids: string[];
-    favorite_content_ids: string[];
-    ads: boolean;
+    pinned: boolean;
+    updated_at: string;
+    title: string;
+    body: string;
 }
 export interface Dashboard {
     hot_contents: ContentCasual[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@3birds/midori-ui",
-	"version": "0.0.50",
+	"version": "0.0.52",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",