Skip to content

Update create-app frontend #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jesusmpc merged 6 commits into from
May 23, 2025
Merged

Update create-app frontend #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73217bb
chore: initial commit
jesusmpc May 23, 2025
ad47f34
feat: update create-app frontend cli
jesusmpc May 23, 2025
9ea1c25
feat: update create-app frontend
jesusmpc May 23, 2025
81e5502
Merge branch 'main' into improvement/GH-274-update-create-app-fronten
jesusmpc May 23, 2025
67034fd
chore: fix changelog errors
jesusmpc May 23, 2025
c952564
Merge branch 'improvement/GH-274-update-create-app-fronten' of https:…
jesusmpc May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions code/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## Added
### Added

- [#264](https://github.com/InditexTech/weavejs/issues/264) User selection awareness events plugin

## Changed
### Changed

- [#263](https://github.com/InditexTech/weavejs/issues/263) Awareness cursor UI improvements
- [#274](https://github.com/InditexTech/weavejs/issues/274) Update create-app frontend

## Fixed
### Fixed

- [#245](https://github.com/InditexTech/weavejs/issues/245) Frames drag-and-drop quirks when frames overlap

Expand Down
58 changes: 38 additions & 20 deletions ...tend-app/template/+nextjs+azure-web-pubsub/components/room-components/connected-users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use client';

import React from 'react';
import Avatar from 'boring-avatars';
import { Avatar as AvatarUI, AvatarFallback } from '@/components/ui/avatar';
import {
Tooltip,
Expand All @@ -19,6 +18,7 @@ import {
} from '@/components/ui/dropdown-menu';
import { useWeave } from '@inditextech/weave-react';
import { cn } from '@/lib/utils';
import { getUserShort, stringToColor } from '../utils/users';

export const ConnectedUsers = () => {
const connectedUsers = useWeave((state) => state.users);
Expand Down Expand Up @@ -61,19 +61,23 @@ export const ConnectedUsers = () => {
{connectedUserKey && (
<Tooltip>
<TooltipTrigger asChild>
<button className="cursor-pointer">
<AvatarUI className="w-[32px] h-[32px]">
<AvatarFallback>
<Avatar name={user?.name} size={32} variant="beam" />
<button className="cursor-pointer rounded-none">
<AvatarUI className="w-[32px] h-[32px] bg-muted font-light text-[13] leading-[18px]">
<AvatarFallback className="bg-transparent uppercase">
{getUserShort(user?.name ?? '')}
</AvatarFallback>
</AvatarUI>
</button>
</TooltipTrigger>
<TooltipContent
sideOffset={8}
side="bottom"
className="rounded-none"
className="rounded-none flex gap-2 justify-start items-center"
>
<div
className="w-[16px] h-[16px]"
style={{ background: stringToColor(user?.name ?? '') }}
></div>
<p className="font-inter text-xs">{user?.name}</p>
</TooltipContent>
</Tooltip>
Expand All @@ -84,19 +88,23 @@ export const ConnectedUsers = () => {
<Tooltip key={user}>
<TooltipTrigger asChild>
<button className="cursor-pointer">
<AvatarUI className="w-[32px] h-[32px]">
<AvatarFallback>
<Avatar
name={userInfo?.name}
size={32}
variant="beam"
/>
<AvatarUI className="w-[32px] h-[32px] bg-muted font-light text-[13] leading-[18px]">
<AvatarFallback className="bg-transparent uppercase">
{getUserShort(userInfo?.name ?? '')}
</AvatarFallback>
</AvatarUI>
</button>
</TooltipTrigger>
<TooltipContent side="bottom">
<p className="font-inter text-sm">{userInfo.name}</p>
<TooltipContent
sideOffset={8}
side="bottom"
className="rounded-none flex gap-2 justify-start items-center"
>
<div
className="w-[16px] h-[16px]"
style={{ background: stringToColor(userInfo?.name ?? '') }}
></div>
<p className="font-inter text-xs">{userInfo.name}</p>
</TooltipContent>
</Tooltip>
);
Expand All @@ -110,14 +118,18 @@ export const ConnectedUsers = () => {
>
<DropdownMenuTrigger
className={cn(
'rounded-none cursor-pointer p-2 hover:bg-accent focus:outline-none',
'rounded-full cursor-pointer p-1 !bg-muted hover:bg-accent focus:outline-none',
{
['bg-accent']: menuOpen,
['bg-white']: !menuOpen,
}
)}
>
<ChevronDown className="rounded-none" />
<ChevronDown
size={24}
strokeWidth={1}
className="rounded-none"
/>
</DropdownMenuTrigger>
<DropdownMenuContent
align="end"
Expand All @@ -133,9 +145,15 @@ export const ConnectedUsers = () => {
key={user}
className="text-foreground focus:bg-white hover:rounded-none"
>
<AvatarUI className="w-[32px] h-[32px]">
<AvatarFallback>
<Avatar name={userInfo?.name} variant="beam" />
<div
className="w-[16px] h-[16px]"
style={{
background: stringToColor(userInfo?.name ?? ''),
}}
></div>
<AvatarUI className="w-[32px] h-[32px] bg-muted font-light text-[13] leading-[18px]">
<AvatarFallback className="bg-transparent uppercase">
{getUserShort(userInfo?.name ?? '')}
</AvatarFallback>
</AvatarUI>
{userInfo?.name}
Expand Down
18 changes: 18 additions & 0 deletions .../packages/create-frontend-app/template/+nextjs+azure-web-pubsub/components/utils/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export const stringToColor = (str: string) => {
let hash = 0;
str.split("").forEach((char) => {
hash = char.charCodeAt(0) + ((hash << 5) - hash);
});
let colour = "#";
for (let i = 0; i < 3; i++) {
const value = (hash >> (i * 8)) & 0xff;
colour += value.toString(16).padStart(2, "0");
}
return colour;
};

export const getUserShort = (userName: string) => {
const firstLetter = userName.slice(0, 1);
const lastLetter = userName.slice(-1);
return `${firstLetter}${lastLetter}`;
};
58 changes: 38 additions & 20 deletions ...e-frontend-app/template/+nextjs+websockets/components/room-components/connected-users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use client';

import React from 'react';
import Avatar from 'boring-avatars';
import { Avatar as AvatarUI, AvatarFallback } from '@/components/ui/avatar';
import {
Tooltip,
Expand All @@ -19,6 +18,7 @@ import {
} from '@/components/ui/dropdown-menu';
import { useWeave } from '@inditextech/weave-react';
import { cn } from '@/lib/utils';
import { getUserShort, stringToColor } from '../utils/users';

export const ConnectedUsers = () => {
const connectedUsers = useWeave((state) => state.users);
Expand Down Expand Up @@ -61,19 +61,23 @@ export const ConnectedUsers = () => {
{connectedUserKey && (
<Tooltip>
<TooltipTrigger asChild>
<button className="cursor-pointer">
<AvatarUI className="w-[32px] h-[32px]">
<AvatarFallback>
<Avatar name={user?.name} size={32} variant="beam" />
<button className="cursor-pointer rounded-none">
<AvatarUI className="w-[32px] h-[32px] bg-muted font-light text-[13] leading-[18px]">
<AvatarFallback className="bg-transparent uppercase">
{getUserShort(user?.name ?? '')}
</AvatarFallback>
</AvatarUI>
</button>
</TooltipTrigger>
<TooltipContent
sideOffset={8}
side="bottom"
className="rounded-none"
className="rounded-none flex gap-2 justify-start items-center"
>
<div
className="w-[16px] h-[16px]"
style={{ background: stringToColor(user?.name ?? '') }}
></div>
<p className="font-inter text-xs">{user?.name}</p>
</TooltipContent>
</Tooltip>
Expand All @@ -84,19 +88,23 @@ export const ConnectedUsers = () => {
<Tooltip key={user}>
<TooltipTrigger asChild>
<button className="cursor-pointer">
<AvatarUI className="w-[32px] h-[32px]">
<AvatarFallback>
<Avatar
name={userInfo?.name}
size={32}
variant="beam"
/>
<AvatarUI className="w-[32px] h-[32px] bg-muted font-light text-[13] leading-[18px]">
<AvatarFallback className="bg-transparent uppercase">
{getUserShort(userInfo?.name ?? '')}
</AvatarFallback>
</AvatarUI>
</button>
</TooltipTrigger>
<TooltipContent side="bottom">
<p className="font-inter text-sm">{userInfo.name}</p>
<TooltipContent
sideOffset={8}
side="bottom"
className="rounded-none flex gap-2 justify-start items-center"
>
<div
className="w-[16px] h-[16px]"
style={{ background: stringToColor(userInfo?.name ?? '') }}
></div>
<p className="font-inter text-xs">{userInfo.name}</p>
</TooltipContent>
</Tooltip>
);
Expand All @@ -110,14 +118,18 @@ export const ConnectedUsers = () => {
>
<DropdownMenuTrigger
className={cn(
'rounded-none cursor-pointer p-2 hover:bg-accent focus:outline-none',
'rounded-full cursor-pointer p-1 !bg-muted hover:bg-accent focus:outline-none',
{
['bg-accent']: menuOpen,
['bg-white']: !menuOpen,
}
)}
>
<ChevronDown className="rounded-none" />
<ChevronDown
size={24}
strokeWidth={1}
className="rounded-none"
/>
</DropdownMenuTrigger>
<DropdownMenuContent
align="end"
Expand All @@ -133,9 +145,15 @@ export const ConnectedUsers = () => {
key={user}
className="text-foreground focus:bg-white hover:rounded-none"
>
<AvatarUI className="w-[32px] h-[32px]">
<AvatarFallback>
<Avatar name={userInfo?.name} variant="beam" />
<div
className="w-[16px] h-[16px]"
style={{
background: stringToColor(userInfo?.name ?? ''),
}}
></div>
<AvatarUI className="w-[32px] h-[32px] bg-muted font-light text-[13] leading-[18px]">
<AvatarFallback className="bg-transparent uppercase">
{getUserShort(userInfo?.name ?? '')}
</AvatarFallback>
</AvatarUI>
{userInfo?.name}
Expand Down
18 changes: 18 additions & 0 deletions code/packages/create-frontend-app/template/+nextjs+websockets/components/utils/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
export const stringToColor = (str: string) => {
let hash = 0;
str.split("").forEach((char) => {
hash = char.charCodeAt(0) + ((hash << 5) - hash);
});
let colour = "#";
for (let i = 0; i < 3; i++) {
const value = (hash >> (i * 8)) & 0xff;
colour += value.toString(16).padStart(2, "0");
}
return colour;
};

export const getUserShort = (userName: string) => {
const firstLetter = userName.slice(0, 1);
const lastLetter = userName.slice(-1);
return `${firstLetter}${lastLetter}`;
};
6 changes: 4 additions & 2 deletions docs/content/docs/main/changelog/prerelease/0.16.0.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
title: v0.16.0
description: Awareness Improvements
description: Awareness improvements & other minor improvements and bugfixes
---

## Metadata

- **Release date**: 2025-05-22
- **Release date**: 2025-05-23

## Added

Expand All @@ -14,7 +14,9 @@ description: Awareness Improvements
## Changed

- [#263](https://github.com/InditexTech/weavejs/issues/263) Awareness cursor UI improvements
- [#274](https://github.com/InditexTech/weavejs/issues/274) Update create-app frontend

## Fixed

- [#238](https://github.com/InditexTech/weavejs/issues/238) Crop image resizing and after-cropping position issues
- [#245](https://github.com/InditexTech/weavejs/issues/245) Frames drag-and-drop quirks when frames overlap
Loading