Browse Source

test to fix heroku deplyment

pull/146/head
Davide Bragagnolo 7 years ago
parent
commit
fee9102e2a
14 changed files with 23 additions and 18 deletions
  1. +1
    -0
      .env
  2. +3
    -2
      package.json
  3. +1
    -1
      src/assets/scripts/ads-details/ads-details.service.js
  4. +1
    -1
      src/assets/scripts/ads/ads.service.js
  5. +1
    -1
      src/assets/scripts/companies/companies.service.js
  6. +1
    -1
      src/assets/scripts/logout/service.js
  7. +1
    -1
      src/assets/scripts/nwLogin/service.js
  8. +1
    -1
      src/assets/scripts/profile/profile.service.js
  9. +1
    -1
      src/assets/scripts/referees/referees.service.js
  10. +1
    -1
      src/assets/scripts/signup/signup.service.js
  11. +1
    -1
      src/assets/scripts/user-details/user-details.service.js
  12. +1
    -1
      src/assets/scripts/users/users.service.js
  13. +6
    -5
      webpack/devServer.js
  14. +3
    -1
      webpack/plugins/index.js

+ 1
- 0
.env View File

@ -0,0 +1 @@
RESTAPI_URL="https://nomitwisp-restapi.herokuapp.com"

+ 3
- 2
package.json View File

@ -4,7 +4,7 @@
"private": true,
"description": "HTML Admin Template",
"scripts": {
"start": "webpack-dashboard -t 'Project' -- webpack-dev-server",
"start": "webpack-dev-server",
"dev": "webpack-dashboard -t 'Project' -- webpack-dev-server",
"clean": "shx rm -rf ./build",
"build": "npm run clean && cross-env NODE_ENV=\"production\" webpack",
@ -40,6 +40,7 @@
"cross-env": "^5.1.0",
"css-loader": "^0.28.7",
"datatables": "^1.10.13",
"dotenv-webpack": "^1.7.0",
"easy-pie-chart": "^2.1.7",
"eslint": "^4.9.0",
"eslint-config-airbnb-base": "^12.1.0",
@ -72,6 +73,6 @@
"stylelint-config-standard": "^17.0.0",
"webpack": "^3.8.1",
"webpack-dashboard": "^1.0.0",
"webpack-dev-server": "^2.9.3"
"webpack-dev-server": "^2.11.3"
}
}

+ 1
- 1
src/assets/scripts/ads-details/ads-details.service.js View File

@ -2,7 +2,7 @@ const AdsDetailsService = ($http) => {
let serv = {};
serv.fetchAdDetails = (route) =>{
return $http.get('https://nomitwisp-restapi.herokuapp.com/api/ads/'+route.id)
return $http.get(`${process.env.RESTAPI_URL}/api/ads/${route.id}`)
.then( (result) => { return result.data; })
.catch( (error) => { return error; })
}


+ 1
- 1
src/assets/scripts/ads/ads.service.js View File

@ -3,7 +3,7 @@ const AdsService = ($http) => {
let serv = {};
serv.fetchAdsService = () =>{
return $http.get('https://nomitwisp-restapi.herokuapp.com/api/ads', { withCredentials: true })
return $http.get(`${process.env.RESTAPI_URL}/api/ads`, { withCredentials: true })
.then( (result) => { return result.data; })
.catch( (error) => { return error; });
}


+ 1
- 1
src/assets/scripts/companies/companies.service.js View File

@ -3,7 +3,7 @@ const CompaniesService = ($http) => {
let serv = {};
serv.fetchCompaniesService = () =>{
return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/company', { withCredentials: true })
return $http.get(`${process.env.RESTAPI_URL}/api/users/company`, { withCredentials: true })
.then( (result) => { console.log(result.data); return result.data; })
.catch( (error) => { return error; });
}


+ 1
- 1
src/assets/scripts/logout/service.js View File

@ -4,7 +4,7 @@ const LogoutService = ($http) => {
serv.logoutUserService = (user) =>{
return $http({
method: 'POST',
url: 'https://nomitwisp-restapi.herokuapp.com/logout',
url: `${process.env.RESTAPI_URL}/logout`,
data: user,
headers: { 'Content-Type': 'application/json' }
})


+ 1
- 1
src/assets/scripts/nwLogin/service.js View File

@ -4,7 +4,7 @@ const LoginService = ($http) => {
serv.loginUserService = (user) => {
return $http({
method: 'POST',
url: 'https://nomitwisp-restapi.herokuapp.com/login',
url: `${process.env.RESTAPI_URL}/login`,
data: user,
headers: { 'Content-Type': 'application/json' }
})


+ 1
- 1
src/assets/scripts/profile/profile.service.js View File

@ -3,7 +3,7 @@ const ProfileService = ($http) => {
let serv = {};
serv.fetchProfileService = (id) =>{
return $http.get('https://nomitwisp-restapi.herokuapp.com/api/user/'+id, { withCredentials: true })
return $http.get(`${process.env.RESTAPI_URL}/api/user/${id}`, { withCredentials: true })
.then( (result) => { return result.data; })
.catch( (error) => { return error; });
}


+ 1
- 1
src/assets/scripts/referees/referees.service.js View File

@ -3,7 +3,7 @@ const RefereesService = ($http) => {
let serv = {};
serv.fetchRefereesService = () => {
return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/referee', { withCredentials: true })
return $http.get(`${process.env.RESTAPI_URL}/api/users/referee`, { withCredentials: true })
.then( (result) => { console.log(result.data); return result.data; })
.catch( (error) => { return error; });
}


+ 1
- 1
src/assets/scripts/signup/signup.service.js View File

@ -7,7 +7,7 @@ const SignupService = ($http)=> {
serv.signupUserService = (user) => {
return $http({
method: 'POST',
url: 'https://nomitwisp-restapi.herokuapp.com/signup',
url: `${process.env.RESTAPI_URL}/signup`,
data: user,
headers: { 'Content-Type': 'application/json' }
})


+ 1
- 1
src/assets/scripts/user-details/user-details.service.js View File

@ -2,7 +2,7 @@ const UserDetailsService = ($http) => {
let serv = {};
serv.fetchUserDetails = (route) =>{
return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/'+route.id)
return $http.get(`${process.env.RESTAPI_URL}/api/users/${route.id}`)
.then( (result) => { return result.data; })
.catch( (error) => { return error; })
}


+ 1
- 1
src/assets/scripts/users/users.service.js View File

@ -3,7 +3,7 @@ const UsersService = ($http) => {
let serv = {};
serv.fetchUsersService = () => {
return $http.get('https://nomitwisp-restapi.herokuapp.com/api/users/user', { withCredentials: true })
return $http.get(`${process.env.RESTAPI_URL}/api/users/user`, { withCredentials: true })
.then( (result) => { console.log(result.data); return result.data; })
.catch( (error) => { return error; });
}


+ 6
- 5
webpack/devServer.js View File

@ -15,12 +15,13 @@ const
*/
const devServer = {
contentBase : manifest.IS_PRODUCTION ? manifest.paths.build : manifest.paths.src,
contentBase : manifest.paths.src,
historyApiFallback : true,
port : manifest.IS_PRODUCTION ? process.env.PORT || 3001 : process.env.PORT || 3000,
compress : manifest.IS_PRODUCTION,
inline : !manifest.IS_PRODUCTION,
watchContentBase: true,
port : process.env.PORT || 3000,
compress : false,
inline : true,
watchContentBase : !manifest.IS_PRODUCTION,
open : false,
hot : !manifest.IS_PRODUCTION,
host : '0.0.0.0',
disableHostCheck : true, // [1]


+ 3
- 1
webpack/plugins/index.js View File

@ -1,5 +1,6 @@
const
manifest = require('../manifest');
const Dotenv = require('dotenv-webpack');
const plugins = [];
@ -8,7 +9,8 @@ plugins.push(
...(require('./htmlPlugin')),
...(require('./internal')),
require('./caseSensitivePlugin'),
require('./extractPlugin')
require('./extractPlugin'),
new Dotenv()
);
if (manifest.IS_DEVELOPMENT) {


Loading…
Cancel
Save