Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
feat(setup): update logo and components props (#10204)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
mikeplascdev and hanzlamateen authored May 23, 2024
1 parent 8ccc2fa commit df2e384
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
Binary file modified packages/client/public/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/client/public/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions packages/client/scripts/getClientSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand All @@ -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',
Expand Down
9 changes: 5 additions & 4 deletions packages/ui/src/primitives/tailwind/Accordion/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<HTMLDivElement> {
Expand All @@ -38,6 +37,7 @@ export interface AccordionProps extends React.HTMLAttributes<HTMLDivElement> {
prefixIcon?: ReactNode
children?: ReactNode
titleClassName?: string
titleFontSize?: 'xs' | 'sm' | 'base' | 'lg' | 'xl' | '2xl' | '3xl'
className?: string
open?: boolean
}
Expand All @@ -53,6 +53,7 @@ const Accordion = forwardRef(
children,
className,
titleClassName,
titleFontSize = 'xl',
open,
...props
}: AccordionProps,
Expand All @@ -76,7 +77,7 @@ const Accordion = forwardRef(
>
<div className={twClassNameTitle}>
{prefixIcon && <div className="mr-2">{prefixIcon}</div>}
<Text component="h2" fontSize="xl" fontWeight="semibold">
<Text component="h2" fontSize={titleFontSize!} fontWeight="semibold">
{title}
</Text>
</div>
Expand Down
6 changes: 4 additions & 2 deletions packages/ui/src/primitives/tailwind/Button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ Ethereal Engine. All Rights Reserved.
*/

import React, { ReactNode } from 'react'

import { twMerge } from 'tailwind-merge'

export interface ButtonProps extends React.HTMLAttributes<HTMLButtonElement> {
startIcon?: ReactNode
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'
Expand Down Expand Up @@ -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 = ({
Expand Down

0 comments on commit df2e384

Please sign in to comment.