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

stg -> prd #10912

Merged
merged 5 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env.local.default
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ KEY=certs/key.pem

# Client variables ---------------
APP_TITLE="IR Engine"
APP_LOGO=https://etherealengine-static.s3-us-east-1.amazonaws.com/logo.png
APP_LOGO=https://preview.ir.world/static/ir.svg
APP_URL=https://localhost:3000
APP_HOST=localhost:3000
APP_PORT=3000
Expand Down
91 changes: 0 additions & 91 deletions .github/workflows/dev-deploy.yml

This file was deleted.

91 changes: 0 additions & 91 deletions .github/workflows/prod-deploy.yml

This file was deleted.

2 changes: 1 addition & 1 deletion packages/client-core/src/admin/adminRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const AdminTopBar = () => {
<HiMiniSun className="text-theme-primary" size="1.5rem" />
)}
</Button>
<Tooltip title={tooltip}>
<Tooltip content={tooltip}>
<Button className="pointer-events-auto" size="small" onClick={() => AuthService.logoutUser()}>
{t('admin:components.common.logOut')}
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ export default function ProjectTable(props: { search: string }) {
{row.name}
</a>
{!!row.needsRebuild && (
<Tooltip title={t('admin:components.project.outdatedBuild')} position="right center">
<Tooltip content={t('admin:components.project.outdatedBuild')} position="right center">
<HiOutlineExclamationCircle className="text-orange-400" size={22} />
</Tooltip>
)}
{!!row.hasLocalChanges && (
<Tooltip title={t('admin:components.project.hasLocalChanges')} position="right center">
<Tooltip content={t('admin:components.project.hasLocalChanges')} position="right center">
<HiOutlineExclamationCircle className="text-yellow-400" size={22} />
</Tooltip>
)}
Expand All @@ -243,7 +243,7 @@ export default function ProjectTable(props: { search: string }) {
visibility: <Toggle value={row.visibility === 'public'} onChange={() => handleVisibilityChange(row)} />,
commitSHA: (
<span className="flex items-center justify-between">
<Tooltip title={row.commitSHA || ''}>
<Tooltip content={row.commitSHA || ''}>
<>{row.commitSHA?.slice(0, 8)}</>
</Tooltip>{' '}
<CopyText text={row.commitSHA || ''} className="ml-1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function ServerStatus({ serverPodInfo }: { serverPodInfo: ServerPodInfoType }) {
)}
<div className="flex gap-1">
{serverPodInfo.containers.map((container) => (
<Tooltip key={container.name} title={`${t('admin:components.server.name')}: ${container.name}`}>
<Tooltip key={container.name} content={`${t('admin:components.server.name')}: ${container.name}`}>
<div className={`${containerColor[container.status]} h-3.5 w-3.5 rounded-full`} />
</Tooltip>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const FeatureItem = ({ feature }: { feature: FeatureFlagSettingType }) => {
/>
{feature.userId && (
<Tooltip
title={t('admin:components.common.lastUpdatedBy', {
content={t('admin:components.common.lastUpdatedBy', {
userId: feature.userId,
updatedAt: toDisplayDateTime(feature.updatedAt)
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ const ProjectTab = forwardRef(({ open }: { open: boolean }, ref: React.MutableRe
endComponent={
setting.userId && (
<Tooltip
title={t('admin:components.common.lastUpdatedBy', {
position="left center"
content={t('admin:components.common.lastUpdatedBy', {
userId: setting.userId,
updatedAt: toDisplayDateTime(setting.updatedAt)
})}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,47 +53,47 @@ export default function AccountIdentifiers({ user }: { user: UserType }) {
return (
<div className="flex items-center gap-2">
{appleIp ? (
<Tooltip title={appleIp.accountIdentifier!}>
<Tooltip content={appleIp.accountIdentifier!}>
<RiAppleFill className="h-6 w-6" />
</Tooltip>
) : null}
{discordIp ? (
<Tooltip title={discordIp.accountIdentifier!}>
<Tooltip content={discordIp.accountIdentifier!}>
<RiDiscordFill className="h-6 w-6" />
</Tooltip>
) : null}
{googleIp ? (
<Tooltip title={googleIp.accountIdentifier!}>
<Tooltip content={googleIp.accountIdentifier!}>
<RiGoogleFill className="h-6 w-6" />
</Tooltip>
) : null}
{facebookIp ? (
<Tooltip title={facebookIp.accountIdentifier!}>
<Tooltip content={facebookIp.accountIdentifier!}>
<RiMetaFill className="h-6 w-6" />
</Tooltip>
) : null}
{twitterIp ? (
<Tooltip title={twitterIp.accountIdentifier!}>
<Tooltip content={twitterIp.accountIdentifier!}>
<RiTwitterXFill className="h-6 w-6" />
</Tooltip>
) : null}
{linkedinIp ? (
<Tooltip title={linkedinIp.accountIdentifier!}>
<Tooltip content={linkedinIp.accountIdentifier!}>
<RiLinkedinFill className="h-6 w-6" />
</Tooltip>
) : null}
{githubIp ? (
<Tooltip title={githubIp.accountIdentifier!}>
<Tooltip content={githubIp.accountIdentifier!}>
<RiGithubFill className="h-6 w-6" />
</Tooltip>
) : null}
{smsIp ? (
<Tooltip title={smsIp.accountIdentifier!}>
<Tooltip content={smsIp.accountIdentifier!}>
<RiMessage2Line className="h-6 w-6" />
</Tooltip>
) : null}
{emailIp ? (
<Tooltip title={emailIp.accountIdentifier!}>
<Tooltip content={emailIp.accountIdentifier!}>
<MdEmail className="h-6 w-6" />
</Tooltip>
) : null}
Expand Down
Loading
Loading