1. var changed to let

2. Send the selected service provider from front end
3. node-backend renamed to server

Author: amrita019

.DS_Store

@@ -1,4 +1,3 @@
 {
-    "editor.formatOnSave": true
-  }
-  
+  "editor.formatOnSave": true
+}

.vscode/settings.json

@@ -18,32 +18,15 @@ class HomePage extends React.Component {
 
   componentDidMount() {
     this.state.user = localStorage.getItem("user");
-    this.props.dispatch(userActions.getAll());
+    this.props.dispatch(userActions.getAll(this.state.selectedService));
   }
 
   handleDeleteUser(id) {
     return e => this.props.dispatch(userActions.delete(id));
   }
 
   render() {
-    // if(!this.props.users.loading){
-    //     console.log("loaded here")
-    // const items= this.props.users["item"]
-    // tableItems = items.map(item => (
-    //     <Table.Row key={item.id}>
-    //           <Table.Cell>{item.serviceId}</Table.Cell>
-    //           <Table.Cell>{item.name}</Table.Cell>
-    //           <Table.Cell>{item.type}</Table.Cell>
-    //        </Table.Row>
-    // ));
-    // }
     const { selectedService } = this.state;
-    console.log("HOME RENDER METHOD", this.props.users);
-    // if(this.props.users === {}){
-    //     console.log("\n\n\n Empty");
-    // } else {
-    //     console.log("\n\n\n\ has data", this.props.users);
-    // }
     return (
       <div style={{ margin: 20 }}>
         <div class="ui center aligned page grid">

node-backend/helpers/listcompute.js

@@ -68,11 +68,11 @@ function register(user) {
   }
 }
 
-function getAll() {
+function getAll(serviceProvider) {
   return dispatch => {
     dispatch(request());
 
-    userService.getAll().then(res => {
+    userService.getAll(serviceProvider).then(res => {
       if (res.success) {
         dispatch(success(res.data));
       } else {

node-backend/routes/getservices.js

@@ -1,9 +1,9 @@
 export function authHeader() {
   // return authorization header with jwt token
-  let user = JSON.parse(localStorage.getItem("user"));
+  let token = localStorage.getItem("access_token");
 
-  if (user && user.token) {
-    return { Authorization: "Bearer " + user.token };
+  if (token) {
+    return { token };
   } else {
     return {};
   }

react-frontend/src/HomePage/HomePage.js

@@ -1,6 +1,5 @@
 import { userConstants } from "../_constants/user.constants";
 
-localStorage.clear();
 let user = JSON.parse(localStorage.getItem("user"));
 const initialState = user ? { loggedIn: true, user } : {};
 

react-frontend/src/_actions/user.actions.js

@@ -31,15 +31,19 @@ function login(username, password) {
 
 function logout() {
   // remove user from local storage to log user out
+  console.log("some how logout was called");
   localStorage.removeItem("user");
 }
 
-function getAll() {
+function getAll(serviceProvider) {
   const requestOptions = {
     method: "GET",
     headers: authHeader()
   };
-  return fetch(`http://localhost:4000/home`, requestOptions)
+  return fetch(
+    `http://localhost:4000/home/?serviceProvider=${serviceProvider}`,
+    requestOptions
+  )
     .then(handleResponse)
     .then(data => {
       console.log("AAAA", data);

react-frontend/src/_helpers/auth-header.js

@@ -1,64 +1,65 @@
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var path = require('path');
-var APP_DIR = path.resolve(__dirname, 'src');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+let HtmlWebpackPlugin = require("html-webpack-plugin");
+let path = require("path");
+let APP_DIR = path.resolve(__dirname, "src");
+const ExtractTextPlugin = require("extract-text-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 
 module.exports = {
-    entry: APP_DIR + '/index.js',
-    mode: 'development',
-    resolve: {
-        extensions: ['.js', '.jsx']
-    },
-    module: {
-        rules: [
-            {
-                test: /\.jsx?$/,
-                loader: 'babel-loader'
-            },
-            {
-                test: /\.css$/,
-                use: [
-                  {
-                    loader: MiniCssExtractPlugin.loader,
-                    options: {
-                      // you can specify a publicPath here
-                      // by default it uses publicPath in webpackOptions.output
-                      publicPath: '../',
-                      hmr: process.env.NODE_ENV === 'development',
-                    },
-                  },
-                  'css-loader',
-                ],
-              },
-              {
-                test: /\.(png|jpe?g|gif)$/,
-                use: [
-                  {
-                    loader: 'file-loader',
-                    options: {},
-                  },
-                ],
-              },
+  entry: APP_DIR + "/index.js",
+  mode: "development",
+  resolve: {
+    extensions: [".js", ".jsx"]
+  },
+  module: {
+    rules: [
+      {
+        test: /\.jsx?$/,
+        loader: "babel-loader"
+      },
+      {
+        test: /\.css$/,
+        use: [
+          {
+            loader: MiniCssExtractPlugin.loader,
+            options: {
+              // you can specify a publicPath here
+              // by default it uses publicPath in webpackOptions.output
+              publicPath: "../",
+              hmr: process.env.NODE_ENV === "development"
+            }
+          },
+          "css-loader"
         ]
-    },
-    plugins: [new HtmlWebpackPlugin({
-        template: './src/index.html'
+      },
+      {
+        test: /\.(png|jpe?g|gif)$/,
+        use: [
+          {
+            loader: "file-loader",
+            options: {}
+          }
+        ]
+      }
+    ]
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: "./src/index.html"
     }),
     new MiniCssExtractPlugin({
-        // Options similar to the same options in webpackOptions.output
-        // both options are optional
-        filename: '[name].css',
-        chunkFilename: '[id].css',
-      }),
-],
-    devServer: {
-        historyApiFallback: true
-    },
-    externals: {
-        // global app config object
-        config: JSON.stringify({
-            apiUrl: 'http://localhost:4000'
-        })
-    }
-}
+      // Options similar to the same options in webpackOptions.output
+      // both options are optional
+      filename: "[name].css",
+      chunkFilename: "[id].css"
+    })
+  ],
+  devServer: {
+    historyApiFallback: true
+  },
+  externals: {
+    // global app config object
+    config: JSON.stringify({
+      apiUrl: "http://localhost:4000"
+    })
+  }
+};