Skip to content

Commit 8892fcc

Browse files
committed
1. Add urls.js
2. Changed occurences of let to const
1 parent 5cbde10 commit 8892fcc

15 files changed

Lines changed: 71 additions & 53 deletions

File tree

client/src/HomePage/ServiceTable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ServiceTable extends Component {
2020
}
2121

2222
renderTableHeader() {
23-
let header = Object.keys(this.props.service[0]);
23+
const header = Object.keys(this.props.service[0]);
2424
return header.map((key, index) => {
2525
return (
2626
<Table.HeaderCell key={index}>{key.toUpperCase()}</Table.HeaderCell>

client/src/SignupPage/SignupPage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class SignupPage extends React.Component {
5050

5151
handleValidation() {
5252
const { user } = this.state;
53-
let isFormValid = true;
53+
const isFormValid = true;
5454

5555
//Password
5656
if (!user.password) {
@@ -90,8 +90,8 @@ class SignupPage extends React.Component {
9090
passwordError: ""
9191
});
9292
} else if (typeof user.email !== "undefined") {
93-
let lastAtPos = user.email.lastIndexOf("@");
94-
let lastDotPos = user.email.lastIndexOf(".");
93+
const lastAtPos = user.email.lastIndexOf("@");
94+
const lastDotPos = user.email.lastIndexOf(".");
9595

9696
if (
9797
!(

client/src/_helpers/auth-header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export function authHeader() {
22
// return authorization header with jwt token
3-
let token = localStorage.getItem("access_token");
3+
const token = localStorage.getItem("access_token");
44

55
if (token) {
66
return { token };

client/src/_helpers/urls.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export const Urls = {
2+
BASE_URL: "http://localhost:4000/",
3+
SUB_URL_LOGIN: "login",
4+
SUB_URL_SIGNUP: "signup",
5+
SUB_URL_HOME: "home"
6+
};

client/src/_reducers/authentication.reducer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { userConstants } from "../_constants/user.constants";
22

3-
let user = JSON.parse(localStorage.getItem("user"));
3+
const user = JSON.parse(localStorage.getItem("user"));
44
const initialState = user ? { loggedIn: true, user } : {};
55

66
export function authentication(state = initialState, action) {

client/src/_services/user.services.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { authHeader } from "../_helpers/auth-header.js";
22
import { history } from "../_helpers/history.js";
3+
import { Urls } from "../_helpers/urls.js";
34

45
export const userService = {
56
login,
@@ -18,7 +19,7 @@ function login(username, password) {
1819
body: JSON.stringify({ username, password })
1920
};
2021

21-
return fetch(`http://localhost:4000/login`, requestOptions)
22+
return fetch(Urls.BASE_URL + Urls.SUB_URL_LOGIN, requestOptions)
2223
.then(handleResponse)
2324
.then(user => {
2425
// store user details and jwt token in local storage to keep user logged in between page refreshes
@@ -40,12 +41,11 @@ function getAll(serviceProvider) {
4041
headers: authHeader()
4142
};
4243
return fetch(
43-
`http://localhost:4000/home/?serviceProvider=${serviceProvider}`,
44+
Urls.BASE_URL + Urls.SUB_URL_HOME + "?serviceProvider=" + serviceProvider,
4445
requestOptions
4546
)
4647
.then(handleResponse)
4748
.then(data => {
48-
console.log("AAAA", data);
4949
return data;
5050
});
5151
}
@@ -66,7 +66,7 @@ function register(user) {
6666
body: JSON.stringify(user)
6767
};
6868

69-
return fetch(`http://localhost:4000/signup`, requestOptions).then(
69+
return fetch(Urls.BASE_URL + Urls.SUB_URL_SIGNUP, requestOptions).then(
7070
handleResponse
7171
);
7272
}

client/webpack.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
let HtmlWebpackPlugin = require("html-webpack-plugin");
2-
let path = require("path");
3-
let APP_DIR = path.resolve(__dirname, "src");
1+
const HtmlWebpackPlugin = require("html-webpack-plugin");
2+
const path = require("path");
3+
const APP_DIR = path.resolve(__dirname, "src");
44
const ExtractTextPlugin = require("extract-text-webpack-plugin");
55
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
66

server/db.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const sqlite3 = require("sqlite3").verbose();
33

44
// create a db instance
5-
let db = new sqlite3.Database("./user.sqlite3", err => {
5+
const db = new sqlite3.Database("./user.sqlite3", err => {
66
if (err) {
77
console.log("Error when creating the database", err);
88
} else {

server/helpers/listazureservices.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
let store = require("../store");
2-
let utils = require("../helpers/utils");
3-
let async = require("async");
1+
const store = require("../store");
2+
const utils = require("../helpers/utils");
3+
const async = require("async");
44

55
const nodeCloud = require("nodecloud");
66

server/helpers/utils.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
let jwt = require("jsonwebtoken");
1+
const jwt = require("jsonwebtoken");
22
require("dotenv").config();
33

44
module.exports = {
55
generateToken(user) {
6-
let u = {
6+
const u = {
77
email: user.email,
88
username: user.username
99
};

0 commit comments

Comments
 (0)