Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2024-12-14 03:16:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wip work on federation settings

Browse Source
This commit is contained in:
Reckless_Satoshi 2022-10-30 06:02:06 -07:00
parent ca35d6b3d2
commit d64adfc2bf
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
9 changed files with 138 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/App.tsx
View File

@ -42,7 +42,7 @@ const App = (): JSX.Element => {
useEffect(() => { useEffect(() => {
updateTheme(); updateTheme();
}, [settings]); }, [settings.fontSize, settings.mode]);
useEffect(() => { useEffect(() => {
i18n.changeLanguage(settings.language); i18n.changeLanguage(settings.language);

18
frontend/src/basic/Main.tsx
View File

@ -10,9 +10,7 @@ import SettingsPage from './SettingsPage';
import NavBar, { Page } from './NavBar'; import NavBar, { Page } from './NavBar';
import MainDialogs, { OpenDialogs } from './MainDialogs'; import MainDialogs, { OpenDialogs } from './MainDialogs';
import { apiClient } from '../services/api'; import RobotAvatar from '../components/RobotAvatar';
import { checkVer } from '../utils';
import { import {
Book, Book,
LimitList, LimitList,
@ -24,9 +22,14 @@ import {
defaultMaker, defaultMaker,
defaultRobot, defaultRobot,
defaultInfo, defaultInfo,
Coordinator,
} from '../models'; } from '../models';
import { apiClient } from '../services/api';
import { checkVer } from '../utils';
import { sha256 } from 'js-sha256'; import { sha256 } from 'js-sha256';
import RobotAvatar from '../components/RobotAvatar';
import defaultCoordinators from '../../static/federation.json';
const getWindowSize = function (fontSize: number) { const getWindowSize = function (fontSize: number) {
// returns window size in EM units // returns window size in EM units
@ -56,6 +59,7 @@ const Main = ({ settings, setSettings }: MainProps): JSX.Element => {
const [robot, setRobot] = useState<Robot>(defaultRobot); const [robot, setRobot] = useState<Robot>(defaultRobot);
const [maker, setMaker] = useState<Maker>(defaultMaker); const [maker, setMaker] = useState<Maker>(defaultMaker);
const [info, setInfo] = useState<Info>(defaultInfo); const [info, setInfo] = useState<Info>(defaultInfo);
const [coordinators, setCoordinators] = useState<Coordinator[]>(defaultCoordinators);
const [fav, setFav] = useState<Favorites>({ type: null, currency: 0 }); const [fav, setFav] = useState<Favorites>({ type: null, currency: 0 });
const theme = useTheme(); const theme = useTheme();
@ -133,7 +137,7 @@ const Main = ({ settings, setSettings }: MainProps): JSX.Element => {
}; };
const fetchInfo = function () { const fetchInfo = function () {
apiClient.get('/api/info/').then((data: any) => { apiClient.get('/api/info/').then((data: Info) => {
const versionInfo: any = checkVer(data.version.major, data.version.minor, data.version.patch); const versionInfo: any = checkVer(data.version.major, data.version.minor, data.version.patch);
setInfo({ setInfo({
...data, ...data,
@ -141,6 +145,10 @@ const Main = ({ settings, setSettings }: MainProps): JSX.Element => {
coordinatorVersion: versionInfo.coordinatorVersion, coordinatorVersion: versionInfo.coordinatorVersion,
clientVersion: versionInfo.clientVersion, clientVersion: versionInfo.clientVersion,
}); });
setSettings({
...settings,
network: data.network,
});
}); });
}; };

112
frontend/src/components/Charts/DepthChart/index.tsx
View File

@ -215,62 +215,60 @@ const DepthChart: React.FC<DepthChartProps> = ({
/> />
); );
// Unkown Bug. Temporarily silenced until cause is found. const generateTooltip: React.FunctionComponent<PointTooltipProps> = (
pointTooltip: PointTooltipProps,
// const generateTooltip: React.FunctionComponent<PointTooltipProps> = ( ) => {
// pointTooltip: PointTooltipProps, const order: Order = pointTooltip.point.data.order;
// ) => { return order ? (
// const order: Order = pointTooltip.point.data.order; <Paper elevation={12} style={{ padding: 10, width: 250 }}>
// return order ? ( <Grid container justifyContent='space-between'>
// <Paper elevation={12} style={{ padding: 10, width: 250 }}> <Grid item xs={3}>
// <Grid container justifyContent='space-between'> <Grid container justifyContent='center' alignItems='center'>
// <Grid item xs={3}> <RobotAvatar
// <Grid container justifyContent='center' alignItems='center'> nickname={order.maker_nick}
// <RobotAvatar orderType={order.type}
// nickname={order.maker_nick} statusColor={statusBadgeColor(order.maker_status)}
// orderType={order.type} tooltip={t(order.maker_status)}
// statusColor={statusBadgeColor(order.maker_status)} />
// tooltip={t(order.maker_status)} </Grid>
// /> </Grid>
// </Grid> <Grid item xs={8}>
// </Grid> <Grid container direction='column' justifyContent='center' alignItems='flex-start'>
// <Grid item xs={8}> <Box>{order.maker_nick}</Box>
// <Grid container direction='column' justifyContent='center' alignItems='flex-start'> <Box>
// <Box>{order.maker_nick}</Box> <Grid
// <Box> container
// <Grid direction='column'
// container justifyContent='flex-start'
// direction='column' alignItems='flex-start'
// justifyContent='flex-start' >
// alignItems='flex-start' <Grid item xs={12}>
// > {amountToString(
// <Grid item xs={12}> order.amount,
// {amountToString( order.has_range,
// order.amount, order.min_amount,
// order.has_range, order.max_amount,
// order.min_amount, )}{' '}
// order.max_amount, {currencyDict[order.currency]}
// )}{' '} </Grid>
// {currencyDict[order.currency]} <Grid item xs={12}>
// </Grid> <PaymentStringAsIcons
// <Grid item xs={12}> othersText={t('Others')}
// <PaymentStringAsIcons verbose={true}
// othersText={t('Others')} size={20}
// verbose={true} text={order.payment_method}
// size={20} />
// text={order.payment_method} </Grid>
// /> </Grid>
// </Grid> </Box>
// </Grid> </Grid>
// </Box> </Grid>
// </Grid> </Grid>
// </Grid> </Paper>
// </Grid> ) : (
// </Paper> <></>
// ) : ( );
// <></> };
// );
// };
const formatAxisX = (value: number): string => { const formatAxisX = (value: number): string => {
if (xType === 'base_amount') { if (xType === 'base_amount') {
@ -362,7 +360,7 @@ const DepthChart: React.FC<DepthChartProps> = ({
useMesh={true} useMesh={true}
animate={false} animate={false}
crosshairType='cross' crosshairType='cross'
// tooltip={generateTooltip} tooltip={generateTooltip}
onClick={handleOnClick} onClick={handleOnClick}
axisLeft={{ axisLeft={{
tickSize: 5, tickSize: 5,

46
frontend/src/components/SettingsForm/index.tsx
View File

@ -11,10 +11,19 @@ import {
ListItemIcon, ListItemIcon,
Slider, Slider,
Typography, Typography,
ToggleButtonGroup,
ToggleButton,
} from '@mui/material'; } from '@mui/material';
import { Settings } from '../../models'; import { Settings } from '../../models';
import SelectLanguage from './SelectLanguage'; import SelectLanguage from './SelectLanguage';
import { Language, Palette, LightMode, DarkMode, SettingsOverscan } from '@mui/icons-material'; import {
Translate,
Palette,
LightMode,
DarkMode,
SettingsOverscan,
Link,
} from '@mui/icons-material';
interface SettingsFormProps { interface SettingsFormProps {
dense?: boolean; dense?: boolean;
@ -22,21 +31,6 @@ interface SettingsFormProps {
setSettings: (state: Settings) => void; setSettings: (state: Settings) => void;
} }
const fontSizesBasic = [
{ label: 'XS', value: 12 },
{ label: 'S', value: 13 },
{ label: 'M', value: 14 },
{ label: 'L', value: 15 },
{ label: 'XL', value: 16 },
];
const fontSizesPro = [
{ label: 'XS', value: 10 },
{ label: 'S', value: 11 },
{ label: 'M', value: 12 },
{ label: 'L', value: 13 },
{ label: 'XL', value: 14 },
];
const SettingsForm = ({ dense = false, settings, setSettings }: SettingsFormProps): JSX.Element => { const SettingsForm = ({ dense = false, settings, setSettings }: SettingsFormProps): JSX.Element => {
const theme = useTheme(); const theme = useTheme();
const { t } = useTranslation(); const { t } = useTranslation();
@ -54,7 +48,7 @@ const SettingsForm = ({ dense = false, settings, setSettings }: SettingsFormProp
<List dense={dense}> <List dense={dense}>
<ListItem> <ListItem>
<ListItemIcon> <ListItemIcon>
<Language /> <Translate />
</ListItemIcon> </ListItemIcon>
<SelectLanguage <SelectLanguage
language={settings.language} language={settings.language}
@ -129,6 +123,24 @@ const SettingsForm = ({ dense = false, settings, setSettings }: SettingsFormProp
track={false} track={false}
/> />
</ListItem> </ListItem>
<ListItem>
<ListItemIcon>
<Link />
</ListItemIcon>
<ToggleButtonGroup
exclusive={true}
value={settings.network}
onChange={(e, value) => setSettings({ ...settings, network: value })}
>
<ToggleButton value='mainnet' color='primary'>
{t('Mainnet')}
</ToggleButton>
<ToggleButton value='testnet' color='secondary'>
{t('Testnet')}
</ToggleButton>
</ToggleButtonGroup>
</ListItem>
</List> </List>
</Grid> </Grid>
</Grid> </Grid>

2
frontend/src/models/Coordinator.model.ts
View File

@ -12,7 +12,9 @@ export interface Coordinator {
website: string | undefined; website: string | undefined;
}; };
mainnetOnion: string | undefined; mainnetOnion: string | undefined;
mainnetClearnet: string | undefined;
testnetOnion: string | undefined; testnetOnion: string | undefined;
testnetClearnet: string | undefined;
mainnetNodesPubkeys: string[]; mainnetNodesPubkeys: string[];
testnetNodesPubkeys: string[]; testnetNodesPubkeys: string[];
} }

19
frontend/src/models/Language.model.ts
View File

@ -1,19 +0,0 @@
export type Language =
| 'en'
| 'es'
| 'ru'
| 'de'
| 'pl'
| 'fr'
| 'ca'
| 'it'
| 'pt'
| 'eu'
| 'cs'
| 'th'
| 'pl'
| 'sv'
| 'zh-SI'
| 'zh-TR';
export default Language;

19
frontend/src/models/Settings.model.ts
View File

@ -1,6 +1,23 @@
import i18n from '../i18n/Web'; import i18n from '../i18n/Web';
import type Coordinator from './Coordinator.model'; import type Coordinator from './Coordinator.model';
import type Language from './Language.model';
export type Language =
| 'en'
| 'es'
| 'ru'
| 'de'
| 'pl'
| 'fr'
| 'ca'
| 'it'
| 'pt'
| 'eu'
| 'cs'
| 'th'
| 'pl'
| 'sv'
| 'zh-SI'
| 'zh-TR';
export interface Settings { export interface Settings {
frontend: 'basic' | 'pro'; frontend: 'basic' | 'pro';

2
frontend/src/models/index.ts
View File

@ -6,9 +6,9 @@ export type { Book } from './Book.model';
export type { Robot } from './Robot.model'; export type { Robot } from './Robot.model';
export type { Info } from './Info.model'; export type { Info } from './Info.model';
export type { Settings } from './Settings.model'; export type { Settings } from './Settings.model';
export type { Language } from './Settings.model';
export type { Favorites } from './Favorites.model'; export type { Favorites } from './Favorites.model';
export type { Coordinator } from './Coordinator.model'; export type { Coordinator } from './Coordinator.model';
export type { Language } from './Coordinator.model';
export { defaultMaker } from './Maker.model'; export { defaultMaker } from './Maker.model';
export { defaultRobot } from './Robot.model'; export { defaultRobot } from './Robot.model';

37
frontend/static/federation.json
View File

@ -1,21 +1,22 @@
{ [
"coordinator_1": { {
"alias": "Maximalist", "alias": "Inception",
"description": "Maximalist Robots. P2P for freedom. No trade limits, low fees.", "description": "RoboSats original and experimental coordinator",
"cover_letter": "Hi! I am Mike. I'm a freedom activist based in TorLand. I have been running LN infrastructure since early 2019, long time FOSS contributor....", "coverLetter": "N/A",
"contact_methods": { "contact_methods": {
"email": "maximalist@bitcoin.p2p", "email": "robosats@protonmail.com",
"telegram": "maximalist_robot", "telegram": "@robosats",
".....": "...." "twitter": "@robosats",
"matrix": "#robosats:matrix.org",
"website": "learn.robosats.com"
}, },
"color": "#FFFFFF", "color": "#9C27B0",
"mainnet_onion": "robomaxim......onion", "mainnetOnion": "robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion",
"testnet_onion": null, "mainnetClearnet": "unsafe.robosats.com",
"mainnet_ln_nodes_pubkeys": ["03e96as....", "02aaecc...."], "testnetOnion": "robotestagw3dcxmd66r4rgksb4nmmr43fh77bzn2ia2eucduyeafnyd.onion",
"testnet_ln_nodes_pubkeys": ["0284ff2...."], "testnetClearnet": "unsafe.testnet.robosats.com",
"logo_svg_200x200": "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"120\" height=\"120\"> <rect x=\"14\" y=\"23\" width=\"200\" height=\"50\" fill=\"lime\" stroke=\"black\" /> </svg>" "mainnetNodesPubkeys": ["0282eb467bc073833a039940392592bf10cf338a830ba4e392c1667d7697654c7e"],
}, "testnetNodesPubkeys": ["03ecb271b3e2e36f2b91c92c65bab665e5165f8cdfdada1b5f46cfdd3248c87fd6"],
"coordinator_2": { "logo": "/static/federation/inception.svg"
"...": "..."
} }
} ]