Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
ari-party committed Jun 23, 2024
1 parent 71ceb3e commit f597c4c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
1 change: 1 addition & 0 deletions packages/mtc-artillery-overlay/src/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ fn main() {

if tauri_env == "production" {
let version = app.package_info().version.to_string();

spawn(async move {
check_for_updates(version).await;
});
Expand Down
14 changes: 8 additions & 6 deletions src/components/atoms/HeaderCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type { PropsWithChildren } from 'react';

export default function HeaderCard({
children,
sx = {},
...props
}: PropsWithChildren<CardProps>) {
return (
Expand All @@ -16,11 +15,14 @@ export default function HeaderCard({
size="sm"
variant="soft"
{...props}
sx={mergeSx(sx, {
paddingX: 2,
maxHeight: 75,
overflow: 'auto',
})}
sx={mergeSx(
{
paddingX: 2,
maxHeight: 75,
overflow: 'auto',
},
props.sx,
)}
>
{children}
</Card>
Expand Down
4 changes: 2 additions & 2 deletions src/components/atoms/configuration/map/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function MapItem({ item }: { item: Map }) {
})}
>
<Image
alt=""
alt={item.name}
height={24}
src={`/images/webp/maps/${item.image}_small.webp`}
width={24}
Expand All @@ -53,7 +53,7 @@ export default function MapItem({ item }: { item: Map }) {
title={t('typography.heightmap')}
variant="plain"
>
<Typography color="primary" fontSize={10}>
<Typography color="primary" sx={{ fontSize: 10 }}>
<Plus fontSize="small" />
</Typography>
</Tooltip>
Expand Down
6 changes: 5 additions & 1 deletion src/utils/getVersion.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
export default function getVersion() {
const commitHash =
process.env.VERCEL_GIT_COMMIT_SHA ?? process.env.SOURCE_COMMIT;
// vercel enviroment
process.env.VERCEL_GIT_COMMIT_SHA ??
// coolify enviroment
process.env.SOURCE_COMMIT;

return (commitHash ?? 'dev').slice(0, 9);
}

0 comments on commit f597c4c

Please sign in to comment.