Skip to content

Commit

Permalink
feat: support manual announcement view (#58)
Browse files Browse the repository at this point in the history
  • Loading branch information
zmh-program committed Jan 23, 2024
1 parent 651d529 commit e2b2cd2
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 21 deletions.
4 changes: 4 additions & 0 deletions app/src/assets/pages/navbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
height: 40px;
border-radius: var(--radius);
cursor: pointer;

@media (max-width: 360px) {
display: none;
}
}

button {
Expand Down
11 changes: 2 additions & 9 deletions app/src/components/ProjectLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { selectMessages } from "@/store/chat.ts";
import { useDispatch, useSelector } from "react-redux";
import { MessageSquarePlus } from "lucide-react";
import { toggleConversation } from "@/api/history.ts";
import Github from "@/components/ui/icons/Github.tsx";

function ProjectLink() {
const dispatch = useDispatch();
Expand All @@ -24,15 +25,7 @@ function ProjectLink() {
window.open("https://github.com/Deeptrain-Community/chatnio")
}
>
<svg
viewBox="0 0 438.549 438.549"
className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100"
>
<path
fill="currentColor"
d="M409.132 114.573c-19.608-33.596-46.205-60.194-79.798-79.8-33.598-19.607-70.277-29.408-110.063-29.408-39.781 0-76.472 9.804-110.063 29.408-33.596 19.605-60.192 46.204-79.8 79.8C9.803 148.168 0 184.854 0 224.63c0 47.78 13.94 90.745 41.827 128.906 27.884 38.164 63.906 64.572 108.063 79.227 5.14.954 8.945.283 11.419-1.996 2.475-2.282 3.711-5.14 3.711-8.562 0-.571-.049-5.708-.144-15.417a2549.81 2549.81 0 01-.144-25.406l-6.567 1.136c-4.187.767-9.469 1.092-15.846 1-6.374-.089-12.991-.757-19.842-1.999-6.854-1.231-13.229-4.086-19.13-8.559-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-.951-2.568-2.098-3.711-3.429-1.142-1.331-1.997-2.663-2.568-3.997-.572-1.335-.098-2.43 1.427-3.289 1.525-.859 4.281-1.276 8.28-1.276l5.708.853c3.807.763 8.516 3.042 14.133 6.851 5.614 3.806 10.229 8.754 13.846 14.842 4.38 7.806 9.657 13.754 15.846 17.847 6.184 4.093 12.419 6.136 18.699 6.136 6.28 0 11.704-.476 16.274-1.423 4.565-.952 8.848-2.383 12.847-4.285 1.713-12.758 6.377-22.559 13.988-29.41-10.848-1.14-20.601-2.857-29.264-5.14-8.658-2.286-17.605-5.996-26.835-11.14-9.235-5.137-16.896-11.516-22.985-19.126-6.09-7.614-11.088-17.61-14.987-29.979-3.901-12.374-5.852-26.648-5.852-42.826 0-23.035 7.52-42.637 22.557-58.817-7.044-17.318-6.379-36.732 1.997-58.24 5.52-1.715 13.706-.428 24.554 3.853 10.85 4.283 18.794 7.952 23.84 10.994 5.046 3.041 9.089 5.618 12.135 7.708 17.705-4.947 35.976-7.421 54.818-7.421s37.117 2.474 54.823 7.421l10.849-6.849c7.419-4.57 16.18-8.758 26.262-12.565 10.088-3.805 17.802-4.853 23.134-3.138 8.562 21.509 9.325 40.922 2.279 58.24 15.036 16.18 22.559 35.787 22.559 58.817 0 16.178-1.958 30.497-5.853 42.966-3.9 12.471-8.941 22.457-15.125 29.979-6.191 7.521-13.901 13.85-23.131 18.986-9.232 5.14-18.182 8.85-26.84 11.136-8.662 2.286-18.415 4.004-29.263 5.146 9.894 8.562 14.842 22.077 14.842 40.539v60.237c0 3.422 1.19 6.279 3.572 8.562 2.379 2.279 6.136 2.95 11.276 1.995 44.163-14.653 80.185-41.062 108.068-79.226 27.88-38.161 41.825-81.126 41.825-128.906-.01-39.771-9.818-76.454-29.414-110.049z"
></path>
</svg>
<Github className="h-[1.2rem] w-[1.2rem] rotate-0 scale-100" />
</Button>
);
}
Expand Down
20 changes: 14 additions & 6 deletions app/src/components/app/Announcement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,32 @@ import {
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
AlertDialogTrigger,
} from "@/components/ui/alert-dialog";
import { announcementEvent } from "@/events/announcement.ts";
import { AnnouncementEvent, announcementEvent } from "@/events/announcement.ts";
import { Bell, Check } from "lucide-react";
import Markdown from "@/components/Markdown.tsx";
import { Button } from "@/components/ui/button.tsx";

function Announcement() {
const { t } = useTranslation();
const [announcement, setAnnouncement] = useState<string>("");
const [open, setOpen] = useState<boolean>(false);

useEffect(() => {
announcementEvent.bind((data: string) => setAnnouncement(data));
announcementEvent.bind((data: AnnouncementEvent) => {
setAnnouncement(data.message);
data.firstReceived && setOpen(true);
});
}, []);

return (
<AlertDialog
open={announcement !== ""}
onOpenChange={() => setAnnouncement("")}
>
<AlertDialog open={open} onOpenChange={setOpen}>
<AlertDialogTrigger asChild>
<Button variant={`outline`} size={`icon`}>
<Bell className={`h-4 w-4`} />
</Button>
</AlertDialogTrigger>
<AlertDialogContent className={`announcement-dialog flex-dialog`}>
<AlertDialogHeader>
<AlertDialogTitle
Expand Down
2 changes: 0 additions & 2 deletions app/src/components/app/AppProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { Model } from "@/api/types.ts";
import { ChargeProps, nonBilling } from "@/admin/charge.ts";
import { dispatchSubscriptionData } from "@/store/globals.ts";
import { marketEvent } from "@/events/market.ts";
import Announcement from "@/components/app/Announcement.tsx";

function AppProvider() {
const dispatch = useDispatch();
Expand Down Expand Up @@ -58,7 +57,6 @@ function AppProvider() {

return (
<>
<Announcement />
<Broadcast />
<NavBar />
<ThemeProvider />
Expand Down
2 changes: 2 additions & 0 deletions app/src/components/app/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { getMemory } from "@/utils/memory.ts";
import { goAuth } from "@/utils/app.ts";
import Avatar from "@/components/Avatar.tsx";
import { appLogo } from "@/conf/env.ts";
import Announcement from "@/components/app/Announcement.tsx";

function NavMenu() {
const username = useSelector(selectUsername);
Expand Down Expand Up @@ -60,6 +61,7 @@ function NavBar() {
/>
<div className={`grow`} />
<ProjectLink />
<Announcement />
<ModeToggle />
{auth ? (
<NavMenu />
Expand Down
14 changes: 14 additions & 0 deletions app/src/components/ui/icons/Github.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from "react";

function Github(props: React.SVGProps<SVGSVGElement>) {
return (
<svg viewBox="0 0 438.549 438.549" {...props}>
<path
fill="currentColor"
d="M409.132 114.573c-19.608-33.596-46.205-60.194-79.798-79.8-33.598-19.607-70.277-29.408-110.063-29.408-39.781 0-76.472 9.804-110.063 29.408-33.596 19.605-60.192 46.204-79.8 79.8C9.803 148.168 0 184.854 0 224.63c0 47.78 13.94 90.745 41.827 128.906 27.884 38.164 63.906 64.572 108.063 79.227 5.14.954 8.945.283 11.419-1.996 2.475-2.282 3.711-5.14 3.711-8.562 0-.571-.049-5.708-.144-15.417a2549.81 2549.81 0 01-.144-25.406l-6.567 1.136c-4.187.767-9.469 1.092-15.846 1-6.374-.089-12.991-.757-19.842-1.999-6.854-1.231-13.229-4.086-19.13-8.559-5.898-4.473-10.085-10.328-12.56-17.556l-2.855-6.57c-1.903-4.374-4.899-9.233-8.992-14.559-4.093-5.331-8.232-8.945-12.419-10.848l-1.999-1.431c-1.332-.951-2.568-2.098-3.711-3.429-1.142-1.331-1.997-2.663-2.568-3.997-.572-1.335-.098-2.43 1.427-3.289 1.525-.859 4.281-1.276 8.28-1.276l5.708.853c3.807.763 8.516 3.042 14.133 6.851 5.614 3.806 10.229 8.754 13.846 14.842 4.38 7.806 9.657 13.754 15.846 17.847 6.184 4.093 12.419 6.136 18.699 6.136 6.28 0 11.704-.476 16.274-1.423 4.565-.952 8.848-2.383 12.847-4.285 1.713-12.758 6.377-22.559 13.988-29.41-10.848-1.14-20.601-2.857-29.264-5.14-8.658-2.286-17.605-5.996-26.835-11.14-9.235-5.137-16.896-11.516-22.985-19.126-6.09-7.614-11.088-17.61-14.987-29.979-3.901-12.374-5.852-26.648-5.852-42.826 0-23.035 7.52-42.637 22.557-58.817-7.044-17.318-6.379-36.732 1.997-58.24 5.52-1.715 13.706-.428 24.554 3.853 10.85 4.283 18.794 7.952 23.84 10.994 5.046 3.041 9.089 5.618 12.135 7.708 17.705-4.947 35.976-7.421 54.818-7.421s37.117 2.474 54.823 7.421l10.849-6.849c7.419-4.57 16.18-8.758 26.262-12.565 10.088-3.805 17.802-4.853 23.134-3.138 8.562 21.509 9.325 40.922 2.279 58.24 15.036 16.18 22.559 35.787 22.559 58.817 0 16.178-1.958 30.497-5.853 42.966-3.9 12.471-8.941 22.457-15.125 29.979-6.191 7.521-13.901 13.85-23.131 18.986-9.232 5.14-18.182 8.85-26.84 11.136-8.662 2.286-18.415 4.004-29.263 5.146 9.894 8.562 14.842 22.077 14.842 40.539v60.237c0 3.422 1.19 6.279 3.572 8.562 2.379 2.279 6.136 2.95 11.276 1.995 44.163-14.653 80.185-41.062 108.068-79.226 27.88-38.161 41.825-81.126 41.825-128.906-.01-39.771-9.818-76.454-29.414-110.049z"
></path>
</svg>
);
}

export default Github;
7 changes: 5 additions & 2 deletions app/src/conf/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,13 @@ export function setAnnouncement(announcement: string): void {
/**
* set the announcement in localStorage
*/
if (getMemory("announcement") === announcement) return;
const firstReceived = getMemory("announcement") !== announcement;
setMemory("announcement", announcement);

announcementEvent.emit(announcement);
announcementEvent.emit({
message: announcement,
firstReceived,
});
}

export function setBuyLink(link: string): void {
Expand Down
11 changes: 10 additions & 1 deletion app/src/dialogs/SettingsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
} from "@/components/ui/select.tsx";
import { langsProps, setLanguage } from "@/i18n.ts";
import { cn } from "@/components/ui/lib/utils.ts";
import Github from "@/components/ui/icons/Github.tsx";

function SettingsDialog() {
const { t, i18n } = useTranslation();
Expand Down Expand Up @@ -170,7 +171,15 @@ function SettingsDialog() {
? memorySize.toFixed(2) + " MB"
: t("unknown")}
</p>
<p>chatnio v{version}</p>
<a
className={`flex flex-row items-center`}
href={`https://github.com/Deeptrain-Community/chatnio`}
>
<Github
className={`inline-block h-4 w-4 mr-1 translate-y-[1px]`}
/>
chatnio v{version}
</a>
</div>
</div>
</DialogDescription>
Expand Down
7 changes: 6 additions & 1 deletion app/src/events/announcement.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { EventCommitter } from "@/events/struct.ts";

export const announcementEvent = new EventCommitter<string>({
export type AnnouncementEvent = {
message: string;
firstReceived: boolean;
};

export const announcementEvent = new EventCommitter<AnnouncementEvent>({
name: "announcement",
});

0 comments on commit e2b2cd2

Please sign in to comment.