terry-staging #1

Merged
terry merged 8 commits from terry-staging into main 2026-05-26 06:53:11 +00:00
15 changed files with 67 additions and 67 deletions
Showing only changes of commit f6c0f30921 - Show all commits

View File

@@ -4,10 +4,10 @@ import { I18nProvider } from "./i18n";
import { PublicLayout } from "./layouts/PublicLayout"; import { PublicLayout } from "./layouts/PublicLayout";
import { Home } from "./pages/Home"; import { Home } from "./pages/Home";
import { Browse } from "./pages/Browse"; import { Browse } from "./pages/Browse";
import { CategoryPage } from "./pages/CategoryPage"; import { CategoryPage } from "./pages/Category";
import { SearchPage } from "./pages/SearchPage"; import { SearchPage } from "./pages/Search";
import { PostRedirect } from "./pages/PostRedirect"; import { PostRedirect } from "./pages/PostRedirect";
import { AboutPage } from "./pages/AboutPage"; import { AboutPage } from "./pages/About";
import { adminUiPrefix } from "./adminPaths"; import { adminUiPrefix } from "./adminPaths";
import { AdminRouteTree } from "./adminRouteTree"; import { AdminRouteTree } from "./adminRouteTree";
import { AdminRouterModeProvider } from "./adminRouterMode"; import { AdminRouterModeProvider } from "./adminRouterMode";
@@ -15,7 +15,7 @@ import { ImageLightboxProvider } from "./components/messageStream/overlays/Image
import { VideoPlayerProvider } from "./components/messageStream/overlays/VideoPlayer"; import { VideoPlayerProvider } from "./components/messageStream/overlays/VideoPlayer";
const WalletPage = lazy(() => const WalletPage = lazy(() =>
import("./pages/WalletPage").then((module) => ({ import("./pages/Wallet").then((module) => ({
default: module.WalletPage, default: module.WalletPage,
})), })),
); );

View File

@@ -3,11 +3,11 @@ import { I18nProvider } from "./i18n";
import { adminUiPrefix } from "./adminPaths"; import { adminUiPrefix } from "./adminPaths";
import { AdminRouterModeProvider } from "./adminRouterMode"; import { AdminRouterModeProvider } from "./adminRouterMode";
import { AdminLayout } from "./layouts/AdminLayout"; import { AdminLayout } from "./layouts/AdminLayout";
import { AdminLogin } from "./pages/admin/AdminLogin"; import { AdminLogin } from "./pages/admin/Login";
import { AdminDashboard } from "./pages/admin/AdminDashboard"; import { AdminDashboard } from "./pages/admin/Dashboard";
import { AdminResources } from "./pages/admin/AdminResources"; import { AdminResources } from "./pages/admin/Resources";
import { AdminResourceForm } from "./pages/admin/AdminResourceForm"; import { AdminResourceForm } from "./pages/admin/ResourceForm";
import { AdminSearchLogs } from "./pages/admin/AdminSearchLogs"; import { AdminSearchLogs } from "./pages/admin/SearchLogs";
function NotFound() { function NotFound() {
return ( return (

View File

@@ -1,11 +1,11 @@
import { Route } from "react-router-dom"; import { Route } from "react-router-dom";
import { adminUiPrefix } from "./adminPaths"; import { adminUiPrefix } from "./adminPaths";
import { AdminLayout } from "./layouts/AdminLayout"; import { AdminLayout } from "./layouts/AdminLayout";
import { AdminLogin } from "./pages/admin/AdminLogin"; import { AdminLogin } from "./pages/admin/Login";
import { AdminDashboard } from "./pages/admin/AdminDashboard"; import { AdminDashboard } from "./pages/admin/Dashboard";
import { AdminResources } from "./pages/admin/AdminResources"; import { AdminResources } from "./pages/admin/Resources";
import { AdminResourceForm } from "./pages/admin/AdminResourceForm"; import { AdminResourceForm } from "./pages/admin/ResourceForm";
import { AdminSearchLogs } from "./pages/admin/AdminSearchLogs"; import { AdminSearchLogs } from "./pages/admin/SearchLogs";
/** Shared between full `App` (when admin enabled) and `AppAdminOnly`. */ /** Shared between full `App` (when admin enabled) and `AppAdminOnly`. */
export function AdminRouteTree() { export function AdminRouteTree() {

View File

@@ -1,4 +1,4 @@
import { useI18n } from "../i18n"; import { useI18n } from "../../i18n";
export function AboutPage() { export function AboutPage() {
const { t } = useI18n(); const { t } = useI18n();

View File

@@ -1,5 +1,5 @@
import { MessageStream } from "../components/messageStream/MessageStream"; import { MessageStream } from "../../components/messageStream/MessageStream";
import { useI18n } from "../i18n"; import { useI18n } from "../../i18n";
export function Browse() { export function Browse() {
const { t } = useI18n(); const { t } = useI18n();

View File

@@ -1,8 +1,8 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import { getJSON, itemsOrEmpty, type Category } from "../api"; import { getJSON, itemsOrEmpty, type Category } from "../../api";
import { MessageStream } from "../components/messageStream/MessageStream"; import { MessageStream } from "../../components/messageStream/MessageStream";
import { langQuery, useI18n } from "../i18n"; import { langQuery, useI18n } from "../../i18n";
export function CategoryPage() { export function CategoryPage() {
const { slug = "" } = useParams(); const { slug = "" } = useParams();

View File

@@ -1,22 +1,22 @@
import { ChevronRight } from "lucide-react"; import { ChevronRight } from "lucide-react";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { getJSON, itemsOrEmpty, type Category } from "../api"; import { getJSON, itemsOrEmpty, type Category } from "../../api";
import { CategoryIcon } from "../components/CategoryIcon"; import { CategoryIcon } from "../../components/CategoryIcon";
import { FigmaBanner } from "../components/FigmaBanner"; import { FigmaBanner } from "../../components/FigmaBanner";
import { import {
ComingSoonLatestUpdateRow, ComingSoonLatestUpdateRow,
LatestUpdateRow, LatestUpdateRow,
} from "../components/LatestUpdateRow"; } from "../../components/LatestUpdateRow";
import { RecommendedCard } from "../components/RecommendedCard"; import { RecommendedCard } from "../../components/RecommendedCard";
import { SectionHeader } from "../components/SectionHeader"; import { SectionHeader } from "../../components/SectionHeader";
import { langQuery, useI18n } from "../i18n"; import { langQuery, useI18n } from "../../i18n";
import { categoryCardLines } from "../utils/categoryDisplay"; import { categoryCardLines } from "../../utils/categoryDisplay";
import { import {
postToResource, postToResource,
type PostBackedResource, type PostBackedResource,
} from "../utils/postResourceAdapter"; } from "../../utils/postResourceAdapter";
import type { Post } from "../types/post"; import type { Post } from "../../types/post";
export function Home() { export function Home() {
const { t, lang } = useI18n(); const { t, lang } = useI18n();

View File

@@ -1,10 +1,10 @@
import { useEffect } from "react"; import { useEffect } from "react";
import { useNavigate, useParams } from "react-router-dom"; import { useNavigate, useParams } from "react-router-dom";
import { getJSON } from "../api"; import { getJSON } from "../../api";
import { langQuery, useI18n } from "../i18n"; import { langQuery, useI18n } from "../../i18n";
import { MOCK_POSTS } from "../mocks/mockPosts"; import { MOCK_POSTS } from "../../mocks/mockPosts";
import { POST_STREAM_USES_MOCK } from "../components/messageStream/hooks/usePostStream"; import { POST_STREAM_USES_MOCK } from "../../components/messageStream/hooks/usePostStream";
import type { Post } from "../types/post"; import type { Post } from "../../types/post";
export function PostRedirect() { export function PostRedirect() {
const { id } = useParams(); const { id } = useParams();

View File

@@ -1,15 +1,15 @@
import { useEffect, useMemo, useState } from "react"; import { useEffect, useMemo, useState } from "react";
import { useSearchParams } from "react-router-dom"; import { useSearchParams } from "react-router-dom";
import { getJSON, itemsOrEmpty, postJSON } from "../api"; import { getJSON, itemsOrEmpty, postJSON } from "../../api";
import { langQuery, useI18n } from "../i18n"; import { langQuery, useI18n } from "../../i18n";
import { import {
LANG_OPTIONS, LANG_OPTIONS,
languageLabel, languageLabel,
sourceLanguageQuery, sourceLanguageQuery,
} from "../i18nLanguages"; } from "../../i18nLanguages";
import { MessageBubble } from "../components/messageStream/MessageBubble"; import { MessageBubble } from "../../components/messageStream/MessageBubble";
import { typeFilterLabel } from "../resourceTypeLabels"; import { typeFilterLabel } from "../../resourceTypeLabels";
import type { Post } from "../types/post"; import type { Post } from "../../types/post";
const types = [ const types = [
"all", "all",

View File

@@ -1,9 +1,9 @@
import { RainbowKitProvider, darkTheme } from "@rainbow-me/rainbowkit"; import { RainbowKitProvider, darkTheme } from "@rainbow-me/rainbowkit";
import { WagmiProvider } from "wagmi"; import { WagmiProvider } from "wagmi";
import "@rainbow-me/rainbowkit/styles.css"; import "@rainbow-me/rainbowkit/styles.css";
import { WalletLoginControls } from "../components/WalletLoginControls"; import { WalletLoginControls } from "../../components/WalletLoginControls";
import { useI18n } from "../i18n"; import { useI18n } from "../../i18n";
import { wagmiConfig } from "../wagmiConfig"; import { wagmiConfig } from "../../wagmiConfig";
export function WalletPage() { export function WalletPage() {
const { t } = useI18n(); const { t } = useI18n();

View File

@@ -1,7 +1,7 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { getJSONAuth } from "../../api"; import { getJSONAuth } from "../../../api";
import { getToken } from "../../admin/token"; import { getToken } from "../../../admin/token";
import { useAdminT } from "../../admin/useAdminT"; import { useAdminT } from "../../../admin/useAdminT";
type Dash = { type Dash = {
totalResources: number; totalResources: number;

View File

@@ -1,10 +1,10 @@
import { useState } from "react"; import { useState } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { postJSON } from "../../api"; import { postJSON } from "../../../api";
import { setToken } from "../../admin/token"; import { setToken } from "../../../admin/token";
import { useAdminT } from "../../admin/useAdminT"; import { useAdminT } from "../../../admin/useAdminT";
import { useAdminRouterMode } from "../../adminRouterMode"; import { useAdminRouterMode } from "../../../adminRouterMode";
import { adminUiPrefix } from "../../adminPaths"; import { adminUiPrefix } from "../../../adminPaths";
export function AdminLogin() { export function AdminLogin() {
const t = useAdminT(); const t = useAdminT();

View File

@@ -7,12 +7,12 @@ import {
putJSON, putJSON,
uploadFile, uploadFile,
type Category, type Category,
} from "../../api"; } from "../../../api";
import { getToken } from "../../admin/token"; import { getToken } from "../../../admin/token";
import { useAdminT } from "../../admin/useAdminT"; import { useAdminT } from "../../../admin/useAdminT";
import { resourceTypeDisplay } from "../../resourceTypeLabels"; import { resourceTypeDisplay } from "../../../resourceTypeLabels";
import { adminUiPrefix } from "../../adminPaths"; import { adminUiPrefix } from "../../../adminPaths";
import { useAdminRouterMode } from "../../adminRouterMode"; import { useAdminRouterMode } from "../../../adminRouterMode";
const types = [ const types = [
"image", "image",

View File

@@ -6,12 +6,12 @@ import {
itemsOrEmpty, itemsOrEmpty,
type AdminResource, type AdminResource,
type Category, type Category,
} from "../../api"; } from "../../../api";
import { getToken } from "../../admin/token"; import { getToken } from "../../../admin/token";
import { resourceTypeDisplay } from "../../resourceTypeLabels"; import { resourceTypeDisplay } from "../../../resourceTypeLabels";
import { useAdminT } from "../../admin/useAdminT"; import { useAdminT } from "../../../admin/useAdminT";
import { adminUiPrefix } from "../../adminPaths"; import { adminUiPrefix } from "../../../adminPaths";
import { useAdminRouterMode } from "../../adminRouterMode"; import { useAdminRouterMode } from "../../../adminRouterMode";
function statusLabel(t: (k: string) => string, s: string) { function statusLabel(t: (k: string) => string, s: string) {
if (s === "published") return t("published"); if (s === "published") return t("published");

View File

@@ -1,7 +1,7 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { getJSONAuth } from "../../api"; import { getJSONAuth } from "../../../api";
import { getToken } from "../../admin/token"; import { getToken } from "../../../admin/token";
import { useAdminT } from "../../admin/useAdminT"; import { useAdminT } from "../../../admin/useAdminT";
type Row = { id: number; query: string; createdAt: string }; type Row = { id: number; query: string; createdAt: string };