Browse Source

Log transition & light mode messaging fixes

pull/21/head
Sacha Weatherstone 4 years ago
parent
commit
7d0c264313
  1. 115
      src/pages/Extensions/Logs.tsx
  2. 4
      src/pages/Messages/Message.tsx

115
src/pages/Extensions/Logs.tsx

@ -85,63 +85,68 @@ export const Logs = (): JSX.Element => {
/> />
</div> </div>
)} )}
</AnimatePresence>
{meshtasticState.logs.map((log, index) => (
// <ContextMenu
// key={index}
// items={
// <>
// <ContextItem title="Test" icon={<FiGitBranch />} />
// </>
// }
// >
<tr
key={index}
className="group hover:bg-gray-200 dark:hover:bg-secondaryDark"
>
<m.td
className="w-6 cursor-pointer"
whileHover={{ scale: 1.01 }}
whileTap={{ scale: 0.99 }}
>
<div className="m-auto pl-2 text-white group-hover:text-black dark:text-primaryDark dark:group-hover:text-gray-400">
<FiArrowRight />
</div>
</m.td>
<Wrapper>
{log.date
.toLocaleString(undefined, {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit', {meshtasticState.logs.map((log, index) => (
minute: '2-digit', // <ContextMenu
second: '2-digit', // key={index}
}) // items={
.replaceAll('/', '-') // <>
.replace(',', '')} // <ContextItem title="Test" icon={<FiGitBranch />} />
</Wrapper> // </>
<Wrapper> // }
<div className={emitterLookup[log.emitter]}> // >
[{Types.EmitterScope[log.scope]}. <m.tr
{Types.Emitter[log.emitter]}] key={index}
</div> initial={{ opacity: 0 }}
</Wrapper> animate={{ opacity: 1 }}
<Wrapper className={levelLookup[log.level]}> exit={{ opacity: 0 }}
[{Protobuf.LogRecord_Level[log.level]}]{/* </div> */} transition={{ duration: 0.3 }}
</Wrapper> className="group hover:bg-gray-200 dark:hover:bg-secondaryDark"
<td
className={`m-auto ${
log.packet ? '' : 'dark:text-secondaryDark'
}`}
> >
<FiPaperclip /> <m.td
</td> className="w-6 cursor-pointer"
<td className="w-full truncate pl-1">{log.message}</td> whileHover={{ scale: 1.01 }}
</tr> whileTap={{ scale: 0.99 }}
// </ContextMenu> >
))} <div className="m-auto pl-2 text-white group-hover:text-black dark:text-primaryDark dark:group-hover:text-gray-400">
<FiArrowRight />
</div>
</m.td>
<Wrapper>
{log.date
.toLocaleString(undefined, {
year: 'numeric',
month: '2-digit',
day: '2-digit',
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
})
.replaceAll('/', '-')
.replace(',', '')}
</Wrapper>
<Wrapper>
<div className={emitterLookup[log.emitter]}>
[{Types.EmitterScope[log.scope]}.
{Types.Emitter[log.emitter]}]
</div>
</Wrapper>
<Wrapper className={levelLookup[log.level]}>
[{Protobuf.LogRecord_Level[log.level]}]{/* </div> */}
</Wrapper>
<td
className={`m-auto ${
log.packet ? '' : 'dark:text-secondaryDark'
}`}
>
<FiPaperclip />
</td>
<td className="w-full truncate pl-1">{log.message}</td>
</m.tr>
// </ContextMenu>
))}
</AnimatePresence>
</tbody> </tbody>
</table> </table>
</Card> </Card>

4
src/pages/Messages/Message.tsx

@ -31,7 +31,7 @@ export const Message = ({
> >
<div className="flex gap-2"> <div className="flex gap-2">
<Tooltip content={rxTime.toString()}> <Tooltip content={rxTime.toString()}>
<div className="my-auto ml-auto w-8 pt-1 text-xs text-transparent dark:group-hover:text-gray-400"> <div className="my-auto ml-auto w-8 pt-1 text-xs text-transparent group-hover:text-gray-500 dark:group-hover:text-gray-400">
{rxTime {rxTime
.toLocaleTimeString(undefined, { .toLocaleTimeString(undefined, {
hour: '2-digit', hour: '2-digit',
@ -50,7 +50,7 @@ export const Message = ({
</div> </div>
</div> </div>
<Tooltip content="Response time"> <Tooltip content="Response time">
<div className="flex gap-1 pt-1 text-xs text-transparent dark:group-hover:text-gray-400"> <div className="flex gap-1 pt-1 text-xs text-transparent group-hover:text-gray-500 dark:group-hover:text-gray-400">
<FiClock className="mt-0.5" /> <FiClock className="mt-0.5" />
<div>25s</div> <div>25s</div>
</div> </div>

Loading…
Cancel
Save