Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User stories and UI #361

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mobile/tradeverse/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
babel.config.js
23 changes: 23 additions & 0 deletions mobile/tradeverse/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"extends": [
"airbnb-base",
"prettier",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
],
"plugins": ["prettier", "react", "react-hooks"],
"rules": {
"prettier/prettier": ["error"],
"eqeqeq": "off",
"comma-dangle": "off",
"no-underscore-dangle": "off",
},
"settings": {
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"],
},
"babel-module": {},
},
},
}
5 changes: 5 additions & 0 deletions mobile/tradeverse/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"semi": false,
"singleQuote": true,
"trailingComma": "es5"
}
15 changes: 11 additions & 4 deletions mobile/tradeverse/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,25 @@
"adaptiveIcon": {
"foregroundImage": "./assets/images/adaptive-icon.png",
"backgroundColor": "#ffffff"
}
},
"package": "com.huseyin.karatas.tradeverse"
},
"web": {
"bundler": "metro",
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": [
"expo-router"
],
"plugins": ["expo-router"],
"experiments": {
"typedRoutes": true
},
"extra": {
"router": {
"origin": false
},
"eas": {
"projectId": "afbaffdd-20ea-4bb5-85ee-988716e97ea4"
}
}
}
}
18 changes: 11 additions & 7 deletions mobile/tradeverse/app/(tabs)/_layout.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
/* eslint-disable react/self-closing-comp */
import { Tabs } from "expo-router";
import { COLORS } from "../../constants/theme";
import { NAV_OPTIONS } from "../../config/navigation";
import AuthGuard from "../../auth/context/auth-guard";
import { Tabs } from 'expo-router'
import { COLORS } from '../../constants/theme'
import { NAV_OPTIONS } from '../../config/navigation'
import AuthGuard from '../../auth/context/auth-guard'
import CustomTabBar from '../../components/ui/tabbar/index'

export default function Layout() {
return (
<AuthGuard>
<Tabs initialRouteName="home">
<Tabs
tabBar={(props) => <CustomTabBar {...props} />}
initialRouteName="home"
>
{NAV_OPTIONS.map((option) => (
<Tabs.Screen
key={option.routeValue}
Expand All @@ -16,13 +20,13 @@ export default function Layout() {
...(option.headerOptions ?? {}),
title: option.label,
tabBarIcon: (opt) => {
return opt.focused ? option.activeIcon : option.icon;
return opt.focused ? option.activeIcon : option.icon
},
tabBarActiveTintColor: COLORS.primary,
}}
/>
))}
</Tabs>
</AuthGuard>
);
)
}
8 changes: 4 additions & 4 deletions mobile/tradeverse/app/(tabs)/account/_layout.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Stack } from 'expo-router';
import React from 'react';
import { Stack } from 'expo-router'
import React from 'react'

export default function StackLayout() {
return (
<Stack>
<Stack.Screen name='index' options={{ headerShown: false }} />
<Stack.Screen name="index" options={{ headerShown: false }} />
</Stack>
);
)
}
6 changes: 2 additions & 4 deletions mobile/tradeverse/app/(tabs)/account/followed-topics.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ import React from 'react'
import FollowedTopicsScreen from '../../../screens/followed-topics'

export default function FollowedTopics() {
return (
<FollowedTopicsScreen />
)
}
return <FollowedTopicsScreen />
}
6 changes: 2 additions & 4 deletions mobile/tradeverse/app/(tabs)/account/followed-users.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@ import AssetDetailScreen from '../../../screens/asset-detail'
import FollowedUsersScreen from '../../../screens/followed-users'

export default function AssetDetail() {
return (
<FollowedUsersScreen/>
)
}
return <FollowedUsersScreen />
}
8 changes: 3 additions & 5 deletions mobile/tradeverse/app/(tabs)/account/index.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react';
import AccountRootScreen from '../../../screens/account-root';
import React from 'react'
import AccountRootScreen from '../../../screens/account-root'

export default function Account() {
return (
<AccountRootScreen/>
);
return <AccountRootScreen />
}
6 changes: 2 additions & 4 deletions mobile/tradeverse/app/(tabs)/account/portfolio.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ import React from 'react'
import PortfolioScreen from '../../../screens/portfolio'

export default function Profile() {
return (
<PortfolioScreen />
)
}
return <PortfolioScreen />
}
6 changes: 2 additions & 4 deletions mobile/tradeverse/app/(tabs)/account/profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ import React from 'react'
import AccountProfileScreen from '../../../screens/account-profile'

export default function Profile() {
return (
<AccountProfileScreen />
)
}
return <AccountProfileScreen />
}
9 changes: 4 additions & 5 deletions mobile/tradeverse/app/(tabs)/create/_layout.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { Stack } from 'expo-router';
import React from 'react';
import { Stack } from 'expo-router'
import React from 'react'

export default function StackLayout() {
return (
<Stack>
<Stack.Screen name='index' options={{ headerShown: false }} />
<Stack.Screen name="index" options={{ headerShown: false }} />
</Stack>
);
)
}

6 changes: 2 additions & 4 deletions mobile/tradeverse/app/(tabs)/create/add-post.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ import React from 'react'
import CreatePostScreen from '../../../screens/create-post'

export default function post() {
return (
<CreatePostScreen />
)
}
return <CreatePostScreen />
}
6 changes: 3 additions & 3 deletions mobile/tradeverse/app/(tabs)/create/add-subforum.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import CreateSubForumScreen from "../../../screens/create-subforum";
import React from 'react'
import CreateSubForumScreen from '../../../screens/create-subforum'

export default function post() {
return <CreateSubForumScreen />;
return <CreateSubForumScreen />
}
8 changes: 3 additions & 5 deletions mobile/tradeverse/app/(tabs)/create/index.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react';
import CreateRootScreen from '../../../screens/create-root';
import React from 'react'
import CreateRootScreen from '../../../screens/create-root'

export default function Create() {
return (
<CreateRootScreen/>
);
return <CreateRootScreen />
}
8 changes: 4 additions & 4 deletions mobile/tradeverse/app/(tabs)/explore/_layout.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Stack } from 'expo-router';
import React from 'react';
import { Stack } from 'expo-router'
import React from 'react'

export default function StackLayout() {
return (
<Stack>
<Stack.Screen name='index' options={{ headerShown: false }} />
<Stack.Screen name="index" options={{ headerShown: false }} />
</Stack>
);
)
}
10 changes: 4 additions & 6 deletions mobile/tradeverse/app/(tabs)/explore/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import React from 'react';
import { Text } from 'react-native';
import ExploreRootScreen from '../../../screens/explore-root';
import React from 'react'
import { Text } from 'react-native'
import ExploreRootScreen from '../../../screens/explore-root'

export default function Explore() {
return (
<ExploreRootScreen/>
);
return <ExploreRootScreen />
}
7 changes: 3 additions & 4 deletions mobile/tradeverse/app/(tabs)/explore/post-detail.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { View, Text } from 'react-native'
import React from 'react'
import PostDetailScreen from '../../../screens/post-detail'

export default function PostDetail() {
return (
<PostDetailScreen />
)
}
return <PostDetailScreen />
}
9 changes: 5 additions & 4 deletions mobile/tradeverse/app/(tabs)/explore/search/asset-detail.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { View, Text } from "react-native";
import React from "react";
import AssetDetailScreen from "../../../../screens/asset-detail";
import { View, Text } from 'react-native'
import React from 'react'
import AssetDetailScreen from '../../../../screens/asset-detail'

export default function AssetDetail() {
return <AssetDetailScreen />;
return <AssetDetailScreen />
}
14 changes: 6 additions & 8 deletions mobile/tradeverse/app/(tabs)/explore/search/index.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React from 'react';
import SearchResultsScreen from '../../../../screens/explore-search-results';

export default function SearchItem() {
return (
<SearchResultsScreen />
);
}
import React from 'react'
import SearchResultsScreen from '../../../../screens/explore-search-results'

export default function SearchItem() {
return <SearchResultsScreen />
}
7 changes: 3 additions & 4 deletions mobile/tradeverse/app/(tabs)/explore/search/post-detail.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { View, Text } from 'react-native'
import React from 'react'
import PostDetailScreen from '../../../../screens/post-detail'

export default function PostDetail() {
return (
<PostDetailScreen />
)
}
return <PostDetailScreen />
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { View, Text } from 'react-native'
import React from 'react'
import SubForumDetailScreen from '../../../../screens/subforum-detail'
export default function SubForumDetail() {
return (
<SubForumDetailScreen/>

)
}
export default function SubForumDetail() {
return <SubForumDetailScreen />
}
6 changes: 2 additions & 4 deletions mobile/tradeverse/app/(tabs)/explore/search/user-profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ import React from 'react'
import UserProfileScreen from '../../../../screens/profile'

export default function UserProfile() {
return (
<UserProfileScreen />
)
}
return <UserProfileScreen />
}
8 changes: 3 additions & 5 deletions mobile/tradeverse/app/(tabs)/explore/subforum-detail.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { View, Text } from 'react-native'
import React from 'react'
import SubForumDetailScreen from '../../../screens/subforum-detail'
export default function SubForumDetail() {
return (
<SubForumDetailScreen/>

)
}
export default function SubForumDetail() {
return <SubForumDetailScreen />
}
6 changes: 2 additions & 4 deletions mobile/tradeverse/app/(tabs)/explore/user-profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ import React from 'react'
import UserProfileScreen from '../../../screens/profile'

export default function UserProfile() {
return (
<UserProfileScreen />
)
}
return <UserProfileScreen />
}
8 changes: 4 additions & 4 deletions mobile/tradeverse/app/(tabs)/home/_layout.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Stack } from 'expo-router';
import React from 'react';
import { Stack } from 'expo-router'
import React from 'react'

export default function StackLayout() {
return (
<Stack>
<Stack.Screen name='index' options={{ headerShown: false }} />
<Stack.Screen name="index" options={{ headerShown: false }} />
</Stack>
);
)
}
10 changes: 4 additions & 6 deletions mobile/tradeverse/app/(tabs)/home/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import React from "react";
import { Text } from "react-native";
import HomeRootScreen from "../../../screens/home-root";
import React from 'react'
import { Text } from 'react-native'
import HomeRootScreen from '../../../screens/home-root'

export default function Home() {
return (
<HomeRootScreen />
);
return <HomeRootScreen />
}
7 changes: 3 additions & 4 deletions mobile/tradeverse/app/(tabs)/home/post-detail.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { View, Text } from 'react-native'
import React from 'react'
import PostDetailScreen from '../../../screens/post-detail'

export default function PostDetail() {
return (
<PostDetailScreen />
)
}
return <PostDetailScreen />
}
Loading