Skip to content

Commit

Permalink
v1.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ajoslin103 committed Jun 4, 2020
2 parents ac652a9 + 307a821 commit 910601f
Show file tree
Hide file tree
Showing 8 changed files with 247 additions and 587 deletions.
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node server.js
787 changes: 212 additions & 575 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 13 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
{
"name": "brand-marketing",
"version": "1.0.5",
"version": "1.0.6",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"coveralls": "cat ./coverage/brand-marketing/lcov.info | coveralls"
"coveralls": "cat ./coverage/brand-marketing/lcov.info | coveralls",
"heroku-postbuild": "ng build --prod"
},
"private": true,
"dependencies": {
"@angular/animations": "~9.1.9",
"@angular/cdk": "^9.2.4",
"@angular/cli": "~9.1.7",
"@angular/common": "~9.1.9",
"@angular/compiler": "~9.1.9",
"@angular/compiler-cli": "~9.1.9",
"@angular/core": "~9.1.9",
"@angular/forms": "~9.1.9",
"@angular/material": "^9.2.4",
"@angular/platform-browser": "~9.1.9",
"@angular/platform-browser-dynamic": "~9.1.9",
"@angular/router": "~9.1.9",
"@angular/service-worker": "~9.1.9",
"express": "^4.17.1",
"path": "^0.12.7",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",
"typescript": "~3.8.3",
"zone.js": "~0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.901.7",
"@angular/cli": "~9.1.7",
"@angular/compiler-cli": "~9.1.9",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
Expand All @@ -45,7 +49,10 @@
"karma-jasmine-html-reporter": "^1.4.2",
"protractor": "~7.0.0",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~3.8.3"
"tslint": "~6.1.0"
},
"engines": {
"node": "12.13.0",
"npm": "6.12.0"
}
}
16 changes: 16 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//Install express server
const express = require('express');
const path = require('path');

const app = express();

// Serve only the static files form the dist directory
app.use(express.static('./dist'));

app.get('/*', function (req, res) {

res.sendFile(path.join(__dirname, '/dist/index.html'));
});

// Start the app by listening on the default Heroku port
app.listen(process.env.PORT || 8080);
4 changes: 2 additions & 2 deletions src/app/contacts-table/contacts-table.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="mat-elevation-z8">
<table mat-table class="full-width-table" matSort aria-label="Elements">
<div class="mat-elevation-z8 full-width-table">
<table mat-table matSort aria-label="Elements">

<!-- _id Column -->
<ng-container matColumnDef="_id">
Expand Down
2 changes: 1 addition & 1 deletion src/app/contacts-table/contacts-table.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.full-width-table {
width: 100%;
display: flex;
}

.table-paginator {
Expand Down
2 changes: 1 addition & 1 deletion src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const environment = {
production: true,
contactListUrl: 'http://demo5838836.mockable.io/contact',
contactListUrl: 'https://evening-sierra-94782.herokuapp.com/http://demo5838836.mockable.io/contact',
};
3 changes: 1 addition & 2 deletions src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

export const environment = {
production: false,
contactListUrl: 'http://demo5838836.mockable.io/contact',
// contactListUrl: 'http://localhost:3000/contacts',
contactListUrl: 'https://evening-sierra-94782.herokuapp.com/http://demo5838836.mockable.io/contact',
};

/*
Expand Down

0 comments on commit 910601f

Please sign in to comment.