Compare commits
	
		
			4 Commits
		
	
	
		
			c6cf6e6b40
			...
			82c90c1ceb
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 82c90c1ceb | |||
| 4fe4808b3c | |||
| b6b9b989c7 | |||
| 13b223ed5f | 
@@ -5,8 +5,8 @@ import Text from "@components/Text";
 | 
				
			|||||||
import { colors } from "@components/style";
 | 
					import { colors } from "@components/style";
 | 
				
			||||||
import * as ImagePicker from "expo-image-picker";
 | 
					import * as ImagePicker from "expo-image-picker";
 | 
				
			||||||
import DropDownPicker from "react-native-dropdown-picker";
 | 
					import DropDownPicker from "react-native-dropdown-picker";
 | 
				
			||||||
/* import DropdownTheme from "@components/DropdownTheme"; */
 | 
					 | 
				
			||||||
const DropdownTheme = require("@components/DropdownTheme");
 | 
					const DropdownTheme = require("@components/DropdownTheme");
 | 
				
			||||||
 | 
					import { Platform } from "react-native";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default function BeerAdd() {
 | 
					export default function BeerAdd() {
 | 
				
			||||||
	const [b_name, setBName] = useState("");
 | 
						const [b_name, setBName] = useState("");
 | 
				
			||||||
@@ -165,6 +165,7 @@ export default function BeerAdd() {
 | 
				
			|||||||
					onChangeText={(text) => validateDegreeInput(text)}
 | 
										onChangeText={(text) => validateDegreeInput(text)}
 | 
				
			||||||
					placeholderTextColor="#aaaaaa"
 | 
										placeholderTextColor="#aaaaaa"
 | 
				
			||||||
					keyboardType="numeric"
 | 
										keyboardType="numeric"
 | 
				
			||||||
 | 
										maxLength={3}
 | 
				
			||||||
				/>
 | 
									/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
				<DropDownPicker
 | 
									<DropDownPicker
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,9 +1,16 @@
 | 
				
			|||||||
import { StyleSheet, View, FlatList } from "react-native";
 | 
					import {
 | 
				
			||||||
 | 
						StyleSheet,
 | 
				
			||||||
 | 
						View,
 | 
				
			||||||
 | 
						FlatList,
 | 
				
			||||||
 | 
						Dimensions,
 | 
				
			||||||
 | 
						StatusBar,
 | 
				
			||||||
 | 
					} from "react-native";
 | 
				
			||||||
import Text from "@components/Text";
 | 
					import Text from "@components/Text";
 | 
				
			||||||
import Button from "@components/Button";
 | 
					import Button from "@components/Button";
 | 
				
			||||||
import { colors } from "@components/style";
 | 
					import { colors } from "@components/style";
 | 
				
			||||||
import { router } from "expo-router";
 | 
					import { router } from "expo-router";
 | 
				
			||||||
import { useEffect, useState } from "react";
 | 
					import { useEffect, useState } from "react";
 | 
				
			||||||
 | 
					import { FlashList } from "@shopify/flash-list";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default function Tab() {
 | 
					export default function Tab() {
 | 
				
			||||||
	const [data, setData] = useState([]);
 | 
						const [data, setData] = useState([]);
 | 
				
			||||||
@@ -28,26 +35,42 @@ export default function Tab() {
 | 
				
			|||||||
	return (
 | 
						return (
 | 
				
			||||||
		<View style={styles.container}>
 | 
							<View style={styles.container}>
 | 
				
			||||||
			<Button
 | 
								<Button
 | 
				
			||||||
				title="Add Beer"
 | 
									title="Add new beer"
 | 
				
			||||||
				color={colors.gold}
 | 
									color={colors.gold}
 | 
				
			||||||
				onPress={() => {
 | 
									onPress={() => {
 | 
				
			||||||
					router.replace("/beer/add");
 | 
										router.replace("/beer/add");
 | 
				
			||||||
				}}
 | 
									}}
 | 
				
			||||||
			/>
 | 
								/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			<FlatList
 | 
								<View style={styles.beerList}>
 | 
				
			||||||
				data={data}
 | 
									{/* 				<FlashList
 | 
				
			||||||
				style={styles.beerList}
 | 
										data={data}
 | 
				
			||||||
				keyExtractor={(item) => String(item._id)}
 | 
										estimatedItemSize={100}
 | 
				
			||||||
				renderItem={({ item }) => (
 | 
										keyExtractor={(item) => String(item._id)}
 | 
				
			||||||
					<View style={styles.item}>
 | 
										renderItem={({ item }) => (
 | 
				
			||||||
						<Text>Name: {item.name}</Text>
 | 
											<View style={styles.item}>
 | 
				
			||||||
						<Text>Brand: {item.brand}</Text>
 | 
												<Text>Name: {item.name}</Text>
 | 
				
			||||||
						<Text>Degree: {item.degree}</Text>
 | 
												<Text>Brand: {item.brand}</Text>
 | 
				
			||||||
						<Text>Packaging: {item.packaging}</Text>
 | 
												<Text>Degree: {item.degree}</Text>
 | 
				
			||||||
					</View>
 | 
												<Text>Packaging: {item.packaging}</Text>
 | 
				
			||||||
				)}
 | 
											</View>
 | 
				
			||||||
			/>
 | 
										)}
 | 
				
			||||||
 | 
									/> */}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									<FlatList
 | 
				
			||||||
 | 
										data={data}
 | 
				
			||||||
 | 
										style={styles.beerList}
 | 
				
			||||||
 | 
										keyExtractor={(item) => String(item._id)}
 | 
				
			||||||
 | 
										renderItem={({ item }) => (
 | 
				
			||||||
 | 
											<View style={styles.item}>
 | 
				
			||||||
 | 
												<Text>Name: {item.name}</Text>
 | 
				
			||||||
 | 
												<Text>Brand: {item.brand}</Text>
 | 
				
			||||||
 | 
												<Text>Degree: {item.degree}</Text>
 | 
				
			||||||
 | 
												<Text>Packaging: {item.packaging}</Text>
 | 
				
			||||||
 | 
											</View>
 | 
				
			||||||
 | 
										)}
 | 
				
			||||||
 | 
									/>
 | 
				
			||||||
 | 
								</View>
 | 
				
			||||||
		</View>
 | 
							</View>
 | 
				
			||||||
	);
 | 
						);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
@@ -57,12 +80,12 @@ export const styles = StyleSheet.create({
 | 
				
			|||||||
		flex: 1,
 | 
							flex: 1,
 | 
				
			||||||
		justifyContent: "center",
 | 
							justifyContent: "center",
 | 
				
			||||||
		alignItems: "center",
 | 
							alignItems: "center",
 | 
				
			||||||
		marginTop: "5%",
 | 
							width: "100%",
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	beerList: {
 | 
						beerList: {
 | 
				
			||||||
		width: "100%",
 | 
							width: "100%",
 | 
				
			||||||
		paddingHorizontal: "15%",
 | 
							paddingHorizontal: "15%",
 | 
				
			||||||
		marginTop: "5%",
 | 
							marginTop: "2%",
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	item: {
 | 
						item: {
 | 
				
			||||||
		borderColor: "gray",
 | 
							borderColor: "gray",
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										39
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										39
									
								
								frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -10,6 +10,7 @@
 | 
				
			|||||||
      "dependencies": {
 | 
					      "dependencies": {
 | 
				
			||||||
        "@expo/metro-runtime": "~3.2.1",
 | 
					        "@expo/metro-runtime": "~3.2.1",
 | 
				
			||||||
        "@react-native-async-storage/async-storage": "^1.23.1",
 | 
					        "@react-native-async-storage/async-storage": "^1.23.1",
 | 
				
			||||||
 | 
					        "@shopify/flash-list": "1.6.4",
 | 
				
			||||||
        "@types/react": "~18.2.45",
 | 
					        "@types/react": "~18.2.45",
 | 
				
			||||||
        "axios": "^1.6.8",
 | 
					        "axios": "^1.6.8",
 | 
				
			||||||
        "expo": "^51.0.2",
 | 
					        "expo": "^51.0.2",
 | 
				
			||||||
@@ -6303,6 +6304,25 @@
 | 
				
			|||||||
        "join-component": "^1.1.0"
 | 
					        "join-component": "^1.1.0"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "node_modules/@shopify/flash-list": {
 | 
				
			||||||
 | 
					      "version": "1.6.4",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/@shopify/flash-list/-/flash-list-1.6.4.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-M2momcnY7swsvmpHIFDVbdOaFw4aQocJXA/lFP0Gpz+alQjFylqVKvszxl4atYO2SNbjxlb2L6hEP9WEcAknGQ==",
 | 
				
			||||||
 | 
					      "dependencies": {
 | 
				
			||||||
 | 
					        "recyclerlistview": "4.2.0",
 | 
				
			||||||
 | 
					        "tslib": "2.4.0"
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      "peerDependencies": {
 | 
				
			||||||
 | 
					        "@babel/runtime": "*",
 | 
				
			||||||
 | 
					        "react": "*",
 | 
				
			||||||
 | 
					        "react-native": "*"
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    "node_modules/@shopify/flash-list/node_modules/tslib": {
 | 
				
			||||||
 | 
					      "version": "2.4.0",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "node_modules/@sideway/address": {
 | 
					    "node_modules/@sideway/address": {
 | 
				
			||||||
      "version": "4.1.5",
 | 
					      "version": "4.1.5",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
 | 
				
			||||||
@@ -13091,6 +13111,20 @@
 | 
				
			|||||||
        "node": ">=0.10.0"
 | 
					        "node": ">=0.10.0"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "node_modules/recyclerlistview": {
 | 
				
			||||||
 | 
					      "version": "4.2.0",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/recyclerlistview/-/recyclerlistview-4.2.0.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-uuBCi0c+ggqHKwrzPX4Z/mJOzsBbjZEAwGGmlwpD/sD7raXixdAbdJ6BTcAmuWG50Cg4ru9p12M94Njwhr/27A==",
 | 
				
			||||||
 | 
					      "dependencies": {
 | 
				
			||||||
 | 
					        "lodash.debounce": "4.0.8",
 | 
				
			||||||
 | 
					        "prop-types": "15.8.1",
 | 
				
			||||||
 | 
					        "ts-object-utils": "0.0.5"
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      "peerDependencies": {
 | 
				
			||||||
 | 
					        "react": ">= 15.2.1",
 | 
				
			||||||
 | 
					        "react-native": ">= 0.30.0"
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "node_modules/regenerate": {
 | 
					    "node_modules/regenerate": {
 | 
				
			||||||
      "version": "1.4.2",
 | 
					      "version": "1.4.2",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
 | 
				
			||||||
@@ -14337,6 +14371,11 @@
 | 
				
			|||||||
      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
 | 
				
			||||||
      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
 | 
					      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "node_modules/ts-object-utils": {
 | 
				
			||||||
 | 
					      "version": "0.0.5",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/ts-object-utils/-/ts-object-utils-0.0.5.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-iV0GvHqOmilbIKJsfyfJY9/dNHCs969z3so90dQWsO1eMMozvTpnB1MEaUbb3FYtZTGjv5sIy/xmslEz0Rg2TA=="
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "node_modules/tslib": {
 | 
					    "node_modules/tslib": {
 | 
				
			||||||
      "version": "2.6.2",
 | 
					      "version": "2.6.2",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,7 +28,8 @@
 | 
				
			|||||||
    "react-native-dropdown-picker": "^5.4.6",
 | 
					    "react-native-dropdown-picker": "^5.4.6",
 | 
				
			||||||
    "react-native-safe-area-context": "4.10.1",
 | 
					    "react-native-safe-area-context": "4.10.1",
 | 
				
			||||||
    "react-native-screens": "3.31.1",
 | 
					    "react-native-screens": "3.31.1",
 | 
				
			||||||
    "react-native-web": "~0.19.6"
 | 
					    "react-native-web": "~0.19.6",
 | 
				
			||||||
 | 
					    "@shopify/flash-list": "1.6.4"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "@babel/core": "^7.20.0",
 | 
					    "@babel/core": "^7.20.0",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user