Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e57f81c9c3 | |||
| 0a5811cc68 |
@@ -21,12 +21,8 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- platform: macos-14 # apple silicon
|
- platform: macos-14 # universal binary covers both Intel + Apple Silicon
|
||||||
args: "--target aarch64-apple-darwin --bundles app,updater"
|
args: "--target universal-apple-darwin --bundles app,updater"
|
||||||
- platform: macos-13 # intel
|
|
||||||
args: "--target x86_64-apple-darwin --bundles app,updater"
|
|
||||||
- platform: ubuntu-22.04
|
|
||||||
args: ""
|
|
||||||
- platform: windows-latest
|
- platform: windows-latest
|
||||||
args: ""
|
args: ""
|
||||||
|
|
||||||
@@ -47,13 +43,7 @@ jobs:
|
|||||||
- name: Setup Rust
|
- name: Setup Rust
|
||||||
uses: dtolnay/rust-toolchain@stable
|
uses: dtolnay/rust-toolchain@stable
|
||||||
with:
|
with:
|
||||||
targets: ${{ matrix.platform == 'macos-14' && 'aarch64-apple-darwin' || matrix.platform == 'macos-13' && 'x86_64-apple-darwin' || '' }}
|
targets: ${{ matrix.platform == 'macos-14' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
|
||||||
|
|
||||||
- name: Install Linux build deps
|
|
||||||
if: matrix.platform == 'ubuntu-22.04'
|
|
||||||
run: |
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libgtk-3-dev
|
|
||||||
|
|
||||||
- name: Install JS deps
|
- name: Install JS deps
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "ChatApp",
|
"productName": "ChatApp",
|
||||||
"version": "0.2.0",
|
"version": "0.2.1",
|
||||||
"identifier": "com.meinname.chatapp",
|
"identifier": "com.meinname.chatapp",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "pnpm vite:dev",
|
"beforeDevCommand": "pnpm vite:dev",
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { CallBar } from './CallUI';
|
|||||||
import {
|
import {
|
||||||
ChatBubbleIcon,
|
ChatBubbleIcon,
|
||||||
GearIcon,
|
GearIcon,
|
||||||
LogoMark,
|
LogoLockup,
|
||||||
ShieldIcon,
|
ShieldIcon,
|
||||||
SignOutIcon,
|
SignOutIcon,
|
||||||
UsersIcon,
|
UsersIcon,
|
||||||
@@ -33,7 +33,7 @@ const ADMIN_NAV_ITEM: NavItem = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export function Sidebar() {
|
export function Sidebar() {
|
||||||
const { t } = useTranslation(['app', 'common']);
|
const { t } = useTranslation(['app']);
|
||||||
const { signOut, profile } = useAuth();
|
const { signOut, profile } = useAuth();
|
||||||
const { incomingCount } = useFriendshipsContext();
|
const { incomingCount } = useFriendshipsContext();
|
||||||
const { totalUnread } = useConversationsContext();
|
const { totalUnread } = useConversationsContext();
|
||||||
@@ -45,11 +45,8 @@ export function Sidebar() {
|
|||||||
aria-label="Primary navigation"
|
aria-label="Primary navigation"
|
||||||
className="flex h-screen w-72 shrink-0 flex-col border-r border-white/5 bg-ink-900/70 backdrop-blur-xl"
|
className="flex h-screen w-72 shrink-0 flex-col border-r border-white/5 bg-ink-900/70 backdrop-blur-xl"
|
||||||
>
|
>
|
||||||
<div className="flex items-center gap-2.5 px-5 pb-3 pt-5">
|
<div className="flex items-center px-5 pb-3 pt-5">
|
||||||
<LogoMark className="h-7 w-7" />
|
<LogoLockup tone="dark" className="h-8 w-auto" aria-label="Netralax" />
|
||||||
<span className="font-display text-base font-semibold tracking-tight text-white">
|
|
||||||
{t('common:app_name')}
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav className="mt-2 flex flex-col gap-0.5 px-3">
|
<nav className="mt-2 flex flex-col gap-0.5 px-3">
|
||||||
|
|||||||
@@ -376,3 +376,58 @@ export function LogoMark(props: IconProps) {
|
|||||||
</svg>
|
</svg>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Full lockup: hex icon + "Netralax" wordmark. `tone` decides text colour:
|
||||||
|
// "dark" = white text (use on dark background), "light" = black text.
|
||||||
|
export function LogoLockup({
|
||||||
|
tone = 'dark',
|
||||||
|
...props
|
||||||
|
}: IconProps & { tone?: 'dark' | 'light' }) {
|
||||||
|
const textFill = tone === 'dark' ? '#ffffff' : '#0F172A';
|
||||||
|
return (
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
viewBox="0 0 260 64"
|
||||||
|
fill="none"
|
||||||
|
aria-hidden="true"
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
<defs>
|
||||||
|
<clipPath id="logo-lockup-hex-clip">
|
||||||
|
<polygon points="32,5 57,19 57,45 32,59 7,45 7,19" />
|
||||||
|
</clipPath>
|
||||||
|
</defs>
|
||||||
|
<polygon points="32,5 57,19 57,45 32,59 7,45 7,19" fill="#2e1065" />
|
||||||
|
<g clipPath="url(#logo-lockup-hex-clip)">
|
||||||
|
<path
|
||||||
|
d="M-4 32 Q 16 18 32 32 T 68 32 L 68 64 L -4 64 Z"
|
||||||
|
fill="#7c4dff"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M-4 32 Q 16 18 32 32 T 68 32"
|
||||||
|
stroke="#a78bfa"
|
||||||
|
strokeWidth="2"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
<polygon
|
||||||
|
points="32,5 57,19 57,45 32,59 7,45 7,19"
|
||||||
|
fill="none"
|
||||||
|
stroke="#a78bfa"
|
||||||
|
strokeWidth="1.5"
|
||||||
|
opacity="0.4"
|
||||||
|
/>
|
||||||
|
<text
|
||||||
|
x="78"
|
||||||
|
y="42"
|
||||||
|
fontFamily="'Space Grotesk', system-ui, sans-serif"
|
||||||
|
fontSize="30"
|
||||||
|
fontWeight="600"
|
||||||
|
letterSpacing="-0.6"
|
||||||
|
fill={textFill}
|
||||||
|
>
|
||||||
|
Netralax
|
||||||
|
</text>
|
||||||
|
</svg>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user