beenull/WebChat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
molvqingtai 2024-10-08 19:38:51 +08:00
commit d286188a3f
5 changed files with 9735 additions and 7903 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.husky/commit-msg
View file

@ -1,2 +1,2 @@
npx commitlint --edit "$1"
pnpm commitlint --edit "$1"

48
package.json
View file

@ -45,19 +45,19 @@
"homepage": "https://github.com/molvqingtai/WebChat",
"dependencies": {
"@hookform/resolvers": "^3.9.0",
"@lottiefiles/dotlottie-react": "^0.9.0",
"@lottiefiles/dotlottie-react": "^0.9.1",
"@perfsee/jsonr": "^1.13.0",
"@radix-ui/react-avatar": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.1",
"@radix-ui/react-dropdown-menu": "^2.1.1",
"@radix-ui/react-hover-card": "^1.1.1",
"@radix-ui/react-avatar": "^1.1.1",
"@radix-ui/react-checkbox": "^1.1.2",
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-hover-card": "^1.1.2",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.1",
"@radix-ui/react-radio-group": "^1.2.0",
"@radix-ui/react-scroll-area": "^1.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-radio-group": "^1.2.1",
"@radix-ui/react-scroll-area": "^1.2.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-switch": "^1.1.1",
"@resreq/event-hub": "^1.6.0",
"@resreq/timer": "^1.1.6",
"@rtco/client": "^0.2.17",
@ -67,9 +67,9 @@
"clsx": "^2.1.1",
"danmaku": "^2.0.7",
"date-fns": "^4.1.0",
"framer-motion": "^11.9.0",
"framer-motion": "^11.11.1",
"idb-keyval": "^6.2.1",
"lucide-react": "^0.446.0",
"lucide-react": "^0.449.0",
"nanoid": "^5.0.7",
"next-themes": "^0.3.0",
"react": "^18.3.1",
@ -85,51 +85,51 @@
"remesh-react": "^4.1.2",
"rxjs": "^7.8.1",
"sonner": "^1.5.0",
"tailwind-merge": "^2.5.2",
"tailwind-merge": "^2.5.3",
"trystero": "^0.20.0",
"type-fest": "^4.26.1",
"unstorage": "1.11.0",
"valibot": "^0.42.1"
"unstorage": "1.12.0",
"valibot": "1.0.0-beta.0"
},
"devDependencies": {
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"@eslint-react/eslint-plugin": "^1.14.3",
"@eslint/js": "^9.11.1",
"@eslint/js": "^9.12.0",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@types/eslint": "^9.6.1",
"@types/eslint-plugin-tailwindcss": "^3.17.0",
"@types/eslint__js": "^8.42.3",
"@types/node": "^22.7.4",
"@types/react": "^18.3.10",
"@types/node": "^22.7.5",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@typescript-eslint/parser": "^8.7.0",
"@typescript-eslint/parser": "^8.8.1",
"@vitejs/plugin-react": "^4.3.2",
"autoprefixer": "^10.4.20",
"cross-env": "^7.0.3",
"eslint": "^9.11.1",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-tailwindcss": "^3.17.4",
"globals": "^15.9.0",
"globals": "^15.10.0",
"husky": "^9.1.6",
"jiti": "^2.0.0",
"jiti": "^2.3.3",
"lint-staged": "^15.2.10",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.47",
"postcss-rem-to-responsive-pixel": "^6.0.2",
"prettier": "^3.3.3",
"rimraf": "^5.0.10",
"rimraf": "^6.0.1",
"semantic-release": "^24.1.2",
"tailwindcss": "^3.4.13",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.6.2",
"typescript-eslint": "^8.7.0",
"typescript-eslint": "^8.8.1",
"vite-plugin-svgr": "^4.2.0",
"webext-bridge": "^6.0.1",
"wxt": "^0.19.10"
"wxt": "^0.19.11"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": "eslint --fix --flag unstable_ts_config"

17154
pnpm-lock.yaml
View file

File diff suppressed because it is too large Load diff

2
src/app/content/components/EmojiButton.tsx
View file

@ -34,7 +34,7 @@ const EmojiButton: FC<EmojiButtonProps> = ({ onSelect }) => {
<SmileIcon size={20} />
</Button>
</PopoverTrigger>
<PopoverContent className="z-infinity w-72 px-0" onCloseAutoFocus={handleCloseAutoFocus}>
<PopoverContent className="z-infinity w-72 rounded-xl px-0" onCloseAutoFocus={handleCloseAutoFocus}>
<ScrollArea className="size-72 px-3">
{emojiGroups.map((group, index) => {
return (

26
src/app/content/views/Header/index.tsx
View file

@ -6,6 +6,7 @@ import { Button } from '@/components/ui/Button'
import { cn, getSiteInfo } from '@/utils'
import { useRemeshDomain, useRemeshQuery } from 'remesh-react'
import RoomDomain from '@/domain/Room'
import { ScrollArea } from '@/components/ui/ScrollArea'
const Header: FC = () => {
const siteInfo = getSiteInfo()
@ -29,7 +30,7 @@ const Header: FC = () => {
</span>
</Button>
</HoverCardTrigger>
<HoverCardContent className="w-80">
<HoverCardContent className="w-80 rounded-lg">
<div className="grid grid-cols-[auto_1fr] gap-x-4">
<Avatar className="size-14">
<AvatarImage src={siteInfo.icon} alt="favicon" />
@ -46,7 +47,10 @@ const Header: FC = () => {
</div>
</HoverCardContent>
</HoverCard>
<div className="flex items-center gap-x-1 text-sm text-slate-500">
<HoverCard>
<HoverCardTrigger asChild>
<Button className="overflow-hidden" variant="link">
<div className="flex items-center gap-x-1 text-nowrap text-sm text-slate-500">
<span className="relative flex size-2">
<span
className={cn(
@ -63,6 +67,24 @@ const Header: FC = () => {
</span>
<span>ONLINE {onlineCount > 99 ? '99+' : onlineCount}</span>
</div>
</Button>
</HoverCardTrigger>
<HoverCardContent className="w-44 rounded-lg p-2">
<ScrollArea className="max-h-80">
{userList.map((user) => (
<div className="flex items-center gap-x-2 p-2 [content-visibility:auto]" key={user.userId}>
<Avatar className="size-6 shrink-0">
<AvatarImage src={user.userAvatar} alt="avatar" />
<AvatarFallback>{user.username.at(0)}</AvatarFallback>
</Avatar>
<div className="flex-1 overflow-hidden text-ellipsis text-nowrap text-sm text-slate-500">
{user.username}
</div>
</div>
))}
</ScrollArea>
</HoverCardContent>
</HoverCard>
</div>
)
}