Skip to content

Commit

Permalink
''
Browse files Browse the repository at this point in the history
  • Loading branch information
vishalb13 committed Oct 27, 2018
1 parent b17b0e3 commit c8787f0
Show file tree
Hide file tree
Showing 48 changed files with 3,663 additions and 2,757 deletions.
4 changes: 2 additions & 2 deletions Angular/e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ describe('workspace-project App', () => {
page = new AppPage();
});

it('should display welcome message', () => {
/*it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to app!');
});
});*/
});
2 changes: 1 addition & 1 deletion Angular/e2e/src/app.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ export class AppPage {
}

getParagraphText() {
return element(by.css('app-root h1')).getText();
return element(by.css('')).getText();
}
}
3,558 changes: 1,997 additions & 1,561 deletions Angular/package-lock.json

Large diffs are not rendered by default.

99 changes: 50 additions & 49 deletions Angular/package.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
{
"name": "xtreme-admin-angular-lite",
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@angular/animations": "^6.0.2",
"@angular/common": "^6.0.2",
"@angular/compiler": "^6.0.2",
"@angular/core": "^6.0.2",
"@angular/forms": "^6.0.2",
"@angular/http": "^6.0.2",
"@angular/platform-browser": "^6.0.2",
"@angular/platform-browser-dynamic": "^6.0.2",
"@angular/router": "^6.0.2",
"@ng-bootstrap/ng-bootstrap": "^2.0.0",
"core-js": "^2.5.4",
"jquery": "^3.3.1",
"rxjs": "^6.0.0",
"rxjs-compat": "^6.2.0",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular/compiler-cli": "^6.0.2",
"@angular-devkit/build-angular": "~0.6.3",
"typescript": "~2.7.2",
"@angular/cli": "~6.0.3",
"@angular/language-service": "^6.0.2",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.2.1",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~1.4.2",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1"
}
"name": "xtreme-admin-angular-lite",
"version": "0.0.0",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
"@angular/animations": "^7.0.1",
"@angular/common": "^7.0.1",
"@angular/compiler": "^7.0.1",
"@angular/core": "^7.0.1",
"@angular/forms": "^7.0.1",
"@angular/http": "^7.0.1",
"@angular/platform-browser": "^7.0.1",
"@angular/platform-browser-dynamic": "^7.0.1",
"@angular/router": "^7.0.1",
"@ng-bootstrap/ng-bootstrap": "^3.3.1",
"core-js": "^2.5.4",
"jquery": "^3.3.1",
"rxjs": "^6.3.3",
"rxjs-compat": "^6.2.0",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular/compiler-cli": "^7.0.1",
"@angular-devkit/build-angular": "~0.10.0",
"typescript": "~3.1.3",
"@angular/cli": "~7.0.3",
"@angular/language-service": "^7.0.1",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~8.9.4",
"codelyzer": "~4.2.1",
"jasmine-core": "~2.6.2",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma-chrome-launcher": "~2.2.0",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "~1.4.2",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1"
}
}
25 changes: 15 additions & 10 deletions Angular/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,23 @@ import { Routes, RouterModule } from '@angular/router';
import { FullComponent } from './layouts/full/full.component';

export const Approutes: Routes = [
{
{
path: '',
component: FullComponent,
children: [
{ path: '', redirectTo: '/starter', pathMatch: 'full' },
{ path: 'starter', loadChildren: './starter/starter.module#StarterModule' },
{ path: 'component', loadChildren: './component/component.module#ComponentsModule' }
{ path: '', redirectTo: '/starter', pathMatch: 'full' },
{
path: 'starter',
loadChildren: './starter/starter.module#StarterModule'
},
{
path: 'component',
loadChildren: './component/component.module#ComponentsModule'
}
]
},
{
},
{
path: '**',
redirectTo: '/starter'
}];


redirectTo: '/starter'
}
];
27 changes: 0 additions & 27 deletions Angular/src/app/app.component.spec.ts

This file was deleted.

Loading

0 comments on commit c8787f0

Please sign in to comment.