8 Commits

Author SHA1 Message Date
68b1884b73 chore(release): v2.0.6
All checks were successful
CI / lint-and-test (push) Successful in 1m2s
Docker Build and Release / build-and-push (push) Successful in 1m1s
Docker Build and Release / release (push) Successful in 9s
Made-with: Cursor
2026-03-04 22:12:22 +03:00
fb786c4c3a refactor: remove haptic feedback triggers from calendar and duty components
- Eliminated triggerHapticLight calls from CalendarPage, CalendarDay, DayDetail, and DutyTimelineCard components to streamline user interaction.
- This change focuses on improving performance and reducing unnecessary feedback in the user interface.
2026-03-04 22:11:07 +03:00
07e22079ee feat: enhance CSS and components for Telegram Mini App performance
- Updated CSS to utilize viewport variables for safe area insets and stable height, improving layout consistency across devices.
- Introduced haptic feedback triggers in various components to enhance user interaction, mimicking native Telegram behavior.
- Added functionality to detect Android performance class, minimizing animations on low-performance devices for better user experience.
- Refactored components to incorporate new CSS classes for content safety and improved responsiveness.
2026-03-04 19:19:14 +03:00
13aba85e28 chore(release): v2.0.4
All checks were successful
CI / lint-and-test (push) Successful in 1m2s
Docker Build and Release / build-and-push (push) Successful in 49s
Docker Build and Release / release (push) Successful in 9s
Made-with: Cursor
2026-03-04 18:39:37 +03:00
8ad8dffd0a feat: implement post-init function for application startup tasks
- Added _post_init function to run startup tasks, including restoring group pin jobs and resolving bot username.
- Updated main function to utilize the new _post_init for improved application initialization process.
2026-03-04 18:38:20 +03:00
6d087d1b26 feat: prevent default focus behavior on DayDetail component
- Added onOpenAutoFocus handler to DayDetail component to prevent default focus behavior when the overlay opens.
- This enhancement improves user experience by maintaining focus control during component interactions.
2026-03-04 18:18:15 +03:00
94545dc8c3 feat: add overlay class support to SheetContent and DayDetail components
- Introduced overlayClassName prop to SheetContent for customizable overlay styling.
- Updated DayDetail component to utilize the new overlayClassName for enhanced visual effects.
- Improved user experience by allowing dynamic styling of the overlay during component rendering.
2026-03-04 18:03:35 +03:00
33359f589a feat: implement AccessDeniedScreen and enhance error handling
- Introduced AccessDeniedScreen component for improved user experience when access is denied, replacing the previous AccessDenied component.
- Updated CurrentDutyView and CalendarPage to handle access denied scenarios, displaying the new screen appropriately.
- Enhanced tests for CurrentDutyView and AccessDeniedScreen to ensure correct rendering and functionality under access denied conditions.
- Refactored localization messages to include new labels for access denied scenarios in both English and Russian.
2026-03-04 17:51:30 +03:00
25 changed files with 404 additions and 132 deletions

View File

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [2.0.6] - 2025-03-04
(No changes documented; release for version sync.)
## [2.0.4] - 2025-03-04
(No changes documented; release for version sync.)
## [2.0.3] - 2025-03-04 ## [2.0.3] - 2025-03-04
(No changes documented; release for version sync.) (No changes documented; release for version sync.)
@@ -52,7 +60,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Input validation and initData hash verification for Miniapp access. - Input validation and initData hash verification for Miniapp access.
- Optional CORS and init_data_max_age; use env for secrets. - Optional CORS and init_data_max_age; use env for secrets.
[Unreleased]: https://github.com/your-org/duty-teller/compare/v2.0.3...HEAD [Unreleased]: https://github.com/your-org/duty-teller/compare/v2.0.6...HEAD
[2.0.6]: https://github.com/your-org/duty-teller/releases/tag/v2.0.6 <!-- placeholder: set to your repo URL when publishing -->
[2.0.4]: https://github.com/your-org/duty-teller/releases/tag/v2.0.4 <!-- placeholder: set to your repo URL when publishing -->
[2.0.3]: https://github.com/your-org/duty-teller/releases/tag/v2.0.3 <!-- placeholder: set to your repo URL when publishing --> [2.0.3]: https://github.com/your-org/duty-teller/releases/tag/v2.0.3 <!-- placeholder: set to your repo URL when publishing -->
[2.0.2]: https://github.com/your-org/duty-teller/releases/tag/v2.0.2 <!-- placeholder: set to your repo URL when publishing --> [2.0.2]: https://github.com/your-org/duty-teller/releases/tag/v2.0.2 <!-- placeholder: set to your repo URL when publishing -->
[2.0.0]: https://github.com/your-org/duty-teller/releases/tag/v2.0.0 <!-- placeholder: set to your repo URL when publishing --> [2.0.0]: https://github.com/your-org/duty-teller/releases/tag/v2.0.0 <!-- placeholder: set to your repo URL when publishing -->

View File

@@ -19,6 +19,12 @@ from duty_teller.utils.http_client import safe_urlopen
_HTTP_STARTUP_WAIT_SEC = 3 _HTTP_STARTUP_WAIT_SEC = 3
async def _post_init(application) -> None:
"""Run startup tasks: restore group pin jobs, then resolve bot username."""
await group_duty_pin.restore_group_pin_jobs(application)
await _resolve_bot_username(application)
async def _resolve_bot_username(application) -> None: async def _resolve_bot_username(application) -> None:
"""If BOT_USERNAME is not set from env, resolve it via get_me().""" """If BOT_USERNAME is not set from env, resolve it via get_me()."""
if not config.BOT_USERNAME: if not config.BOT_USERNAME:
@@ -98,13 +104,7 @@ def main() -> None:
require_bot_token() require_bot_token()
# Optional: set bot menu button to open the Miniapp. Uncomment to enable: # Optional: set bot menu button to open the Miniapp. Uncomment to enable:
# _set_default_menu_button_webapp() # _set_default_menu_button_webapp()
app = ( app = ApplicationBuilder().token(config.BOT_TOKEN).post_init(_post_init).build()
ApplicationBuilder()
.token(config.BOT_TOKEN)
.post_init(group_duty_pin.restore_group_pin_jobs)
.post_init(_resolve_bot_username)
.build()
)
register_handlers(app) register_handlers(app)
from duty_teller.api.app import app as web_app from duty_teller.api.app import app as web_app

View File

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project] [project]
name = "duty-teller" name = "duty-teller"
version = "2.0.3" version = "2.0.6"
description = "Telegram bot for team duty shift calendar and group reminder" description = "Telegram bot for team duty shift calendar and group reminder"
readme = "README.md" readme = "README.md"
requires-python = ">=3.11" requires-python = ">=3.11"

View File

@@ -174,7 +174,7 @@ html::-webkit-scrollbar {
margin-right: auto; margin-right: auto;
padding: 12px; padding: 12px;
padding-top: 0; padding-top: 0;
padding-bottom: env(safe-area-inset-bottom, 12px); padding-bottom: var(--tg-viewport-content-safe-area-inset-bottom, env(safe-area-inset-bottom, 12px));
border-radius: 12px; border-radius: 12px;
} }
@@ -261,9 +261,25 @@ html::-webkit-scrollbar {
} }
} }
/* Android low-performance devices: minimize animations (Telegram User-Agent). */
[data-perf="low"] *,
[data-perf="low"] *::before,
[data-perf="low"] *::after {
animation-duration: 0.01ms !important;
animation-iteration-count: 1 !important;
transition-duration: 0.01ms !important;
}
/* Safe area for Telegram Mini App (notch / status bar). */ /* Safe area for Telegram Mini App (notch / status bar). */
.pt-safe { .pt-safe {
padding-top: env(safe-area-inset-top, 0); padding-top: var(--tg-viewport-content-safe-area-inset-top, env(safe-area-inset-top, 0));
}
/* Content safe area: top/bottom only to avoid overlap with Telegram header/bottom bar (Bot API 8.0+).
Horizontal padding is left to layout classes (e.g. px-3) so indents are preserved when viewport vars are 0. */
.content-safe {
padding-top: var(--tg-viewport-content-safe-area-inset-top, env(safe-area-inset-top, 0));
padding-bottom: var(--tg-viewport-content-safe-area-inset-bottom, env(safe-area-inset-bottom, 0));
} }
/* Sticky calendar header: shadow when scrolled (useStickyScroll). */ /* Sticky calendar header: shadow when scrolled (useStickyScroll). */
@@ -305,7 +321,7 @@ html::-webkit-scrollbar {
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;
min-height: 100vh; min-height: var(--tg-viewport-stable-height, 100vh);
background: var(--bg); background: var(--bg);
color: var(--text); color: var(--text);
font-family: system-ui, -apple-system, sans-serif; font-family: system-ui, -apple-system, sans-serif;

View File

@@ -4,17 +4,14 @@
*/ */
import { describe, it, expect, beforeEach, vi } from "vitest"; import { describe, it, expect, beforeEach, vi } from "vitest";
import { render, screen, waitFor } from "@testing-library/react"; import { render, screen, waitFor, act } from "@testing-library/react";
import Page from "./page"; import Page from "./page";
import { resetAppStore } from "@/test/test-utils"; import { resetAppStore } from "@/test/test-utils";
import { useAppStore } from "@/store/app-store"; import { useAppStore } from "@/store/app-store";
import { useTelegramAuth } from "@/hooks/use-telegram-auth";
vi.mock("@/hooks/use-telegram-auth", () => ({ vi.mock("@/hooks/use-telegram-auth", () => ({
useTelegramAuth: () => ({ useTelegramAuth: vi.fn(),
initDataRaw: "test-init",
startParam: undefined,
isLocalhost: true,
}),
})); }));
vi.mock("@/hooks/use-month-data", () => ({ vi.mock("@/hooks/use-month-data", () => ({
@@ -26,6 +23,11 @@ vi.mock("@/hooks/use-month-data", () => ({
describe("Page", () => { describe("Page", () => {
beforeEach(() => { beforeEach(() => {
resetAppStore(); resetAppStore();
vi.mocked(useTelegramAuth).mockReturnValue({
initDataRaw: "test-init",
startParam: undefined,
isLocalhost: true,
});
}); });
it("renders calendar and header when store has default state", async () => { it("renders calendar and header when store has default state", async () => {
@@ -51,4 +53,27 @@ describe("Page", () => {
expect(document.title).toBe("Календарь дежурств"); expect(document.title).toBe("Календарь дежурств");
}); });
}); });
it("renders AccessDeniedScreen when not allowed and delay has passed", async () => {
const { RETRY_DELAY_MS } = await import("@/lib/constants");
vi.mocked(useTelegramAuth).mockReturnValue({
initDataRaw: undefined,
startParam: undefined,
isLocalhost: false,
});
vi.useFakeTimers();
render(<Page />);
await act(async () => {
vi.advanceTimersByTime(RETRY_DELAY_MS);
});
vi.useRealTimers();
expect(
await screen.findByText(/Access denied|Доступ запрещён/i, {}, { timeout: 2000 })
).toBeInTheDocument();
expect(
screen.getByText(/Open the app again from Telegram|Откройте приложение снова из Telegram/i)
).toBeInTheDocument();
expect(screen.getByRole("button", { name: /Reload|Обновить/i })).toBeInTheDocument();
expect(screen.queryByRole("grid", { name: "Calendar" })).not.toBeInTheDocument();
});
}); });

View File

@@ -6,12 +6,13 @@
"use client"; "use client";
import { useCallback, useEffect } from "react"; import { useCallback, useEffect } from "react";
import { useAppStore } from "@/store/app-store"; import { useAppStore, type AppState } from "@/store/app-store";
import { useShallow } from "zustand/react/shallow"; import { useShallow } from "zustand/react/shallow";
import { useTelegramTheme } from "@/hooks/use-telegram-theme"; import { useTelegramTheme } from "@/hooks/use-telegram-theme";
import { useTelegramAuth } from "@/hooks/use-telegram-auth"; import { useTelegramAuth } from "@/hooks/use-telegram-auth";
import { useAppInit } from "@/hooks/use-app-init"; import { useAppInit } from "@/hooks/use-app-init";
import { callMiniAppReadyOnce } from "@/lib/telegram-ready"; import { callMiniAppReadyOnce } from "@/lib/telegram-ready";
import { AccessDeniedScreen } from "@/components/states/AccessDeniedScreen";
import { CurrentDutyView } from "@/components/current-duty/CurrentDutyView"; import { CurrentDutyView } from "@/components/current-duty/CurrentDutyView";
import { CalendarPage } from "@/components/CalendarPage"; import { CalendarPage } from "@/components/CalendarPage";
@@ -23,9 +24,10 @@ export default function Home() {
useAppInit({ isAllowed, startParam }); useAppInit({ isAllowed, startParam });
const { currentView, setCurrentView, setSelectedDay, appContentReady } = const { accessDenied, currentView, setCurrentView, setSelectedDay, appContentReady } =
useAppStore( useAppStore(
useShallow((s) => ({ useShallow((s: AppState) => ({
accessDenied: s.accessDenied,
currentView: s.currentView, currentView: s.currentView,
setCurrentView: s.setCurrentView, setCurrentView: s.setCurrentView,
setSelectedDay: s.setSelectedDay, setSelectedDay: s.setSelectedDay,
@@ -45,23 +47,24 @@ export default function Home() {
setSelectedDay(null); setSelectedDay(null);
}, [setCurrentView, setSelectedDay]); }, [setCurrentView, setSelectedDay]);
const content = const content = accessDenied ? (
currentView === "currentDuty" ? ( <AccessDeniedScreen primaryAction="reload" />
<div className="mx-auto flex min-h-screen w-full max-w-[var(--max-width-app)] flex-col bg-background px-3 pb-6 pt-safe"> ) : currentView === "currentDuty" ? (
<CurrentDutyView <div className="content-safe mx-auto flex min-h-screen w-full max-w-[var(--max-width-app)] flex-col bg-background px-3 pb-6">
onBack={handleBackFromCurrentDuty} <CurrentDutyView
openedFromPin={startParam === "duty"} onBack={handleBackFromCurrentDuty}
/> openedFromPin={startParam === "duty"}
</div> />
) : ( </div>
<CalendarPage isAllowed={isAllowed} initDataRaw={initDataRaw} /> ) : (
); <CalendarPage isAllowed={isAllowed} initDataRaw={initDataRaw} />
);
return ( return (
<div <div
className="min-h-[var(--tg-viewport-stable-height,100vh)]"
style={{ style={{
visibility: appContentReady ? "visible" : "hidden", visibility: appContentReady ? "visible" : "hidden",
minHeight: "100vh",
}} }}
> >
{content} {content}

View File

@@ -17,7 +17,6 @@ import { CalendarGrid } from "@/components/calendar/CalendarGrid";
import { DutyList } from "@/components/duty/DutyList"; import { DutyList } from "@/components/duty/DutyList";
import { DayDetail, type DayDetailHandle } from "@/components/day-detail"; import { DayDetail, type DayDetailHandle } from "@/components/day-detail";
import { ErrorState } from "@/components/states/ErrorState"; import { ErrorState } from "@/components/states/ErrorState";
import { AccessDenied } from "@/components/states/AccessDenied";
/** Fallback height (px) until ResizeObserver reports the sticky block size. Matches --calendar-block-min-height + pb-2 (260 + 8). */ /** Fallback height (px) until ResizeObserver reports the sticky block size. Matches --calendar-block-min-height + pb-2 (260 + 8). */
const STICKY_HEIGHT_FALLBACK_PX = 268; const STICKY_HEIGHT_FALLBACK_PX = 268;
@@ -51,7 +50,6 @@ export function CalendarPage({ isAllowed, initDataRaw }: CalendarPageProps) {
loading, loading,
error, error,
accessDenied, accessDenied,
accessDeniedDetail,
duties, duties,
calendarEvents, calendarEvents,
selectedDay, selectedDay,
@@ -67,7 +65,6 @@ export function CalendarPage({ isAllowed, initDataRaw }: CalendarPageProps) {
loading: s.loading, loading: s.loading,
error: s.error, error: s.error,
accessDenied: s.accessDenied, accessDenied: s.accessDenied,
accessDeniedDetail: s.accessDeniedDetail,
duties: s.duties, duties: s.duties,
calendarEvents: s.calendarEvents, calendarEvents: s.calendarEvents,
selectedDay: s.selectedDay, selectedDay: s.selectedDay,
@@ -136,7 +133,7 @@ export function CalendarPage({ isAllowed, initDataRaw }: CalendarPageProps) {
}, [loading, accessDenied, setAppContentReady]); }, [loading, accessDenied, setAppContentReady]);
return ( return (
<div className="mx-auto flex min-h-screen w-full max-w-[var(--max-width-app)] flex-col bg-background px-3 pb-6 pt-safe"> <div className="content-safe mx-auto flex min-h-screen w-full max-w-[var(--max-width-app)] flex-col bg-background px-3 pb-6">
<div <div
ref={calendarStickyRef} ref={calendarStickyRef}
className="sticky top-0 z-10 min-h-[var(--calendar-block-min-height)] bg-background pb-2" className="sticky top-0 z-10 min-h-[var(--calendar-block-min-height)] bg-background pb-2"
@@ -155,13 +152,10 @@ export function CalendarPage({ isAllowed, initDataRaw }: CalendarPageProps) {
/> />
</div> </div>
{accessDenied && ( {error && (
<AccessDenied serverDetail={accessDeniedDetail} className="my-3" />
)}
{!accessDenied && error && (
<ErrorState message={error} onRetry={retry} className="my-3" /> <ErrorState message={error} onRetry={retry} className="my-3" />
)} )}
{!accessDenied && !error && ( {!error && (
<DutyList <DutyList
scrollMarginTop={stickyBlockHeight} scrollMarginTop={stickyBlockHeight}
className="mt-2" className="mt-2"

View File

@@ -127,4 +127,25 @@ describe("CurrentDutyView", () => {
expect(buttons[0]).toHaveAccessibleName(/Retry|Повторить/i); expect(buttons[0]).toHaveAccessibleName(/Retry|Повторить/i);
vi.mocked(fetchDuties).mockResolvedValue([]); vi.mocked(fetchDuties).mockResolvedValue([]);
}); });
it("403 shows AccessDeniedScreen with Back button and no Retry", async () => {
const { fetchDuties, AccessDeniedError } = await import("@/lib/api");
vi.mocked(fetchDuties).mockRejectedValue(
new AccessDeniedError("ACCESS_DENIED", "Custom 403 message")
);
const onBack = vi.fn();
render(<CurrentDutyView onBack={onBack} />);
await screen.findByText(/Access denied|Доступ запрещён/i, {}, { timeout: 3000 });
expect(
screen.getByText(/Open the app again from Telegram|Откройте приложение снова из Telegram/i)
).toBeInTheDocument();
expect(screen.getByText("Custom 403 message")).toBeInTheDocument();
expect(
screen.getByRole("button", { name: /Back to calendar|Назад к календарю/i })
).toBeInTheDocument();
expect(screen.queryByRole("button", { name: /Retry|Повторить/i })).not.toBeInTheDocument();
fireEvent.click(screen.getByRole("button", { name: /Back to calendar|Назад к календарю/i }));
expect(onBack).toHaveBeenCalled();
vi.mocked(fetchDuties).mockResolvedValue([]);
});
}); });

View File

@@ -20,6 +20,7 @@ import {
formatHHMM, formatHHMM,
} from "@/lib/date-utils"; } from "@/lib/date-utils";
import { getRemainingTime, findCurrentDuty } from "@/lib/current-duty"; import { getRemainingTime, findCurrentDuty } from "@/lib/current-duty";
import { triggerHapticLight } from "@/lib/telegram-haptic";
import { ContactLinks } from "@/components/contact/ContactLinks"; import { ContactLinks } from "@/components/contact/ContactLinks";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { import {
@@ -30,6 +31,7 @@ import {
CardTitle, CardTitle,
} from "@/components/ui/card"; } from "@/components/ui/card";
import { Skeleton } from "@/components/ui/skeleton"; import { Skeleton } from "@/components/ui/skeleton";
import { AccessDeniedScreen } from "@/components/states/AccessDeniedScreen";
import type { DutyWithUser } from "@/types"; import type { DutyWithUser } from "@/types";
export interface CurrentDutyViewProps { export interface CurrentDutyViewProps {
@@ -39,7 +41,7 @@ export interface CurrentDutyViewProps {
openedFromPin?: boolean; openedFromPin?: boolean;
} }
type ViewState = "loading" | "error" | "ready"; type ViewState = "loading" | "error" | "accessDenied" | "ready";
/** /**
* Full-screen current duty view with Telegram BackButton and auto-updating remaining time. * Full-screen current duty view with Telegram BackButton and auto-updating remaining time.
@@ -53,6 +55,7 @@ export function CurrentDutyView({ onBack, openedFromPin = false }: CurrentDutyVi
const [state, setState] = useState<ViewState>("loading"); const [state, setState] = useState<ViewState>("loading");
const [duty, setDuty] = useState<DutyWithUser | null>(null); const [duty, setDuty] = useState<DutyWithUser | null>(null);
const [errorMessage, setErrorMessage] = useState<string | null>(null); const [errorMessage, setErrorMessage] = useState<string | null>(null);
const [accessDeniedDetail, setAccessDeniedDetail] = useState<string | null>(null);
const [remaining, setRemaining] = useState<{ hours: number; minutes: number } | null>(null); const [remaining, setRemaining] = useState<{ hours: number; minutes: number } | null>(null);
const loadTodayDuties = useCallback( const loadTodayDuties = useCallback(
@@ -74,14 +77,17 @@ export function CurrentDutyView({ onBack, openedFromPin = false }: CurrentDutyVi
} }
} catch (e) { } catch (e) {
if (signal?.aborted) return; if (signal?.aborted) return;
setState("error"); if (e instanceof AccessDeniedError) {
const msg = setState("accessDenied");
e instanceof AccessDeniedError && e.serverDetail setAccessDeniedDetail(e.serverDetail ?? null);
? e.serverDetail setDuty(null);
: t("error_generic"); setRemaining(null);
setErrorMessage(msg); } else {
setDuty(null); setState("error");
setRemaining(null); setErrorMessage(t("error_generic"));
setDuty(null);
setRemaining(null);
}
} }
}, },
[initDataRaw, lang, t] [initDataRaw, lang, t]
@@ -140,10 +146,12 @@ export function CurrentDutyView({ onBack, openedFromPin = false }: CurrentDutyVi
}, [onBack]); }, [onBack]);
const handleBack = () => { const handleBack = () => {
triggerHapticLight();
onBack(); onBack();
}; };
const handleClose = () => { const handleClose = () => {
triggerHapticLight();
if (closeMiniApp.isAvailable()) { if (closeMiniApp.isAvailable()) {
closeMiniApp(); closeMiniApp();
} else { } else {
@@ -195,8 +203,20 @@ export function CurrentDutyView({ onBack, openedFromPin = false }: CurrentDutyVi
); );
} }
if (state === "accessDenied") {
return (
<AccessDeniedScreen
serverDetail={accessDeniedDetail}
primaryAction="back"
onBack={handlePrimaryAction}
openedFromPin={openedFromPin}
/>
);
}
if (state === "error") { if (state === "error") {
const handleRetry = () => { const handleRetry = () => {
triggerHapticLight();
setState("loading"); setState("loading");
loadTodayDuties(); loadTodayDuties();
}; };

View File

@@ -207,8 +207,10 @@ export const DayDetail = React.forwardRef<DayDetailHandle, DayDetailProps>(
"rounded-t-2xl pt-3 pb-[calc(24px+env(safe-area-inset-bottom,0px))] max-h-[70vh] bg-[var(--surface)]", "rounded-t-2xl pt-3 pb-[calc(24px+env(safe-area-inset-bottom,0px))] max-h-[70vh] bg-[var(--surface)]",
className className
)} )}
overlayClassName="backdrop-blur-md"
showCloseButton={false} showCloseButton={false}
onCloseAnimationEnd={handleClose} onCloseAnimationEnd={handleClose}
onOpenAutoFocus={(e) => e.preventDefault()}
> >
<div className="relative px-4"> <div className="relative px-4">
{closeButton} {closeButton}

View File

@@ -6,15 +6,20 @@ import {
mountMiniAppSync, mountMiniAppSync,
mountThemeParamsSync, mountThemeParamsSync,
bindThemeParamsCssVars, bindThemeParamsCssVars,
mountViewport,
bindViewportCssVars,
unmountViewport,
} from "@telegram-apps/sdk-react"; } from "@telegram-apps/sdk-react";
import { fixSurfaceContrast } from "@/hooks/use-telegram-theme"; import { fixSurfaceContrast } from "@/hooks/use-telegram-theme";
import { applyAndroidPerformanceClass } from "@/lib/telegram-android-perf";
/** /**
* Wraps the app with Telegram Mini App SDK initialization. * Wraps the app with Telegram Mini App SDK initialization.
* Calls init(acceptCustomStyles), mounts theme params (binds --tg-theme-* CSS vars), * Calls init(acceptCustomStyles), mounts theme params (binds --tg-theme-* CSS vars),
* and mounts the mini app. Does not call ready() here — the app calls * mounts the mini app, then mounts viewport and binds viewport CSS vars
* callMiniAppReadyOnce() from lib/telegram-ready when the first visible screen * (--tg-viewport-stable-height, --tg-viewport-content-safe-area-inset-*, etc.).
* has finished loading, so Telegram keeps its native loading animation until then. * Does not call ready() here — the app calls callMiniAppReadyOnce() from
* lib/telegram-ready when the first visible screen has finished loading.
* Theme is set before first paint by the inline script in layout.tsx (URL hash); * Theme is set before first paint by the inline script in layout.tsx (URL hash);
* useTelegramTheme() in the app handles ongoing theme changes. * useTelegramTheme() in the app handles ongoing theme changes.
*/ */
@@ -39,7 +44,26 @@ export function TelegramProvider({
mountMiniAppSync(); mountMiniAppSync();
} }
return cleanup; applyAndroidPerformanceClass();
let unbindViewportCssVars: (() => void) | undefined;
if (mountViewport.isAvailable()) {
mountViewport()
.then(() => {
if (bindViewportCssVars.isAvailable()) {
unbindViewportCssVars = bindViewportCssVars();
}
})
.catch(() => {
// Viewport not supported (e.g. not in Mini App); ignore.
});
}
return () => {
unbindViewportCssVars?.();
unmountViewport();
cleanup();
};
}, []); }, []);
return <>{children}</>; return <>{children}</>;

View File

@@ -1,24 +0,0 @@
/**
* Unit tests for AccessDenied. Ported from webapp/js/ui.test.js showAccessDenied.
*/
import { describe, it, expect, beforeEach } from "vitest";
import { render, screen } from "@testing-library/react";
import { AccessDenied } from "./AccessDenied";
import { resetAppStore } from "@/test/test-utils";
describe("AccessDenied", () => {
beforeEach(() => {
resetAppStore();
});
it("renders translated access denied message", () => {
render(<AccessDenied serverDetail={null} />);
expect(screen.getByText(/Access denied|Доступ запрещён/i)).toBeInTheDocument();
});
it("appends serverDetail when provided", () => {
render(<AccessDenied serverDetail="Custom 403 message" />);
expect(screen.getByText("Custom 403 message")).toBeInTheDocument();
});
});

View File

@@ -1,46 +0,0 @@
/**
* Access denied state: message and optional server detail.
* Ported from webapp/js/ui.js showAccessDenied and states.css .access-denied.
*/
"use client";
import { useTranslation } from "@/i18n/use-translation";
import { cn } from "@/lib/utils";
export interface AccessDeniedProps {
/** Optional detail from API 403 response, shown below the main message. */
serverDetail?: string | null;
/** Optional class for the container. */
className?: string;
}
/**
* Displays access denied message; optional second paragraph for server detail.
*/
export function AccessDenied({ serverDetail, className }: AccessDeniedProps) {
const { t } = useTranslation();
const hasDetail = Boolean(serverDetail && String(serverDetail).trim());
return (
<div
className={cn(
"rounded-xl bg-surface py-6 px-4 my-3 text-center text-muted-foreground shadow-sm transition-opacity duration-200",
className
)}
role="alert"
>
<p className="m-0 mb-2 font-semibold text-error">
{t("access_denied")}
</p>
{hasDetail && (
<p className="mt-2 m-0 text-sm text-muted">
{serverDetail}
</p>
)}
<p className="mt-2 m-0 text-sm text-muted">
{t("access_denied.hint")}
</p>
</div>
);
}

View File

@@ -0,0 +1,74 @@
/**
* Unit tests for AccessDeniedScreen: full-screen access denied, reload and back modes.
*/
import { describe, it, expect, beforeEach, vi } from "vitest";
import { render, screen, fireEvent } from "@testing-library/react";
import { AccessDeniedScreen } from "./AccessDeniedScreen";
import { resetAppStore } from "@/test/test-utils";
describe("AccessDeniedScreen", () => {
beforeEach(() => {
resetAppStore();
});
it("renders translated access denied title and hint", () => {
render(<AccessDeniedScreen primaryAction="reload" />);
expect(screen.getByText(/Access denied|Доступ запрещён/i)).toBeInTheDocument();
expect(
screen.getByText(/Open the app again from Telegram|Откройте приложение снова из Telegram/i)
).toBeInTheDocument();
});
it("shows serverDetail when provided", () => {
render(
<AccessDeniedScreen primaryAction="reload" serverDetail="Custom 403 message" />
);
expect(screen.getByText("Custom 403 message")).toBeInTheDocument();
});
it("reload mode shows Reload button", () => {
render(<AccessDeniedScreen primaryAction="reload" />);
const button = screen.getByRole("button", { name: /Reload|Обновить/i });
expect(button).toBeInTheDocument();
const reloadFn = vi.fn();
Object.defineProperty(window, "location", {
value: { ...window.location, reload: reloadFn },
writable: true,
});
fireEvent.click(button);
expect(reloadFn).toHaveBeenCalled();
});
it("back mode shows Back to calendar and calls onBack on click", () => {
const onBack = vi.fn();
render(
<AccessDeniedScreen
primaryAction="back"
onBack={onBack}
openedFromPin={false}
/>
);
const button = screen.getByRole("button", {
name: /Back to calendar|Назад к календарю/i,
});
expect(button).toBeInTheDocument();
fireEvent.click(button);
expect(onBack).toHaveBeenCalled();
});
it("back mode with openedFromPin shows Close button", () => {
const onBack = vi.fn();
render(
<AccessDeniedScreen
primaryAction="back"
onBack={onBack}
openedFromPin={true}
/>
);
const button = screen.getByRole("button", { name: /Close|Закрыть/i });
expect(button).toBeInTheDocument();
fireEvent.click(button);
expect(onBack).toHaveBeenCalled();
});
});

View File

@@ -0,0 +1,86 @@
/**
* Full-screen access denied view. Used when the user is not allowed (no initData / not localhost)
* or when API returns 403. Matches global-error and not-found layout: no extra chrome, one action.
*/
"use client";
import { useEffect } from "react";
import { getLang, translate } from "@/i18n/messages";
import { useAppStore } from "@/store/app-store";
import { triggerHapticLight } from "@/lib/telegram-haptic";
export interface AccessDeniedScreenProps {
/** Optional detail from API 403 response, shown below the hint. */
serverDetail?: string | null;
/** Primary button: reload (main page) or back/close (deep link). */
primaryAction: "reload" | "back";
/** Called when primaryAction is "back" (e.g. Back to calendar or Close). */
onBack?: () => void;
/** When true and primaryAction is "back", button label is "Close" instead of "Back to calendar". */
openedFromPin?: boolean;
}
/**
* Full-screen access denied: title, hint, optional server detail, single action button.
* Calls setAppContentReady(true) on mount so Telegram receives ready().
*/
export function AccessDeniedScreen({
serverDetail,
primaryAction,
onBack,
openedFromPin = false,
}: AccessDeniedScreenProps) {
const lang = getLang();
const setAppContentReady = useAppStore((s) => s.setAppContentReady);
useEffect(() => {
setAppContentReady(true);
}, [setAppContentReady]);
const hasDetail = Boolean(serverDetail && String(serverDetail).trim());
const handleClick = () => {
triggerHapticLight();
if (primaryAction === "reload") {
if (typeof window !== "undefined") {
window.location.reload();
}
} else {
onBack?.();
}
};
const buttonLabel =
primaryAction === "reload"
? translate(lang, "access_denied.reload")
: openedFromPin
? translate(lang, "current_duty.close")
: translate(lang, "current_duty.back");
return (
<div
className="flex min-h-screen flex-col items-center justify-center gap-4 bg-background px-4 text-foreground"
role="alert"
>
<h1 className="text-xl font-semibold">
{translate(lang, "access_denied")}
</h1>
<p className="text-center text-muted-foreground">
{translate(lang, "access_denied.hint")}
</p>
{hasDetail && (
<p className="text-center text-sm text-muted-foreground">
{serverDetail}
</p>
)}
<button
type="button"
onClick={handleClick}
className="rounded-lg bg-primary px-4 py-2 text-primary-foreground hover:bg-primary/90"
>
{buttonLabel}
</button>
</div>
);
}

View File

@@ -8,6 +8,7 @@
import { useTranslation } from "@/i18n/use-translation"; import { useTranslation } from "@/i18n/use-translation";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { triggerHapticLight } from "@/lib/telegram-haptic";
export interface ErrorStateProps { export interface ErrorStateProps {
/** Error message to display. If not provided, uses generic i18n message. */ /** Error message to display. If not provided, uses generic i18n message. */
@@ -65,7 +66,10 @@ export function ErrorState({ message, onRetry, className }: ErrorStateProps) {
variant="default" variant="default"
size="sm" size="sm"
className="mt-1 bg-primary text-primary-foreground hover:opacity-90 focus-visible:outline-2 focus-visible:outline-accent focus-visible:outline-offset-2" className="mt-1 bg-primary text-primary-foreground hover:opacity-90 focus-visible:outline-2 focus-visible:outline-accent focus-visible:outline-offset-2"
onClick={onRetry} onClick={() => {
triggerHapticLight();
onRetry();
}}
> >
{t("error.retry")} {t("error.retry")}
</Button> </Button>

View File

@@ -4,4 +4,4 @@
export { LoadingState } from "./LoadingState"; export { LoadingState } from "./LoadingState";
export { ErrorState } from "./ErrorState"; export { ErrorState } from "./ErrorState";
export { AccessDenied } from "./AccessDenied"; export { AccessDeniedScreen } from "./AccessDeniedScreen";

View File

@@ -53,12 +53,15 @@ function SheetContent({
showCloseButton = true, showCloseButton = true,
onCloseAnimationEnd, onCloseAnimationEnd,
onAnimationEnd, onAnimationEnd,
overlayClassName,
...props ...props
}: React.ComponentProps<typeof SheetPrimitive.Content> & { }: React.ComponentProps<typeof SheetPrimitive.Content> & {
side?: "top" | "right" | "bottom" | "left" side?: "top" | "right" | "bottom" | "left"
showCloseButton?: boolean showCloseButton?: boolean
/** When provided, content and overlay stay mounted until close animation ends (forceMount). */ /** When provided, content and overlay stay mounted until close animation ends (forceMount). */
onCloseAnimationEnd?: () => void onCloseAnimationEnd?: () => void
/** Optional class name applied to the overlay (e.g. backdrop-blur-md). */
overlayClassName?: string
}) { }) {
const useForceMount = Boolean(onCloseAnimationEnd) const useForceMount = Boolean(onCloseAnimationEnd)
@@ -74,7 +77,10 @@ function SheetContent({
return ( return (
<SheetPortal> <SheetPortal>
<SheetOverlay forceMount={useForceMount ? true : undefined} /> <SheetOverlay
forceMount={useForceMount ? true : undefined}
className={overlayClassName}
/>
<SheetPrimitive.Content <SheetPrimitive.Content
data-slot="sheet-content" data-slot="sheet-content"
forceMount={useForceMount ? true : undefined} forceMount={useForceMount ? true : undefined}

View File

@@ -16,6 +16,7 @@ vi.mock("@telegram-apps/sdk-react", () => ({
isThemeParamsDark: vi.fn(), isThemeParamsDark: vi.fn(),
setMiniAppBackgroundColor: { isAvailable: vi.fn(() => false) }, setMiniAppBackgroundColor: { isAvailable: vi.fn(() => false) },
setMiniAppHeaderColor: { isAvailable: vi.fn(() => false) }, setMiniAppHeaderColor: { isAvailable: vi.fn(() => false) },
setMiniAppBottomBarColor: { isAvailable: vi.fn(() => false) },
})); }));
describe("getFallbackScheme", () => { describe("getFallbackScheme", () => {

View File

@@ -6,6 +6,7 @@ import {
isThemeParamsDark, isThemeParamsDark,
setMiniAppBackgroundColor, setMiniAppBackgroundColor,
setMiniAppHeaderColor, setMiniAppHeaderColor,
setMiniAppBottomBarColor,
} from "@telegram-apps/sdk-react"; } from "@telegram-apps/sdk-react";
/** /**
@@ -69,6 +70,9 @@ export function applyTheme(scheme?: "dark" | "light"): void {
if (setMiniAppHeaderColor.isAvailable()) { if (setMiniAppHeaderColor.isAvailable()) {
setMiniAppHeaderColor("bg_color"); setMiniAppHeaderColor("bg_color");
} }
if (setMiniAppBottomBarColor.isAvailable()) {
setMiniAppBottomBarColor("bottom_bar_bg_color");
}
} }
/** /**

View File

@@ -81,6 +81,7 @@ export const MESSAGES: Record<Lang, Record<string, string>> = {
"not_found.description": "The page you are looking for does not exist.", "not_found.description": "The page you are looking for does not exist.",
"not_found.open_calendar": "Open calendar", "not_found.open_calendar": "Open calendar",
"access_denied.hint": "Open the app again from Telegram.", "access_denied.hint": "Open the app again from Telegram.",
"access_denied.reload": "Reload",
}, },
ru: { ru: {
"app.title": "Календарь дежурств", "app.title": "Календарь дежурств",
@@ -157,6 +158,7 @@ export const MESSAGES: Record<Lang, Record<string, string>> = {
"not_found.description": "Запрашиваемая страница не существует.", "not_found.description": "Запрашиваемая страница не существует.",
"not_found.open_calendar": "Открыть календарь", "not_found.open_calendar": "Открыть календарь",
"access_denied.hint": "Откройте приложение снова из Telegram.", "access_denied.hint": "Откройте приложение снова из Telegram.",
"access_denied.reload": "Обновить",
}, },
}; };

View File

@@ -0,0 +1,26 @@
/**
* Detects Android Telegram Mini App performance class from User-Agent and sets
* data-perf on document.documentElement so CSS can reduce animations on low-end devices.
* @see https://core.telegram.org/bots/webapps#additional-data-in-user-agent
*/
import { retrieveAndroidDeviceData } from "@telegram-apps/sdk-react";
const DATA_ATTR = "data-perf";
/**
* Runs once: if running in Telegram on Android with LOW performance class,
* sets data-perf="low" on the document root for CSS to minimize animations.
*/
export function applyAndroidPerformanceClass(): void {
if (typeof document === "undefined") return;
try {
const data = retrieveAndroidDeviceData();
const perf = data?.performanceClass;
if (perf === "LOW") {
document.documentElement.setAttribute(DATA_ATTR, "low");
}
} catch {
// Not in Telegram or not Android; ignore.
}
}

View File

@@ -0,0 +1,19 @@
/**
* Triggers Telegram Mini App haptic feedback when available.
* Use on primary actions and key interactions to mimic native Telegram behavior.
*/
import { hapticFeedbackImpactOccurred } from "@telegram-apps/sdk-react";
/**
* Triggers light impact haptic feedback. No-op when not in Telegram or unsupported.
*/
export function triggerHapticLight(): void {
try {
if (hapticFeedbackImpactOccurred.isAvailable()) {
hapticFeedbackImpactOccurred("light");
}
} catch {
// SDK not available; ignore.
}
}

View File

@@ -1,15 +1,17 @@
/** /**
* Single-call wrapper for Telegram Mini App ready(). * Single-call wrapper for Telegram Mini App ready() and expand().
* Called once when the first visible screen has finished loading so Telegram * Called once when the first visible screen has finished loading so Telegram
* hides its native loading animation only after our content is ready. * hides its native loading animation only after our content is ready.
* Also expands the Mini App to full height when supported.
*/ */
import { miniAppReady } from "@telegram-apps/sdk-react"; import { miniAppReady, expandViewport } from "@telegram-apps/sdk-react";
let readyCalled = false; let readyCalled = false;
/** /**
* Calls Telegram miniAppReady() at most once per session. * Calls Telegram miniAppReady() at most once per session, then expandViewport()
* when available so the app opens to full height.
* Safe when SDK is unavailable (e.g. non-Telegram environment). * Safe when SDK is unavailable (e.g. non-Telegram environment).
*/ */
export function callMiniAppReadyOnce(): void { export function callMiniAppReadyOnce(): void {
@@ -19,6 +21,9 @@ export function callMiniAppReadyOnce(): void {
miniAppReady(); miniAppReady();
readyCalled = true; readyCalled = true;
} }
if (expandViewport.isAvailable()) {
expandViewport();
}
} catch { } catch {
// SDK not available or not in Mini App context; no-op. // SDK not available or not in Mini App context; no-op.
} }

View File

@@ -24,7 +24,7 @@ export interface AppState {
loading: boolean; loading: boolean;
error: string | null; error: string | null;
accessDenied: boolean; accessDenied: boolean;
/** Server detail from API 403 response; shown in AccessDenied component. */ /** Server detail from API 403 response; shown in AccessDeniedScreen. */
accessDeniedDetail: string | null; accessDeniedDetail: string | null;
currentView: CurrentView; currentView: CurrentView;
selectedDay: string | null; selectedDay: string | null;