+
diff --git a/src/app/themes/redux/redux.component.ts b/src/app/themes/redux/redux.component.ts
new file mode 100644
index 0000000..75338a6
--- /dev/null
+++ b/src/app/themes/redux/redux.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { Game } from '../../../lib/gj-lib-client/components/game/game.model';
+import { GamePackage } from '../../../lib/gj-lib-client/components/game/package/package.model';
+import { GameScreenshot } from '../../../lib/gj-lib-client/components/game/screenshot/screenshot.model';
+import { GameVideo } from '../../../lib/gj-lib-client/components/game/video/video.model';
+import template from 'html!./redux.component.html';
+
+@Component( {
+ selector: 'gj-theme-redux',
+ template,
+})
+export class ThemeReduxComponent implements OnInit
+{
+ @Input() game: Game;
+ @Input() packages: GamePackage[];
+ @Input() mediaItems: (GameScreenshot | GameVideo)[];
+
+ constructor() { }
+
+ ngOnInit() { }
+}
diff --git a/src/app/themes/themes.module.ts b/src/app/themes/themes.module.ts
new file mode 100644
index 0000000..1c118f9
--- /dev/null
+++ b/src/app/themes/themes.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { ThemeVashComponent } from './vash/vash.component';
+import { ThemeReduxComponent } from './redux/redux.component';
+import { SharedModule } from '../shared/shared.module';
+
+const THEMES: any[] = [
+ ThemeVashComponent,
+ ThemeReduxComponent,
+];
+
+@NgModule({
+ imports: [
+ SharedModule,
+ ],
+ exports: [
+ ...THEMES,
+ ],
+ declarations: [
+ ...THEMES,
+ ],
+ providers: [],
+})
+export class ThemesModule { }
diff --git a/src/app/themes/vash/vash.component.html b/src/app/themes/vash/vash.component.html
new file mode 100644
index 0000000..45acdce
--- /dev/null
+++ b/src/app/themes/vash/vash.component.html
@@ -0,0 +1,45 @@
+
+
+
+
+testing this out, okay?
+
+
+
diff --git a/src/app/themes/vash/vash.component.ts b/src/app/themes/vash/vash.component.ts
new file mode 100644
index 0000000..5b21450
--- /dev/null
+++ b/src/app/themes/vash/vash.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { Game } from '../../../lib/gj-lib-client/components/game/game.model';
+import { GamePackage } from '../../../lib/gj-lib-client/components/game/package/package.model';
+import { GameScreenshot } from '../../../lib/gj-lib-client/components/game/screenshot/screenshot.model';
+import { GameVideo } from '../../../lib/gj-lib-client/components/game/video/video.model';
+import template from 'html!./vash.component.html';
+
+@Component( {
+ selector: 'gj-theme-vash',
+ template,
+})
+export class ThemeVashComponent implements OnInit
+{
+ @Input() game: Game;
+ @Input() packages: GamePackage[];
+ @Input() mediaItems: (GameScreenshot | GameVideo)[];
+
+ constructor() { }
+
+ ngOnInit() { }
+}
diff --git a/src/app/themes/vash/vash.html b/src/app/themes/vash/vash.html
deleted file mode 100644
index 5dbe77f..0000000
--- a/src/app/themes/vash/vash.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
diff --git a/src/index.html b/src/index.html
index fd58d1b..6ef146a 100644
--- a/src/index.html
+++ b/src/index.html
@@ -57,7 +57,7 @@
-
+
@@ -68,7 +68,8 @@
ga('require', 'linkid', 'linkid.js');
-
+
+
diff --git a/src/lib/gj-lib-client b/src/lib/gj-lib-client
index e134ed2..334ed16 160000
--- a/src/lib/gj-lib-client
+++ b/src/lib/gj-lib-client
@@ -1 +1 @@
-Subproject commit e134ed2b532401eccabe7a29e7824406479b7017
+Subproject commit 334ed166903f4a21345ea37778148c22b6297da3
diff --git a/src/polyfill.ts b/src/polyfill.ts
new file mode 100644
index 0000000..b126611
--- /dev/null
+++ b/src/polyfill.ts
@@ -0,0 +1,20 @@
+// This file includes polyfills needed by Angular 2 and is loaded before
+// the app. You can add your own extra polyfills to this file.
+import 'core-js/es6/symbol';
+import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+import 'core-js/es6/math';
+import 'core-js/es6/string';
+import 'core-js/es6/date';
+import 'core-js/es6/array';
+import 'core-js/es6/regexp';
+import 'core-js/es6/map';
+import 'core-js/es6/set';
+import 'core-js/es6/reflect';
+import 'core-js/es6/promise';
+
+import 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
diff --git a/src/vendor.ts b/src/vendor.ts
index 2a66e0b..b130da8 100644
--- a/src/vendor.ts
+++ b/src/vendor.ts
@@ -3,11 +3,13 @@
// It also means that changes to the app.js files won't change the vendor.js file
// so that we can keep this in cache.
-import 'reflect-metadata';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/toPromise';
+
import {
+ NgModule,
Inject,
Injectable,
- provide,
Component,
Directive,
Input,
@@ -20,13 +22,42 @@ import {
Self,
SkipSelf,
ViewChild,
-} from 'ng-metadata/core';
-import { bootstrap } from 'ng-metadata/platform';
+ ElementRef,
+} from '@angular/core';
+
+import {
+ Location,
+ LocationStrategy,
+ PathLocationStrategy,
+ CommonModule,
+} from '@angular/common';
+
+import {
+ DomSanitizer,
+ BrowserModule,
+ Title,
+ Meta,
+ DOCUMENT,
+} from '@angular/platform-browser';
-const ngMetadata_core = {
+import {
+ platformBrowserDynamic,
+} from '@angular/platform-browser-dynamic';
+
+import {
+ FormsModule,
+} from '@angular/forms';
+
+import {
+ HttpModule,
+ Http,
+ RequestMethod,
+} from '@angular/http';
+
+const ng_core = {
+ NgModule,
Inject,
Injectable,
- provide,
Component,
Directive,
Input,
@@ -39,13 +70,43 @@ const ngMetadata_core = {
Self,
SkipSelf,
ViewChild,
+ ElementRef,
+};
+
+const ng_common = {
+ Location,
+ LocationStrategy,
+ PathLocationStrategy,
+ CommonModule,
+};
+
+const ng_platformBrowser = {
+ DomSanitizer,
+ BrowserModule,
+ Title,
+ Meta,
+ DOCUMENT,
+};
+
+const ng_platformBrowserDynamic = {
+ platformBrowserDynamic,
+};
+
+const ng_forms = {
+ FormsModule,
};
-const ngMetadata_platform = {
- bootstrap,
+const ng_http = {
+ HttpModule,
+ Http,
+ RequestMethod,
};
export default {
- ngMetadata_core,
- ngMetadata_platform,
+ ng_core,
+ ng_common,
+ ng_platformBrowser,
+ ng_platformBrowserDynamic,
+ ng_forms,
+ ng_http,
};
diff --git a/todo.txt b/todo.txt
new file mode 100644
index 0000000..0670593
--- /dev/null
+++ b/todo.txt
@@ -0,0 +1,10 @@
+$location.path() -> Location.path()
+
+Change directions from snake-case to camelCase
+
+TODO
+
+[ ] Replace App with new App service declarations
+[ ] Remove @Inject calls
+[ ] Create modules for everything.
+[ ] Model isn't actually getting injected into models?
diff --git a/tsconfig.json b/tsconfig.json
index ea41106..50ed797 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,17 +2,15 @@
"compilerOptions": {
"target": "es5",
"moduleResolution": "node",
- // Doesn't work with lazy loading and rollup.
- // Can only turn it on when angular2 is in place.
- // "emitDecoratorMetadata": true,
+ "emitDecoratorMetadata": true,
"experimentalDecorators": true,
- "removeComments": false,
"noImplicitAny": true,
"strictNullChecks": true,
"noUnusedParameters": true,
"noUnusedLocals": true,
"allowJs": true,
- "skipLibCheck": true
+ "skipLibCheck": true,
+ "importHelpers": true
},
"exclude": [
"build",
diff --git a/tsconfig.webpack.json b/tsconfig.webpack.json
new file mode 100644
index 0000000..c3f02a4
--- /dev/null
+++ b/tsconfig.webpack.json
@@ -0,0 +1,28 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "module": "es2015",
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "noEmit": true,
+ "noImplicitAny": true,
+ "strictNullChecks": true,
+ "noUnusedParameters": true,
+ "noUnusedLocals": true,
+ "skipLibCheck": true,
+ "lib": [
+ "es2015",
+ "dom"
+ ]
+ },
+ "exclude": [
+ "build",
+ "node_modules",
+ "src/bower-lib"
+ ],
+ "awesomeTypescriptLoaderOptions": {
+ "forkChecker": true,
+ "useWebpackText": true
+ }
+}
diff --git a/tslint.json b/tslint.json
index 3a36db4..0876737 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,33 +1,70 @@
{
+ "rulesDirectory": [
+ "node_modules/codelyzer"
+ ],
"rules": {
- "no-inferrable-types": true,
"class-name": true,
"comment-format": [
true,
"check-space"
],
+ "curly": true,
+ "eofline": true,
+ "forin": true,
"indent": [
true,
"tabs"
],
- "eofline": true,
- "no-duplicate-variable": true,
- "no-eval": true,
+ "label-position": true,
+ "max-line-length": [
+ true,
+ 140
+ ],
+ "member-access": false,
+ "member-ordering": [
+ true,
+ "variables-before-functions"
+ ],
"no-arg": true,
- "no-internal-module": true,
- "no-trailing-whitespace": true,
"no-bitwise": true,
+ "no-console": [
+ true,
+ "debug",
+ "info",
+ "time",
+ "timeEnd",
+ "trace"
+ ],
+ "no-construct": true,
+ "no-debugger": true,
+ "no-duplicate-variable": true,
+ "no-empty": false,
+ "no-eval": true,
+ "no-inferrable-types": true,
"no-shadowed-variable": true,
+ "no-string-literal": false,
+ "no-switch-case-fall-through": true,
+ "no-trailing-whitespace": true,
"no-unused-expression": true,
- "no-unused-variable": true,
-
+ "no-use-before-declare": true,
+ "no-var-keyword": true,
+ "object-literal-sort-keys": false,
+ "one-line": [
+ true,
+ "check-catch",
+ "check-whitespace"
+ ],
"quotemark": [
true,
- "single",
- "avoid-escape"
+ "single"
],
+ "radix": true,
"semicolon": [
- "always"
+ "always"
+ ],
+ "triple-equals": [
+ true,
+ "allow-null-check"
],
"typedef-whitespace": [
true,
@@ -39,14 +76,7 @@
"variable-declaration": "nospace"
}
],
- "curly": true,
- "variable-name": [
- false,
- "ban-keywords",
- "check-format",
- "allow-trailing-underscore",
- "allow-leading-underscore"
- ],
+ "variable-name": false,
"whitespace": [
true,
"check-branch",
@@ -54,6 +84,21 @@
"check-operator",
"check-separator",
"check-type"
- ]
+ ],
+
+ "directive-selector": [true, "attribute", "gj", "camelCase"],
+ "component-selector": [true, "element", "gj", "kebab-case"],
+ "use-input-property-decorator": true,
+ "use-output-property-decorator": true,
+ "use-host-property-decorator": true,
+ "no-input-rename": true,
+ "no-output-rename": true,
+ "use-life-cycle-interface": true,
+ "use-pipe-transform-interface": true,
+ "component-class-suffix": true,
+ "directive-class-suffix": true,
+ "no-access-missing-member": true,
+ "templates-use-public": true,
+ "invoke-injectable": true
}
}
diff --git a/typings.json b/typings.json
deleted file mode 100644
index 3132621..0000000
--- a/typings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": "sites-io",
- "version": false,
- "globalDependencies": {
- "angular": "registry:dt/angular#1.5.0+20160602160139",
- "angular-animate": "registry:dt/angular-animate#1.5.0+20160614091201",
- "angular-sanitize": "registry:dt/angular-sanitize#1.3.0+20160317120654",
- "jquery": "registry:dt/jquery#1.10.0+20160704162008"
- }
-}