diff --git a/packages/components/src/App.web.tsx b/packages/components/src/App.web.tsx index 8c04deb..9deb752 100644 --- a/packages/components/src/App.web.tsx +++ b/packages/components/src/App.web.tsx @@ -1,13 +1,26 @@ import React from 'react' -import { - SafeAreaView, - ScrollView, - StatusBar, - StyleSheet, - Text, - View, -} from 'react-native' + +import { Provider } from 'react-redux' + +import { store } from './store' +import { RootStackParamList } from './navigation/navigation' +import Menu from './features/menu/Menu' +import Reviews from './features/reviews/Reviews' +import Review from './features/review/Review' export function App() { - return Hello world ! + return ( + + + + + + + + + ) } diff --git a/packages/components/src/features/menu/Menu.tsx b/packages/components/src/features/menu/Menu.tsx index 8e8adce..83c819a 100644 --- a/packages/components/src/features/menu/Menu.tsx +++ b/packages/components/src/features/menu/Menu.tsx @@ -10,13 +10,13 @@ import { RootStackParamList } from '../../navigation/navigation' import { Tag } from '../../components' type Props = { - navigation: BottomTabNavigationProp + // navigation: BottomTabNavigationProp } /** * @param props {@link Props} */ -export default ({ navigation }: Props) => { +export default (props: Props) => { const state = useSelector((rootState: RootState) => rootState.menu) const dispatch = useDispatch() diff --git a/packages/components/src/features/review/Review.tsx b/packages/components/src/features/review/Review.tsx index fe642cd..667a393 100644 --- a/packages/components/src/features/review/Review.tsx +++ b/packages/components/src/features/review/Review.tsx @@ -9,8 +9,8 @@ import { } from 'react-native' import { useSelector, useDispatch } from 'react-redux' import { BottomTabNavigationProp } from '@react-navigation/bottom-tabs' +// import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view' -// import { Button } from '../../components/' import { RootState } from '../../store' import { decrement, increment } from './slice' import { RootStackParamList } from '../../navigation/navigation' @@ -22,45 +22,72 @@ type Props = { export default ({ navigation }: Props) => { return ( - - - - - Thank you John! - - - Thanks John! - - - Many thanks John! - - - Appreciate it John! - + + + + + + Thank you John! + + + Thanks John! + + + Many thanks John! + + + Appreciate it John! + + + Customize.. + + + ) } const styles = StyleSheet.create({ + container: { + // flex: 1, + }, + reviewContainer: { + // flex: 1, + }, textInput: { fontSize: 14, backgroundColor: 'white', padding: 15, + paddingTop: 15, + margin: 15, + borderRadius: 15, + shadowColor: 'grey', + shadowOpacity: 0.1, + shadowOffset: { width: 0, height: 0 }, + }, + replyOptionsContainer: { + backgroundColor: 'white', }, replyOptions: { flexDirection: 'row', padding: 15, + backgroundColor: 'white', }, replyOption: { flexDirection: 'row', - backgroundColor: '#A9A9A9', + backgroundColor: '#0F9D58', borderRadius: 8, padding: 8, marginHorizontal: 5, @@ -68,5 +95,6 @@ const styles = StyleSheet.create({ replyOptionText: { fontWeight: 'bold', color: 'white', + fontSize: 12, }, }) diff --git a/packages/web-nextjs/pages/about.tsx b/packages/web-nextjs/pages/about.tsx deleted file mode 100644 index ed2cabd..0000000 --- a/packages/web-nextjs/pages/about.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import React from 'react' - -function About() { - return
About
-} - -export default About diff --git a/packages/web-nextjs/pages/menu.tsx b/packages/web-nextjs/pages/menu.tsx new file mode 100644 index 0000000..a12d6b7 --- /dev/null +++ b/packages/web-nextjs/pages/menu.tsx @@ -0,0 +1,6 @@ +import React from 'react' +import Menu from 'components/src/features/menu/Menu' + +export default () => { + return +}