Skip to content

Commit

Permalink
Merge pull request #1012 from andrew-bierman/fix/linting-june16
Browse files Browse the repository at this point in the history
🎨 linting
  • Loading branch information
andrew-bierman authored Jun 17, 2024
2 parents f5e7ece + 2a05ca0 commit e430be1
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 38 deletions.
2 changes: 1 addition & 1 deletion packages/app/components/card/CustomCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const CustomCard = ({
)}
</View>
<RSeparator />
{type === 'pack' && authUser?.id === data.owner_id? (
{type === 'pack' && authUser?.id === data.owner_id ? (
<>
<View
style={
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/dashboard/QuickActionButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const loadStyles = (theme: any) => {
},
text: {
fontSize: 13,
fontWeight:'bold',
fontWeight: 'bold',
color: currentTheme.colors.iconColor,
},
};
Expand Down
18 changes: 11 additions & 7 deletions packages/app/components/feed/FeedSearchFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,15 @@ const FeedSearchFilter = ({
<View style={styles.filterContainer}>
<View style={styles.searchContainer}>
<Form>
<RStack
style={{ flexDirection: 'row',marginLeft:30, }}
>
<RStack style={{ flexDirection: 'row', marginLeft: 30 }}>
<FormInput
width={Platform.OS === "web" ? screenWidth <= 425 ? '30vw' : '12vw': '100%'}
width={
Platform.OS === 'web'
? screenWidth <= 425
? '30vw'
: '12vw'
: '100%'
}
placeholder={`Search ${feedType || 'Feed'}`}
name="search"
value={searchValue}
Expand Down Expand Up @@ -119,7 +123,7 @@ const FeedSearchFilter = ({
<RSwitch
id="single-switch"
size="$1.5"
width={ screenWidth <= SCREEN_WIDTH ?"10vw" : '3vw'}
width={screenWidth <= SCREEN_WIDTH ? '10vw' : '3vw'}
checked={selectedTypes.pack}
onCheckedChange={handleTogglePack}
>
Expand All @@ -135,7 +139,7 @@ const FeedSearchFilter = ({
<RSwitch
id="two-switch"
size="$1.5"
width={ screenWidth <= SCREEN_WIDTH ?"10vw" : '3vw'}
width={screenWidth <= SCREEN_WIDTH ? '10vw' : '3vw'}
checked={selectedTypes.trip}
onCheckedChange={handleToggleTrip}
>
Expand Down Expand Up @@ -224,4 +228,4 @@ const loadStyles = (theme: any) => {
};
};

export default FeedSearchFilter;
export default FeedSearchFilter;
2 changes: 1 addition & 1 deletion packages/app/components/map/MapButtonsOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ const loadStyles = (theme) => {
downloadText: {
fontSize: 15,
fontWeight: '500',
marginRight:8
marginRight: 8,
},
modal: {
alignItems: 'center',
Expand Down
8 changes: 7 additions & 1 deletion packages/app/components/map/NativeMap.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,13 @@ function NativeMap({ shape: shapeProp }) {
/>
</AlertDialog.Body>
<AlertDialog.Footer>
<RStack style={{width:'60%', justifyContent:'space-between', flexDirection:'row'}}>
<RStack
style={{
width: '60%',
justifyContent: 'space-between',
flexDirection: 'row',
}}
>
<RButton
variant="unstyled"
colorScheme="coolGray"
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/navigation/NavigationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const NavigationList: React.FC<NavigationListProps> = ({
style={{
width: '100%',
borderRadius: 8,
marginBottom: isMobileView ? 6:0,
marginBottom: isMobileView ? 6 : 0,
backgroundColor: currentTheme.colors.background,
color: currentTheme.colors.white,
}}
Expand Down
10 changes: 5 additions & 5 deletions packages/app/screens/dashboard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ const loadStyles = (theme) => {
alignItems: 'stretch',
paddingHorizontal: 20,
width:
Platform.OS === 'web'
? screenWidth <= SCREEN_WIDTH
? '100vw'
: '90vw'
: '100%',
Platform.OS === 'web'
? screenWidth <= SCREEN_WIDTH
? '100vw'
: '90vw'
: '100%',
},
cardContainer: {
flexDirection: 'column',
Expand Down
4 changes: 3 additions & 1 deletion packages/crosspath/types/lib-interface.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { LinkComponent, Router, CreateParam } from './model';
export declare function Link(props: Parameters<LinkComponent>): ReturnType<LinkComponent>;
export declare function Link(
props: Parameters<LinkComponent>,
): ReturnType<LinkComponent>;
export declare const createParam: CreateParam;
export declare function useRouter(): Router;
41 changes: 23 additions & 18 deletions packages/crosspath/types/model/types.d.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
import { FC } from 'react';
import { LinkProps } from 'solito/link';
export interface CreateParamOptions {
initial?: string;
parse?: (param: string) => unknown;
stringify?: (param: unknown) => string;
initial?: string;
parse?: (param: string) => unknown;
stringify?: (param: unknown) => string;
}
export interface Router {
push: (url: URL) => void;
replace: (url: URL) => void;
back: () => void;
push: (url: URL) => void;
replace: (url: URL) => void;
back: () => void;
}
export type LinkComponent = FC<LinkProps>;
export type URL = string | {
pathname?: string;
query?: Record<string, any>;
state?: Record<string, any>;
hash?: string;
as?: string | object;
};
export type CreateParam = <T>() => {
useParam: (key: keyof T, options?: CreateParamOptions) => [value: any, setValue: (value: any) => void];
useParams: (key: keyof T) => {
params: T;
setParams: (value: any) => void;
export type URL =
| string
| {
pathname?: string;
query?: Record<string, any>;
state?: Record<string, any>;
hash?: string;
as?: string | object;
};
export type CreateParam = <T>() => {
useParam: (
key: keyof T,
options?: CreateParamOptions,
) => [value: any, setValue: (value: any) => void];
useParams: (key: keyof T) => {
params: T;
setParams: (value: any) => void;
};
};
4 changes: 2 additions & 2 deletions packages/ui/src/Bento/elements/tables/Basic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ export function BasicTable({
header: () => 'Category',
cell: (info) => info.getValue(),
// footer: (info) => 'category',
})
}),
];

if (hasPermissions) {
Expand All @@ -161,7 +161,7 @@ export function BasicTable({
id: 'actions',
cell: (props) => <ActionButtons item={props.row.original} />,
header: () => 'Actions',
})
}),
);
}

Expand Down

0 comments on commit e430be1

Please sign in to comment.