Resolved conflict

frontend/src/actions/cart/cartActions.js

@@ -56,7 +56,6 @@ export const receiveCustomerDetails = (json) => ({
 
 export const fetchCartCount = () => {
     return dispatch => {
-<<<<<<< HEAD
         dispatch(requestShopCartCount());
         //TODO : fetch cart count from woocommerce (requires plugin)
         dispatch(receiveShopCartCount(0));
@@ -69,17 +68,6 @@ export const fetchCartCount = () => {
             client.onError(error, dispatch);
         });
         */
-=======
-        // TODO Fetch correct cart count after adding support to cart on API
-        // dispatch(requestShopCartCount());
-        // return client.fetch({url: `${API_SERVER}/cart/api/getCartCount`}).then(response => {
-        //     if (typeof response.data !== 'undefined' && 'cartItemsCount' in response.data) {
-                dispatch(receiveShopCartCount(0));
-        //     }
-        // }).catch(error => {
-        //     client.onError(error, dispatch);
-        // });
->>>>>>> 6e0c26d... Connected and enabled  co-maket
     }
 }
 

frontend/src/actions/login/authActions.js

@@ -162,80 +162,6 @@ const validateRefreshToken = () => {
 export const getModules = () => {
     return dispatch => {
         dispatch(requestModules());
-<<<<<<< HEAD
-        //TODO : check how to solve modules, don't hardocde values
-        const modules={
-            modules:{
-                modules:[
-                    {
-                        id:"19",
-                        isInMenu:"0",
-                        menuName:"Cart",
-                        name:"Cart",
-                        url:"cart",
-
-                    },
-                    {
-                        id:"14",
-                        isInMenu:"0",
-                        menuName:"ProfileSettings",
-                        name:"ProfileSettings",
-                        url:"profileSettings",
-                    },
-                    {
-                        id:"23",
-                        isInMenu:"0",
-                        menuName:"OrderProjects",
-                        name:"OrderProjects",
-                        url:"orderProjects",
-                    },
-                    {
-                        id:"15",
-                        isInMenu:"0",
-                        menuName:"Terms",
-                        name:"Terms",
-                        url:"terms",
-                    },
-                    {
-                        id:"1",
-                        isInMenu:"1",
-                        menuName:"Overview",
-                        name:"Dashboards",
-                        url:"dashboards",
-                    },
-                    {
-                        id:"18",
-                        isInMenu:"1",
-                        menuName:"Co-Market",
-                        name:"CoMarket",
-                        url:"co-market",
-                    }
-                ],
-                subModules:{
-                    "co-market":[
-                        {
-                            menuName:"Orders",
-                            name:"Orders",
-                            url:"orders",
-                            moduleUrl:"co-market",
-                        }
-                    ]
-                }
-            }
-        }
-        dispatch(recieveModules(modules));
-        /*
-        return htmlClient.fetch({
-                url: `${API_SERVER}/login/api/getModules`,
-            })
-        .then(response => {
-            dispatch(recieveModules(response.data));
-        })
-        .catch(error => {
-            htmlClient.onError(error, dispatch);
-        });
-        */
-=======
         let appModules = {
             modules: {
               modules: [
@@ -305,7 +231,6 @@ export const getModules = () => {
         //     htmlClient.onError(error, dispatch);
         // });
         // return {activeModule : ""}
->>>>>>> 6e0c26d... Connected and enabled  co-maket
 
     }
 }

frontend/src/containers/coMarket/CoMarketPackagesContainer.jsx

@@ -46,7 +46,7 @@ class CoMarketPackagesContainer extends Component {
                                 }
                             </Row>
                         </WiaasBox>
-                    </Col>a
+                    </Col>
                 </Row>
             </div>
         );