minor govno

This commit is contained in:
2023-10-13 05:40:03 +03:00
parent fd74b5b79a
commit 67258c8114
17 changed files with 329 additions and 23 deletions

View File

@@ -1,6 +1,5 @@
import {Button, Modal, SafeAreaView, Text, View} from "react-native";
import {useAppDispatch} from "../../redux/store";
import {logoutUser, useGetPokemonByNameQuery} from "../../features/auth/authSlice";
import * as process from "process";
import React, {useState} from "react";
import BasicButton from "../../components/BasicButton/BasicButton";

View File

@@ -11,6 +11,8 @@ import profileScreen from "../ProfileScreen/ProfileScreen";
import {responsiveHeight, responsiveWidth} from "react-native-responsive-dimensions";
import {RFPercentage} from "react-native-responsive-fontsize";
import LoginScreen from "../LoginScreen/LoginScreen";
import OrderScreen from "../OrderScreen/OrderScreen";
import OrdersScreen from "../OrdersScreen/OrdersScreen";
interface CustomTabProps {
@@ -43,12 +45,12 @@ function MainScreen() {
const tabScreens = [
{
name: "Home",
component: HomeScreen,
component: OrderScreen,
icon: require('assets/icons/home.png')
},
{
name: "Box",
component: BoxScreen,
component: OrdersScreen,
icon: require('assets/icons/box.png')
},
{

View File

@@ -0,0 +1,120 @@
import {View, Text, Image, StyleSheet, Button} from "react-native";
import {responsiveHeight, responsiveWidth} from "react-native-responsive-dimensions";
import DText from "../../components/DText/DText";
import {RFPercentage} from "react-native-responsive-fontsize";
import DTitle from "../../components/DTitle/DTitle";
import BasicButton from "../../components/BasicButton/BasicButton";
import Hyperlink from "../../components/Hyperlink/Hyperlink";
import React, {useState} from "react";
type ArticleTextProps = {
article: number
}
function OrderScreen() {
const [order, setOrder] = useState({
article: 183658,
imageUrl: "https://421421.selcdn.ru/denco/996956/thumbzoom/h0b41036e5dc84a88b3dd344a46ab33edt.jpg-640x640.jpg",
orderNumber: "93757290-0104-7",
productName: "Фигурки животных «Собачки» 258, 5-7 см., статичные / 12 шт.",
supplierName: "simaland",
marketplaceName: "Wildberries РЕНТА",
sellerName: "DENCO",
assembled: false
});
return (
<View style={styles.container}>
<View style={styles.dataContainer}>
<View style={styles.imageWrapper}>
<Image source={{uri: order.imageUrl}} style={styles.image}/>
</View>
<View style={styles.contentContainer}>
<View style={styles.contentWrapper}>
<DTitle style={styles.contentTitle}>{order.orderNumber}</DTitle>
<Hyperlink url={`https://denco.store/manager/?a=resource/update&id=${order.article}`}>
<DText style={styles.articleText}>Артикул: {order.article}</DText>
</Hyperlink>
<DText>Товар: {order.productName}</DText>
<DText>Поставщик: {order.supplierName}</DText>
<DText>Селлер: {order.sellerName}</DText>
<DText>Маркетплейс: {order.marketplaceName}</DText>
</View>
</View>
</View>
<View style={styles.buttonsContainer}>
<View style={styles.buttonsWrapper}>
{!order.assembled &&
<BasicButton label={"Отметить как собранный"} onPress={() => {
setOrder({...order, assembled: true})
console.log(order);
}}/>
}
{order.assembled &&
<BasicButton label={"Печать этикетки"}/>
}
{/*<BasicButton label={"Следующий товар"}/>*/}
</View>
</View>
</View>
)
}
const styles = StyleSheet.create({
container: {
padding: 30,
width: "100%",
height: "100%",
overflow: "hidden",
display: "flex",
flex: 1,
},
dataContainer: {
backgroundColor: "black",
display: "flex",
flexDirection: "row",
},
buttonsContainer: {
backgroundColor: "blue",
flex: 1,
display: "flex",
justifyContent: "center",
paddingHorizontal: responsiveWidth(10)
},
buttonsWrapper: {
backgroundColor: "red",
rowGap: responsiveHeight(3)
},
imageWrapper: {
width: responsiveWidth(40),
// height: responsiveHeight(40),
backgroundColor: "red",
padding: RFPercentage(1)
},
image: {
flex: 1,
borderRadius: RFPercentage(3)
},
contentContainer: {
padding: RFPercentage(1),
backgroundColor: "pink",
flex: 1
},
contentWrapper: {
display: "flex",
flexDirection: "column",
gap: 0,
},
contentTitle: {
alignSelf: "center"
},
articleText: {
color: 'blue',
textDecorationLine: 'underline'
}
})
export default OrderScreen;

View File

@@ -0,0 +1,48 @@
import {ScrollView, StyleSheet, View} from "react-native";
import SearchBar from "../../components/SearchBar/SearchBar";
import OrderCard from "../../components/OrderCard/OrderCard";
import {RFPercentage} from "react-native-responsive-fontsize";
import {responsiveHeight} from "react-native-responsive-dimensions";
function OrdersScreen() {
return (
<View style={styles.container}>
<SearchBar onSearch={() => {
}}/>
<View style={styles.content}>
<ScrollView keyboardShouldPersistTaps={"never"} showsHorizontalScrollIndicator={false}
showsVerticalScrollIndicator={false}
contentContainerStyle={styles.scrollContainer}>
<OrderCard />
<OrderCard/>
<OrderCard/>
<OrderCard/>
<OrderCard/>
<OrderCard/>
<OrderCard/>
</ScrollView>
</View>
</View>
)
}
const styles = StyleSheet.create({
container: {
width: "100%",
height: "100%",
display: "flex",
},
content: {
flex: 1,
paddingHorizontal: RFPercentage(3),
paddingTop: RFPercentage(3)
},
scrollContainer: {
rowGap: responsiveHeight(2)
}
});
export default OrdersScreen;

View File

@@ -1,6 +1,5 @@
import {Button, Text, View} from "react-native";
import {useAppDispatch} from "../../redux/store";
import {logoutUser, useGetPokemonByNameQuery} from "../../features/auth/authSlice";
import * as process from "process";
function ProfileScreen() {