hermes/meshtastic-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start consistancy fixing

Browse Source
This commit is contained in:
Sacha Weatherstone
2022-03-01 22:19:57 +11:00
parent 115ff9d4bf
commit 4dc39623dc
31 changed files with 404 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/Extensions/FileBrowser.tsx
+1 -1
View File
@@ -71,7 +71,7 @@ export const FileBrowser = (): JSX.Element => {
{data?.data.files.map((file) => (
<div
key={file.name}
className="flex h-10 w-full border-b border-gray-300 px-4 font-medium dark:border-gray-600 dark:text-white"
className="flex h-10 w-full border-b border-gray-400 px-4 font-medium dark:border-gray-600 dark:text-white"
>
<div className="my-auto w-1/3">
<a
src/pages/Extensions/Info.tsx
+3 -2
View File
@@ -1,10 +1,11 @@
import type React from 'react';
import { FiClipboard, FiRefreshCw } from 'react-icons/fi';
import { FiRefreshCw } from 'react-icons/fi';
import JSONPretty from 'react-json-pretty';
import { IconButton } from '@app/components/generic/button/IconButton';
import { Card } from '@app/components/generic/Card';
import { CopyButton } from '@app/components/menu/buttons/CopyButton';
import { Hashicon } from '@emeraldpay/hashicon-react';
import { useAppSelector } from '@hooks/useAppSelector';
@@ -40,7 +41,7 @@ export const Info = (): JSX.Element => {
<Card
title="Debug Information"
className="flex-grow"
actions={<IconButton icon={<FiClipboard />} />}
actions={<CopyButton data={JSON.stringify(hardwareInfo)} />}
>
<JSONPretty className="overflow-y-auto" data={hardwareInfo} />
</Card>
src/pages/Extensions/Logs.tsx
+1 -9
View File
@@ -87,21 +87,13 @@ export const Logs = (): JSX.Element => {
)}
{meshtasticState.logs.map((log, index) => (
// <ContextMenu
// key={index}
// items={
// <>
// <ContextItem title="Test" icon={<FiGitBranch />} />
// </>
// }
// >
<m.tr
key={index}
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
exit={{ opacity: 0 }}
transition={{ duration: 0.3 }}
className="group hover:bg-gray-200 dark:hover:bg-secondaryDark"
className="group hover:bg-gray-300 dark:hover:bg-secondaryDark"
>
<m.td
className="w-6 cursor-pointer"
src/pages/Map/MapContainer.tsx
+4 -4
View File
@@ -5,6 +5,8 @@ import { FaDirections, FaGlobeAfrica, FaMountain } from 'react-icons/fa';
import { MdFullscreen, MdRadar, MdWbShade } from 'react-icons/md';
import { IconButton } from '@components/generic/button/IconButton';
import type { MapStyle } from '@core/mapStyles';
import { MapStyles } from '@core/mapStyles';
import {
setExaggeration,
setHillShade,
@@ -13,8 +15,6 @@ import {
import { useAppDispatch } from '@hooks/useAppDispatch';
import { useAppSelector } from '@hooks/useAppSelector';
import { useMapbox } from '@hooks/useMapbox';
import type { MapStyle } from '@pages/Map/styles';
import { MapStyles } from '@pages/Map/styles';
export const MapContainer = (): JSX.Element => {
const dispatch = useAppDispatch();
@@ -46,7 +46,7 @@ export const MapContainer = (): JSX.Element => {
e.stopPropagation();
}}
>
<div className="absolute right-0 z-10 m-4 space-y-2 rounded-md border border-gray-300 bg-white p-2 shadow-md dark:border-gray-600 dark:bg-primaryDark">
<div className="absolute right-0 z-10 m-4 space-y-2 rounded-md border border-gray-400 bg-white p-2 shadow-md dark:border-gray-600 dark:bg-primaryDark">
<IconButton
active={mapState.style === 'Satellite'}
onClick={(): void => {
@@ -56,7 +56,7 @@ export const MapContainer = (): JSX.Element => {
/>
<div
className={`-m-1 space-y-2 rounded-md border-gray-300 p-1 dark:border-gray-600 ${
className={`-m-1 space-y-2 rounded-md border-gray-400 p-1 dark:border-gray-600 ${
mapState.style === 'Outdoors' ? 'border' : ''
}`}
>
src/pages/Map/styles.ts
-60
View File
@@ -1,60 +0,0 @@
import type { Style } from 'mapbox-gl';
export type MapStyleName =
| 'Streets'
| 'Outdoors'
| 'Light'
| 'Dark'
| 'Satellite';
export interface MapStyle {
title: MapStyleName;
data: Style | string;
}
type MapStyleType = {
[mapStyleType in MapStyleName]: MapStyle;
};
export const MapStyles: MapStyleType = {
Streets: {
title: 'Streets',
data: 'mapbox://styles/mapbox/streets-v11?optimize=true',
} as MapStyle,
Outdoors: {
title: 'Outdoors',
data: 'mapbox://styles/mapbox/outdoors-v11?optimize=true',
} as MapStyle,
Light: {
title: 'Light',
data: 'mapbox://styles/mapbox/light-v10?optimize=true',
} as MapStyle,
Dark: {
title: 'Dark',
data: 'mapbox://styles/sachaw/ckwzwm92e1oep14pjunjqlqbo?optimize=true',
} as MapStyle,
Satellite: {
title: 'Satellite',
data: {
version: 8,
layers: [
{
id: 'esri',
type: 'raster',
source: 'esri',
},
],
sources: {
esri: {
type: 'raster',
tiles: [
'https://clarity.maptiles.arcgis.com/arcgis/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
],
maxzoom: 17,
},
},
},
} as MapStyle,
};
src/pages/Messages/ChannelChat.tsx
+1 -1
View File
@@ -50,7 +50,7 @@ export const ChannelChat = ({
: `CH: ${channel.index}`
}
>
<div className="flex h-8 w-8 rounded-full bg-gray-200 dark:bg-primaryDark dark:text-white">
<div className="flex h-8 w-8 rounded-full bg-gray-300 dark:bg-primaryDark dark:text-white">
<div className="m-auto">
{channel.role === Protobuf.Channel_Role.PRIMARY ? (
<MdPublic />
src/pages/Messages/Message.tsx
+1 -1
View File
@@ -22,7 +22,7 @@ export const Message = ({
sender,
}: MessageProps): JSX.Element => {
return (
<div className="group mb-3 hover:bg-gray-200 dark:hover:bg-primaryDark">
<div className="group mb-3 hover:bg-gray-200 dark:hover:bg-tertiaryDark">
{lastMsgSameUser ? (
<div
className={`mx-6 -mt-3 flex justify-between ${
src/pages/Messages/MessageBar.tsx
+1 -1
View File
@@ -55,7 +55,7 @@ export const MessageBar = ({ chatIndex }: MessageBarProps): JSX.Element => {
}
};
return (
<div className="mx-auto flex w-full space-x-2 bg-gray-50 p-3 text-gray-500 dark:bg-transparent dark:text-gray-400">
<div className="mx-auto flex w-full space-x-2 bg-gray-50 bg-transparent p-3 text-gray-500 dark:text-gray-400">
<div className="mx-auto flex w-full max-w-4xl">
<form
className="flex w-full space-x-2"
src/pages/Messages/index.tsx
+3 -3
View File
@@ -49,7 +49,7 @@ export const Messages = (): JSX.Element => {
/>
))}
{nodes.length !== 0 && channels.length !== 0 && (
<div className="mx-2 rounded-md border-2 border-gray-300 dark:border-gray-600" />
<div className="mx-2 border-b border-gray-400 dark:border-gray-600" />
)}
{nodes
.filter((node) => node.number !== myNodeNum)
@@ -65,7 +65,7 @@ export const Messages = (): JSX.Element => {
}
>
<div className="flex w-full flex-col">
<div className="flex w-full justify-between border-b border-gray-300 px-2 dark:border-gray-600 dark:text-gray-300">
<div className="flex w-full justify-between border-b border-gray-400 px-2 dark:border-gray-600 dark:text-gray-300">
<div className="my-auto flex gap-2 py-2 text-sm">
<IconButton nested icon={<FiHash className="h-4 w-4" />} />
<div className="my-auto">
@@ -90,7 +90,7 @@ export const Messages = (): JSX.Element => {
</div>
<div
ref={chatRef}
className="flex flex-grow flex-col space-y-2 overflow-y-auto border-b border-gray-300 bg-white pb-6 dark:border-gray-600 dark:bg-secondaryDark"
className="flex flex-grow flex-col space-y-2 overflow-y-auto border-b border-gray-400 bg-gray-300 pb-6 dark:border-gray-600 dark:bg-secondaryDark"
>
<div className="mt-auto">
{chats[selectedChatIndex]?.messages.map((message, index) => (
src/pages/Nodes/NodeCard.tsx
+1 -1
View File
@@ -145,7 +145,7 @@ export const NodeCard = ({
</CollapsibleSection>
<CollapsibleSection title="Location" icon={<FiMapPin />}>
<>
<div className="flex h-10 select-none justify-between rounded-md border border-gray-300 bg-transparent bg-gray-200 px-1 text-gray-500 dark:border-gray-600 dark:bg-secondaryDark dark:text-gray-400 ">
<div className="flex h-10 select-none justify-between rounded-md border border-gray-400 bg-transparent bg-gray-300 px-1 text-gray-500 dark:border-gray-600 dark:bg-secondaryDark dark:text-gray-400 ">
{node.currentPosition ? (
<>
<div className="my-auto px-1">