Remove separate Menu file on the client

nars-dev · Feb 13, 2020 · 1811b94 · 1811b94
1 parent 51fb89f
commit 1811b94
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 39 deletions.
diff --git a/RestaurantMenu/client/App.tsx b/RestaurantMenu/client/App.tsx
@@ -8,17 +8,49 @@
  * @format
  */
 
-import React from 'react';
-import {StatusBar} from 'react-native';
-import {Menu} from './Menu';
+import * as React from 'react';
+import {
+  Alert,
+  Text,
+  SafeAreaView,
+  StyleSheet,
+  View,
+  StatusBar,
+} from 'react-native';
+import {config} from 'RestaurantMenu-config';
+import * as Nars from 'nars-client';
 
 declare var global: {HermesInternal: null | {}};
 
+const styles = StyleSheet.create({
+  headerContainer: {
+    paddingVertical: 10,
+    borderBottomWidth: 1,
+    borderBottomColor: '#EEE',
+  },
+  header: {
+    fontSize: 18,
+    fontWeight: 'bold',
+    textAlign: 'center',
+  },
+});
+
+const {Menu} = Nars.createRemoteComponentWithUrl('ws://localhost:9000', config);
+
 const App = () => {
   return (
     <>
       <StatusBar barStyle="light-content" />
-      <Menu />
+      <SafeAreaView>
+        <View style={styles.headerContainer}>
+          <Text style={styles.header}>{'Menu'}</Text>
+        </View>
+        <Menu
+          onMenuItemSelected={(_, title) => {
+            Alert.alert(`Tapped "${title}"`);
+          }}
+        />
+      </SafeAreaView>
     </>
   );
 };

diff --git a/RestaurantMenu/client/Menu.tsx b/RestaurantMenu/client/Menu.tsx
@@ -1,35 +0,0 @@
-import * as React from 'react';
-import {Alert, Text, SafeAreaView, StyleSheet, View} from 'react-native';
-import {config} from 'RestaurantMenu-config';
-import * as Nars from 'nars-client';
-
-const styles = StyleSheet.create({
-  headerContainer: {
-    paddingVertical: 10,
-    borderBottomWidth: 1,
-    borderBottomColor: '#EEE',
-  },
-  header: {
-    fontSize: 18,
-    fontWeight: 'bold',
-    textAlign: 'center',
-  },
-});
-
-const {Menu: RemoteMenuComponent} = Nars.createRemoteComponentWithUrl(
-  'ws://localhost:9000',
-  config,
-);
-
-export const Menu = () => (
-  <SafeAreaView>
-    <View style={styles.headerContainer}>
-      <Text style={styles.header}>{'Menu'}</Text>
-    </View>
-    <RemoteMenuComponent
-      onMenuItemSelected={(_, title) => {
-        Alert.alert(`Tapped "${title}"`);
-      }}
-    />
-  </SafeAreaView>
-);

diff --git a/RestaurantMenu/config/src/Config.ts b/RestaurantMenu/config/src/Config.ts
@@ -4,6 +4,7 @@ import { InputProp, localCallback } from "nars-common";
  * Define Routes and the props
  */
 const title = InputProp.string;
+
 export const config = {
   Menu: {
     onMenuItemSelected: localCallback(InputProp.void, title)