test push du merge

src/js/Views/Stock.js

@@ -35,12 +35,8 @@ export default class Stock extends React.Component {
       categorySorted:false,
       onSortedCategories:false,
       onSearch:false,
-<<<<<<< HEAD
-      sortOrder: 0
-=======
+      sortOrder: 0,
       selectedArticles:[]
-      sortOrder: 0
->>>>>>> a7884d9a3b4883254a979124e14663b887b85821
     }
   }
 
@@ -48,32 +44,7 @@ export default class Stock extends React.Component {
     this.getArticles()
 }
 
-<<<<<<< HEAD
 // Implémenter la fonction sortArticles :
-  sortArticles = (sortType) => {
-    let sorted;
-    if (sortType === "name"){
-      this.setState({orderIsVisible: false})
-      if (this.state.sortOrder === 0) {
-        //ordre alphabétique croissant
-        sorted = [...this.state.articles].sort((a, b) => a.name.localeCompare(b.name))
-      } else {
-        //ordre alphabétique décroissant
-        sorted = [...this.state.articles].sort((a, b) => b.name.localeCompare(a.name))
-      }
-    } else {
-      this.setState({orderIsVisible: true})
-      this.setState({sortOrder: 0})
-      sorted = [...this.state.articles].sort((a, b) => b[sortType] - a[sortType]);
-    }
-
-    if (sortType === 'category_id'){
-      this.setState({articles:sorted},() => {
-        this.setState({onSortedCategories:true})
-      })
-    }else{
-=======
-
 sortArticles = (sortType) => {
     
   let sorted;
@@ -93,7 +64,6 @@ export default class Stock extends React.Component {
   }
 
   if (sortType === 'category_id'){
->>>>>>> a7884d9a3b4883254a979124e14663b887b85821
       this.setState({articles:sorted},() => {
         this.setState({onSortedCategories:true})
       })
@@ -103,9 +73,6 @@ export default class Stock extends React.Component {
       this.setState({onSortedCategories:false})
     })
   }
-
-  
-  
 }
 
   getArticles = () => {
@@ -215,10 +182,6 @@ export default class Stock extends React.Component {
   }
 
   handleSubmit = event => {
-<<<<<<< HEAD
-    event.preventDefault()
-    this.searchArticles();
-=======
     event.preventDefault()
     this.searchArticles();
   }
@@ -237,8 +200,6 @@ export default class Stock extends React.Component {
       this.handleCloseCategories()
     }
   }
->>>>>>> a7884d9a3b4883254a979124e14663b887b85821
-  }
 
     render() {
       if (!sessionStorage.getItem('token')){