From df2e384b0d96d0aa1390acbc722b9675c7b07341 Mon Sep 17 00:00:00 2001 From: Miguel <113119956+mikeplascdev@users.noreply.github.com> Date: Thu, 23 May 2024 04:27:32 -0600 Subject: [PATCH] feat(setup): update logo and components props (#10204) * fix(logo): update the app logos and rename the default title * fix(accourdion): add title font size property * fix(button): add new variant for sidebar buttons * fix(client-settings): update the app title --------- Co-authored-by: Hanzla Mateen --- packages/client/public/favicon-16x16.png | Bin 1187 -> 354 bytes packages/client/public/favicon-32x32.png | Bin 2500 -> 1058 bytes packages/client/scripts/getClientSettings.ts | 6 +++--- .../primitives/tailwind/Accordion/index.tsx | 9 +++++---- .../src/primitives/tailwind/Button/index.tsx | 6 ++++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/packages/client/public/favicon-16x16.png b/packages/client/public/favicon-16x16.png index 952c439a64f2e861be761d45252e1ebca01f8130..67e4ce64e49bb5e9c226001d7a893c75635fa2f3 100644 GIT binary patch delta 338 zcmV-Y0j>U{3E~2f8Gi%-006c6H|hWY00Lr5M??VshmXv^0003SNklYHKmz}{ ze&znI{x8aa9sCUYUH?tyKi}_?-=+UK(Io#f{_*~G_2*+|kqlz&D+SicVc`v0>Ntfc};!7t(4Hb!9TTseFZA`|5Fpq1O|rha=+_-t$;`ap&?Ll7rH0?e?Nvw{{bsEM3MeAA1Zn6 z*TY{a-{pSgp?cC1Ecy3W)(_QR$H3+_q3TZsE0_iJunLei1!{5rZI7%V6YTa-sDj0y zkp0<+q2P}XP)mUtkoEJw1W+vfn>4Z;?g32*_?7gt_18fltKqlX&yF9;$U(*OEB@Dn kpBiB04!`FAc819S0Giswv9YLcYybcN07*qoM6N<$f`G%Wt^fc4 delta 1178 zcmV;L1ZDf;0;36#8Gi-<001BJ|6u?C0d8qSLr`gBV*mgsk#&(fO9Md^g}+3_S0sgk zA}LZtu}DA^#8P8n6GUPJqc+*iOGx6fyFtWOu(1#pg)|3F*8RzVOHLB!79S0iD) zlLQhZnPv8VoSAdEdluZ0oSwH@ryyUj&FE~{zZ75gx4+YgkAHq9nMmlCF+D#Yq3Qa0 z#HH#(NcC!dui@%WrYs#?9l{g3VcNnn4UrAoP`oSLr)LvM;S=GYDFX`MDqXAao8nA` zzZ9FX=nS}3Pk*M4wK~?bW?pziIFQd3_3Aw8OFXH<;)2vc**+|y%o4_rMv*mg*o34O zB(ui8(Xwxjb${{b@;2DS6i0@vc!Q!ArE5xRTJ)4WIW|@9|MRrc<71WXo-nk%I?m@1 zwC_V{&vAZF9j9~#EiZ6gsQK3=r^#>8_i9?;7`)qXc~jH01Gw6OfoCIOCdyKaYZGu9IcSPIbrHbOM zz6es(2rBfc4?^GCCn4=iA4PvlyMGH!W*cys229o9TqqI&3~tvG4@Ni%!?TE3}>RL|P3)zC3O(f#xv-JW zsE&W*I{KV|Ri>g$VhY+qZ!n+q=vtam~_Q%r}37qq=F7@<|{X(-7PUF!S}J@d4Fn{Ei%~T7I~h2Nxd`5x7Oif9jmKtEYa$B z6N4X3nX(*z_UF(uwv5l5cN{eVP1?d=81l-e8sxCXT`8Zf&Qw}SlYVbdRL8x>dP7v) z7DBs%X*fK!9w%&?%h3nCXu1zteOTSNUyZ&{@2kfi)G}z@Ymb_UV_IQRHOR^get#=$ zqPw`9ftHgx7nmV-*S-yC7lYNF5$E5BxXZd4v`Jj;w0$C{ZoBR}gl?T7RRIE sbu*iTdJfk*4$g>fjS3Hbm@N4ZgcFMzvAmAG2mk;807*qoM6N<$g7=9-UjP6A diff --git a/packages/client/public/favicon-32x32.png b/packages/client/public/favicon-32x32.png index 9b9d567645a497630a953725cf65a4dea7c73795..e9dddf13557367c849f1b4d3b4dedfe6380121b6 100644 GIT binary patch delta 1038 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 FV1n>N;kW<* diff --git a/packages/client/scripts/getClientSettings.ts b/packages/client/scripts/getClientSettings.ts index b7d7b9a709..cb375b81b8 100644 --- a/packages/client/scripts/getClientSettings.ts +++ b/packages/client/scripts/getClientSettings.ts @@ -23,9 +23,9 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20 Ethereal Engine. All Rights Reserved. */ -import knex from 'knex' - import { ClientSettingDatabaseType, clientSettingPath } from '../../common/src/schemas/setting/client-setting.schema' + +import knex from 'knex' import { clientDbToSchema } from '../../server-core/src/setting/client-setting/client-setting.resolvers' export const getClientSetting = async () => { @@ -47,7 +47,7 @@ export const getClientSetting = async () => { .then(([dbClient]) => { const dbClientConfig = clientDbToSchema(dbClient) || { logo: './logo.svg', - title: 'Ethereal Engine', + title: 'IR Engine', url: 'https://local.etherealengine.org', releaseName: 'local', siteDescription: 'Connected Worlds for Everyone', diff --git a/packages/ui/src/primitives/tailwind/Accordion/index.tsx b/packages/ui/src/primitives/tailwind/Accordion/index.tsx index cf3c2a547e..d147ab38d5 100644 --- a/packages/ui/src/primitives/tailwind/Accordion/index.tsx +++ b/packages/ui/src/primitives/tailwind/Accordion/index.tsx @@ -23,11 +23,10 @@ All portions of the code written by the Ethereal Engine team are Copyright © 20 Ethereal Engine. All Rights Reserved. */ -import React, { forwardRef, ReactNode, useEffect } from 'react' -import { twMerge } from 'tailwind-merge' +import React, { ReactNode, forwardRef, useEffect } from 'react' import { useHookstate } from '@etherealengine/hyperflux' - +import { twMerge } from 'tailwind-merge' import Text from '../Text' export interface AccordionProps extends React.HTMLAttributes { @@ -38,6 +37,7 @@ export interface AccordionProps extends React.HTMLAttributes { prefixIcon?: ReactNode children?: ReactNode titleClassName?: string + titleFontSize?: 'xs' | 'sm' | 'base' | 'lg' | 'xl' | '2xl' | '3xl' className?: string open?: boolean } @@ -53,6 +53,7 @@ const Accordion = forwardRef( children, className, titleClassName, + titleFontSize = 'xl', open, ...props }: AccordionProps, @@ -76,7 +77,7 @@ const Accordion = forwardRef( >
{prefixIcon &&
{prefixIcon}
} - + {title}
diff --git a/packages/ui/src/primitives/tailwind/Button/index.tsx b/packages/ui/src/primitives/tailwind/Button/index.tsx index 44b42d42d1..9853035a6c 100644 --- a/packages/ui/src/primitives/tailwind/Button/index.tsx +++ b/packages/ui/src/primitives/tailwind/Button/index.tsx @@ -24,6 +24,7 @@ Ethereal Engine. All Rights Reserved. */ import React, { ReactNode } from 'react' + import { twMerge } from 'tailwind-merge' export interface ButtonProps extends React.HTMLAttributes { @@ -31,7 +32,7 @@ export interface ButtonProps extends React.HTMLAttributes { endIcon?: ReactNode children?: ReactNode size?: 'small' | 'medium' | 'large' - variant?: 'primary' | 'outline' | 'danger' | 'success' | 'pink' | 'transparent' | 'onboarding' + variant?: 'primary' | 'outline' | 'danger' | 'success' | 'pink' | 'transparent' | 'onboarding' | 'sidebar' disabled?: boolean fullWidth?: boolean rounded?: 'partial' | 'full' | 'none' @@ -59,7 +60,8 @@ const variants = { danger: 'bg-red-500', success: 'bg-teal-700', transparent: 'bg-transparent', - onboarding: 'bg-button-gradient-onboarding' + onboarding: 'bg-button-gradient-onboarding', + sidebar: 'bg-[#141619]' } const Button = ({