mirror of
https://github.com/magnum-opus-tender-hack/frontend.git
synced 2024-11-22 08:16:35 +03:00
remove confs
This commit is contained in:
commit
06f2502a20
|
@ -29,14 +29,16 @@ interface INodesInput {
|
||||||
value: INode
|
value: INode
|
||||||
}[],
|
}[],
|
||||||
current_word: string,
|
current_word: string,
|
||||||
products: IProduct[]
|
products: IProduct[],
|
||||||
|
loading: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
const initialState: INodesInput = {
|
const initialState: INodesInput = {
|
||||||
nodes: [],
|
nodes: [],
|
||||||
hints: [],
|
hints: [],
|
||||||
current_word: "",
|
current_word: "",
|
||||||
products: []
|
products: [],
|
||||||
|
loading:false
|
||||||
}
|
}
|
||||||
|
|
||||||
const nodesInputSlice = createSlice({
|
const nodesInputSlice = createSlice({
|
||||||
|
@ -52,11 +54,15 @@ const nodesInputSlice = createSlice({
|
||||||
deleteNode(state, action: PayloadAction<string>) {
|
deleteNode(state, action: PayloadAction<string>) {
|
||||||
state.nodes = state.nodes.filter((e) => e.value != action.payload)
|
state.nodes = state.nodes.filter((e) => e.value != action.payload)
|
||||||
},
|
},
|
||||||
|
setLoading(state, action: PayloadAction<boolean>){
|
||||||
|
state.loading = action.payload
|
||||||
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
extraReducers: (builder) => {
|
extraReducers: (builder) => {
|
||||||
builder.addCase(search.fulfilled, (state, action) => {
|
builder.addCase(search.fulfilled, (state, action) => {
|
||||||
state.products = action.payload;
|
state.products = action.payload;
|
||||||
|
state.loading = false
|
||||||
})
|
})
|
||||||
builder.addCase(createHints.fulfilled, (state, action) => {
|
builder.addCase(createHints.fulfilled, (state, action) => {
|
||||||
state.hints = action.payload;
|
state.hints = action.payload;
|
||||||
|
@ -64,13 +70,15 @@ const nodesInputSlice = createSlice({
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
export const {setCurrentWord, createNode, deleteNode} = nodesInputSlice.actions;
|
export const {setCurrentWord, createNode, deleteNode, setLoading} = nodesInputSlice.actions;
|
||||||
|
|
||||||
|
|
||||||
export const hints = createSelector((state: INodesInput) => state.hints, hints => hints)
|
export const hints = createSelector((state: INodesInput) => state.hints, hints => hints)
|
||||||
export const currentWord = createSelector((state: INodesInput) => state.current_word, word => word)
|
export const currentWord = createSelector((state: INodesInput) => state.current_word, word => word)
|
||||||
export const products = createSelector((state: INodesInput) => state.products, products => products)
|
export const products = createSelector((state: INodesInput) => state.products, products => products)
|
||||||
export const nodes = createSelector((state: INodesInput) => state.nodes, nodes => nodes)
|
export const nodes = createSelector((state: INodesInput) => state.nodes, nodes => nodes)
|
||||||
|
export const loading = createSelector((state: INodesInput) => state.loading, loading => loading)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export default nodesInputSlice.reducer;
|
export default nodesInputSlice.reducer;
|
|
@ -7,3 +7,8 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 800px) {
|
||||||
|
.container{
|
||||||
|
padding: 75px 30px;
|
||||||
|
}
|
||||||
|
}
|
|
@ -112,5 +112,6 @@
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap:15px;
|
gap:15px;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ export const ProductCard: React.FC<IProduct> = (props) =>{
|
||||||
return(
|
return(
|
||||||
props.characteristic == undefined? null:
|
props.characteristic == undefined? null:
|
||||||
<div className={styles.card}>
|
<div className={styles.card}>
|
||||||
<div className={styles.name}>{props.name}</div>
|
<div className={styles.name}>{props.name.length > 100? props.name.slice(0,100) + "...":props.name}</div>
|
||||||
<div className={styles.prWrap}>
|
<div className={styles.prWrap}>
|
||||||
<div className={styles.score}> <span className={styles.red}>{props.score}</span> прсмотров</div>
|
<div className={styles.score}> <span className={styles.red}>{props.score}</span> прсмотров</div>
|
||||||
<div className={styles.characteristic}> <span className={styles.blue}>{props.characteristic.length}</span> характеристик</div>
|
<div className={styles.characteristic}> <span className={styles.blue}>{props.characteristic.length}</span> характеристик</div>
|
||||||
|
|
|
@ -1,10 +1,15 @@
|
||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { AutoComplete, Input, Tag, Tooltip } from 'antd';
|
import { AutoComplete, Input, Tag, Tooltip } from 'antd';
|
||||||
|
import { InputNumber, Popover, Radio } from 'antd';
|
||||||
import { useAppDispatch, useAppSelector } from "../../hooks";
|
import { useAppDispatch, useAppSelector } from "../../hooks";
|
||||||
import { createNode, deleteNode, hints, INode, nodes, products } from "../../store/reducers/nodesInputReducer";
|
import { createNode, deleteNode, hints, INode, loading, nodes, products, setLoading } from "../../store/reducers/nodesInputReducer";
|
||||||
import { createHints, search } from "../../store/reducers/asyncActions";
|
import { createHints, search } from "../../store/reducers/asyncActions";
|
||||||
import styles from "./search.module.css"
|
import styles from "./search.module.css"
|
||||||
|
|
||||||
|
import {CalculatorOutlined} from '@ant-design/icons';
|
||||||
|
import 'antd/dist/antd.css';
|
||||||
|
|
||||||
|
|
||||||
function parse_types(type: string) {
|
function parse_types(type: string) {
|
||||||
if (type == 'Name') return 'Наименование'
|
if (type == 'Name') return 'Наименование'
|
||||||
if (type == 'Category') return 'Категория'
|
if (type == 'Category') return 'Категория'
|
||||||
|
@ -14,14 +19,15 @@ function parse_types(type: string) {
|
||||||
export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
||||||
const [data, setData] = useState("")
|
const [data, setData] = useState("")
|
||||||
const [tags, setTags] = useState(new Array<JSX.Element>())
|
const [tags, setTags] = useState(new Array<JSX.Element>())
|
||||||
const [loading, setLoading] = useState(false)
|
|
||||||
const dispatch = useAppDispatch();
|
const dispatch = useAppDispatch();
|
||||||
const getNodes = useAppSelector(nodes);
|
const getNodes = useAppSelector(nodes);
|
||||||
const getProducts = useAppSelector(products);
|
const getProducts = useAppSelector(products);
|
||||||
const getHints = useAppSelector(hints);
|
const getHints = useAppSelector(hints);
|
||||||
|
const getLoading = useAppSelector(loading)
|
||||||
|
const [disableInput, setDisableInput] = useState(false)
|
||||||
const [autoCompleteValue, setAutoCompleteValue] = useState("")
|
const [autoCompleteValue, setAutoCompleteValue] = useState("")
|
||||||
const onChange = (text:string) =>{
|
const onChange = (text:string) =>{
|
||||||
if (text.length >= 3 && text.length%3 == 0){
|
if (text.length >= 3 && text.length%2 == 0){
|
||||||
dispatch(
|
dispatch(
|
||||||
createHints({word:text, hints:getHints.length == 0? []: getHints.map((el)=>el.value)})
|
createHints({word:text, hints:getHints.length == 0? []: getHints.map((el)=>el.value)})
|
||||||
)
|
)
|
||||||
|
@ -30,7 +36,8 @@ export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
||||||
}
|
}
|
||||||
const addTag = (value:INode) => {
|
const addTag = (value:INode) => {
|
||||||
let color = "red"
|
let color = "red"
|
||||||
switch((value as any).type ){
|
|
||||||
|
switch(value.type){
|
||||||
case "Category":
|
case "Category":
|
||||||
color = "gold"
|
color = "gold"
|
||||||
break
|
break
|
||||||
|
@ -54,6 +61,36 @@ export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
||||||
>
|
>
|
||||||
{value.value.length <13? value.value:value.value.slice(0,10)+"..."}
|
{value.value.length <13? value.value:value.value.slice(0,10)+"..."}
|
||||||
</Tag>
|
</Tag>
|
||||||
|
|
||||||
|
if (value.type.split("_")[1] == "numeric"){
|
||||||
|
let popver = <div className={styles.popover}>
|
||||||
|
<div>{value.type.split("_")[0]}</div>
|
||||||
|
<Radio.Group defaultValue="=" size="small">
|
||||||
|
<Radio.Button value=">=">≥</Radio.Button>
|
||||||
|
<Radio.Button value="=">=</Radio.Button>
|
||||||
|
<Radio.Button value="<=">≤</Radio.Button>
|
||||||
|
</Radio.Group>
|
||||||
|
<InputNumber autoFocus onClick={()=>setDisableInput(true)} size="small" min={1} max={100000} defaultValue={100}/>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
tag = <Popover onOpenChange={(e)=> e?null:setDisableInput(false)} content={popver} title="Задать значение">
|
||||||
|
<Tag
|
||||||
|
color={"cyan"}
|
||||||
|
closable
|
||||||
|
style={{ marginRight: 3 }}
|
||||||
|
onClose={() => {
|
||||||
|
dispatch(
|
||||||
|
deleteNode(value.value)
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<CalculatorOutlined></CalculatorOutlined>
|
||||||
|
{value.value.length < 13? value.value:value.value.slice(0,10)+"..."}
|
||||||
|
</Tag>
|
||||||
|
</Popover>
|
||||||
|
}
|
||||||
|
|
||||||
setTags(tags.concat([tag]))
|
setTags(tags.concat([tag]))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,8 +110,8 @@ export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
||||||
}
|
}
|
||||||
|
|
||||||
const onEnter = (value:any) => {
|
const onEnter = (value:any) => {
|
||||||
setLoading(true)
|
|
||||||
console.log(getNodes);
|
console.log(getNodes);
|
||||||
|
dispatch(setLoading(true))
|
||||||
dispatch(
|
dispatch(
|
||||||
search(
|
search(
|
||||||
getNodes.concat(
|
getNodes.concat(
|
||||||
|
@ -106,6 +143,9 @@ export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
||||||
}
|
}
|
||||||
return(
|
return(
|
||||||
<AutoComplete
|
<AutoComplete
|
||||||
|
autoFocus={false}
|
||||||
|
onBlur={()=>null}
|
||||||
|
disabled={disableInput}
|
||||||
options={getHints.map((e) => {
|
options={getHints.map((e) => {
|
||||||
const pre_str = e.value.value.slice(0, e.coordinate)
|
const pre_str = e.value.value.slice(0, e.coordinate)
|
||||||
const after_str = e.value.value.slice(e.coordinate+autoCompleteValue.length, e.value.value.length)
|
const after_str = e.value.value.slice(e.coordinate+autoCompleteValue.length, e.value.value.length)
|
||||||
|
@ -128,7 +168,9 @@ export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
||||||
dropdownMatchSelectWidth={252}
|
dropdownMatchSelectWidth={252}
|
||||||
>
|
>
|
||||||
<Input.Search prefix={tags}
|
<Input.Search prefix={tags}
|
||||||
style={{ width: "50vw" }}
|
autoFocus={false}
|
||||||
|
onBlur={()=>null}
|
||||||
|
style={{ width: "60vw" }}
|
||||||
color="red-6"
|
color="red-6"
|
||||||
className={styles.search}
|
className={styles.search}
|
||||||
onChange={(e)=>onChange(e.target.value)}
|
onChange={(e)=>onChange(e.target.value)}
|
||||||
|
@ -136,7 +178,7 @@ export const Search: React.FC<{onData:(data:any)=>void}> = (props) =>{
|
||||||
onSearch={(e) => onEnter(e)}
|
onSearch={(e) => onEnter(e)}
|
||||||
size="large"
|
size="large"
|
||||||
placeholder="Поиск товара"
|
placeholder="Поиск товара"
|
||||||
loading={loading && getProducts.length == 0}
|
loading={getLoading}
|
||||||
enterButton />
|
enterButton />
|
||||||
</AutoComplete>
|
</AutoComplete>
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
border: 1px solid #BDBDBD;
|
border: 1px solid #BDBDBD;
|
||||||
border-radius: 0px 17px 17px 0px !important;
|
border-radius: 0px 17px 17px 0px !important;
|
||||||
background-color: #DB2B21;
|
background-color: #DB2B21;
|
||||||
|
z-index: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.search button:hover{
|
.search button:hover{
|
||||||
|
@ -17,10 +18,16 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.search input{
|
|
||||||
}
|
|
||||||
|
|
||||||
.search.ant-input-affix-wrapper-lg{
|
.search.ant-input-affix-wrapper-lg{
|
||||||
background-color: #FBFBFB !important;
|
background-color: #FBFBFB !important;
|
||||||
border-radius: 17px !important;
|
border-radius: 17px !important;
|
||||||
}
|
}
|
||||||
|
.popover{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
gap:3px;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user