From d7addbb49632ba9f079a9385c7c0d2a666900738 Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 1 Aug 2022 05:53:14 -0400 Subject: [PATCH] basic styles --- packages/renderer/src/App.tsx | 9 ++++ .../renderer/src/components/ColorTest.tsx | 36 ++++++++++++++++ packages/renderer/src/pages/Channel.tsx | 17 ++++---- packages/renderer/src/pages/Channels.tsx | 42 ++++--------------- 4 files changed, 60 insertions(+), 44 deletions(-) create mode 100644 packages/renderer/src/components/ColorTest.tsx diff --git a/packages/renderer/src/App.tsx b/packages/renderer/src/App.tsx index dcfd37e..41762bd 100644 --- a/packages/renderer/src/App.tsx +++ b/packages/renderer/src/App.tsx @@ -38,6 +38,15 @@ export default function App() { --red: #ff5555; --yellow: #f1fa8c; --primary: var(--purple); + --neutral-1: #191a21; + --neutral-2: #21222c; + --neutral-3: #282a36; + --neutral-4: #343746; + --neutral-5: #44475a; + --neutral-6: #717380; + --neutral-7: #9ea0a6; + --neutral-8: #cbcccc; + --neutral-9: #f8f8f2; } a { color: var(--cyan); diff --git a/packages/renderer/src/components/ColorTest.tsx b/packages/renderer/src/components/ColorTest.tsx new file mode 100644 index 0000000..ce557a5 --- /dev/null +++ b/packages/renderer/src/components/ColorTest.tsx @@ -0,0 +1,36 @@ + + + +export function ColorTest() { + return ( +
+
+ {[1, 2, 3, 4, 5, 6, 7, 8, 9].map(n => ( +
+ ))} +
+ +
+ {['green','orange','cyan','pink','purple','red','yellow'].map((c) => ( +
+ ))} +
+
+ ); +} \ No newline at end of file diff --git a/packages/renderer/src/pages/Channel.tsx b/packages/renderer/src/pages/Channel.tsx index 252d487..b95e3e0 100644 --- a/packages/renderer/src/pages/Channel.tsx +++ b/packages/renderer/src/pages/Channel.tsx @@ -22,8 +22,8 @@ export default function Channel(props: ChannelProps) { gridTemplateColumns: 'min-content 1fr', color: selected ? 'cyan' : 'inherit', cursor: 'pointer', - background: selected ? 'var(--current-line)' : - hover ? 'rgba(255, 255, 255, 0.1)' : + background: selected ? 'var(--neutral-4)' : + hover ? 'var(--neutral-3)' : 'inherit', borderRadius: '8px', // placeItems: 'left center', @@ -35,18 +35,17 @@ export default function Channel(props: ChannelProps) { ref={ref} >
{name.toLowerCase().replaceAll(' ', '-').trim()}
diff --git a/packages/renderer/src/pages/Channels.tsx b/packages/renderer/src/pages/Channels.tsx index 2e0f7aa..65f9a7f 100644 --- a/packages/renderer/src/pages/Channels.tsx +++ b/packages/renderer/src/pages/Channels.tsx @@ -1,14 +1,14 @@ -import { useCallback, useContext, useEffect, useRef, useState } from 'react'; +import { + useCallback, + useEffect, + useRef, + useState +} from 'react'; import { useApi } from '../lib/useApi'; import type { IMessage } from './Message'; -import NameTextbox from './NameTextbox'; -import LoginQR from './LoginQR'; -import Totp from '../components/Totp'; import useChannel from '../hooks/useChannel'; import useClientId from '../hooks/useClientId'; import useHomeServer from '../contexts/PersistentState/useHomeServerNative'; -import Logout from '../components/Logout'; -import { CgHashtag } from 'react-icons/cg'; import Channel from './Channel'; interface IChannel { @@ -28,8 +28,6 @@ export default function Channels() { const { channel, setChannel } = useChannel() const { clientId } = useClientId() - const { setHomeServer } = useHomeServer(); - const { send } = useApi({ 'channels:list'(data: IChannel[]) { setChannels(data); @@ -89,6 +87,7 @@ export default function Channels() {


{channels.map(c => ( @@ -99,33 +98,6 @@ export default function Channels() { name={c.name} > ))} - {/* -

-

*/} - {/* */} - {/* */}
); } \ No newline at end of file