Merge remote-tracking branch 'refs/remotes/origin/spacedrive-but-themable'

Conflicts:
	packages/interface/src/screens/settings/client/GeneralSettings.tsx
	packages/ui/src/Dropdown.tsx
This commit is contained in:
Jamie Pine 2022-10-21 21:53:45 -07:00
commit 2f105e9bb6
6 changed files with 212 additions and 160 deletions

View file

@ -7,10 +7,11 @@ import {
} from '@heroicons/react/24/solid';
import { Discord, Github } from '@icons-pack/react-simple-icons';
import AppLogo from '@sd/assets/images/logo.png';
import { Dropdown, DropdownItem } from '@sd/ui';
import { Button, Dropdown } from '@sd/ui';
import clsx from 'clsx';
import { DotsThreeVertical } from 'phosphor-react';
import { PropsWithChildren, useEffect, useState } from 'react';
import * as router from 'vite-plugin-ssr/client/router';
import { positions } from '../pages/careers.page';
import { getWindow } from '../utils';
@ -28,23 +29,15 @@ function NavLink(props: PropsWithChildren<{ link?: string }>) {
);
}
function dropdownItem(
props: { name: string; icon: any } & ({ href: string } | { path: string })
): DropdownItem[number] {
if ('href' in props) {
return {
name: props.name,
icon: props.icon,
onPress: () => (window.location.href = props.href)
};
} else {
return {
name: props.name,
icon: props.icon,
onPress: () => (window.location.href = props.path),
selected: getWindow()?.location.href.includes(props.path)
};
}
function link(path: string) {
return {
selected: getWindow()?.location.href.includes(path),
onClick: () => router.navigate(path)
};
}
function redirect(href: string) {
return () => (window.location.href = href);
}
export default function NavBar() {
@ -88,60 +81,53 @@ export default function NavBar() {
<NavLink link="/careers">Careers</NavLink>
{positions.length > 0 ? (
<span className="absolute bg-opacity-80 px-[5px] text-xs rounded-md bg-primary -top-1 -right-2">
{' '}
{positions.length}{' '}
{` ${positions.length} `}
</span>
) : null}
</div>
</div>
<div className="flex-1 lg:hidden" />
<Dropdown.Root
className="absolute block h-6 text-white w-44 top-2 right-4 lg:hidden"
itemsClassName="!rounded-2xl shadow-2xl shadow-black p-2 !bg-gray-850 mt-2 !border-gray-500"
itemButtonClassName="!py-1 !rounded-md text-[15px]"
items={[
[
dropdownItem({
name: 'Repository',
icon: Github,
href: 'https://github.com/spacedriveapp/spacedrive'
}),
dropdownItem({
name: 'Join Discord',
icon: Discord,
href: 'https://discord.gg/gTaF2Z44f5'
})
],
[
dropdownItem({
name: 'Roadmap',
icon: MapIcon,
path: '/roadmap'
}),
dropdownItem({
name: 'Docs',
icon: BookOpenIcon,
path: '/docs/product/getting-started/introduction'
}),
dropdownItem({
name: 'Team',
icon: UsersIcon,
path: '/team'
}),
dropdownItem({
name: 'Blog',
icon: ChatBubbleOvalLeftIcon,
path: '/blog'
}),
dropdownItem({
name: 'Careers',
icon: AcademicCapIcon,
path: '/careers'
})
]
]}
buttonIcon={<DotsThreeVertical weight="bold" className="w-6 h-6 " />}
buttonProps={{ className: '!p-1 ml-[140px] hover:!bg-transparent' }}
/>
button={
<Button className="ml-[140px] hover:!bg-transparent" padding="thin">
<DotsThreeVertical weight="bold" className="w-6 h-6 " />
</Button>
}
className="block h-6 text-white w-44 top-2 right-4 lg:hidden"
itemsClassName="!rounded-2xl shadow-2xl shadow-black p-2 !bg-gray-850 mt-2 !border-gray-500 text-[15px]"
>
<Dropdown.Section>
<Dropdown.Item
icon={Github}
onClick={redirect('https://github.com/spacedriveapp/spacedrive')}
>
Repository
</Dropdown.Item>
<Dropdown.Item icon={Discord} onClick={redirect('https://discord.gg/gTaF2Z44f5')}>
Join Discord
</Dropdown.Item>
</Dropdown.Section>
<Dropdown.Section>
<Dropdown.Item icon={MapIcon} {...link('/roadmap')}>
Roadmap
</Dropdown.Item>
<Dropdown.Item
icon={BookOpenIcon}
{...link('/docs/product/getting-started/introduction')}
>
Docs
</Dropdown.Item>
<Dropdown.Item icon={UsersIcon} {...link('/team')}>
Team
</Dropdown.Item>
<Dropdown.Item icon={ChatBubbleOvalLeftIcon} {...link('/blog')}>
Blog
</Dropdown.Item>
<Dropdown.Item icon={AcademicCapIcon} {...link('/careers')}>
Careers
</Dropdown.Item>
</Dropdown.Section>
</Dropdown.Root>
<div className="absolute flex-row hidden space-x-5 right-3 lg:flex">
<a href="https://discord.gg/gTaF2Z44f5" target="_blank" rel="noreferrer">

View file

@ -46,7 +46,6 @@
"react-router": "6.4.2",
"react-router-dom": "6.4.2",
"rooks": "^5.14.0",
"tailwind-styled-components": "2.1.7",
"tailwindcss": "^3.1.8",
"use-count-up": "^3.0.1",
"use-debounce": "^8.0.4",

View file

@ -1,7 +1,6 @@
import { useBridgeQuery, usePlatform } from '@sd/client';
import { Input, Switch } from '@sd/ui';
import { Input, Switch, tw } from '@sd/ui';
import { Database } from 'phosphor-react';
import tw from 'tailwind-styled-components';
import Card from '../../../components/layout/Card';
import { SettingsContainer } from '../../../components/settings/SettingsContainer';

View file

@ -64,7 +64,6 @@
"storybook": "^6.5.12",
"storybook-tailwind-dark-mode": "^1.0.15",
"style-loader": "^3.3.1",
"tailwind-styled-components": "2.1.7",
"tailwindcss": "^3.1.8",
"typescript": "^4.8.4"
}

View file

@ -83,31 +83,32 @@ export interface DropdownRootProps {
export const Root = (props: PropsWithChildren<DropdownRootProps>) => {
return (
<Menu as="div" className={clsx('relative flex w-full text-left', props.className)}>
<Menu.Button as="div" className="flex-1 outline-none">
{props.button}
</Menu.Button>
<Transition
as={Fragment}
enter="transition duration-100 ease-out"
enterFrom="transform scale-95 opacity-0"
enterTo="transform scale-100 opacity-100"
leave="transition duration-75 ease-out"
leaveFrom="transform scale-100 opacity-100"
leaveTo="transform scale-95 opacity-0"
>
<Menu.Items
className={clsx(
'absolute z-50 min-w-fit w-full border divide-y divide-app-border/50 rounded shadow-xl top-full ring-1 ring-black ring-opacity-5 focus:outline-none bg-app-box border-app-line',
props.itemsClassName,
{ 'left-0': props.align === 'left' },
{ 'right-0': props.align === 'right' }
)}
<div className={props.className}>
<Menu as="div" className={clsx('relative flex w-full text-left')}>
<Menu.Button as="div" className="flex-1 outline-none">
{props.button}
</Menu.Button>
<Transition
as={Fragment}
enter="transition duration-100 ease-out"
enterFrom="transform scale-95 opacity-0"
enterTo="transform scale-100 opacity-100"
leave="transition duration-75 ease-out"
leaveFrom="transform scale-100 opacity-100"
leaveTo="transform scale-95 opacity-0"
>
{props.children}
</Menu.Items>
</Transition>
</Menu>
<Menu.Items
className={clsx(
'absolute z-50 min-w-fit w-full border divide-y divide-app-border/50 rounded shadow-xl top-full ring-1 ring-black ring-opacity-5 focus:outline-none bg-app-box border-app-border',
props.itemsClassName,
{ 'left-0': props.align === 'left' },
{ 'right-0': props.align === 'right' }
)}
>
{props.children}
</Menu.Items>
</Transition>
</Menu>
</div>
);
};

View file

@ -253,7 +253,7 @@ importers:
moti: 0.18.0_react@18.0.0
phosphor-react-native: 1.1.2_ipumakbosk2s7ylysjmrulvctq
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-gesture-handler: 2.5.0_jk6ntyzimkrv4hwdmdgaaf5yaa
react-native-heroicons: 2.2.0_wxlif5cfng7xfd3uerlw46xcs4
react-native-reanimated: 2.10.0_ifayjdo6vuwky63y7hdw4ayxzu
@ -361,7 +361,7 @@ importers:
'@types/node': 18.11.0
autoprefixer: 10.4.12_postcss@8.4.18
postcss: 8.4.18
tailwindcss: 3.1.8
tailwindcss: 3.1.8_postcss@8.4.18
typescript: 4.8.4
vite: 3.1.8
vite-plugin-solid: 2.3.9_solid-js@1.5.9+vite@3.1.8
@ -456,7 +456,6 @@ importers:
react-router: 6.4.2
react-router-dom: 6.4.2
rooks: ^5.14.0
tailwind-styled-components: 2.1.7
tailwindcss: ^3.1.8
typescript: ^4.8.4
use-count-up: ^3.0.1
@ -496,7 +495,6 @@ importers:
react-router: 6.4.2_react@18.2.0
react-router-dom: 6.4.2_biqbaboplfbrettd7655fr4n2y
rooks: 5.14.1_biqbaboplfbrettd7655fr4n2y
tailwind-styled-components: 2.1.7_biqbaboplfbrettd7655fr4n2y
tailwindcss: 3.1.8
use-count-up: 3.0.1_react@18.2.0
use-debounce: 8.0.4_react@18.2.0
@ -562,7 +560,6 @@ importers:
storybook: ^6.5.12
storybook-tailwind-dark-mode: ^1.0.15
style-loader: ^3.3.1
tailwind-styled-components: 2.1.7
tailwindcss: ^3.1.8
tailwindcss-radix: ^2.6.0
typescript: ^4.8.4
@ -613,8 +610,7 @@ importers:
storybook: 6.5.12_yalvw3r2waubxycyb7k7qsruca
storybook-tailwind-dark-mode: 1.0.15_biqbaboplfbrettd7655fr4n2y
style-loader: 3.3.1
tailwind-styled-components: 2.1.7_biqbaboplfbrettd7655fr4n2y
tailwindcss: 3.1.8
tailwindcss: 3.1.8_postcss@8.4.18
typescript: 4.8.4
packages:
@ -2152,8 +2148,8 @@ packages:
'@cspell/dict-docker': 1.1.1
'@cspell/dict-dotnet': 2.0.1
'@cspell/dict-elixir': 2.0.1
'@cspell/dict-en_us': 2.3.3
'@cspell/dict-en-gb': 1.1.33
'@cspell/dict-en_us': 2.3.3
'@cspell/dict-filetypes': 2.1.1
'@cspell/dict-fonts': 2.1.0
'@cspell/dict-fullstack': 2.0.6
@ -2901,7 +2897,7 @@ packages:
'@gorhom/portal': 1.0.14_jk6ntyzimkrv4hwdmdgaaf5yaa
invariant: 2.2.4
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-gesture-handler: 2.5.0_jk6ntyzimkrv4hwdmdgaaf5yaa
react-native-reanimated: 2.10.0_ifayjdo6vuwky63y7hdw4ayxzu
dev: false
@ -2914,7 +2910,7 @@ packages:
dependencies:
nanoid: 3.3.4
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
dev: false
/@graphql-typed-document-node/core/3.1.1_graphql@15.8.0:
@ -4356,7 +4352,7 @@ packages:
react-native: ^0.0.0-0 || 0.60 - 0.70 || 1000.0.0
dependencies:
merge-options: 3.0.4
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
dev: false
/@react-native-community/cli-clean/8.0.4:
@ -4449,7 +4445,7 @@ packages:
transitivePeerDependencies:
- encoding
/@react-native-community/cli-plugin-metro/8.0.4:
/@react-native-community/cli-plugin-metro/8.0.4_@babel+core@7.19.3:
resolution: {integrity: sha512-UWzY1eMcEr/6262R2+d0Is5M3L/7Y/xXSDIFMoc5Rv5Wucl3hJM/TxHXmByvHpuJf6fJAfqOskyt4bZCvbI+wQ==}
dependencies:
'@react-native-community/cli-server-api': 8.0.4
@ -4458,11 +4454,12 @@ packages:
metro: 0.70.3
metro-config: 0.70.3
metro-core: 0.70.3
metro-react-native-babel-transformer: 0.70.3
metro-react-native-babel-transformer: 0.70.3_@babel+core@7.19.3
metro-resolver: 0.70.3
metro-runtime: 0.70.3
readline: 1.3.0
transitivePeerDependencies:
- '@babel/core'
- bufferutil
- encoding
- supports-color
@ -4507,7 +4504,7 @@ packages:
dependencies:
joi: 17.6.3
/@react-native-community/cli/8.0.6_react-native@0.69.4:
/@react-native-community/cli/8.0.6_2wrsnxuq7u2kmzd6diim7k7fvu:
resolution: {integrity: sha512-E36hU/if3quQCfJHGWVkpsCnwtByRCwORuAX0r6yr1ebKktpKeEO49zY9PAu/Z1gfyxCtgluXY0HfRxjKRFXTg==}
engines: {node: '>=12'}
hasBin: true
@ -4519,7 +4516,7 @@ packages:
'@react-native-community/cli-debugger-ui': 8.0.0
'@react-native-community/cli-doctor': 8.0.6
'@react-native-community/cli-hermes': 8.0.5
'@react-native-community/cli-plugin-metro': 8.0.4
'@react-native-community/cli-plugin-metro': 8.0.4_@babel+core@7.19.3
'@react-native-community/cli-server-api': 8.0.4
'@react-native-community/cli-tools': 8.0.4
'@react-native-community/cli-types': 8.0.0
@ -4533,9 +4530,10 @@ packages:
lodash: 4.17.21
minimist: 1.2.7
prompts: 2.4.2
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
semver: 6.3.0
transitivePeerDependencies:
- '@babel/core'
- bufferutil
- encoding
- supports-color
@ -4548,7 +4546,7 @@ packages:
react-native: '>=0.57'
dependencies:
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
dev: false
/@react-native/assets/1.0.0:
@ -4573,7 +4571,7 @@ packages:
'@react-navigation/native': 6.0.13_jk6ntyzimkrv4hwdmdgaaf5yaa
color: 4.2.3
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-safe-area-context: 4.3.1_jk6ntyzimkrv4hwdmdgaaf5yaa
react-native-screens: 3.15.0_jk6ntyzimkrv4hwdmdgaaf5yaa
warn-once: 0.1.1
@ -4608,7 +4606,7 @@ packages:
'@react-navigation/native': 6.0.13_jk6ntyzimkrv4hwdmdgaaf5yaa
color: 4.2.3
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-gesture-handler: 2.5.0_jk6ntyzimkrv4hwdmdgaaf5yaa
react-native-reanimated: 2.10.0_ifayjdo6vuwky63y7hdw4ayxzu
react-native-safe-area-context: 4.3.1_jk6ntyzimkrv4hwdmdgaaf5yaa
@ -4626,7 +4624,7 @@ packages:
dependencies:
'@react-navigation/native': 6.0.13_jk6ntyzimkrv4hwdmdgaaf5yaa
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-safe-area-context: 4.3.1_jk6ntyzimkrv4hwdmdgaaf5yaa
dev: false
@ -4641,7 +4639,7 @@ packages:
fast-deep-equal: 3.1.3
nanoid: 3.3.4
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
dev: false
/@react-navigation/routers/6.1.3:
@ -4664,7 +4662,7 @@ packages:
'@react-navigation/native': 6.0.13_jk6ntyzimkrv4hwdmdgaaf5yaa
color: 4.2.3
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-gesture-handler: 2.5.0_jk6ntyzimkrv4hwdmdgaaf5yaa
react-native-safe-area-context: 4.3.1_jk6ntyzimkrv4hwdmdgaaf5yaa
react-native-screens: 3.15.0_jk6ntyzimkrv4hwdmdgaaf5yaa
@ -4820,7 +4818,7 @@ packages:
'@rnx-kit/tools-node': 1.3.0
'@rnx-kit/tools-workspaces': 0.1.1
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
transitivePeerDependencies:
- '@babel/core'
- '@babel/plugin-transform-typescript'
@ -6652,7 +6650,7 @@ packages:
tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1'
dependencies:
mini-svg-data-uri: 1.4.4
tailwindcss: 3.1.8
tailwindcss: 3.1.8_postcss@8.4.18
dev: false
/@tailwindcss/line-clamp/0.4.2:
@ -6666,7 +6664,7 @@ packages:
peerDependencies:
tailwindcss: '>=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1'
dependencies:
tailwindcss: 3.1.8
tailwindcss: 3.1.8_postcss@8.4.18
dev: true
/@tailwindcss/typography/0.5.7:
@ -6689,7 +6687,7 @@ packages:
lodash.isplainobject: 4.0.6
lodash.merge: 4.6.2
postcss-selector-parser: 6.0.10
tailwindcss: 3.1.8
tailwindcss: 3.1.8_postcss@8.4.18
dev: true
/@tanstack/match-sorter-utils/8.5.14:
@ -6770,7 +6768,7 @@ packages:
dependencies:
'@tanstack/query-core': 4.12.0
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
use-sync-external-store: 1.2.0_react@18.0.0
dev: false
@ -7121,7 +7119,7 @@ packages:
resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
dependencies:
'@types/minimatch': 5.1.2
'@types/node': 16.11.66
'@types/node': 18.11.0
dev: true
/@types/glob/8.0.0:
@ -7228,7 +7226,7 @@ packages:
/@types/node-fetch/2.6.2:
resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
dependencies:
'@types/node': 16.11.66
'@types/node': 18.11.0
form-data: 3.0.1
dev: true
@ -7364,6 +7362,7 @@ packages:
dependencies:
tailwindcss: 3.1.8
transitivePeerDependencies:
- postcss
- ts-node
dev: true
@ -7392,7 +7391,7 @@ packages:
/@types/webpack-sources/3.2.0:
resolution: {integrity: sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==}
dependencies:
'@types/node': 16.11.66
'@types/node': 18.11.0
'@types/source-list-map': 0.1.2
source-map: 0.7.4
dev: true
@ -7400,7 +7399,7 @@ packages:
/@types/webpack/4.41.33:
resolution: {integrity: sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==}
dependencies:
'@types/node': 16.11.66
'@types/node': 18.11.0
'@types/tapable': 1.0.8
'@types/uglify-js': 3.17.0
'@types/webpack-sources': 3.2.0
@ -8742,7 +8741,7 @@ packages:
'@babel/preset-env': 7.19.4_@babel+core@7.19.3
babel-plugin-module-resolver: 4.1.0
babel-plugin-react-native-web: 0.18.9
metro-react-native-babel-preset: 0.70.3
metro-react-native-babel-preset: 0.70.3_@babel+core@7.19.3
transitivePeerDependencies:
- '@babel/core'
- supports-color
@ -9216,7 +9215,7 @@ packages:
dev: true
/buffer-equal/0.0.1:
resolution: {integrity: sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=}
resolution: {integrity: sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==}
engines: {node: '>=0.4.0'}
dev: true
@ -12964,7 +12963,7 @@ packages:
dev: true
/github-from-package/0.0.0:
resolution: {integrity: sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=}
resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
dev: true
/github-slugger/1.4.0:
@ -15181,7 +15180,7 @@ packages:
dependencies:
invariant: 2.2.4
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-safe-modules: 1.0.3_react-native@0.69.4
dev: false
@ -15613,8 +15612,10 @@ packages:
dependencies:
uglify-es: 3.3.9
/metro-react-native-babel-preset/0.70.3:
/metro-react-native-babel-preset/0.70.3_@babel+core@7.19.3:
resolution: {integrity: sha512-4Nxc1zEiHEu+GTdEMEsHnRgfaBkg8f/Td3+FcQ8NTSvs+xL3LBrQy6N07idWSQZHIdGFf+tTHvRfSIWLD8u8Tg==}
peerDependencies:
'@babel/core': '*'
dependencies:
'@babel/core': 7.19.3
'@babel/plugin-proposal-async-generator-functions': 7.19.1_@babel+core@7.19.3
@ -15658,14 +15659,16 @@ packages:
transitivePeerDependencies:
- supports-color
/metro-react-native-babel-transformer/0.70.3:
/metro-react-native-babel-transformer/0.70.3_@babel+core@7.19.3:
resolution: {integrity: sha512-WKBU6S/G50j9cfmFM4k4oRYprd8u3qjleD4so1E2zbTNILg+gYla7ZFGCAvi2G0ZcqS2XuGCR375c2hF6VVvwg==}
peerDependencies:
'@babel/core': '*'
dependencies:
'@babel/core': 7.19.3
babel-preset-fbjs: 3.4.0_@babel+core@7.19.3
hermes-parser: 0.6.0
metro-babel-transformer: 0.70.3
metro-react-native-babel-preset: 0.70.3
metro-react-native-babel-preset: 0.70.3_@babel+core@7.19.3
metro-source-map: 0.70.3
nullthrows: 1.1.1
transitivePeerDependencies:
@ -15778,7 +15781,7 @@ packages:
metro-hermes-compiler: 0.70.3
metro-inspector-proxy: 0.70.3
metro-minify-uglify: 0.70.3
metro-react-native-babel-preset: 0.70.3
metro-react-native-babel-preset: 0.70.3_@babel+core@7.19.3
metro-resolver: 0.70.3
metro-runtime: 0.70.3
metro-source-map: 0.70.3
@ -17032,7 +17035,7 @@ packages:
dependencies:
caniuse-lite: 1.0.30001421
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-svg: 13.0.0_jk6ntyzimkrv4hwdmdgaaf5yaa
dev: false
@ -17189,6 +17192,16 @@ packages:
postcss: 7.0.39
dev: true
/postcss-import/14.1.0:
resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==}
engines: {node: '>=10.0.0'}
peerDependencies:
postcss: ^8.0.0
dependencies:
postcss-value-parser: 4.2.0
read-cache: 1.0.0
resolve: 1.22.1
/postcss-import/14.1.0_postcss@8.4.18:
resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==}
engines: {node: '>=10.0.0'}
@ -17200,6 +17213,14 @@ packages:
read-cache: 1.0.0
resolve: 1.22.1
/postcss-js/4.0.0:
resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
engines: {node: ^12 || ^14 || >= 16}
peerDependencies:
postcss: ^8.3.3
dependencies:
camelcase-css: 2.0.1
/postcss-js/4.0.0_postcss@8.4.18:
resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
engines: {node: ^12 || ^14 || >= 16}
@ -17209,6 +17230,21 @@ packages:
camelcase-css: 2.0.1
postcss: 8.4.18
/postcss-load-config/3.1.4:
resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
engines: {node: '>= 10'}
peerDependencies:
postcss: '>=8.0.9'
ts-node: '>=9.0.0'
peerDependenciesMeta:
postcss:
optional: true
ts-node:
optional: true
dependencies:
lilconfig: 2.0.6
yaml: 1.10.2
/postcss-load-config/3.1.4_postcss@8.4.18:
resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
engines: {node: '>= 10'}
@ -17342,6 +17378,14 @@ packages:
postcss: 8.4.18
dev: true
/postcss-nested/5.0.6:
resolution: {integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==}
engines: {node: '>=12.0'}
peerDependencies:
postcss: ^8.2.14
dependencies:
postcss-selector-parser: 6.0.10
/postcss-nested/5.0.6_postcss@8.4.18:
resolution: {integrity: sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==}
engines: {node: '>=12.0'}
@ -18028,7 +18072,7 @@ packages:
lodash: 4.17.21
prop-types: 15.8.1
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
dev: false
/react-native-gradle-plugin/0.0.7:
@ -18058,7 +18102,7 @@ packages:
invariant: 2.2.4
lodash.isequal: 4.5.0
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
setimmediate: 1.0.5
string-hash-64: 1.0.3
transitivePeerDependencies:
@ -18072,7 +18116,7 @@ packages:
react-native: '*'
dependencies:
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
dev: false
/react-native-safe-modules/1.0.3_react-native@0.69.4:
@ -18081,7 +18125,7 @@ packages:
react-native: '*'
dependencies:
dedent: 0.6.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
dev: false
/react-native-screens/3.15.0_jk6ntyzimkrv4hwdmdgaaf5yaa:
@ -18092,7 +18136,7 @@ packages:
dependencies:
react: 18.0.0
react-freeze: 1.0.3_react@18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
warn-once: 0.1.1
dev: false
@ -18105,7 +18149,7 @@ packages:
'@svgr/core': 6.5.0
'@svgr/plugin-svgo': 6.5.0_@svgr+core@6.5.0
path-dirname: 1.0.2
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
react-native-svg: 13.0.0_jk6ntyzimkrv4hwdmdgaaf5yaa
transitivePeerDependencies:
- supports-color
@ -18120,9 +18164,9 @@ packages:
css-select: 5.1.0
css-tree: 1.1.3
react: 18.0.0
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
/react-native/0.69.4_react@18.0.0:
/react-native/0.69.4_qwcebhcz7kt2t6qvska3nnpfdm:
resolution: {integrity: sha512-rqNMialM/T4pHRKWqTIpOxA65B/9kUjtnepxwJqvsdCeMP9Q2YdSx4VASFR9RoEFYcPRU41yGf6EKrChNfns3g==}
engines: {node: '>=14'}
hasBin: true
@ -18130,7 +18174,7 @@ packages:
react: 18.0.0
dependencies:
'@jest/create-cache-key-function': 27.5.1
'@react-native-community/cli': 8.0.6_react-native@0.69.4
'@react-native-community/cli': 8.0.6_2wrsnxuq7u2kmzd6diim7k7fvu
'@react-native-community/cli-platform-android': 8.0.5
'@react-native-community/cli-platform-ios': 8.0.6
'@react-native/assets': 1.0.0
@ -18144,7 +18188,7 @@ packages:
invariant: 2.2.4
jsc-android: 250230.2.1
memoize-one: 5.2.1
metro-react-native-babel-transformer: 0.70.3
metro-react-native-babel-transformer: 0.70.3_@babel+core@7.19.3
metro-runtime: 0.70.3
metro-source-map: 0.70.3
mkdirp: 0.5.6
@ -18164,6 +18208,7 @@ packages:
whatwg-fetch: 3.6.2
ws: 6.2.2
transitivePeerDependencies:
- '@babel/core'
- '@babel/preset-env'
- bufferutil
- encoding
@ -20097,19 +20142,6 @@ packages:
resolution: {integrity: sha512-qImOD23aDfnIDNqlG1NOehdB9IYsn1V9oByPjKY1nakv2MQYCEMyX033/q+aEtYCpmYK1cv2+NTmlH+ra6GA5A==}
dev: true
/tailwind-merge/1.7.0:
resolution: {integrity: sha512-A7oBapTWhV9M4bwLtxLQS9ZpPrvcikp21l+Xhwbet5SbaxUVogbHGLy+VDZcHe4LHWE99RpRbSpCBKaVqBs5Og==}
/tailwind-styled-components/2.1.7_biqbaboplfbrettd7655fr4n2y:
resolution: {integrity: sha512-L20oQlwWM+kbYHIrwvvMQ0HHqt1Z/tInnO/Q9zM0IV/vqUxSIcLAmhMwbbiZmyXTdAVz84N4s1GtIyGODq80Pw==}
peerDependencies:
react: '>= 16.8.0'
react-dom: '>= 16.8.0'
dependencies:
react: 18.2.0
react-dom: 18.2.0_react@18.2.0
tailwind-merge: 1.7.0
/tailwind/4.0.0:
resolution: {integrity: sha512-LlUNoD/5maFG1h5kQ6/hXfFPdcnYw+1Z7z+kUD/W/E71CUMwcnrskxiBM8c3G8wmPsD1VvCuqGYMHviI8+yrmg==}
dependencies:
@ -20154,6 +20186,40 @@ packages:
resolution: {integrity: sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==}
engines: {node: '>=12.13.0'}
hasBin: true
peerDependencies:
postcss: ^8.0.9
dependencies:
arg: 5.0.2
chokidar: 3.5.3
color-name: 1.1.4
detective: 5.2.1
didyoumean: 1.2.2
dlv: 1.1.3
fast-glob: 3.2.12
glob-parent: 6.0.2
is-glob: 4.0.3
lilconfig: 2.0.6
normalize-path: 3.0.0
object-hash: 3.0.0
picocolors: 1.0.0
postcss: 8.4.18
postcss-import: 14.1.0
postcss-js: 4.0.0
postcss-load-config: 3.1.4
postcss-nested: 5.0.6
postcss-selector-parser: 6.0.10
postcss-value-parser: 4.2.0
quick-lru: 5.1.1
resolve: 1.22.1
transitivePeerDependencies:
- ts-node
/tailwindcss/3.1.8_postcss@8.4.18:
resolution: {integrity: sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==}
engines: {node: '>=12.13.0'}
hasBin: true
peerDependencies:
postcss: ^8.0.9
dependencies:
arg: 5.0.2
chokidar: 3.5.3
@ -21024,9 +21090,10 @@ packages:
peerDependencies:
react-native: '>=0.63.0'
dependencies:
react-native: 0.69.4_react@18.0.0
react-native: 0.69.4_qwcebhcz7kt2t6qvska3nnpfdm
tailwindcss: 3.1.8
transitivePeerDependencies:
- postcss
- ts-node
dev: false
@ -21191,6 +21258,7 @@ packages:
/unified/9.2.0:
resolution: {integrity: sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==}
dependencies:
'@types/unist': 2.0.6
bail: 1.0.5
extend: 3.0.2
is-buffer: 2.0.5