Skip to content

Commit

Permalink
moved app out of 'code' and upgraded to angular 6
Browse files Browse the repository at this point in the history
  • Loading branch information
mmmatthew committed Aug 14, 2018
1 parent 0e02f15 commit 1b51266
Show file tree
Hide file tree
Showing 77 changed files with 8,043 additions and 2,990 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dependency directories
code/node_modules/
node_modules/
code/jspm_packages/

# Build directories
code/dist/
dist/
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ Clone this repository to your computer, open a command window in the directory y

## Launch a dev server

In the `code/` directory, open a command window and run `ng serve` to launch a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. If the app fails to display in the browser, run `ng serve -prod` instead.
In the cloned repository directory, open a command window and run `npm run start` to launch a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. If the app fails to display in the browser, run `ng serve -prod` instead.

## Build the project

Run `ng build` from the `code/` directory to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
Run `npm run build` to build the project. The build artifacts will be stored in the `dist/` directory.

## Extract and generate translations

Expand Down
File renamed without changes.
14 changes: 0 additions & 14 deletions code/e2e/app.e2e-spec.ts

This file was deleted.

62 changes: 0 additions & 62 deletions code/package.json

This file was deleted.

14 changes: 14 additions & 0 deletions e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { AppPage } from './app.po';

describe('proximap App', () => {
let page: AppPage;

beforeEach(() => {
page = new AppPage();
});

// it('should display welcome message', () => {
// page.navigateTo();
// expect(page.getParagraphText()).toEqual('Welcome to app!');
// });
});
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion code/karma.conf.js → karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module.exports = function (config) {
config.set({
basePath: '',
basePath: 'code),
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
Expand Down
Loading

0 comments on commit 1b51266

Please sign in to comment.