diff --git a/navigation/index.js b/navigation/index.js
index 9739705..bb471b9 100644
--- a/navigation/index.js
+++ b/navigation/index.js
@@ -18,6 +18,7 @@ import Login from "../src/screens/Login";
import Otp from "../src/screens/Otp";
import Product from "../src/screens/Product";
import QR from "../src/screens/QR";
+import QRContent from "../src/screens/QRContent";
import Faq from "../src/screens/Faq";
import Activation from "../src/screens/Activation";
import { connect } from "react-redux";
@@ -112,6 +113,9 @@ const HomeStackScreen = () => {
initialRouteName="Home"
>
+
+
+
);
@@ -173,6 +177,7 @@ const Navigation = ({ getStatus, isLogin }) => {
+
);
diff --git a/src/components/Drawer.js b/src/components/Drawer.js
index f3d845b..3e086e4 100644
--- a/src/components/Drawer.js
+++ b/src/components/Drawer.js
@@ -9,7 +9,7 @@ import {
TouchableOpacity,
} from "react-native";
import { useNavigation } from "@react-navigation/native";
-import { Entypo, FontAwesome, Ionicons, AntDesign } from "@expo/vector-icons";
+import { Ionicons, AntDesign } from "@expo/vector-icons";
import tw from "tailwind-rn";
const width = Dimensions.get("window").width;
@@ -100,7 +100,7 @@ const Drawer = ({ position, setBoxPosition }) => {
>
setBoxPosition()}
- style={[tw(`w-1/5 h-full ${position === "0%" ? "" : ""}`)]}
+ style={[tw(`w-1/5 h-full ${position === "0%" ? "bg-black bg-opacity-40" : ""}`)]}
>
{routes.map((route, index) => (
diff --git a/src/redux/actions/index.js b/src/redux/actions/index.js
index 9fd9385..f8ef32b 100644
--- a/src/redux/actions/index.js
+++ b/src/redux/actions/index.js
@@ -9,8 +9,4 @@ export { default as userProduct } from "./userProduct";
export { default as content } from "./content";
export { default as faq } from "./faq";
export { default as file } from "./file";
-
-
-
-
-
+export { default as qr } from "./qr";
\ No newline at end of file
diff --git a/src/redux/actions/qr.js b/src/redux/actions/qr.js
new file mode 100644
index 0000000..e639def
--- /dev/null
+++ b/src/redux/actions/qr.js
@@ -0,0 +1,33 @@
+import proxy from "../proxy";
+
+const qr = {
+ list:
+ (data = {}) =>
+ async (dispatch) =>
+ await proxy.get("qr/list", data, { dispatch }),
+ info:
+ (data = {}) =>
+ async (dispatch) => {
+ await proxy.get("qr/info", data, { dispatch });
+ },
+ add:
+ (data = {}, data2 = {}) =>
+ async (dispatch) => {
+ await proxy.post("qr/add", data);
+ await proxy.get("qr/list", data2, { dispatch });
+ },
+ del:
+ (data = {}, data2 = {}) =>
+ async (dispatch) => {
+ await proxy.delete("ar/delete", data);
+ await proxy.get("ar/list", data2, { dispatch });
+ },
+ update:
+ (data = {}, data2 = {}) =>
+ async (dispatch) => {
+ await proxy.put("ar/update", data);
+ await proxy.get("ar/list", data2, { dispatch });
+ },
+};
+
+export default qr;
\ No newline at end of file
diff --git a/src/redux/reducers/index.js b/src/redux/reducers/index.js
index 7d836fc..aaa7d34 100644
--- a/src/redux/reducers/index.js
+++ b/src/redux/reducers/index.js
@@ -8,3 +8,4 @@ export { default as faq } from "./faq";
export { default as file } from "./file";
export { default as userFactor } from "./userFactor";
export { default as userProduct } from "./userProduct";
+import { default as qr } from "./qr";
\ No newline at end of file
diff --git a/src/redux/reducers/qr.js b/src/redux/reducers/qr.js
new file mode 100644
index 0000000..280d32f
--- /dev/null
+++ b/src/redux/reducers/qr.js
@@ -0,0 +1,33 @@
+const initialState = {
+ loading: false,
+ error: null,
+ list: null,
+};
+
+export default function qr(state = initialState, action) {
+ let { type, data } = action;
+ switch (type) {
+ case "qr/list":
+ return { ...state, loading: false, error: null };
+ case "qr/update":
+ return { ...state, loading: false, error: null };
+ case "qr/add":
+ return { ...state, loading: false, error: null };
+ case "qr/delete":
+ return { ...state, loading: false, error: null };
+ case "qr/info":
+ return {
+ ...state,
+ loading: false,
+ list: data,
+ error: null,
+ };
+ /////////////
+ case "loading":
+ return { ...state, loading: true };
+ case "error":
+ return { ...state, loading: false, error: data.message };
+ default:
+ return state;
+ }
+}
\ No newline at end of file
diff --git a/src/redux/store.js b/src/redux/store.js
index a107d7f..62ad1cd 100644
--- a/src/redux/store.js
+++ b/src/redux/store.js
@@ -13,6 +13,7 @@ import faq from "./reducers/faq";
import file from "./reducers/file";
import userFactor from "./reducers/userFactor";
import userProduct from "./reducers/userProduct";
+import qr from './reducers/qr';
const persistConfig = {
key: "root",
@@ -43,6 +44,7 @@ const store = createStore(
file,
userFactor,
userProduct,
+ qr
})
),
initialState,
diff --git a/src/screens/AR/index.js b/src/screens/AR/index.js
index d7d5961..318a4d7 100644
--- a/src/screens/AR/index.js
+++ b/src/screens/AR/index.js
@@ -10,4 +10,4 @@ function AR({}) {
)
}
-export default AR;
+export default AR;
\ No newline at end of file
diff --git a/src/screens/Activation/index.js b/src/screens/Activation/index.js
index e30f59b..16f786a 100644
--- a/src/screens/Activation/index.js
+++ b/src/screens/Activation/index.js
@@ -53,78 +53,80 @@ function Activation({}) {
position: "relative",
}}
>
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
);
}
diff --git a/src/screens/Faq/assets/+.png b/src/screens/Faq/assets/+.png
deleted file mode 100644
index 258cdbd..0000000
Binary files a/src/screens/Faq/assets/+.png and /dev/null differ
diff --git a/src/screens/Faq/assets/-.png b/src/screens/Faq/assets/-.png
deleted file mode 100644
index 3013e21..0000000
Binary files a/src/screens/Faq/assets/-.png and /dev/null differ
diff --git a/src/screens/Faq/components/Instance.js b/src/screens/Faq/components/Instance.js
index 41ee679..a42106e 100644
--- a/src/screens/Faq/components/Instance.js
+++ b/src/screens/Faq/components/Instance.js
@@ -1,59 +1,55 @@
-import React, {useState} from 'react';
-import {View, Text, Dimensions, Image, Pressable} from 'react-native';
-import tw from 'tailwind-react-native-classnames';
-import minusIcon from '../assets/-.png';
-import plusIcon from '../assets/+.png';
+import { View, Text, Dimensions, TouchableOpacity } from "react-native";
+import { Entypo } from "@expo/vector-icons";
+import tw from "tailwind-rn";
-const width = Dimensions.get('window').width;
+const { width } = Dimensions.get("window");
-function Instance(props) {
- const [active, setActive] = useState(false);
+function Instance({ question, selectFaq }) {
return (
- setActive(!active)}
+ selectFaq(question.id)}
style={[
- tw.style('w-full flex flex-col my-1.5 rounded-md px-4 py-2'),
+ tw("w-full flex flex-col my-1.5 rounded-md px-4 py-2"),
{
- backgroundColor: !active ? '#F9F9F9' : '#F6F9FD',
- borderColor: !active ? '#DBDBDB' : '#196EC0',
+ backgroundColor: !question.active ? "#F9F9F9" : "#F6F9FD",
+ borderColor: !question.active ? "#DBDBDB" : "#196EC0",
borderWidth: 1,
},
- ]}>
-
+ ]}
+ >
+
- نحوه خرید از سایت چگونه است ؟
+ ]}
+ >
+ {question.title}
-
+ {question.active ? (
+
+ ) : (
+
+ )}
- {active && (
-
+ {question.active && (
+
- هر نفسی که فرو می بریم، مرگی را که مدام به ما دستاندازی میکند پس
- میزند... در نهایت این مرگ است که باید پیروز شود، زیرا از هنگام تولد
- بخشی از سرنوشت ما شده و فقط مدت کوتاهی پیش از بلعیدن طعمه اش، با آن
- بازی می کند. با این همه، ما تا آنجا که ممکن است، با علاقه فراوان و
- دلواپسی
+ { color: "#196EC0", fontSize: width / 36, fontFamily: "light" },
+ tw("text-right flex-1"),
+ ]}
+ >
+ {question.description}
)}
-
+
);
}
diff --git a/src/screens/Faq/index.js b/src/screens/Faq/index.js
index cf1cb75..018ffb1 100644
--- a/src/screens/Faq/index.js
+++ b/src/screens/Faq/index.js
@@ -1,16 +1,17 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
import {
View,
StyleSheet,
Dimensions,
ScrollView,
- Text,
SafeAreaView,
Platform,
StatusBar,
LayoutAnimation,
} from "react-native";
-import tw from "tailwind-react-native-classnames";
+import { connect } from "react-redux";
+import { faq } from "../../redux/actions";
+import tw from "tailwind-rn";
import Header from "../../components/Header";
import Navbar from "../../components/Navbar";
import Drawer from "../../components/Drawer";
@@ -20,10 +21,13 @@ import bgFaq from "./assets/bgFaq.png";
const width = Dimensions.get("window").width;
-function Faq(props) {
- const [search, setSearch] = useState("");
+function Faq({ list, getFaq, searchResult, search, selectFaq, searchFaq }) {
const [position, setPosition] = useState("100%");
+ useEffect(() => {
+ getFaq();
+ }, []);
+
const setBoxPosition = () => {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
setPosition(position === "100%" ? "0%" : "100%");
@@ -36,6 +40,7 @@ function Faq(props) {
style={{
paddingTop: Platform.OS === "android" ? StatusBar.currentHeight : 0,
position: "relative",
+ backgroundColor: "white",
}}
>
+
+
+
+
-
-
-
-
- {[0, 1, 2, 3, 4].map((item, index) => (
-
- ))}
-
+ {!search
+ ? list.length > 0 &&
+ list.map((item, index) => (
+
+ ))
+ : list.length > 0 &&
+ searchResult.map((item, index) => (
+
+ ))}
);
}
-// Later on in your styles..
-const styles = StyleSheet.create({
- contentContainerStyle: {
- paddingBottom: 100,
- alignItems: "flex-end",
- },
- container: {
- width: Dimensions.get("window").width,
- backgroundColor: "white",
- flexDirection: "column",
- paddingVertical: 0,
- paddingHorizontal: 16,
- },
+const mapStateToProps = (state) => ({
+ list: state.faq.list,
+ searchResult: state.faq.searchResult,
+ search: state.faq.search,
});
-export default Faq;
+const mapDispatchToProps = {
+ getFaq: faq.list,
+ selectFaq: faq.selectFaq,
+ searchFaq: faq.searchFaq,
+};
+
+export default connect(mapStateToProps, mapDispatchToProps)(Faq);
diff --git a/src/screens/Home/assets/olum2.png b/src/screens/Home/assets/olum2.png
deleted file mode 100644
index 0435ae3..0000000
Binary files a/src/screens/Home/assets/olum2.png and /dev/null differ
diff --git a/src/screens/Home/components/MyBooks.js b/src/screens/Home/components/MyBooks.js
index d7a95ee..ba8b5fd 100644
--- a/src/screens/Home/components/MyBooks.js
+++ b/src/screens/Home/components/MyBooks.js
@@ -1,4 +1,3 @@
-import React, { useState, useEffect } from "react";
import {
View,
Text,
diff --git a/src/screens/Home/components/Scroll.js b/src/screens/Home/components/Scroll.js
index e89963c..d3e2be1 100644
--- a/src/screens/Home/components/Scroll.js
+++ b/src/screens/Home/components/Scroll.js
@@ -55,7 +55,7 @@ const Product = ({ book, position }) => {
height: position === 0 ? 245 : 118,
},
]}
- onPress={() => navigation.navigate('Product')}
+ onPress={() => navigation.navigate("Product", { id : book.id, type : 'book'})}
>
-
+
}
+ renderItem={({ item }) => }
keyExtractor={(item) => item.id}
/>
@@ -38,10 +33,14 @@ function Videos({ videos, grades }) {
}
const Video = ({ video, grades }) => {
+ const navigation = useNavigation();
return (
-
+ navigation.navigate("Video", { id: video.id })}
+ >
{
fontSize: fontSize.xs,
},
]}
- >{grades[video.gradeId]}
+ >
+ {grades[video.gradeId]}
+
);
};
const mapStateToProps = (state) => ({
- grades : state.publicApi.grades
+ grades: state.publicApi.grades,
});
export default connect(mapStateToProps, {})(Videos);
diff --git a/src/screens/Login/index.js b/src/screens/Login/index.js
index 7e03195..27b1b2a 100644
--- a/src/screens/Login/index.js
+++ b/src/screens/Login/index.js
@@ -8,7 +8,6 @@ import {
ActivityIndicator,
Dimensions,
TouchableHighlight,
- KeyboardAvoidingView
} from "react-native";
import Logo from "./assets/logo.png";
import CustomTextInput from "../../components/CustomTextInput";
@@ -17,7 +16,7 @@ import { asyncAwesomeAlert } from "../../utils/AsyncWrappers";
import tw from "tailwind-rn";
import {user} from '../../redux/actions';
-const { width, height } = Dimensions.get("window");
+const { width } = Dimensions.get("window");
function Login(props) {
const [phone, setPhone] = useState("");
diff --git a/src/screens/OrderDetails/components/Book.js b/src/screens/OrderDetails/components/Book.js
index 55643a3..fccb9a6 100644
--- a/src/screens/OrderDetails/components/Book.js
+++ b/src/screens/OrderDetails/components/Book.js
@@ -4,7 +4,6 @@ import tw from 'tailwind-react-native-classnames';
import _ from 'lodash';
const width = Dimensions.get('window').width;
-const height = Dimensions.get('window').height;
export default function Book({book}) {
return (
diff --git a/src/screens/OrdersFollowUp/assets/b2.png b/src/screens/OrdersFollowUp/assets/b2.png
deleted file mode 100644
index 4d2fcfa..0000000
Binary files a/src/screens/OrdersFollowUp/assets/b2.png and /dev/null differ
diff --git a/src/screens/OrdersFollowUp/assets/b3.png b/src/screens/OrdersFollowUp/assets/b3.png
deleted file mode 100644
index 169c39f..0000000
Binary files a/src/screens/OrdersFollowUp/assets/b3.png and /dev/null differ
diff --git a/src/screens/OrdersFollowUp/assets/plus.png b/src/screens/OrdersFollowUp/assets/plus.png
deleted file mode 100644
index 16ea095..0000000
Binary files a/src/screens/OrdersFollowUp/assets/plus.png and /dev/null differ
diff --git a/src/screens/OrdersFollowUp/components/Order.js b/src/screens/OrdersFollowUp/components/Order.js
index c40f213..717d600 100644
--- a/src/screens/OrdersFollowUp/components/Order.js
+++ b/src/screens/OrdersFollowUp/components/Order.js
@@ -5,7 +5,6 @@ import {
Dimensions,
StyleSheet,
Image,
- Pressable,
TouchableOpacity
} from 'react-native';
import { useNavigation } from '@react-navigation/native';
@@ -15,7 +14,6 @@ import { AntDesign } from '@expo/vector-icons';
import _ from 'lodash';
const width = Dimensions.get('window').width;
-const height = Dimensions.get('window').height;
const colors = {
1: '#FFF700',
@@ -93,25 +91,7 @@ function Order({order}) {
]}
/>
))}
- {order.items.length >= 2 && (
-
- {/* */}
-
-
- )}
+
{}, []);
-
const setBoxPosition = () => {
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut);
setPosition(position === "100%" ? "0%" : "100%");
@@ -39,10 +37,7 @@ function Products({ grades, productTypes, books }) {
}}
>
-
+
+
+
{productType === "کتاب فیزیکی" &&
@@ -88,19 +84,6 @@ function Products({ grades, productTypes, books }) {
);
}
-const styles = StyleSheet.create({
- contentContainerStyle: {
- paddingBottom: 50,
- },
- container: {
- width: Dimensions.get("window").width,
- backgroundColor: "white",
- flexDirection: "column",
- paddingVertical: 0,
- paddingHorizontal: 10,
- },
-});
-
const mapStateToProps = (state) => ({
grades: state.publicApi.grades,
books: state.book.list,
diff --git a/src/screens/QR/Scan/index.js b/src/screens/QR/Scan/index.js
index c57bee6..06abb1e 100644
--- a/src/screens/QR/Scan/index.js
+++ b/src/screens/QR/Scan/index.js
@@ -2,10 +2,10 @@ import React, { useState, useEffect } from "react";
import {
View,
Text,
- Image,
TouchableOpacity,
Dimensions,
ImageBackground,
+ StatusBar
} from "react-native";
import { useNavigation } from "@react-navigation/native";
import tw from "tailwind-rn";
@@ -31,7 +31,7 @@ export default function Scan({}) {
const handleBarCodeScanned = ({ type, data }) => {
setScanned(true);
- alert(`Bar code with type ${type} and data ${data} has been scanned!`);
+ navigation.navigate("QRContent", {data});
};
if (hasPermission === null) {
@@ -45,26 +45,20 @@ export default function Scan({}) {
- {/*
-
- */}
+
+
+
-
{/* {scanned && ( */}
navigation.goBack()}
diff --git a/src/screens/QR/index.js b/src/screens/QR/index.js
index 77461cf..2940049 100644
--- a/src/screens/QR/index.js
+++ b/src/screens/QR/index.js
@@ -6,39 +6,21 @@ import {
Dimensions,
StatusBar,
} from "react-native";
-import Content from "./Content";
import Scan from "./Scan";
-import Navbar from "../../components/Navbar";
const width = Dimensions.get("window").width;
-function QR({ page }) {
- const [currentPage, setCurrentPage] = useState(page);
+function QR({ }) {
return (
- {currentPage === "content" && (
-
- )}
-
- {currentPage === "scan" && }
- {currentPage === "content" && }
+
);
@@ -54,11 +36,7 @@ const styles = StyleSheet.create({
width: Dimensions.get("window").width,
backgroundColor: "white",
flexDirection: "column",
- paddingVertical: 5,
+ paddingVertical: 0,
paddingHorizontal: 0,
},
});
-
-QR.defaultProps = {
- page: "content",
-};
diff --git a/src/screens/QR/Content/Links.js b/src/screens/QRContent/Content/Links.js
similarity index 100%
rename from src/screens/QR/Content/Links.js
rename to src/screens/QRContent/Content/Links.js
diff --git a/src/screens/QR/Content/PDF.js b/src/screens/QRContent/Content/PDF.js
similarity index 99%
rename from src/screens/QR/Content/PDF.js
rename to src/screens/QRContent/Content/PDF.js
index e5951e9..57648e8 100644
--- a/src/screens/QR/Content/PDF.js
+++ b/src/screens/QRContent/Content/PDF.js
@@ -1,6 +1,7 @@
import React from "react";
import { View, Text, Image, Dimensions } from "react-native";
import tw from "tailwind-rn";
+
import pdfIcon from "../../../assets/icons/pdf.png";
const {width} = Dimensions.get("window");
diff --git a/src/screens/QR/Content/PPT.js b/src/screens/QRContent/Content/PPT.js
similarity index 100%
rename from src/screens/QR/Content/PPT.js
rename to src/screens/QRContent/Content/PPT.js
diff --git a/src/screens/QR/Content/Video.js b/src/screens/QRContent/Content/Video.js
similarity index 100%
rename from src/screens/QR/Content/Video.js
rename to src/screens/QRContent/Content/Video.js
diff --git a/src/screens/QR/Content/Voice.js b/src/screens/QRContent/Content/Voice.js
similarity index 100%
rename from src/screens/QR/Content/Voice.js
rename to src/screens/QRContent/Content/Voice.js
diff --git a/src/screens/QR/Content/index.js b/src/screens/QRContent/Content/index.js
similarity index 98%
rename from src/screens/QR/Content/index.js
rename to src/screens/QRContent/Content/index.js
index 5ac2383..6fc6f55 100644
--- a/src/screens/QR/Content/index.js
+++ b/src/screens/QRContent/Content/index.js
@@ -3,7 +3,8 @@ import { View, Text, Image, Dimensions } from "react-native";
import tw from "tailwind-rn";
import Tab from "../Tab";
import Colors from "../../../constants/Colors";
-const { width, height } = Dimensions.get("window");
+
+const { width} = Dimensions.get("window");
export default function Content({ data }) {
return (
diff --git a/src/screens/QR/Tab/index.js b/src/screens/QRContent/Tab/index.js
similarity index 99%
rename from src/screens/QR/Tab/index.js
rename to src/screens/QRContent/Tab/index.js
index 79be6b4..c0330b3 100644
--- a/src/screens/QR/Tab/index.js
+++ b/src/screens/QRContent/Tab/index.js
@@ -8,7 +8,7 @@ import PPT from "../Content/PPT";
import PDF from "../Content/PDF";
import Links from "../Content/Links";
-const { width, height } = Dimensions.get("window");
+const { width} = Dimensions.get("window");
//assets
diff --git a/src/screens/QRContent/index.js b/src/screens/QRContent/index.js
new file mode 100644
index 0000000..a258c86
--- /dev/null
+++ b/src/screens/QRContent/index.js
@@ -0,0 +1,70 @@
+import React, { useState,useEffect } from "react";
+import {
+ StyleSheet,
+ ScrollView,
+ SafeAreaView,
+ Dimensions,
+ StatusBar,
+} from "react-native";
+import { connect } from "react-redux";
+import {qr} from '../../redux/actions'
+import Content from "./Content";
+import Navbar from "../../components/Navbar";
+
+function QRContent({ route, getQrData, data }) {
+ useEffect(() => {
+ getQrData({tail : 'zist10_14'});
+ },[]);
+
+ useEffect(() => {
+ console.log(data);
+ },[data]);
+ return (
+
+
+
+
+
+
+ );
+}
+
+const mapStateToProps = (state) => ({
+ data : state.qr.list
+});
+
+const mapDispatchToProps = {
+ getQrData : qr.info
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(QRContent);
+
+const styles = StyleSheet.create({
+ contentContainerStyle: {
+ paddingBottom: 0,
+ },
+ container: {
+ width: Dimensions.get("window").width,
+ backgroundColor: "white",
+ flexDirection: "column",
+ paddingVertical: 5,
+ paddingHorizontal: 0,
+ },
+});
diff --git a/src/screens/ShoppingCart/assets/+.png b/src/screens/ShoppingCart/assets/+.png
deleted file mode 100644
index b3cdbce..0000000
Binary files a/src/screens/ShoppingCart/assets/+.png and /dev/null differ
diff --git a/src/screens/ShoppingCart/assets/_.png b/src/screens/ShoppingCart/assets/_.png
deleted file mode 100644
index 19583ae..0000000
Binary files a/src/screens/ShoppingCart/assets/_.png and /dev/null differ
diff --git a/src/screens/ShoppingCart/assets/alert.png b/src/screens/ShoppingCart/assets/alert.png
deleted file mode 100644
index ab1dc0d..0000000
Binary files a/src/screens/ShoppingCart/assets/alert.png and /dev/null differ
diff --git a/src/screens/ShoppingCart/assets/book.png b/src/screens/ShoppingCart/assets/book.png
deleted file mode 100644
index f31e3e6..0000000
Binary files a/src/screens/ShoppingCart/assets/book.png and /dev/null differ
diff --git a/src/screens/ShoppingCart/assets/delete.png b/src/screens/ShoppingCart/assets/delete.png
deleted file mode 100644
index dafdf29..0000000
Binary files a/src/screens/ShoppingCart/assets/delete.png and /dev/null differ
diff --git a/src/screens/ShoppingCart/components/Code.js b/src/screens/ShoppingCart/components/Code.js
index 6c3db8e..992db34 100644
--- a/src/screens/ShoppingCart/components/Code.js
+++ b/src/screens/ShoppingCart/components/Code.js
@@ -10,6 +10,7 @@ import {
import { connect } from "react-redux";
import { userFactor } from "../../../redux/actions";
import tw from "tailwind-react-native-classnames";
+
const width = Dimensions.get("window").width;
function Code({ codeId, setCodeId, userId, factorId }) {
diff --git a/src/screens/ShoppingCart/components/Product.js b/src/screens/ShoppingCart/components/Product.js
index cbd1cbb..bec269b 100644
--- a/src/screens/ShoppingCart/components/Product.js
+++ b/src/screens/ShoppingCart/components/Product.js
@@ -4,11 +4,8 @@ import { connect } from "react-redux";
import { userProduct } from "../../../redux/actions";
import { AntDesign } from "@expo/vector-icons";
import tw from "tailwind-react-native-classnames";
-import bookImage from "../assets/book.png";
-import deleteIcon from "../assets/delete.png";
const width = Dimensions.get("window").width;
-const height = Dimensions.get("window").height;
function Product({ product, grades, pushToCart }) {
return (
diff --git a/src/screens/ShoppingCart/index.js b/src/screens/ShoppingCart/index.js
index 1abd059..790ce12 100644
--- a/src/screens/ShoppingCart/index.js
+++ b/src/screens/ShoppingCart/index.js
@@ -6,13 +6,12 @@ import {
Dimensions,
StyleSheet,
Pressable,
- Image,
SafeAreaView,
StatusBar,
LayoutAnimation,
} from "react-native";
import { connect } from "react-redux";
-import { userProduct, userFactor, publicApi } from "../../redux/actions";
+import { userProduct, userFactor} from "../../redux/actions";
import { Ionicons } from "@expo/vector-icons";
import Product from "./components/Product";
import Code from "./components/Code";
diff --git a/src/screens/Splash/index.js b/src/screens/Splash/index.js
index ad0c8f7..822a07b 100644
--- a/src/screens/Splash/index.js
+++ b/src/screens/Splash/index.js
@@ -1,9 +1,10 @@
import React, { useEffect } from "react";
-import { View, Text, Image, ActivityIndicator, Dimensions } from "react-native";
+import { View, Image, ActivityIndicator, Dimensions } from "react-native";
import { connect } from "react-redux";
+
import Logo from "../../assets/images/logo.png";
-const { width, height } = Dimensions.get("window");
+const { width } = Dimensions.get("window");
function Splash({ navigation, isLogin }) {
useEffect(() => {
diff --git a/src/screens/Video/assets/arrowMore.png b/src/screens/Video/assets/arrowMore.png
deleted file mode 100644
index a9c0cf6..0000000
Binary files a/src/screens/Video/assets/arrowMore.png and /dev/null differ
diff --git a/src/screens/Video/assets/poster.png b/src/screens/Video/assets/poster.png
deleted file mode 100644
index b5b5588..0000000
Binary files a/src/screens/Video/assets/poster.png and /dev/null differ
diff --git a/src/screens/Video/assets/user.png b/src/screens/Video/assets/user.png
deleted file mode 100644
index ccf1e39..0000000
Binary files a/src/screens/Video/assets/user.png and /dev/null differ
diff --git a/src/screens/Video/components/Season.js b/src/screens/Video/components/Season.js
index f55520c..4008296 100644
--- a/src/screens/Video/components/Season.js
+++ b/src/screens/Video/components/Season.js
@@ -1,8 +1,7 @@
-import React, { useState } from "react";
+import React from "react";
import {
View,
Text,
- Dimensions,
Pressable,
TouchableOpacity,
} from "react-native";
diff --git a/src/screens/Video/index.js b/src/screens/Video/index.js
index 4784212..492f689 100644
--- a/src/screens/Video/index.js
+++ b/src/screens/Video/index.js
@@ -19,7 +19,7 @@ import Season from "./components/Season";
import tw from "tailwind-rn";
import fontSize from '../../constants/fontSize';
-const { height, width } = Dimensions.get("window");
+const { height } = Dimensions.get("window");
function Product({
route,
diff --git a/src/screens/VideoDisplay/components/Season/index.js b/src/screens/VideoDisplay/components/Season/index.js
index 1ac97e5..92478f3 100644
--- a/src/screens/VideoDisplay/components/Season/index.js
+++ b/src/screens/VideoDisplay/components/Season/index.js
@@ -1,11 +1,12 @@
-import React, { useState } from "react";
+import React from "react";
import { View, Text, Dimensions, Pressable } from "react-native";
import { connect } from "react-redux";
import { publicApi } from "../../../../redux/actions";
import tw from "tailwind-rn";
import Colors from "../../../../constants/Colors";
import { useNavigation } from "@react-navigation/native";
-const { width, height } = Dimensions.get("window");
+
+const { width} = Dimensions.get("window");
const Season = ({ season, activeUnit, name }) => {
const navigation = useNavigation();
diff --git a/src/screens/VideoDisplay/index.js b/src/screens/VideoDisplay/index.js
index d4ef18b..386f65b 100644
--- a/src/screens/VideoDisplay/index.js
+++ b/src/screens/VideoDisplay/index.js
@@ -9,10 +9,9 @@ import {
LayoutAnimation,
} from "react-native";
import { connect } from "react-redux";
-import { book, publicApi } from "../../redux/actions";
import Navbar from "../../components/Navbar";
import Drawer from "../../components/Drawer";
-import { Video, AVPlaybackStatus } from "expo-av";
+import { Video } from "expo-av";
import tw from 'tailwind-rn';
import * as ScreenOrientation from 'expo-screen-orientation';
import Season from "./components/Season";
diff --git a/src/screens/Videos/components/NewestVideo.js b/src/screens/Videos/components/NewestVideo.js
index 0adf89f..8e8d597 100644
--- a/src/screens/Videos/components/NewestVideo.js
+++ b/src/screens/Videos/components/NewestVideo.js
@@ -4,10 +4,9 @@ import { useNavigation } from "@react-navigation/native";
import tw from "tailwind-rn";
import fontSize from "../../../constants/fontSize";
-const { width, height } = Dimensions.get("window");
+const { width } = Dimensions.get("window");
import Header from "../../Home/components/Header";
-import posterImage from "../../Products/assets/poster.png";
const NewestVideo = ({ videos, grades }) => {
const navigation = useNavigation();
diff --git a/src/screens/Videos/components/VerticalGradeFilter.js b/src/screens/Videos/components/VerticalGradeFilter.js
index f4071a2..77a8543 100644
--- a/src/screens/Videos/components/VerticalGradeFilter.js
+++ b/src/screens/Videos/components/VerticalGradeFilter.js
@@ -1,6 +1,5 @@
import React from "react";
import { View, Text, FlatList, TouchableOpacity } from "react-native";
-import { connect } from "react-redux";
import tw from "tailwind-rn";
import fontSize from '../../../constants/fontSize';