Skip to content

Commit

Permalink
cleanup (#1723)
Browse files Browse the repository at this point in the history
  • Loading branch information
@utkubakir
utkubakir committed Nov 3, 2023
1 parent 809cf63 commit 7dd164f
Show file tree
Hide file tree
Showing 12 changed files with 150 additions and 179 deletions.
1 change: 1 addition & 0 deletions apps/landing/src/app/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import PlausibleProvider from 'next-plausible';
import { Providers } from './Providers';

export const metadata = {
metadataBase: new URL('https://spacedrive.com'),
themeColor: { color: '#E751ED', media: 'not screen' },
robots: 'index, follow',
description:
Expand Down
142 changes: 71 additions & 71 deletions apps/mobile/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
{
"name": "@sd/mobile",
"version": "1.0.0",
"main": "index.js",
"license": "GPL-3.0-only",
"private": true,
"scripts": {
"start": "expo start --dev-client",
"android": "expo run:android",
"ios": "expo run:ios",
"prebuild": "expo prebuild",
"xcode": "open ios/Spacedrive.xcworkspace",
"android-studio": "open -a '/Applications/Android Studio.app' ./android",
"lint": "eslint src --cache",
"typecheck": "tsc -b"
},
"dependencies": {
"@gorhom/bottom-sheet": "^4.4.7",
"@hookform/resolvers": "^3.1.0",
"@react-native-async-storage/async-storage": "~1.18.2",
"@react-native-masked-view/masked-view": "0.2.9",
"@react-navigation/bottom-tabs": "^6.5.8",
"@react-navigation/drawer": "^6.6.3",
"@react-navigation/native": "^6.1.7",
"@react-navigation/stack": "^6.3.17",
"@rspc/client": "=0.0.0-main-799eec5d",
"@rspc/react": "=0.0.0-main-799eec5d",
"@sd/assets": "workspace:*",
"@sd/client": "workspace:*",
"@shopify/flash-list": "1.4.3",
"@tanstack/react-query": "^4.36.1",
"class-variance-authority": "^0.7.0",
"dayjs": "^1.11.10",
"event-target-polyfill": "^0.0.3",
"expo": "~49.0.8",
"expo-build-properties": "~0.8.3",
"expo-linking": "~5.0.2",
"expo-media-library": "~15.4.1",
"expo-splash-screen": "~0.20.5",
"expo-status-bar": "~1.6.0",
"intl": "^1.2.5",
"lottie-react-native": "5.1.6",
"moti": "^0.26.0",
"phosphor-react-native": "^1.1.2",
"react": "^18.2.0",
"react-hook-form": "^7.47.0",
"react-native": "0.72.5",
"react-native-document-picker": "^9.0.1",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "~2.12.1",
"react-native-popup-menu": "^0.16.1",
"react-native-reanimated": "~3.3.0",
"react-native-safe-area-context": "4.6.3",
"react-native-screens": "~3.22.1",
"react-native-svg": "13.9.0",
"react-native-wheel-color-picker": "^1.2.0",
"twrnc": "^3.6.4",
"use-count-up": "^3.0.1",
"use-debounce": "^9.0.4",
"valtio": "^1.11.2",
"zod": "~3.22.4"
},
"devDependencies": {
"@babel/core": "^7.23.2",
"@rnx-kit/metro-config": "^1.3.11",
"@sd/config": "workspace:*",
"@types/react": "^18.2.31",
"babel-plugin-module-resolver": "^5.0.0",
"eslint-plugin-react-native": "^4.1.0",
"react-native-svg-transformer": "^1.1.0",
"typescript": "^5.2.2"
}
"name": "@sd/mobile",
"version": "1.0.0",
"main": "index.js",
"license": "GPL-3.0-only",
"private": true,
"scripts": {
"start": "expo start --dev-client",
"android": "expo run:android",
"ios": "expo run:ios",
"prebuild": "expo prebuild",
"xcode": "open ios/Spacedrive.xcworkspace",
"android-studio": "open -a '/Applications/Android Studio.app' ./android",
"lint": "eslint src --cache",
"typecheck": "tsc -b"
},
"dependencies": {
"@gorhom/bottom-sheet": "^4.4.7",
"@hookform/resolvers": "^3.1.0",
"@react-native-async-storage/async-storage": "~1.18.2",
"@react-native-masked-view/masked-view": "0.2.9",
"@react-navigation/bottom-tabs": "^6.5.8",
"@react-navigation/drawer": "^6.6.3",
"@react-navigation/native": "^6.1.7",
"@react-navigation/stack": "^6.3.17",
"@rspc/client": "=0.0.0-main-799eec5d",
"@rspc/react": "=0.0.0-main-799eec5d",
"@sd/assets": "workspace:*",
"@sd/client": "workspace:*",
"@shopify/flash-list": "1.4.3",
"@tanstack/react-query": "^4.36.1",
"class-variance-authority": "^0.7.0",
"dayjs": "^1.11.10",
"event-target-polyfill": "^0.0.3",
"expo": "~49.0.8",
"expo-build-properties": "~0.8.3",
"expo-linking": "~5.0.2",
"expo-media-library": "~15.4.1",
"expo-splash-screen": "~0.20.5",
"expo-status-bar": "~1.6.0",
"intl": "^1.2.5",
"lottie-react-native": "5.1.6",
"moti": "^0.26.0",
"phosphor-react-native": "^1.1.2",
"react": "^18.2.0",
"react-hook-form": "^7.47.0",
"react-native": "0.72.5",
"react-native-document-picker": "^9.0.1",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "~2.12.1",
"react-native-popup-menu": "^0.16.1",
"react-native-reanimated": "~3.3.0",
"react-native-safe-area-context": "4.6.3",
"react-native-screens": "~3.22.1",
"react-native-svg": "13.9.0",
"react-native-wheel-color-picker": "^1.2.0",
"twrnc": "^3.6.4",
"use-count-up": "^3.0.1",
"use-debounce": "^9.0.4",
"valtio": "^1.11.2",
"zod": "~3.22.4"
},
"devDependencies": {
"@babel/core": "^7.23.2",
"@rnx-kit/metro-config": "^1.3.11",
"@sd/config": "workspace:*",
"@types/react": "^18.2.31",
"babel-plugin-module-resolver": "^5.0.0",
"eslint-plugin-react-native": "^4.1.0",
"react-native-svg-transformer": "^1.1.0",
"typescript": "^5.2.2"
}
}
13 changes: 13 additions & 0 deletions apps/mobile/src/components/icons/Brands.tsx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import Svg, { Path, SvgProps } from 'react-native-svg';

export const DiscordIcon = (props: SvgProps) => (
<Svg viewBox="0 0 24 24" {...props}>
<Path d="M20.317 4.37a19.791 19.791 0 0 0-4.885-1.515.074.074 0 0 0-.079.037c-.21.375-.444.864-.608 1.25a18.27 18.27 0 0 0-5.487 0 12.64 12.64 0 0 0-.617-1.25.077.077 0 0 0-.079-.037A19.736 19.736 0 0 0 3.677 4.37a.07.07 0 0 0-.032.027C.533 9.046-.32 13.58.099 18.057a.082.082 0 0 0 .031.057 19.9 19.9 0 0 0 5.993 3.03.078.078 0 0 0 .084-.028c.462-.63.874-1.295 1.226-1.994a.076.076 0 0 0-.041-.106 13.107 13.107 0 0 1-1.872-.892.077.077 0 0 1-.008-.128 10.2 10.2 0 0 0 .372-.292.074.074 0 0 1 .077-.01c3.928 1.793 8.18 1.793 12.062 0a.074.074 0 0 1 .078.01c.12.098.246.198.373.292a.077.077 0 0 1-.006.127 12.299 12.299 0 0 1-1.873.892.077.077 0 0 0-.041.107c.36.698.772 1.362 1.225 1.993a.076.076 0 0 0 .084.028 19.839 19.839 0 0 0 6.002-3.03.077.077 0 0 0 .032-.054c.5-5.177-.838-9.674-3.549-13.66a.061.061 0 0 0-.031-.03zM8.02 15.33c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.956-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.956 2.418-2.157 2.418zm7.975 0c-1.183 0-2.157-1.085-2.157-2.419 0-1.333.955-2.419 2.157-2.419 1.21 0 2.176 1.096 2.157 2.42 0 1.333-.946 2.418-2.157 2.418Z" />
</Svg>
);

export const GitHubIcon = (props: SvgProps) => (
<Svg viewBox="0 0 24 24" {...props}>
<Path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
</Svg>
);
8 changes: 4 additions & 4 deletions apps/mobile/src/components/modal/ImportModal.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { forwardRef, useCallback } from 'react';
import { Alert, Text, View, Platform } from 'react-native';
import { Alert, Platform, Text, View } from 'react-native';
import DocumentPicker from 'react-native-document-picker';
import RNFS from 'react-native-fs';
import { useLibraryMutation } from '@sd/client';
import { Modal, ModalRef } from '~/components/layout/Modal';
import { Button } from '~/components/primitive/Button';
import useForwardedRef from '~/hooks/useForwardedRef';
import { tw } from '~/lib/tailwind';
import RNFS from 'react-native-fs';

// import * as ML from 'expo-media-library';

// WIP component
Expand Down Expand Up @@ -51,7 +52,7 @@ const ImportModal = forwardRef<ModalRef, unknown>((_, ref) => {
const dirName = decodeURIComponent(uri).split('/');
// Remove all elements before 'tree'
dirName.splice(0, dirName.indexOf('tree') + 1);
const parsedDirName = dirName.join('/').split(':')[1]
const parsedDirName = dirName.join('/').split(':')[1];
const dirPath = RNFS.ExternalStorageDirectoryPath + '/' + parsedDirName;
//Verify that the directory exists
const dirExists = await RNFS.exists(dirPath);
Expand All @@ -73,7 +74,6 @@ const ImportModal = forwardRef<ModalRef, unknown>((_, ref) => {
indexer_rules_ids: []
});
}

} catch (err) {
console.error(err);
}
Expand Down
78 changes: 19 additions & 59 deletions apps/mobile/src/navigation/SettingsNavigator.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import SettingsScreen from '~/screens/settings/Settings';

const SettingsStack = createStackNavigator<SettingsStackParamList>();

// NOTE: Why is this needed for Android? Sounds weird @utku
const BackButton = () => <ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />;

export default function SettingsNavigator() {
return (
<SettingsStack.Navigator
Expand All @@ -29,120 +32,86 @@ export default function SettingsNavigator() {
headerStyle: tw`bg-app`,
headerTintColor: tw.color('ink'),
headerTitleStyle: tw`text-base`,
headerBackTitleStyle: tw`text-base`
headerBackTitleStyle: tw`text-base`,
headerBackImage: BackButton
// headerShadowVisible: false // will disable the white line under
}}
>
<SettingsStack.Screen
name="Home"
component={SettingsScreen}
options={{
headerTitle: 'Settings',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Settings'
}}
/>
{/* Client */}
<SettingsStack.Screen
name="GeneralSettings"
component={GeneralSettingsScreen}
options={{
headerTitle: 'General Settings',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
}}
options={{ headerTitle: 'General Settings' }}
/>
<SettingsStack.Screen
name="LibrarySettings"
component={LibrarySettingsScreen}
options={{
headerTitle: 'Libraries',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Libraries'
}}
/>
<SettingsStack.Screen
name="AppearanceSettings"
component={AppearanceSettingsScreen}
options={{
headerTitle: 'Appearance',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Appearance'
}}
/>
<SettingsStack.Screen
name="PrivacySettings"
component={PrivacySettingsScreen}
options={{
headerTitle: 'Privacy',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Privacy'
}}
/>
<SettingsStack.Screen
name="ExtensionsSettings"
component={ExtensionsSettingsScreen}
options={{
headerTitle: 'Extensions',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Extensions'
}}
/>
{/* Library */}
<SettingsStack.Screen
name="LibraryGeneralSettings"
component={LibraryGeneralSettingsScreen}
options={{
headerTitle: 'Library Settings',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Library Settings'
}}
/>
<SettingsStack.Screen
name="LocationSettings"
component={LocationSettingsScreen}
options={{
headerTitle: 'Locations',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Locations'
}}
/>
<SettingsStack.Screen
name="EditLocationSettings"
component={EditLocationSettingsScreen}
options={{
headerTitle: 'Edit Location',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Edit Location'
}}
/>
<SettingsStack.Screen
name="NodesSettings"
component={NodesSettingsScreen}
options={{
headerTitle: 'Nodes',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Nodes'
}}
/>
<SettingsStack.Screen
name="TagsSettings"
component={TagsSettingsScreen}
options={{
headerTitle: 'Tags',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Tags'
}}
/>
{/* <SettingsStack.Screen
Expand All @@ -155,30 +124,21 @@ export default function SettingsNavigator() {
name="About"
component={AboutScreen}
options={{
headerTitle: 'About',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'About'
}}
/>
<SettingsStack.Screen
name="Support"
component={SupportScreen}
options={{
headerTitle: 'Support',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Support'
}}
/>
<SettingsStack.Screen
name="Debug"
component={DebugScreen}
options={{
headerTitle: 'Debug',
headerBackImage: () => (
<ArrowLeft size={23} color={tw.color('ink')} style={tw`ml-2`} />
)
headerTitle: 'Debug'
}}
/>
</SettingsStack.Navigator>
Expand Down
Loading

1 comment on commit 7dd164f

@vercel
Copy link

@vercel vercel bot commented on 7dd164f Nov 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

spacedrive-landing – ./apps/landing

www.spacedrive.com
spacedrive-landing.vercel.app
spacedrive.com
spacedrive-landing-git-main-spacedrive.vercel.app
spacedrive-landing-spacedrive.vercel.app

Please sign in to comment.