Skip to content

Fix/change name #228

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
merged 3 commits into from
Jun 22, 2025
Merged

Fix/change name #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afb0b8c
fix: corrected the name to blabsy
Sahil2004 Jun 20, 2025
1d26ddd
fix: extra shit comming.
Sahil2004 Jun 20, 2025
e6b3ba5
fix: fixed the alignment of the display in more to look more like cur…
Sahil2004 Jun 20, 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: 5 additions & 2 deletions platforms/blabsy/.env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Dev URL
NEXT_PUBLIC_URL=http://localhost
NEXT_PUBLIC_BASE_URL=http://192.168.0.226:4444
# NEXT_PUBLIC_URL=http://localhost
# NEXT_PUBLIC_BASE_URL=http://192.168.0.226:4444

NEXT_PUBLIC_URL=https://blabsy.w3ds-prototype.merul.org
NEXT_PUBLIC_BASE_URL=https://blabsy.w3ds-prototype.merul.org

# Emulator
NEXT_PUBLIC_USE_EMULATOR=false
Expand Down
2 changes: 1 addition & 1 deletion platforms/blabsy/src/components/modal/mobile-sidebar-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export function MobileSidebarModal({
<ActionModal
useIcon
focusOnMainBtn
title='Log out of Twitter?'
title='Log out of Blabsy?'
description='You can always log back in at any time. If you just want to switch accounts, you can do that by adding an existing account.'
mainBtnLabel='Log out'
action={signOut}
Expand Down
2 changes: 1 addition & 1 deletion platforms/blabsy/src/components/sidebar/more-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function MoreSettings(): JSX.Element {
<AnimatePresence>
{open && (
<Menu.Items
className='menu-container absolute -top-44 w-60 font-medium xl:w-11/12'
className='menu-container absolute top-0 w-60 font-medium xl:w-11/12'
as={motion.div}
{...variants}
static
Expand Down
204 changes: 111 additions & 93 deletions platforms/blabsy/src/components/sidebar/sidebar-profile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,104 +34,122 @@ export function SidebarProfile(): JSX.Element {
}}, [user]);

return (
<>
<Modal
modalClassName='max-w-xs bg-main-background w-full p-8 rounded-2xl'
open={open}
closeModal={closeModal}
>
<ActionModal
useIcon
focusOnMainBtn
title='Log out of Twitter?'
description='You can always log back in at any time. If you just want to switch accounts, you can do that by adding an existing account.'
mainBtnLabel='Log out'
action={signOut}
closeModal={closeModal}
/>
</Modal>
<Menu className='relative' as='section'>
{({ open }): JSX.Element => (
<>
<Menu.Button
className={cn(
`custom-button main-tab dark-bg-tab flex w-full items-center
<>
<Modal
modalClassName='max-w-xs bg-main-background w-full p-8 rounded-2xl'
open={open}
closeModal={closeModal}
>
<ActionModal
useIcon
focusOnMainBtn
title='Log out of Blabsy?'
description='You can always log back in at any time. If you just want to switch accounts, you can do that by adding an existing account.'
mainBtnLabel='Log out'
action={signOut}
closeModal={closeModal}
/>
</Modal>
<Menu className='relative' as='section'>
{({ open }): JSX.Element => (
<>
<Menu.Button
className={cn(
`custom-button main-tab dark-bg-tab flex w-full items-center
justify-between hover:bg-light-primary/10 active:bg-light-primary/20
dark:hover:bg-dark-primary/10 dark:active:bg-dark-primary/20`,
open && 'bg-light-primary/10 dark:bg-dark-primary/10'
)}
>
<div className='flex gap-3 truncate'>
<UserAvatar src={photoURL} alt={name} size={40} />
<div className='hidden truncate text-start leading-5 xl:block'>
<UserName name={name} className='start' verified={verified} />
<UserUsername username={username} disableLink />
</div>
</div>
<HeroIcon
className='hidden h-6 w-6 xl:block'
iconName='EllipsisHorizontalIcon'
/>
</Menu.Button>
<AnimatePresence>
{open && (
<Menu.Items
className='menu-container absolute left-0 right-0 -top-36 w-60 xl:w-full'
as={motion.div}
{...variants}
static
>
<Menu.Item
className='flex items-center justify-between gap-4 border-b
border-light-border px-4 py-3 dark:border-dark-border'
as='div'
disabled
>
<div className='flex items-center gap-3 truncate'>
<UserAvatar src={photoURL} alt={name} />
<div className='truncate'>
<UserName name={name} verified={verified} />
<UserUsername username={username} disableLink />
</div>
</div>
<i>
<HeroIcon
className='h-5 w-5 text-main-accent'
iconName='CheckIcon'
/>
</i>
</Menu.Item>
<Menu.Item>
{({ active }): JSX.Element => (
<Button
className={cn(
'flex w-full gap-3 rounded-md rounded-t-none p-4',
active && 'bg-main-sidebar-background'
)}
onClick={openModal}
open &&
'bg-light-primary/10 dark:bg-dark-primary/10'
)}
>
<HeroIcon iconName='ArrowRightOnRectangleIcon' />
Log out @{username}
</Button>
)}
</Menu.Item>
<i
className='absolute -bottom-[10px] left-2 translate-x-1/2 rotate-180
[filter:drop-shadow(#cfd9de_1px_-1px_1px)]
<div className='flex gap-3 truncate'>
<UserAvatar src={photoURL} alt={name} size={40} />
<div className='hidden truncate text-start leading-5 xl:block'>
<UserName
name={name}
className='start'
verified={verified}
/>
<UserUsername
username={username}
disableLink
/>
</div>
</div>
<HeroIcon
className='hidden h-6 w-6 xl:block'
iconName='EllipsisHorizontalIcon'
/>
</Menu.Button>
<AnimatePresence>
{open && (
<Menu.Items
className='menu-container absolute left-0 right-0 -top-36 w-60 xl:w-full'
as={motion.div}
{...variants}
static
>
<Menu.Item
className='flex items-center justify-between gap-4 border-b
border-light-border px-4 py-3 dark:border-dark-border'
as='div'
disabled
>
<div className='flex items-center gap-3 truncate'>
<UserAvatar
src={photoURL}
alt={name}
/>
<div className='truncate'>
<UserName
name={name}
verified={verified}
/>
<UserUsername
username={username}
disableLink
/>
</div>
</div>
<i>
<HeroIcon
className='h-5 w-5 text-main-accent'
iconName='CheckIcon'
/>
</i>
</Menu.Item>
<Menu.Item>
{({ active }): JSX.Element => (
<Button
className={cn(
'flex w-full gap-3 rounded-md rounded-t-none p-4',
active &&
'bg-main-sidebar-background'
)}
onClick={openModal}
>
<HeroIcon iconName='ArrowRightOnRectangleIcon' />
Log out @{username}
</Button>
)}
</Menu.Item>
<i
className='absolute -bottom-[10px] left-2 translate-x-1/2 rotate-180
[filter:drop-shadow(#cfd9de_1px_-1px_1px)]
dark:[filter:drop-shadow(#333639_1px_-1px_1px)]
xl:left-1/2 xl:-translate-x-1/2'
>
<CustomIcon
className='h-4 w-6 fill-main-background'
iconName='TriangleIcon'
/>
</i>
</Menu.Items>
>
<CustomIcon
className='h-4 w-6 fill-main-background'
iconName='TriangleIcon'
/>
</i>
</Menu.Items>
)}
</AnimatePresence>
</>
)}
</AnimatePresence>
</>
)}
</Menu>
</>
</Menu>
</>
);
}
1 change: 1 addition & 0 deletions platforms/metagram/project.inlang/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cache
1 change: 1 addition & 0 deletions platforms/metagram/project.inlang/project_id
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1lExt3FnvpxOpPeeZE
12 changes: 12 additions & 0 deletions platforms/metagram/project.inlang/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"$schema": "https://inlang.com/schema/project-settings",
"modules": [
"https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4/dist/index.js",
"https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2/dist/index.js"
],
"plugin.inlang.messageFormat": {
"pathPattern": "../messages/{locale}.json"
},
"baseLocale": "en",
"locales": ["en", "es"]
}
Loading