+ {factorInfo ?
: null}
+
+
جمع کل
سبد خرید
-
-
- {payPrice}
-
- تومان
-
+ {factorInfo ? (
+
+
+ {factorInfo.sumPrice +
+ factorInfo.transportPrice -
+ factorInfo.offPrice}
+
+ تومان
+
+ ) : null}
{/*
روشهای ارسال
@@ -252,17 +283,6 @@ class Cart extends Component {
)
) : null}
-
>
);
}
@@ -274,11 +294,14 @@ export default connect(
payPrice: state.userProduct.sum,
payMethods: state.transport.list,
factorInfo: state.userFactor.info,
+ userId: state.user.status.id,
+ hasPhysical: state.userProduct.hasPhysical,
}),
{
getList: userProduct.list,
getInfo: userProduct.info,
getTransportList: transport.list,
getFactorInfo: userFactor.info,
+ payFactor: userFactor.payment,
}
)(Cart);
diff --git a/src/views/Cart/index.scss b/src/views/Cart/index.scss
index 67650f6..9aa7315 100644
--- a/src/views/Cart/index.scss
+++ b/src/views/Cart/index.scss
@@ -2,7 +2,7 @@
width: 100vw;
max-width: 1250px;
margin: 0px auto;
- padding: 0px;
+ padding: 0px 10px;
font-family: numeralLight;
padding-top: 85px;
&__totalPrice {
diff --git a/src/views/ChatRoom/Body/Emoji/index.js b/src/views/ChatRoom/Body/Emoji/index.js
index 0b5f1e3..1b6f2d3 100644
--- a/src/views/ChatRoom/Body/Emoji/index.js
+++ b/src/views/ChatRoom/Body/Emoji/index.js
@@ -1,133 +1,330 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { makeStyles } from '@material-ui/core/styles';
-import AppBar from '@material-ui/core/AppBar';
-import Tabs from '@material-ui/core/Tabs';
-import Tab from '@material-ui/core/Tab';
-import Typography from '@material-ui/core/Typography';
-import Box from '@material-ui/core/Box';
+import React from "react";
+import PropTypes from "prop-types";
+import { makeStyles } from "@material-ui/core/styles";
+import AppBar from "@material-ui/core/AppBar";
+import Tabs from "@material-ui/core/Tabs";
+import Tab from "@material-ui/core/Tab";
+import Typography from "@material-ui/core/Typography";
+import Box from "@material-ui/core/Box";
-import './index.scss';
+import "./index.scss";
const Smileys = [
- '😃',
- '😃',
- '😄',
- '😁',
- '😆',
- '😅',
- '😂',
- '🤣',
- '🥲',
- '☺️',
- '😊',
- '😇',
- '🙂',
- '🙃',
- '😉',
- '😌',
- '😍',
- '🥰',
- '😘',
- '😗',
- '😙',
- '😚',
- '😋',
- '😛',
- '😝',
- '😜',
- '🤪',
- '🤨',
- '🧐',
- '🤓',
- '😎',
- '🥸',
- '🤩',
- '🥳',
- '😏',
- '😒',
- '😞',
- '😔',
- '😟',
- '😕',
- '🙁',
- '☹️',
- '😣',
- '😖',
- '😫',
- '😩',
- '🥺',
- '😢',
- '😭',
- '😤',
- '😠',
- '😡',
- '🤬',
- '🤯',
- '😳',
- '🥵',
- '🥶',
- '😱',
- '😨',
- '😰',
- '😥',
- '😓',
- '🤗',
- '🤔',
- '🤭',
- '🤫',
- '🤥',
- '😶',
- '😐',
- '😑',
- '😬',
- '🙄',
- '😯',
- '😦',
- '😧',
- '😮',
- '😲',
- '🥱',
- '😴',
- '🤤',
- '😪',
- '😵',
- '🤐',
- '🥴',
- '🤢',
- '🤮',
- '🤧',
- '😷',
- '🤒',
- '🤕',
- '🤑',
- '🤠',
- '😈',
- '👿',
- '👹',
- '👺',
- '🤡',
- '💩',
- '👻',
- '💀',
- '☠️',
- '👽',
- '👾',
- '🤖',
- '🎃',
- '😺',
- '😸',
- '😹',
- '😻',
- '😼',
- '😽',
- '🙀',
- '😿',
- '😾',
+ "😃",
+ "😃",
+ "😄",
+ "😁",
+ "😆",
+ "😅",
+ "😂",
+ "🤣",
+ "🥲",
+ "☺️",
+ "😊",
+ "😇",
+ "🙂",
+ "🙃",
+ "😉",
+ "😌",
+ "😍",
+ "🥰",
+ "😘",
+ "😗",
+ "😙",
+ "😚",
+ "😋",
+ "😛",
+ "😝",
+ "😜",
+ "🤪",
+ "🤨",
+ "🧐",
+ "🤓",
+ "😎",
+ "🥸",
+ "🤩",
+ "🥳",
+ "😏",
+ "😒",
+ "😞",
+ "😔",
+ "😟",
+ "😕",
+ "🙁",
+ "☹️",
+ "😣",
+ "😖",
+ "😫",
+ "😩",
+ "🥺",
+ "😢",
+ "😭",
+ "😤",
+ "😠",
+ "😡",
+ "🤬",
+ "🤯",
+ "😳",
+ "🥵",
+ "🥶",
+ "😱",
+ "😨",
+ "😰",
+ "😥",
+ "😓",
+ "🤗",
+ "🤔",
+ "🤭",
+ "🤫",
+ "🤥",
+ "😶",
+ "😐",
+ "😑",
+ "😬",
+ "🙄",
+ "😯",
+ "😦",
+ "😧",
+ "😮",
+ "😲",
+ "🥱",
+ "😴",
+ "🤤",
+ "😪",
+ "😵",
+ "🤐",
+ "🥴",
+ "🤢",
+ "🤮",
+ "🤧",
+ "😷",
+ "🤒",
+ "🤕",
+ "🤑",
+ "🤠",
+ "😈",
+ "👿",
+ "👹",
+ "👺",
+ "🤡",
+ "💩",
+ "👻",
+ "💀",
+ "☠️",
+ "👽",
+ "👾",
+ "🤖",
+ "🎃",
+ "😺",
+ "😸",
+ "😹",
+ "😻",
+ "😼",
+ "😽",
+ "🙀",
+ "😿",
+ "😾",
];
const animals = [
- '🐶', '🐱', '🐭', '🐹', '🐰', '🦊', '🐻', '🐼', '🐻❄️', '🐨', '🐯', '🦁', '🐮', '🐷', '🐽', '🐸', '🐵', '🙈', '🙉', '🙊', '🐒', '🐔', '🐧', '🐦', '🐤', '🐣', '🐥', '🦆', '🦅', '🦉', '🦇', '🐺', '🐗', '🐴', '🦄', '🐝', '🪱', '🐛', '🦋', '🐌', '🐞', '🐜', '🪰', '🪲', '🪳', '🦟', '🦗', '🕷', '🕸', '🦂', '🐢', '🐍', '🦎', '🦖', '🦕', '🐙', '🦑', '🦐', '🦞', '🦀', '🐡', '🐠', '🐟', '🐬', '🐳', '🐋', '🦈', '🐊', '🐅', '🐆', '🦓', '🦍', '🦧', '🦣', '🐘', '🦛', '🦏', '🐪', '🐫', '🦒', '🦘', '🦬', '🐃', '🐂', '🐄', '🐎', '🐖', '🐏', '🐑', '🦙', '🐐', '🦌', '🐕', '🐩', '🦮', '🐕🦺', '🐈', '🐈⬛', '🪶', '🐓', '🦃', '🦤', '🦚', '🦜', '🦢', '🦩', '🕊', '🐇', '🦝', '🦨', '🦡', '🦫', '🦦', '🦥', '🐁', '🐀', '🐿', '🦔', '🐾', '🐉', '🐲', '🌵', '🎄', '🌲', '🌳', '🌴', '🪵', '🌱', '🌿', '☘️', '🍀', '🎍', '🪴', '🎋', '🍃', '🍂', '🍁', '🍄', '🐚', '🪨', '🌾', '💐', '🌷', '🌹', '🥀', '🌺', '🌸', '🌼', '🌻', '🌞', '🌝', '🌛', '🌜', '🌚', '🌕', '🌖', '🌗', '🌘', '🌑', '🌒', '🌓', '🌔', '🌙', '🌎', '🌍', '🌏', '🪐 ', '💫', '⭐️', '🌟', '✨', '⚡️', '☄️', '💥', '🔥', '🌪', '🌈', '☀️', '🌤', '⛅️', '🌥', '☁️', '🌦', '🌧', '⛈', '🌩', '🌨', '❄️', '☃️', '⛄️', '🌬', '💨', '💧', '💦', '☔️', '☂️', '🌊', '🌫'
+ "🐶",
+ "🐱",
+ "🐭",
+ "🐹",
+ "🐰",
+ "🦊",
+ "🐻",
+ "🐼",
+ "🐻❄️",
+ "🐨",
+ "🐯",
+ "🦁",
+ "🐮",
+ "🐷",
+ "🐽",
+ "🐸",
+ "🐵",
+ "🙈",
+ "🙉",
+ "🙊",
+ "🐒",
+ "🐔",
+ "🐧",
+ "🐦",
+ "🐤",
+ "🐣",
+ "🐥",
+ "🦆",
+ "🦅",
+ "🦉",
+ "🦇",
+ "🐺",
+ "🐗",
+ "🐴",
+ "🦄",
+ "🐝",
+ "🪱",
+ "🐛",
+ "🦋",
+ "🐌",
+ "🐞",
+ "🐜",
+ "🪰",
+ "🪲",
+ "🪳",
+ "🦟",
+ "🦗",
+ "🕷",
+ "🕸",
+ "🦂",
+ "🐢",
+ "🐍",
+ "🦎",
+ "🦖",
+ "🦕",
+ "🐙",
+ "🦑",
+ "🦐",
+ "🦞",
+ "🦀",
+ "🐡",
+ "🐠",
+ "🐟",
+ "🐬",
+ "🐳",
+ "🐋",
+ "🦈",
+ "🐊",
+ "🐅",
+ "🐆",
+ "🦓",
+ "🦍",
+ "🦧",
+ "🦣",
+ "🐘",
+ "🦛",
+ "🦏",
+ "🐪",
+ "🐫",
+ "🦒",
+ "🦘",
+ "🦬",
+ "🐃",
+ "🐂",
+ "🐄",
+ "🐎",
+ "🐖",
+ "🐏",
+ "🐑",
+ "🦙",
+ "🐐",
+ "🦌",
+ "🐕",
+ "🐩",
+ "🦮",
+ "🐕🦺",
+ "🐈",
+ "🐈⬛",
+ "🪶",
+ "🐓",
+ "🦃",
+ "🦤",
+ "🦚",
+ "🦜",
+ "🦢",
+ "🦩",
+ "🕊",
+ "🐇",
+ "🦝",
+ "🦨",
+ "🦡",
+ "🦫",
+ "🦦",
+ "🦥",
+ "🐁",
+ "🐀",
+ "🐿",
+ "🦔",
+ "🐾",
+ "🐉",
+ "🐲",
+ "🌵",
+ "🎄",
+ "🌲",
+ "🌳",
+ "🌴",
+ "🪵",
+ "🌱",
+ "🌿",
+ "☘️",
+ "🍀",
+ "🎍",
+ "🪴",
+ "🎋",
+ "🍃",
+ "🍂",
+ "🍁",
+ "🍄",
+ "🐚",
+ "🪨",
+ "🌾",
+ "💐",
+ "🌷",
+ "🌹",
+ "🥀",
+ "🌺",
+ "🌸",
+ "🌼",
+ "🌻",
+ "🌞",
+ "🌝",
+ "🌛",
+ "🌜",
+ "🌚",
+ "🌕",
+ "🌖",
+ "🌗",
+ "🌘",
+ "🌑",
+ "🌒",
+ "🌓",
+ "🌔",
+ "🌙",
+ "🌎",
+ "🌍",
+ "🌏",
+ "🪐 ",
+ "💫",
+ "⭐️",
+ "🌟",
+ "✨",
+ "⚡️",
+ "☄️",
+ "💥",
+ "🔥",
+ "🌪",
+ "🌈",
+ "☀️",
+ "🌤",
+ "⛅️",
+ "🌥",
+ "☁️",
+ "🌦",
+ "🌧",
+ "⛈",
+ "🌩",
+ "🌨",
+ "❄️",
+ "☃️",
+ "⛄️",
+ "🌬",
+ "💨",
+ "💧",
+ "💦",
+ "☔️",
+ "☂️",
+ "🌊",
+ "🌫",
];
function TabPanel(props) {
@@ -159,21 +356,21 @@ TabPanel.propTypes = {
function a11yProps(index) {
return {
id: `scrollable-force-tab-${index}`,
- 'aria-controls': `scrollable-force-tabpanel-${index}`,
+ "aria-controls": `scrollable-force-tabpanel-${index}`,
};
}
const useStyles = makeStyles((theme) => ({
root: {
flexGrow: 1,
- width: '100%',
+ width: "100%",
backgroundColor: theme.palette.background.paper,
- flexDirection: 'row-reverse'
+ flexDirection: "row-reverse",
},
list: {
flex: 1,
- width: '100%',
- flexDirection: 'row-reverse'
+ width: "100%",
+ flexDirection: "row-reverse",
},
}));
@@ -184,7 +381,6 @@ export default function ScrollableTabsButtonForce(props) {
const handleChange = (event, newValue) => {
setValue(newValue);
};
- console.log(props.emojies[0]);
return (
@@ -205,8 +401,15 @@ export default function ScrollableTabsButtonForce(props) {
{props.emojies.map((item) => (
- {item.list.map((jojo,i) => (
- props.typeText('emoji',jojo)} style={{fontSize: 24, width: 30, height:30 }} className="m-1">{jojo}
+ {item.list.map((jojo, i) => (
+ props.typeText("emoji", jojo)}
+ style={{ fontSize: 24, width: 30, height: 30 }}
+ className="m-1"
+ >
+ {jojo}
+
))}
@@ -217,8 +420,7 @@ export default function ScrollableTabsButtonForce(props) {
ScrollableTabsButtonForce.defaultProps = {
emojies: [
- { type: 'Smileys', list: Smileys, id: 0 },
- { type: 'Animals', list: animals, id: 1 },
+ { type: "Smileys", list: Smileys, id: 0 },
+ { type: "Animals", list: animals, id: 1 },
],
};
-
diff --git a/src/views/ChatRoom/Body/index.js b/src/views/ChatRoom/Body/index.js
index 42ffd46..1ac9661 100644
--- a/src/views/ChatRoom/Body/index.js
+++ b/src/views/ChatRoom/Body/index.js
@@ -5,7 +5,6 @@ import Keyboard from "./Keyboard";
import { RecordState } from "audio-react-recorder";
import ReactPlayer from "react-player";
import ReactAudioPlayer from "react-audio-player";
-import { ToastContainer } from "react-toastify";
// import { list, send, sendKeys } from "../../../Redux/actions/message";
import { chat } from "../../../Redux/actions";
import { connect } from "react-redux";
@@ -506,17 +505,6 @@ class List extends Component {
) : null}
-