From 4d9dba57b9208ff06bb1383f01a9972352aa58c9 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 6 May 2016 00:27:48 +0500 Subject: [PATCH 1/2] landing screen --- .gitignore | 0 README.md | 0 css/style.css | 4 ++++ index.html | 0 package.json | 18 +++++++++--------- src/bootstrap.ts | 32 +++++++++++++++++++++++++++++++- src/countries.component.ts | 33 +++++++++++++++++++++++++++++++++ tsconfig.json | 0 typings.json | 0 9 files changed, 77 insertions(+), 10 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 README.md create mode 100644 css/style.css mode change 100644 => 100755 index.html mode change 100644 => 100755 package.json mode change 100644 => 100755 src/bootstrap.ts create mode 100755 src/countries.component.ts mode change 100644 => 100755 tsconfig.json mode change 100644 => 100755 typings.json diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/css/style.css b/css/style.css new file mode 100644 index 0000000..033babb --- /dev/null +++ b/css/style.css @@ -0,0 +1,4 @@ +.h1 +{ + text-align: center; +} \ No newline at end of file diff --git a/index.html b/index.html old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 40f0de1..c0c7920 --- a/package.json +++ b/package.json @@ -22,17 +22,17 @@ }, "homepage": "https://github.com/mohuk/a2-countries-and-capitals#readme", "dependencies": { - "angular2": "^2.0.0-beta.17", - "es6-shim": "^0.35.0", - "reflect-metadata": "^0.1.3", - "rxjs": "^5.0.0-beta.7", + "angular2": "2.0.0-beta.17", + "es6-shim": "0.35.0", + "reflect-metadata": "0.1.3", + "rxjs": "5.0.0-beta.7", "systemjs": "0.19.26", - "zone.js": "^0.6.12" + "zone.js": "0.6.12" }, "devDependencies": { - "concurrently": "^2.0.0", - "lite-server": "^2.2.0", - "typescript": "^1.8.10", - "typings": "^0.8.1" + "concurrently": "2.0.0", + "lite-server": "2.2.0", + "typescript": "1.8.10", + "typings": "0.8.1" } } diff --git a/src/bootstrap.ts b/src/bootstrap.ts old mode 100644 new mode 100755 index 74df08e..30d4a7d --- a/src/bootstrap.ts +++ b/src/bootstrap.ts @@ -1,12 +1,42 @@ import {bootstrap} from 'angular2/platform/browser'; import {Component} from 'angular2/core'; +import { CountriesComponent } from './countries.component'; +import { ROUTER_DIRECTIVES, Routes } from '@angular/router'; + + + +// @RouteConfig([ +// { +// path: '/countries', +// name: 'countries', +// component: CountriesComponent +// } +// ]) @Component({ selector: 'app', template: ` -

Countries and Capitals

+

Countries and Capitals

+
+
+
+ lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum +


+ Browse Countries + +
+
+
`, + styles: [` + .aligncenter { + text-align:center; + } + .inner-div { + padding:100px; + } + `] }) export class App {} diff --git a/src/countries.component.ts b/src/countries.component.ts new file mode 100755 index 0000000..4a19171 --- /dev/null +++ b/src/countries.component.ts @@ -0,0 +1,33 @@ +import {bootstrap} from 'angular2/platform/browser'; +import {Component} from 'angular2/core'; +import {CountriesComponent} from './countries'; + +@Component({ + selector: 'countries', + template: ` +

Countries and Capitals

+
+
+
+ lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum lorem ispum +


+ Browse Countries + +
+
+
+ `, + styles: [` + .aligncenter { + text-align:center; + } + .inner-div { + padding:100px; + } + `] +}) +export class CountriesComponent {} + +bootstrap(CountriesComponent) + .then(success => console.log('Kicking off Countries and Capitals')) + .catch(error => console.log(error)); diff --git a/tsconfig.json b/tsconfig.json old mode 100644 new mode 100755 diff --git a/typings.json b/typings.json old mode 100644 new mode 100755 From 8115e0321b396824f2a2d5f9a9a07b1775f6cb27 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 8 May 2016 00:22:34 +0500 Subject: [PATCH 2/2] fixing --- npm-debug.log | 45 ++++++++++++++++++++++++++++++++++++++ src/countries.component.ts | 2 +- src/country.component.ts | 5 +++-- 3 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 npm-debug.log diff --git a/npm-debug.log b/npm-debug.log new file mode 100644 index 0000000..e257fbf --- /dev/null +++ b/npm-debug.log @@ -0,0 +1,45 @@ +0 info it worked if it ends with ok +1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'run', 'start' ] +2 info using npm@3.8.6 +3 info using node@v6.0.0 +4 verbose run-script [ 'prestart', 'start', 'poststart' ] +5 info lifecycle a2-countries-and-capitals@1.0.0~prestart: a2-countries-and-capitals@1.0.0 +6 silly lifecycle a2-countries-and-capitals@1.0.0~prestart: no script for prestart, continuing +7 info lifecycle a2-countries-and-capitals@1.0.0~start: a2-countries-and-capitals@1.0.0 +8 verbose lifecycle a2-countries-and-capitals@1.0.0~start: unsafe-perm in lifecycle true +9 verbose lifecycle a2-countries-and-capitals@1.0.0~start: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/Library/WebServer/Documents/ng-conf-2016-hackathon-app/node_modules/.bin:/usr/local/bin:/Users/jasonbourne/.rvm/gems/ruby-2.2.1/bin:/Users/jasonbourne/.rvm/gems/ruby-2.2.1@global/bin:/Users/jasonbourne/.rvm/rubies/ruby-2.2.1/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jasonbourne/.rvm/gems/ruby-2.2.1/bin:/Users/jasonbourne/.rvm/gems/ruby-2.2.1@global/bin:/Users/jasonbourne/.rvm/rubies/ruby-2.2.1/bin:/Users/jasonbourne/.rvm/bin:/Users/jasonbourne/.rvm/bin +10 verbose lifecycle a2-countries-and-capitals@1.0.0~start: CWD: /Library/WebServer/Documents/ng-conf-2016-hackathon-app +11 silly lifecycle a2-countries-and-capitals@1.0.0~start: Args: [ '-c', 'tsc && concurrently "npm run tsc:w" "npm run lite" ' ] +12 silly lifecycle a2-countries-and-capitals@1.0.0~start: Returned: code: 2 signal: null +13 info lifecycle a2-countries-and-capitals@1.0.0~start: Failed to exec start script +14 verbose stack Error: a2-countries-and-capitals@1.0.0 start: `tsc && concurrently "npm run tsc:w" "npm run lite" ` +14 verbose stack Exit status 2 +14 verbose stack at EventEmitter. (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:239:16) +14 verbose stack at emitTwo (events.js:106:13) +14 verbose stack at EventEmitter.emit (events.js:191:7) +14 verbose stack at ChildProcess. (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:24:14) +14 verbose stack at emitTwo (events.js:106:13) +14 verbose stack at ChildProcess.emit (events.js:191:7) +14 verbose stack at maybeClose (internal/child_process.js:850:16) +14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:215:5) +15 verbose pkgid a2-countries-and-capitals@1.0.0 +16 verbose cwd /Library/WebServer/Documents/ng-conf-2016-hackathon-app +17 error Darwin 15.4.0 +18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "run" "start" +19 error node v6.0.0 +20 error npm v3.8.6 +21 error code ELIFECYCLE +22 error a2-countries-and-capitals@1.0.0 start: `tsc && concurrently "npm run tsc:w" "npm run lite" ` +22 error Exit status 2 +23 error Failed at the a2-countries-and-capitals@1.0.0 start script 'tsc && concurrently "npm run tsc:w" "npm run lite" '. +23 error Make sure you have the latest version of node.js and npm installed. +23 error If you do, this is most likely a problem with the a2-countries-and-capitals package, +23 error not with npm itself. +23 error Tell the author that this fails on your system: +23 error tsc && concurrently "npm run tsc:w" "npm run lite" +23 error You can get information on how to open an issue for this project with: +23 error npm bugs a2-countries-and-capitals +23 error Or if that isn't available, you can get their info via: +23 error npm owner ls a2-countries-and-capitals +23 error There is likely additional logging output above. +24 verbose exit [ 1, true ] diff --git a/src/countries.component.ts b/src/countries.component.ts index 5316e73..588ef4b 100755 --- a/src/countries.component.ts +++ b/src/countries.component.ts @@ -39,7 +39,7 @@ import {ROUTER_DIRECTIVES, RouterLink} from 'angular2/router'; export class CountriesComponent { public countries_error:Boolean = false; - +public countries:Object = []; constructor(private _countryService: CountriesService) { } diff --git a/src/country.component.ts b/src/country.component.ts index 53e9539..940b9ca 100755 --- a/src/country.component.ts +++ b/src/country.component.ts @@ -40,8 +40,9 @@ export class CountryComponent { public country_error:Boolean = false; public geoNameId:String = ''; - - + public countries:Object = []; + public neighbours:Object = []; + constructor(private _countryService: CountryService, params: RouteParams ) { _countryService.country = params.get('id'); }