From b2446a9db7ed47ec353050323cfc11194c4ec4e7 Mon Sep 17 00:00:00 2001 From: Dalton Whyte Date: Mon, 3 Jun 2019 23:28:10 +0100 Subject: [PATCH 1/4] initial commit --- .editorconfig | 13 +++ .gitignore | 43 +++++++++ README.md | 27 ++++++ angular.json | 139 +++++++++++++++++++++++++++ e2e/protractor.conf.js | 28 ++++++ e2e/src/app.e2e-spec.ts | 14 +++ e2e/src/app.po.ts | 11 +++ e2e/tsconfig.e2e.json | 13 +++ package.json | 48 +++++++++ src/app/app-routing.module.ts | 10 ++ src/app/app.component.html | 21 ++++ src/app/app.component.scss | 0 src/app/app.component.spec.ts | 35 +++++++ src/app/app.component.ts | 10 ++ src/app/app.module.ts | 18 ++++ src/assets/.gitkeep | 0 src/browserslist | 11 +++ src/environments/environment.prod.ts | 3 + src/environments/environment.ts | 16 +++ src/favicon.ico | Bin 0 -> 5430 bytes src/index.html | 14 +++ src/karma.conf.js | 31 ++++++ src/main.ts | 12 +++ src/polyfills.ts | 80 +++++++++++++++ src/styles.scss | 1 + src/test.ts | 20 ++++ src/tsconfig.app.json | 11 +++ src/tsconfig.spec.json | 18 ++++ src/tslint.json | 17 ++++ tsconfig.json | 22 +++++ tslint.json | 131 +++++++++++++++++++++++++ 31 files changed, 817 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitignore create mode 100644 README.md create mode 100644 angular.json create mode 100644 e2e/protractor.conf.js create mode 100644 e2e/src/app.e2e-spec.ts create mode 100644 e2e/src/app.po.ts create mode 100644 e2e/tsconfig.e2e.json create mode 100644 package.json create mode 100644 src/app/app-routing.module.ts create mode 100644 src/app/app.component.html create mode 100644 src/app/app.component.scss create mode 100644 src/app/app.component.spec.ts create mode 100644 src/app/app.component.ts create mode 100644 src/app/app.module.ts create mode 100644 src/assets/.gitkeep create mode 100644 src/browserslist create mode 100644 src/environments/environment.prod.ts create mode 100644 src/environments/environment.ts create mode 100644 src/favicon.ico create mode 100644 src/index.html create mode 100644 src/karma.conf.js create mode 100644 src/main.ts create mode 100644 src/polyfills.ts create mode 100644 src/styles.scss create mode 100644 src/test.ts create mode 100644 src/tsconfig.app.json create mode 100644 src/tsconfig.spec.json create mode 100644 src/tslint.json create mode 100644 tsconfig.json create mode 100644 tslint.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e89330a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,13 @@ +# Editor configuration, see https://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +max_line_length = off +trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..85158b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp +/out-tsc + +# dependencies +/node_modules + +# profiling files +chrome-profiler-events.json +speed-measure-plugin.json + +# IDEs and editors +/.idea +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace + +# IDE - VSCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json + +# misc +/.sass-cache +/connect.lock +/coverage +/libpeerconnection.log +npm-debug.log +yarn-error.log +testem.log +/typings + +# System Files +.DS_Store +Thumbs.db diff --git a/README.md b/README.md new file mode 100644 index 0000000..a809b2c --- /dev/null +++ b/README.md @@ -0,0 +1,27 @@ +# PhoenixBuilderAngular + +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.1.1. + +## Development server + +Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files. + +## Code scaffolding + +Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`. + +## Build + +Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build. + +## Running unit tests + +Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io). + +## Running end-to-end tests + +Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/). + +## Further help + +To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). diff --git a/angular.json b/angular.json new file mode 100644 index 0000000..9ca67ab --- /dev/null +++ b/angular.json @@ -0,0 +1,139 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "phoenix-builder-angular": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "prefix": "app", + "schematics": { + "@schematics/angular:component": { + "styleext": "scss" + } + }, + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/phoenix-builder-angular", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.app.json", + "assets": [ + "src/favicon.ico", + "src/assets" + ], + "styles": [ + "src/styles.scss" + ], + "scripts": [] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + } + ] + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "phoenix-builder-angular:build" + }, + "configurations": { + "production": { + "browserTarget": "phoenix-builder-angular:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "phoenix-builder-angular:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.spec.json", + "karmaConfig": "src/karma.conf.js", + "styles": [ + "src/styles.scss" + ], + "scripts": [], + "assets": [ + "src/favicon.ico", + "src/assets" + ] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] + } + } + } + }, + "phoenix-builder-angular-e2e": { + "root": "e2e/", + "projectType": "application", + "prefix": "", + "architect": { + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "e2e/protractor.conf.js", + "devServerTarget": "phoenix-builder-angular:serve" + }, + "configurations": { + "production": { + "devServerTarget": "phoenix-builder-angular:serve:production" + } + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": "e2e/tsconfig.e2e.json", + "exclude": [ + "**/node_modules/**" + ] + } + } + } + } + }, + "defaultProject": "phoenix-builder-angular" +} \ No newline at end of file diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js new file mode 100644 index 0000000..86776a3 --- /dev/null +++ b/e2e/protractor.conf.js @@ -0,0 +1,28 @@ +// Protractor configuration file, see link for more information +// https://github.com/angular/protractor/blob/master/lib/config.ts + +const { SpecReporter } = require('jasmine-spec-reporter'); + +exports.config = { + allScriptsTimeout: 11000, + specs: [ + './src/**/*.e2e-spec.ts' + ], + capabilities: { + 'browserName': 'chrome' + }, + directConnect: true, + baseUrl: 'http://localhost:4200/', + framework: 'jasmine', + jasmineNodeOpts: { + showColors: true, + defaultTimeoutInterval: 30000, + print: function() {} + }, + onPrepare() { + require('ts-node').register({ + project: require('path').join(__dirname, './tsconfig.e2e.json') + }); + jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + } +}; \ No newline at end of file diff --git a/e2e/src/app.e2e-spec.ts b/e2e/src/app.e2e-spec.ts new file mode 100644 index 0000000..d88e3a6 --- /dev/null +++ b/e2e/src/app.e2e-spec.ts @@ -0,0 +1,14 @@ +import { AppPage } from './app.po'; + +describe('workspace-project App', () => { + let page: AppPage; + + beforeEach(() => { + page = new AppPage(); + }); + + it('should display welcome message', () => { + page.navigateTo(); + expect(page.getTitleText()).toEqual('Welcome to phoenix-builder-angular!'); + }); +}); diff --git a/e2e/src/app.po.ts b/e2e/src/app.po.ts new file mode 100644 index 0000000..72e463a --- /dev/null +++ b/e2e/src/app.po.ts @@ -0,0 +1,11 @@ +import { browser, by, element } from 'protractor'; + +export class AppPage { + navigateTo() { + return browser.get('/'); + } + + getTitleText() { + return element(by.css('app-root h1')).getText(); + } +} diff --git a/e2e/tsconfig.e2e.json b/e2e/tsconfig.e2e.json new file mode 100644 index 0000000..a6dd622 --- /dev/null +++ b/e2e/tsconfig.e2e.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "module": "commonjs", + "target": "es5", + "types": [ + "jasmine", + "jasminewd2", + "node" + ] + } +} \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..e495849 --- /dev/null +++ b/package.json @@ -0,0 +1,48 @@ +{ + "name": "phoenix-builder-angular", + "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.1.0", + "@angular/common": "~7.1.0", + "@angular/compiler": "~7.1.0", + "@angular/core": "~7.1.0", + "@angular/forms": "~7.1.0", + "@angular/platform-browser": "~7.1.0", + "@angular/platform-browser-dynamic": "~7.1.0", + "@angular/router": "~7.1.0", + "core-js": "^2.5.4", + "rxjs": "~6.3.3", + "tslib": "^1.9.0", + "zone.js": "~0.8.26" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~0.11.0", + "@angular/cli": "~7.1.1", + "@angular/compiler-cli": "~7.1.0", + "@angular/language-service": "~7.1.0", + "@types/node": "~8.9.4", + "@types/jasmine": "~2.8.8", + "@types/jasminewd2": "~2.0.3", + "codelyzer": "~4.5.0", + "jasmine-core": "~2.99.1", + "jasmine-spec-reporter": "~4.2.1", + "karma": "~3.1.1", + "karma-chrome-launcher": "~2.2.0", + "karma-coverage-istanbul-reporter": "~2.0.1", + "karma-jasmine": "~1.1.2", + "karma-jasmine-html-reporter": "^0.2.2", + "protractor": "~5.4.0", + "ts-node": "~7.0.0", + "tslint": "~5.11.0", + "typescript": "~3.1.6" + } +} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts new file mode 100644 index 0000000..d425c6f --- /dev/null +++ b/src/app/app-routing.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +const routes: Routes = []; + +@NgModule({ + imports: [RouterModule.forRoot(routes)], + exports: [RouterModule] +}) +export class AppRoutingModule { } diff --git a/src/app/app.component.html b/src/app/app.component.html new file mode 100644 index 0000000..0f3d9d8 --- /dev/null +++ b/src/app/app.component.html @@ -0,0 +1,21 @@ + +
+

+ Welcome to {{ title }}! +

+ Angular Logo +
+

Here are some links to help you start:

+ + + diff --git a/src/app/app.component.scss b/src/app/app.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts new file mode 100644 index 0000000..c2cc05b --- /dev/null +++ b/src/app/app.component.spec.ts @@ -0,0 +1,35 @@ +import { TestBed, async } from '@angular/core/testing'; +import { RouterTestingModule } from '@angular/router/testing'; +import { AppComponent } from './app.component'; + +describe('AppComponent', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule + ], + declarations: [ + AppComponent + ], + }).compileComponents(); + })); + + it('should create the app', () => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app).toBeTruthy(); + }); + + it(`should have as title 'phoenix-builder-angular'`, () => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app.title).toEqual('phoenix-builder-angular'); + }); + + it('should render title in a h1 tag', () => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + const compiled = fixture.debugElement.nativeElement; + expect(compiled.querySelector('h1').textContent).toContain('Welcome to phoenix-builder-angular!'); + }); +}); diff --git a/src/app/app.component.ts b/src/app/app.component.ts new file mode 100644 index 0000000..d89608f --- /dev/null +++ b/src/app/app.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-root', + templateUrl: './app.component.html', + styleUrls: ['./app.component.scss'] +}) +export class AppComponent { + title = 'phoenix-builder-angular'; +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts new file mode 100644 index 0000000..2c3ba29 --- /dev/null +++ b/src/app/app.module.ts @@ -0,0 +1,18 @@ +import { BrowserModule } from '@angular/platform-browser'; +import { NgModule } from '@angular/core'; + +import { AppRoutingModule } from './app-routing.module'; +import { AppComponent } from './app.component'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + AppRoutingModule + ], + providers: [], + bootstrap: [AppComponent] +}) +export class AppModule { } diff --git a/src/assets/.gitkeep b/src/assets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/browserslist b/src/browserslist new file mode 100644 index 0000000..37371cb --- /dev/null +++ b/src/browserslist @@ -0,0 +1,11 @@ +# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries +# +# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed + +> 0.5% +last 2 versions +Firefox ESR +not dead +not IE 9-11 \ No newline at end of file diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts new file mode 100644 index 0000000..3612073 --- /dev/null +++ b/src/environments/environment.prod.ts @@ -0,0 +1,3 @@ +export const environment = { + production: true +}; diff --git a/src/environments/environment.ts b/src/environments/environment.ts new file mode 100644 index 0000000..7b4f817 --- /dev/null +++ b/src/environments/environment.ts @@ -0,0 +1,16 @@ +// This file can be replaced during build by using the `fileReplacements` array. +// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. +// The list of file replacements can be found in `angular.json`. + +export const environment = { + production: false +}; + +/* + * For easier debugging in development mode, you can import the following file + * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. + * + * This import should be commented out in production mode because it will have a negative impact + * on performance if an error is thrown. + */ +// import 'zone.js/dist/zone-error'; // Included with Angular CLI. diff --git a/src/favicon.ico b/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..8081c7ceaf2be08bf59010158c586170d9d2d517 GIT binary patch literal 5430 zcmc(je{54#6vvCoAI3i*G5%$U7!sA3wtMZ$fH6V9C`=eXGJb@R1%(I_{vnZtpD{6n z5Pl{DmxzBDbrB>}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975; z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G zQLe{yWA(Y6(;>y|-efAy11k<09(@Oo1B2@0`PtZSkqK&${ zgEY}`W@t{%?9u5rF?}Y7OL{338l*JY#P!%MVQY@oqnItpZ}?s z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8 z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&Wo^4P^Y z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>vtNq_5AB|0N5U*d^T?X9{xQnJYeU{ zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|( z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS- zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn= z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky humW;*g7R+&|Ledvc- + + + + PhoenixBuilderAngular + + + + + + + + + diff --git a/src/karma.conf.js b/src/karma.conf.js new file mode 100644 index 0000000..ee9caa1 --- /dev/null +++ b/src/karma.conf.js @@ -0,0 +1,31 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/1.0/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular-devkit/build-angular'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular-devkit/build-angular/plugins/karma') + ], + client: { + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + coverageIstanbulReporter: { + dir: require('path').join(__dirname, '../coverage'), + reports: ['html', 'lcovonly', 'text-summary'], + fixWebpackSourcePaths: true + }, + reporters: ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false + }); +}; \ No newline at end of file diff --git a/src/main.ts b/src/main.ts new file mode 100644 index 0000000..c7b673c --- /dev/null +++ b/src/main.ts @@ -0,0 +1,12 @@ +import { enableProdMode } from '@angular/core'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { AppModule } from './app/app.module'; +import { environment } from './environments/environment'; + +if (environment.production) { + enableProdMode(); +} + +platformBrowserDynamic().bootstrapModule(AppModule) + .catch(err => console.error(err)); diff --git a/src/polyfills.ts b/src/polyfills.ts new file mode 100644 index 0000000..ee8b84d --- /dev/null +++ b/src/polyfills.ts @@ -0,0 +1,80 @@ +/** + * This file includes polyfills needed by Angular and is loaded before the app. + * You can add your own extra polyfills to this file. + * + * This file is divided into 2 sections: + * 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers. + * 2. Application imports. Files imported after ZoneJS that should be loaded before your main + * file. + * + * The current setup is for so-called "evergreen" browsers; the last versions of browsers that + * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera), + * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile. + * + * Learn more in https://angular.io/guide/browser-support + */ + +/*************************************************************************************************** + * BROWSER POLYFILLS + */ + +/** IE9, IE10 and IE11 requires all of the following polyfills. **/ +// 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/weak-map'; +// import 'core-js/es6/set'; + +/** + * If the application will be indexed by Google Search, the following is required. + * Googlebot uses a renderer based on Chrome 41. + * https://developers.google.com/search/docs/guides/rendering + **/ +// import 'core-js/es6/array'; + +/** IE10 and IE11 requires the following for NgClass support on SVG elements */ +// import 'classlist.js'; // Run `npm install --save classlist.js`. + +/** IE10 and IE11 requires the following for the Reflect API. */ +// import 'core-js/es6/reflect'; + +/** + * Web Animations `@angular/platform-browser/animations` + * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari. + * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0). + **/ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + +/** + * By default, zone.js will patch all possible macroTask and DomEvents + * user can disable parts of macroTask/DomEvents patch by setting following flags + */ + + // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame + // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick + // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames + + /* + * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js + * with the following flag, it will bypass `zone.js` patch for IE/Edge + */ +// (window as any).__Zone_enable_cross_context_check = true; + +/*************************************************************************************************** + * Zone JS is required by default for Angular itself. + */ +import 'zone.js/dist/zone'; // Included with Angular CLI. + + +/*************************************************************************************************** + * APPLICATION IMPORTS + */ diff --git a/src/styles.scss b/src/styles.scss new file mode 100644 index 0000000..90d4ee0 --- /dev/null +++ b/src/styles.scss @@ -0,0 +1 @@ +/* You can add global styles to this file, and also import other style files */ diff --git a/src/test.ts b/src/test.ts new file mode 100644 index 0000000..1631789 --- /dev/null +++ b/src/test.ts @@ -0,0 +1,20 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'zone.js/dist/zone-testing'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; + +declare const require: any; + +// First, initialize the Angular testing environment. +getTestBed().initTestEnvironment( + BrowserDynamicTestingModule, + platformBrowserDynamicTesting() +); +// Then we find all the tests. +const context = require.context('./', true, /\.spec\.ts$/); +// And load the modules. +context.keys().map(context); diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json new file mode 100644 index 0000000..190fd30 --- /dev/null +++ b/src/tsconfig.app.json @@ -0,0 +1,11 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "types": [] + }, + "exclude": [ + "test.ts", + "**/*.spec.ts" + ] +} diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json new file mode 100644 index 0000000..de77336 --- /dev/null +++ b/src/tsconfig.spec.json @@ -0,0 +1,18 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/spec", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "test.ts", + "polyfills.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/src/tslint.json b/src/tslint.json new file mode 100644 index 0000000..52e2c1a --- /dev/null +++ b/src/tslint.json @@ -0,0 +1,17 @@ +{ + "extends": "../tslint.json", + "rules": { + "directive-selector": [ + true, + "attribute", + "app", + "camelCase" + ], + "component-selector": [ + true, + "element", + "app", + "kebab-case" + ] + } +} diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..b271fd9 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "baseUrl": "./", + "outDir": "./dist/out-tsc", + "sourceMap": true, + "declaration": false, + "module": "es2015", + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "importHelpers": true, + "target": "es5", + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2018", + "dom" + ] + } +} diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000..c740a7b --- /dev/null +++ b/tslint.json @@ -0,0 +1,131 @@ +{ + "rulesDirectory": [ + "codelyzer" + ], + "rules": { + "arrow-return-shorthand": true, + "callable-types": true, + "class-name": true, + "comment-format": [ + true, + "check-space" + ], + "curly": true, + "deprecation": { + "severity": "warn" + }, + "eofline": true, + "forin": true, + "import-blacklist": [ + true, + "rxjs/Rx" + ], + "import-spacing": true, + "indent": [ + true, + "spaces" + ], + "interface-over-type-literal": true, + "label-position": true, + "max-line-length": [ + true, + 140 + ], + "member-access": false, + "member-ordering": [ + true, + { + "order": [ + "static-field", + "instance-field", + "static-method", + "instance-method" + ] + } + ], + "no-arg": true, + "no-bitwise": true, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-debugger": true, + "no-duplicate-super": true, + "no-empty": false, + "no-empty-interface": true, + "no-eval": true, + "no-inferrable-types": [ + true, + "ignore-params" + ], + "no-misused-new": true, + "no-non-null-assertion": true, + "no-redundant-jsdoc": true, + "no-shadowed-variable": true, + "no-string-literal": false, + "no-string-throw": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unnecessary-initializer": true, + "no-unused-expression": true, + "no-use-before-declare": true, + "no-var-keyword": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "prefer-const": true, + "quotemark": [ + true, + "single" + ], + "radix": true, + "semicolon": [ + true, + "always" + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "unified-signatures": true, + "variable-name": false, + "whitespace": [ + true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type" + ], + "no-output-on-prefix": true, + "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 + } +} From f6d7deabb20fe18955814da12925b3255d27f299 Mon Sep 17 00:00:00 2001 From: Dalton Whyte Date: Tue, 4 Jun 2019 12:06:28 +0100 Subject: [PATCH 2/4] Initializ phoenix-builder angular project, and add modules: login and words with their various components --- angular.json | 6 ++- package.json | 2 + src/app/app-routing.module.ts | 10 ++++- src/app/app.component.html | 18 --------- src/app/app.component.ts | 25 +++++++++++- src/app/app.module.ts | 8 +++- src/app/auth.service.spec.ts | 12 ++++++ src/app/auth.service.ts | 19 +++++++++ src/app/login/login.component.html | 39 +++++++++++++++++++ src/app/login/login.component.scss | 3 ++ src/app/login/login.component.spec.ts | 25 ++++++++++++ src/app/login/login.component.ts | 32 +++++++++++++++ src/app/login/login.module.ts | 17 ++++++++ .../page-not-found.component.html | 26 +++++++++++++ .../page-not-found.component.scss | 0 .../page-not-found.component.spec.ts | 25 ++++++++++++ .../page-not-found.component.ts | 15 +++++++ .../english-words.component.html | 3 ++ .../english-words.component.scss | 0 .../english-words.component.spec.ts | 25 ++++++++++++ .../english-words/english-words.component.ts | 15 +++++++ .../word-groups/word-groups.component.html | 3 ++ .../word-groups/word-groups.component.scss | 0 .../word-groups/word-groups.component.spec.ts | 25 ++++++++++++ .../word-groups/word-groups.component.ts | 15 +++++++ src/app/words/words.module.ts | 13 +++++++ src/app/words/words/words.component.html | 3 ++ src/app/words/words/words.component.scss | 0 src/app/words/words/words.component.spec.ts | 25 ++++++++++++ src/app/words/words/words.component.ts | 15 +++++++ src/index.html | 2 +- 31 files changed, 401 insertions(+), 25 deletions(-) create mode 100644 src/app/auth.service.spec.ts create mode 100644 src/app/auth.service.ts create mode 100644 src/app/login/login.component.html create mode 100644 src/app/login/login.component.scss create mode 100644 src/app/login/login.component.spec.ts create mode 100644 src/app/login/login.component.ts create mode 100644 src/app/login/login.module.ts create mode 100644 src/app/page-not-found/page-not-found.component.html create mode 100644 src/app/page-not-found/page-not-found.component.scss create mode 100644 src/app/page-not-found/page-not-found.component.spec.ts create mode 100644 src/app/page-not-found/page-not-found.component.ts create mode 100644 src/app/words/english-words/english-words.component.html create mode 100644 src/app/words/english-words/english-words.component.scss create mode 100644 src/app/words/english-words/english-words.component.spec.ts create mode 100644 src/app/words/english-words/english-words.component.ts create mode 100644 src/app/words/word-groups/word-groups.component.html create mode 100644 src/app/words/word-groups/word-groups.component.scss create mode 100644 src/app/words/word-groups/word-groups.component.spec.ts create mode 100644 src/app/words/word-groups/word-groups.component.ts create mode 100644 src/app/words/words.module.ts create mode 100644 src/app/words/words/words.component.html create mode 100644 src/app/words/words/words.component.scss create mode 100644 src/app/words/words/words.component.spec.ts create mode 100644 src/app/words/words/words.component.ts diff --git a/angular.json b/angular.json index 9ca67ab..2ee4369 100644 --- a/angular.json +++ b/angular.json @@ -27,9 +27,13 @@ "src/assets" ], "styles": [ + "node_modules/foundation-sites/dist/css/foundation.min.css", "src/styles.scss" ], - "scripts": [] + "scripts": [ + "node_modules/jquery/dist/jquery.min.js", + "node_modules/foundation-sites/dist/js/foundation.min.js" + ] }, "configurations": { "production": { diff --git a/package.json b/package.json index e495849..a50f7d0 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,8 @@ "@angular/platform-browser-dynamic": "~7.1.0", "@angular/router": "~7.1.0", "core-js": "^2.5.4", + "foundation-sites": "^6.5.3", + "jquery": "^3.4.1", "rxjs": "~6.3.3", "tslib": "^1.9.0", "zone.js": "~0.8.26" diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index d425c6f..24de53c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,10 +1,16 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { LoginComponent } from './login/login.component'; +import { PageNotFoundComponent } from './page-not-found/page-not-found.component'; -const routes: Routes = []; +const routes: Routes = [ + { path: '', component: LoginComponent }, + { path: '**', component: PageNotFoundComponent}, +]; @NgModule({ imports: [RouterModule.forRoot(routes)], exports: [RouterModule] }) -export class AppRoutingModule { } +export class AppRoutingModule {} + \ No newline at end of file diff --git a/src/app/app.component.html b/src/app/app.component.html index 0f3d9d8..cb77bc7 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,21 +1,3 @@ -
-

- Welcome to {{ title }}! -

- Angular Logo -
-

Here are some links to help you start:

- diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d89608f..8c69b27 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,4 +1,6 @@ import { Component } from '@angular/core'; +import { AuthService } from './auth.service'; +import { Router } from '@angular/router'; @Component({ selector: 'app-root', @@ -6,5 +8,26 @@ import { Component } from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent { - title = 'phoenix-builder-angular'; + pageTitle = 'Phoenix Builder'; + + get isLoggedIn(): boolean { + return this.authService.isLoggedIn; + } + + get userName(): string { + if (this.authService.currentUser) { + return this.authService.currentUser.userName; + } + return ''; + } + + constructor( + private authService: AuthService, + private router: Router + ) {} + + logOut(): void { + this.authService.logOut(); + this.router.navigateByUrl('/login'); + } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2c3ba29..2041b1e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,14 +3,18 @@ import { NgModule } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; +import { LoginModule } from './login/login.module'; +import { PageNotFoundComponent } from './page-not-found/page-not-found.component'; @NgModule({ declarations: [ - AppComponent + AppComponent, + PageNotFoundComponent ], imports: [ BrowserModule, - AppRoutingModule + AppRoutingModule, + LoginModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/auth.service.spec.ts b/src/app/auth.service.spec.ts new file mode 100644 index 0000000..f3d964d --- /dev/null +++ b/src/app/auth.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { AuthService } from './auth.service'; + +describe('AuthService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: AuthService = TestBed.get(AuthService); + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/auth.service.ts b/src/app/auth.service.ts new file mode 100644 index 0000000..21107f0 --- /dev/null +++ b/src/app/auth.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from "@angular/core"; + +@Injectable({ + providedIn: "root" +}) +export class AuthService { + public isLoggedIn: boolean; + public currentUser: CurrentUser; + + constructor() {} + + login(userName: string, password: string) {} + + logOut() {} +} + +interface CurrentUser { + userName: string; +} diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html new file mode 100644 index 0000000..9ec2294 --- /dev/null +++ b/src/app/login/login.component.html @@ -0,0 +1,39 @@ +
+
+
+

Phoenix Builder

+

+
+
+ + + An email address is required. +
+ + +
+
+
+
+ + + \ No newline at end of file diff --git a/src/app/login/login.component.scss b/src/app/login/login.component.scss new file mode 100644 index 0000000..4d66230 --- /dev/null +++ b/src/app/login/login.component.scss @@ -0,0 +1,3 @@ +body{ + background-color:#039; +} diff --git a/src/app/login/login.component.spec.ts b/src/app/login/login.component.spec.ts new file mode 100644 index 0000000..d6d85a8 --- /dev/null +++ b/src/app/login/login.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { LoginComponent } from './login.component'; + +describe('LoginComponent', () => { + let component: LoginComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ LoginComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(LoginComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts new file mode 100644 index 0000000..5bfbb35 --- /dev/null +++ b/src/app/login/login.component.ts @@ -0,0 +1,32 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { NgForm } from '@angular/forms'; +import { AuthService } from '../auth.service'; + +@Component({ + selector: 'app-login', + templateUrl: './login.component.html', + styleUrls: ['./login.component.scss'] +}) +export class LoginComponent implements OnInit { + errorMessage: string; + pageTitle = 'Log In'; + + constructor( + private authService: AuthService, + private router: Router) { } + + ngOnInit() {} + + login(loginForm: NgForm) { + if(loginForm && loginForm.valid) { + const userName = loginForm.form.value.userName; + const password = loginForm.form.value.password; + this.authService.login(userName, password); + this.router.navigate(['/dashboard']); + } else { + this.errorMessage = 'Please enter a user name and password.'; + } + } + +} diff --git a/src/app/login/login.module.ts b/src/app/login/login.module.ts new file mode 100644 index 0000000..64b0888 --- /dev/null +++ b/src/app/login/login.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { LoginComponent } from './login.component'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; + +@NgModule({ + declarations: [ + LoginComponent + ], + imports: [ + CommonModule, + RouterModule.forChild([ + { path: '/login', component: LoginComponent } + ]), + ], +}) +export class LoginModule {} diff --git a/src/app/page-not-found/page-not-found.component.html b/src/app/page-not-found/page-not-found.component.html new file mode 100644 index 0000000..6499598 --- /dev/null +++ b/src/app/page-not-found/page-not-found.component.html @@ -0,0 +1,26 @@ +
+
+
+

Phoenix Builder

+

+

Ooops! Page Not Found. Check your link!

+
+
+ + + \ No newline at end of file diff --git a/src/app/page-not-found/page-not-found.component.scss b/src/app/page-not-found/page-not-found.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/page-not-found/page-not-found.component.spec.ts b/src/app/page-not-found/page-not-found.component.spec.ts new file mode 100644 index 0000000..697a946 --- /dev/null +++ b/src/app/page-not-found/page-not-found.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PageNotFoundComponent } from './page-not-found.component'; + +describe('PageNotFoundComponent', () => { + let component: PageNotFoundComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PageNotFoundComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PageNotFoundComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/page-not-found/page-not-found.component.ts b/src/app/page-not-found/page-not-found.component.ts new file mode 100644 index 0000000..31ae4d8 --- /dev/null +++ b/src/app/page-not-found/page-not-found.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-page-not-found', + templateUrl: './page-not-found.component.html', + styleUrls: ['./page-not-found.component.scss'] +}) +export class PageNotFoundComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/english-words/english-words.component.html b/src/app/words/english-words/english-words.component.html new file mode 100644 index 0000000..9698278 --- /dev/null +++ b/src/app/words/english-words/english-words.component.html @@ -0,0 +1,3 @@ +

+ english-words works! +

diff --git a/src/app/words/english-words/english-words.component.scss b/src/app/words/english-words/english-words.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/english-words/english-words.component.spec.ts b/src/app/words/english-words/english-words.component.spec.ts new file mode 100644 index 0000000..9f437a0 --- /dev/null +++ b/src/app/words/english-words/english-words.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EnglishWordsComponent } from './english-words.component'; + +describe('EnglishWordsComponent', () => { + let component: EnglishWordsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EnglishWordsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EnglishWordsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/english-words/english-words.component.ts b/src/app/words/english-words/english-words.component.ts new file mode 100644 index 0000000..a6cb777 --- /dev/null +++ b/src/app/words/english-words/english-words.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-english-words', + templateUrl: './english-words.component.html', + styleUrls: ['./english-words.component.scss'] +}) +export class EnglishWordsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/word-groups/word-groups.component.html b/src/app/words/word-groups/word-groups.component.html new file mode 100644 index 0000000..b316852 --- /dev/null +++ b/src/app/words/word-groups/word-groups.component.html @@ -0,0 +1,3 @@ +

+ word-groups works! +

diff --git a/src/app/words/word-groups/word-groups.component.scss b/src/app/words/word-groups/word-groups.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/word-groups/word-groups.component.spec.ts b/src/app/words/word-groups/word-groups.component.spec.ts new file mode 100644 index 0000000..a4c1281 --- /dev/null +++ b/src/app/words/word-groups/word-groups.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WordGroupsComponent } from './word-groups.component'; + +describe('WordGroupsComponent', () => { + let component: WordGroupsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WordGroupsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WordGroupsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/word-groups/word-groups.component.ts b/src/app/words/word-groups/word-groups.component.ts new file mode 100644 index 0000000..0a43dfc --- /dev/null +++ b/src/app/words/word-groups/word-groups.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-word-groups', + templateUrl: './word-groups.component.html', + styleUrls: ['./word-groups.component.scss'] +}) +export class WordGroupsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/words.module.ts b/src/app/words/words.module.ts new file mode 100644 index 0000000..79040ea --- /dev/null +++ b/src/app/words/words.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { WordsComponent } from './words/words.component'; +import { WordGroupsComponent } from './word-groups/word-groups.component'; +import { EnglishWordsComponent } from './english-words/english-words.component'; + +@NgModule({ + declarations: [WordsComponent, WordGroupsComponent, EnglishWordsComponent], + imports: [ + CommonModule + ] +}) +export class WordsModule { } diff --git a/src/app/words/words/words.component.html b/src/app/words/words/words.component.html new file mode 100644 index 0000000..8c996a9 --- /dev/null +++ b/src/app/words/words/words.component.html @@ -0,0 +1,3 @@ +

+ words works! +

diff --git a/src/app/words/words/words.component.scss b/src/app/words/words/words.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/words/words.component.spec.ts b/src/app/words/words/words.component.spec.ts new file mode 100644 index 0000000..946bcad --- /dev/null +++ b/src/app/words/words/words.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WordsComponent } from './words.component'; + +describe('WordsComponent', () => { + let component: WordsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WordsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WordsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/words/words.component.ts b/src/app/words/words/words.component.ts new file mode 100644 index 0000000..28e6a27 --- /dev/null +++ b/src/app/words/words/words.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-words', + templateUrl: './words.component.html', + styleUrls: ['./words.component.scss'] +}) +export class WordsComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/index.html b/src/index.html index 2d9a899..4c7dd0a 100644 --- a/src/index.html +++ b/src/index.html @@ -2,7 +2,7 @@ - PhoenixBuilderAngular + Project Phoenix From cda3734d23d7fa21dfa431a772479fe4e4b97c63 Mon Sep 17 00:00:00 2001 From: Dalton Whyte Date: Tue, 4 Jun 2019 12:34:16 +0100 Subject: [PATCH 3/4] Add more routes and sub-components for words, workd-groups and english-words. --- .../english-word-detail.component.html | 3 +++ .../english-word-detail.component.scss} | 0 .../english-word-detail.component.spec.ts | 25 +++++++++++++++++++ .../english-word-detail.component.ts | 15 +++++++++++ .../english-word-edit.component.html | 3 +++ .../english-word-edit.component.scss} | 0 .../english-word-edit.component.spec.ts | 25 +++++++++++++++++++ .../english-word-edit.component.ts | 15 +++++++++++ .../english-word-list.component.html | 3 +++ .../english-word-list.component.scss} | 0 .../english-word-list.component.spec.ts | 25 +++++++++++++++++++ .../english-word-list.component.ts | 15 +++++++++++ .../english-words.component.html | 3 --- .../english-words/english-words.component.ts | 15 ----------- .../word-detail/word-detail.component.html | 3 +++ .../word-detail/word-detail.component.scss | 0 .../word-detail.component.spec.ts} | 12 ++++----- .../word-detail/word-detail.component.ts | 15 +++++++++++ .../words/word-edit/word-edit.component.html | 3 +++ .../words/word-edit/word-edit.component.scss | 0 .../word-edit.component.spec.ts} | 12 ++++----- .../words/word-edit/word-edit.component.ts | 15 +++++++++++ .../word-group-detail.component.html | 3 +++ .../word-group-detail.component.scss | 0 .../word-group-detail.component.spec.ts | 25 +++++++++++++++++++ .../word-group-detail.component.ts | 15 +++++++++++ .../word-group-edit.component.html | 3 +++ .../word-group-edit.component.scss | 0 .../word-group-edit.component.spec.ts | 25 +++++++++++++++++++ .../word-group-edit.component.ts | 15 +++++++++++ .../word-group-list.component.html | 3 +++ .../word-group-list.component.scss | 0 .../word-group-list.component.spec.ts | 25 +++++++++++++++++++ .../word-group-list.component.ts | 15 +++++++++++ .../word-groups/word-groups.component.html | 3 --- .../word-groups/word-groups.component.ts | 15 ----------- .../words/word-list/word-list.component.html | 3 +++ .../words/word-list/word-list.component.scss | 0 .../word-list.component.spec.ts} | 12 ++++----- .../words/word-list/word-list.component.ts | 15 +++++++++++ src/app/words/words.module.ts | 13 +++++++++- src/app/words/words/words.component.html | 3 --- src/app/words/words/words.component.ts | 15 ----------- 43 files changed, 342 insertions(+), 73 deletions(-) create mode 100644 src/app/words/english-word-detail/english-word-detail.component.html rename src/app/words/{english-words/english-words.component.scss => english-word-detail/english-word-detail.component.scss} (100%) create mode 100644 src/app/words/english-word-detail/english-word-detail.component.spec.ts create mode 100644 src/app/words/english-word-detail/english-word-detail.component.ts create mode 100644 src/app/words/english-word-edit/english-word-edit.component.html rename src/app/words/{word-groups/word-groups.component.scss => english-word-edit/english-word-edit.component.scss} (100%) create mode 100644 src/app/words/english-word-edit/english-word-edit.component.spec.ts create mode 100644 src/app/words/english-word-edit/english-word-edit.component.ts create mode 100644 src/app/words/english-word-list/english-word-list.component.html rename src/app/words/{words/words.component.scss => english-word-list/english-word-list.component.scss} (100%) create mode 100644 src/app/words/english-word-list/english-word-list.component.spec.ts create mode 100644 src/app/words/english-word-list/english-word-list.component.ts delete mode 100644 src/app/words/english-words/english-words.component.html delete mode 100644 src/app/words/english-words/english-words.component.ts create mode 100644 src/app/words/word-detail/word-detail.component.html create mode 100644 src/app/words/word-detail/word-detail.component.scss rename src/app/words/{word-groups/word-groups.component.spec.ts => word-detail/word-detail.component.spec.ts} (54%) create mode 100644 src/app/words/word-detail/word-detail.component.ts create mode 100644 src/app/words/word-edit/word-edit.component.html create mode 100644 src/app/words/word-edit/word-edit.component.scss rename src/app/words/{words/words.component.spec.ts => word-edit/word-edit.component.spec.ts} (55%) create mode 100644 src/app/words/word-edit/word-edit.component.ts create mode 100644 src/app/words/word-group-detail/word-group-detail.component.html create mode 100644 src/app/words/word-group-detail/word-group-detail.component.scss create mode 100644 src/app/words/word-group-detail/word-group-detail.component.spec.ts create mode 100644 src/app/words/word-group-detail/word-group-detail.component.ts create mode 100644 src/app/words/word-group-edit/word-group-edit.component.html create mode 100644 src/app/words/word-group-edit/word-group-edit.component.scss create mode 100644 src/app/words/word-group-edit/word-group-edit.component.spec.ts create mode 100644 src/app/words/word-group-edit/word-group-edit.component.ts create mode 100644 src/app/words/word-group-list/word-group-list.component.html create mode 100644 src/app/words/word-group-list/word-group-list.component.scss create mode 100644 src/app/words/word-group-list/word-group-list.component.spec.ts create mode 100644 src/app/words/word-group-list/word-group-list.component.ts delete mode 100644 src/app/words/word-groups/word-groups.component.html delete mode 100644 src/app/words/word-groups/word-groups.component.ts create mode 100644 src/app/words/word-list/word-list.component.html create mode 100644 src/app/words/word-list/word-list.component.scss rename src/app/words/{english-words/english-words.component.spec.ts => word-list/word-list.component.spec.ts} (53%) create mode 100644 src/app/words/word-list/word-list.component.ts delete mode 100644 src/app/words/words/words.component.html delete mode 100644 src/app/words/words/words.component.ts diff --git a/src/app/words/english-word-detail/english-word-detail.component.html b/src/app/words/english-word-detail/english-word-detail.component.html new file mode 100644 index 0000000..b14155e --- /dev/null +++ b/src/app/words/english-word-detail/english-word-detail.component.html @@ -0,0 +1,3 @@ +

+ english-word-detail works! +

diff --git a/src/app/words/english-words/english-words.component.scss b/src/app/words/english-word-detail/english-word-detail.component.scss similarity index 100% rename from src/app/words/english-words/english-words.component.scss rename to src/app/words/english-word-detail/english-word-detail.component.scss diff --git a/src/app/words/english-word-detail/english-word-detail.component.spec.ts b/src/app/words/english-word-detail/english-word-detail.component.spec.ts new file mode 100644 index 0000000..a50a5ca --- /dev/null +++ b/src/app/words/english-word-detail/english-word-detail.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EnglishWordDetailComponent } from './english-word-detail.component'; + +describe('EnglishWordDetailComponent', () => { + let component: EnglishWordDetailComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EnglishWordDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EnglishWordDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/english-word-detail/english-word-detail.component.ts b/src/app/words/english-word-detail/english-word-detail.component.ts new file mode 100644 index 0000000..b034473 --- /dev/null +++ b/src/app/words/english-word-detail/english-word-detail.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-english-word-detail', + templateUrl: './english-word-detail.component.html', + styleUrls: ['./english-word-detail.component.scss'] +}) +export class EnglishWordDetailComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/english-word-edit/english-word-edit.component.html b/src/app/words/english-word-edit/english-word-edit.component.html new file mode 100644 index 0000000..da72673 --- /dev/null +++ b/src/app/words/english-word-edit/english-word-edit.component.html @@ -0,0 +1,3 @@ +

+ english-word-edit works! +

diff --git a/src/app/words/word-groups/word-groups.component.scss b/src/app/words/english-word-edit/english-word-edit.component.scss similarity index 100% rename from src/app/words/word-groups/word-groups.component.scss rename to src/app/words/english-word-edit/english-word-edit.component.scss diff --git a/src/app/words/english-word-edit/english-word-edit.component.spec.ts b/src/app/words/english-word-edit/english-word-edit.component.spec.ts new file mode 100644 index 0000000..5f879fa --- /dev/null +++ b/src/app/words/english-word-edit/english-word-edit.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EnglishWordEditComponent } from './english-word-edit.component'; + +describe('EnglishWordEditComponent', () => { + let component: EnglishWordEditComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EnglishWordEditComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EnglishWordEditComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/english-word-edit/english-word-edit.component.ts b/src/app/words/english-word-edit/english-word-edit.component.ts new file mode 100644 index 0000000..74efd32 --- /dev/null +++ b/src/app/words/english-word-edit/english-word-edit.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-english-word-edit', + templateUrl: './english-word-edit.component.html', + styleUrls: ['./english-word-edit.component.scss'] +}) +export class EnglishWordEditComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/english-word-list/english-word-list.component.html b/src/app/words/english-word-list/english-word-list.component.html new file mode 100644 index 0000000..6107636 --- /dev/null +++ b/src/app/words/english-word-list/english-word-list.component.html @@ -0,0 +1,3 @@ +

+ english-word-list works! +

diff --git a/src/app/words/words/words.component.scss b/src/app/words/english-word-list/english-word-list.component.scss similarity index 100% rename from src/app/words/words/words.component.scss rename to src/app/words/english-word-list/english-word-list.component.scss diff --git a/src/app/words/english-word-list/english-word-list.component.spec.ts b/src/app/words/english-word-list/english-word-list.component.spec.ts new file mode 100644 index 0000000..fc681bb --- /dev/null +++ b/src/app/words/english-word-list/english-word-list.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EnglishWordListComponent } from './english-word-list.component'; + +describe('EnglishWordListComponent', () => { + let component: EnglishWordListComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EnglishWordListComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EnglishWordListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/english-word-list/english-word-list.component.ts b/src/app/words/english-word-list/english-word-list.component.ts new file mode 100644 index 0000000..416e639 --- /dev/null +++ b/src/app/words/english-word-list/english-word-list.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-english-word-list', + templateUrl: './english-word-list.component.html', + styleUrls: ['./english-word-list.component.scss'] +}) +export class EnglishWordListComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/english-words/english-words.component.html b/src/app/words/english-words/english-words.component.html deleted file mode 100644 index 9698278..0000000 --- a/src/app/words/english-words/english-words.component.html +++ /dev/null @@ -1,3 +0,0 @@ -

- english-words works! -

diff --git a/src/app/words/english-words/english-words.component.ts b/src/app/words/english-words/english-words.component.ts deleted file mode 100644 index a6cb777..0000000 --- a/src/app/words/english-words/english-words.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-english-words', - templateUrl: './english-words.component.html', - styleUrls: ['./english-words.component.scss'] -}) -export class EnglishWordsComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/words/word-detail/word-detail.component.html b/src/app/words/word-detail/word-detail.component.html new file mode 100644 index 0000000..cbbc822 --- /dev/null +++ b/src/app/words/word-detail/word-detail.component.html @@ -0,0 +1,3 @@ +

+ word-detail works! +

diff --git a/src/app/words/word-detail/word-detail.component.scss b/src/app/words/word-detail/word-detail.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/word-groups/word-groups.component.spec.ts b/src/app/words/word-detail/word-detail.component.spec.ts similarity index 54% rename from src/app/words/word-groups/word-groups.component.spec.ts rename to src/app/words/word-detail/word-detail.component.spec.ts index a4c1281..f14a06e 100644 --- a/src/app/words/word-groups/word-groups.component.spec.ts +++ b/src/app/words/word-detail/word-detail.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { WordGroupsComponent } from './word-groups.component'; +import { WordDetailComponent } from './word-detail.component'; -describe('WordGroupsComponent', () => { - let component: WordGroupsComponent; - let fixture: ComponentFixture; +describe('WordDetailComponent', () => { + let component: WordDetailComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ WordGroupsComponent ] + declarations: [ WordDetailComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(WordGroupsComponent); + fixture = TestBed.createComponent(WordDetailComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/words/word-detail/word-detail.component.ts b/src/app/words/word-detail/word-detail.component.ts new file mode 100644 index 0000000..a652d4d --- /dev/null +++ b/src/app/words/word-detail/word-detail.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-word-detail', + templateUrl: './word-detail.component.html', + styleUrls: ['./word-detail.component.scss'] +}) +export class WordDetailComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/word-edit/word-edit.component.html b/src/app/words/word-edit/word-edit.component.html new file mode 100644 index 0000000..7929b4c --- /dev/null +++ b/src/app/words/word-edit/word-edit.component.html @@ -0,0 +1,3 @@ +

+ word-edit works! +

diff --git a/src/app/words/word-edit/word-edit.component.scss b/src/app/words/word-edit/word-edit.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/words/words.component.spec.ts b/src/app/words/word-edit/word-edit.component.spec.ts similarity index 55% rename from src/app/words/words/words.component.spec.ts rename to src/app/words/word-edit/word-edit.component.spec.ts index 946bcad..49dd2b5 100644 --- a/src/app/words/words/words.component.spec.ts +++ b/src/app/words/word-edit/word-edit.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { WordsComponent } from './words.component'; +import { WordEditComponent } from './word-edit.component'; -describe('WordsComponent', () => { - let component: WordsComponent; - let fixture: ComponentFixture; +describe('WordEditComponent', () => { + let component: WordEditComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ WordsComponent ] + declarations: [ WordEditComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(WordsComponent); + fixture = TestBed.createComponent(WordEditComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/words/word-edit/word-edit.component.ts b/src/app/words/word-edit/word-edit.component.ts new file mode 100644 index 0000000..7bcc904 --- /dev/null +++ b/src/app/words/word-edit/word-edit.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-word-edit', + templateUrl: './word-edit.component.html', + styleUrls: ['./word-edit.component.scss'] +}) +export class WordEditComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/word-group-detail/word-group-detail.component.html b/src/app/words/word-group-detail/word-group-detail.component.html new file mode 100644 index 0000000..a19d9bf --- /dev/null +++ b/src/app/words/word-group-detail/word-group-detail.component.html @@ -0,0 +1,3 @@ +

+ word-group-detail works! +

diff --git a/src/app/words/word-group-detail/word-group-detail.component.scss b/src/app/words/word-group-detail/word-group-detail.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/word-group-detail/word-group-detail.component.spec.ts b/src/app/words/word-group-detail/word-group-detail.component.spec.ts new file mode 100644 index 0000000..47e687f --- /dev/null +++ b/src/app/words/word-group-detail/word-group-detail.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WordGroupDetailComponent } from './word-group-detail.component'; + +describe('WordGroupDetailComponent', () => { + let component: WordGroupDetailComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WordGroupDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WordGroupDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/word-group-detail/word-group-detail.component.ts b/src/app/words/word-group-detail/word-group-detail.component.ts new file mode 100644 index 0000000..23fbd96 --- /dev/null +++ b/src/app/words/word-group-detail/word-group-detail.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-word-group-detail', + templateUrl: './word-group-detail.component.html', + styleUrls: ['./word-group-detail.component.scss'] +}) +export class WordGroupDetailComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/word-group-edit/word-group-edit.component.html b/src/app/words/word-group-edit/word-group-edit.component.html new file mode 100644 index 0000000..6a2f842 --- /dev/null +++ b/src/app/words/word-group-edit/word-group-edit.component.html @@ -0,0 +1,3 @@ +

+ word-group-edit works! +

diff --git a/src/app/words/word-group-edit/word-group-edit.component.scss b/src/app/words/word-group-edit/word-group-edit.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/word-group-edit/word-group-edit.component.spec.ts b/src/app/words/word-group-edit/word-group-edit.component.spec.ts new file mode 100644 index 0000000..18db218 --- /dev/null +++ b/src/app/words/word-group-edit/word-group-edit.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WordGroupEditComponent } from './word-group-edit.component'; + +describe('WordGroupEditComponent', () => { + let component: WordGroupEditComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WordGroupEditComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WordGroupEditComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/word-group-edit/word-group-edit.component.ts b/src/app/words/word-group-edit/word-group-edit.component.ts new file mode 100644 index 0000000..06cc01d --- /dev/null +++ b/src/app/words/word-group-edit/word-group-edit.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-word-group-edit', + templateUrl: './word-group-edit.component.html', + styleUrls: ['./word-group-edit.component.scss'] +}) +export class WordGroupEditComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/word-group-list/word-group-list.component.html b/src/app/words/word-group-list/word-group-list.component.html new file mode 100644 index 0000000..abf1066 --- /dev/null +++ b/src/app/words/word-group-list/word-group-list.component.html @@ -0,0 +1,3 @@ +

+ word-group-list works! +

diff --git a/src/app/words/word-group-list/word-group-list.component.scss b/src/app/words/word-group-list/word-group-list.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/word-group-list/word-group-list.component.spec.ts b/src/app/words/word-group-list/word-group-list.component.spec.ts new file mode 100644 index 0000000..e351bc9 --- /dev/null +++ b/src/app/words/word-group-list/word-group-list.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { WordGroupListComponent } from './word-group-list.component'; + +describe('WordGroupListComponent', () => { + let component: WordGroupListComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ WordGroupListComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(WordGroupListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/words/word-group-list/word-group-list.component.ts b/src/app/words/word-group-list/word-group-list.component.ts new file mode 100644 index 0000000..bbd9dbf --- /dev/null +++ b/src/app/words/word-group-list/word-group-list.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-word-group-list', + templateUrl: './word-group-list.component.html', + styleUrls: ['./word-group-list.component.scss'] +}) +export class WordGroupListComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/word-groups/word-groups.component.html b/src/app/words/word-groups/word-groups.component.html deleted file mode 100644 index b316852..0000000 --- a/src/app/words/word-groups/word-groups.component.html +++ /dev/null @@ -1,3 +0,0 @@ -

- word-groups works! -

diff --git a/src/app/words/word-groups/word-groups.component.ts b/src/app/words/word-groups/word-groups.component.ts deleted file mode 100644 index 0a43dfc..0000000 --- a/src/app/words/word-groups/word-groups.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-word-groups', - templateUrl: './word-groups.component.html', - styleUrls: ['./word-groups.component.scss'] -}) -export class WordGroupsComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/words/word-list/word-list.component.html b/src/app/words/word-list/word-list.component.html new file mode 100644 index 0000000..f0a761d --- /dev/null +++ b/src/app/words/word-list/word-list.component.html @@ -0,0 +1,3 @@ +

+ word-list works! +

diff --git a/src/app/words/word-list/word-list.component.scss b/src/app/words/word-list/word-list.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/words/english-words/english-words.component.spec.ts b/src/app/words/word-list/word-list.component.spec.ts similarity index 53% rename from src/app/words/english-words/english-words.component.spec.ts rename to src/app/words/word-list/word-list.component.spec.ts index 9f437a0..d4c43fe 100644 --- a/src/app/words/english-words/english-words.component.spec.ts +++ b/src/app/words/word-list/word-list.component.spec.ts @@ -1,20 +1,20 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { EnglishWordsComponent } from './english-words.component'; +import { WordListComponent } from './word-list.component'; -describe('EnglishWordsComponent', () => { - let component: EnglishWordsComponent; - let fixture: ComponentFixture; +describe('WordListComponent', () => { + let component: WordListComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ EnglishWordsComponent ] + declarations: [ WordListComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(EnglishWordsComponent); + fixture = TestBed.createComponent(WordListComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/words/word-list/word-list.component.ts b/src/app/words/word-list/word-list.component.ts new file mode 100644 index 0000000..14bd2b1 --- /dev/null +++ b/src/app/words/word-list/word-list.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-word-list', + templateUrl: './word-list.component.html', + styleUrls: ['./word-list.component.scss'] +}) +export class WordListComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/words/words.module.ts b/src/app/words/words.module.ts index 79040ea..2fbd14f 100644 --- a/src/app/words/words.module.ts +++ b/src/app/words/words.module.ts @@ -3,9 +3,20 @@ import { CommonModule } from '@angular/common'; import { WordsComponent } from './words/words.component'; import { WordGroupsComponent } from './word-groups/word-groups.component'; import { EnglishWordsComponent } from './english-words/english-words.component'; +import { WordDetailComponent } from './word-detail/word-detail.component'; +import { WordEditComponent } from './word-edit/word-edit.component'; +import { WordListComponent } from './word-list/word-list.component'; +import { WordGroupDetailsComponent } from './word-group-details/word-group-details.component'; +import { WordGroupEditComponent } from './word-group-edit/word-group-edit.component'; +import { WordGroupListComponent } from './word-group-list/word-group-list.component'; +import { EnglishWordListComponent } from './english-word-list/english-word-list.component'; +import { EnglishWordDetailsComponent } from './english-word-details/english-word-details.component'; +import { WordGroupDetailComponent } from './word-group-detail/word-group-detail.component'; +import { EnglishWordDetailComponent } from './english-word-detail/english-word-detail.component'; +import { EnglishWordEditComponent } from './english-word-edit/english-word-edit.component'; @NgModule({ - declarations: [WordsComponent, WordGroupsComponent, EnglishWordsComponent], + declarations: [WordsComponent, WordGroupsComponent, EnglishWordsComponent, WordDetailComponent, WordEditComponent, WordListComponent, WordGroupDetailsComponent, WordGroupEditComponent, WordGroupListComponent, EnglishWordListComponent, EnglishWordDetailsComponent, WordGroupDetailComponent, EnglishWordDetailComponent, EnglishWordEditComponent], imports: [ CommonModule ] diff --git a/src/app/words/words/words.component.html b/src/app/words/words/words.component.html deleted file mode 100644 index 8c996a9..0000000 --- a/src/app/words/words/words.component.html +++ /dev/null @@ -1,3 +0,0 @@ -

- words works! -

diff --git a/src/app/words/words/words.component.ts b/src/app/words/words/words.component.ts deleted file mode 100644 index 28e6a27..0000000 --- a/src/app/words/words/words.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-words', - templateUrl: './words.component.html', - styleUrls: ['./words.component.scss'] -}) -export class WordsComponent implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} From 0a93c27b68babd118be02e6e1bcec32554d88961 Mon Sep 17 00:00:00 2001 From: Dalton Whyte Date: Tue, 4 Jun 2019 12:43:27 +0100 Subject: [PATCH 4/4] Add Words module to App module --- src/app/app.module.ts | 4 +++- src/app/words/words.module.ts | 25 ++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2041b1e..c1eef62 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,6 +5,7 @@ import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { LoginModule } from './login/login.module'; import { PageNotFoundComponent } from './page-not-found/page-not-found.component'; +import { WordsModule } from './words/words.module'; @NgModule({ declarations: [ @@ -14,7 +15,8 @@ import { PageNotFoundComponent } from './page-not-found/page-not-found.component imports: [ BrowserModule, AppRoutingModule, - LoginModule + LoginModule, + WordsModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/words/words.module.ts b/src/app/words/words.module.ts index 2fbd14f..495263d 100644 --- a/src/app/words/words.module.ts +++ b/src/app/words/words.module.ts @@ -1,24 +1,31 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { WordsComponent } from './words/words.component'; -import { WordGroupsComponent } from './word-groups/word-groups.component'; -import { EnglishWordsComponent } from './english-words/english-words.component'; +import { RouterModule } from '@angular/router'; import { WordDetailComponent } from './word-detail/word-detail.component'; import { WordEditComponent } from './word-edit/word-edit.component'; import { WordListComponent } from './word-list/word-list.component'; -import { WordGroupDetailsComponent } from './word-group-details/word-group-details.component'; +import { WordGroupDetailComponent } from './word-group-detail/word-group-detail.component'; import { WordGroupEditComponent } from './word-group-edit/word-group-edit.component'; import { WordGroupListComponent } from './word-group-list/word-group-list.component'; import { EnglishWordListComponent } from './english-word-list/english-word-list.component'; -import { EnglishWordDetailsComponent } from './english-word-details/english-word-details.component'; -import { WordGroupDetailComponent } from './word-group-detail/word-group-detail.component'; import { EnglishWordDetailComponent } from './english-word-detail/english-word-detail.component'; import { EnglishWordEditComponent } from './english-word-edit/english-word-edit.component'; @NgModule({ - declarations: [WordsComponent, WordGroupsComponent, EnglishWordsComponent, WordDetailComponent, WordEditComponent, WordListComponent, WordGroupDetailsComponent, WordGroupEditComponent, WordGroupListComponent, EnglishWordListComponent, EnglishWordDetailsComponent, WordGroupDetailComponent, EnglishWordDetailComponent, EnglishWordEditComponent], + declarations: [WordListComponent, WordGroupListComponent, EnglishWordListComponent], imports: [ - CommonModule + CommonModule, + RouterModule.forChild([ + { path: 'words', component: WordListComponent }, + { path: 'words/:id', component: WordDetailComponent }, + { path: 'words/:id/edit', component: WordEditComponent }, + { path: 'wordgroups', component: WordGroupListComponent }, + { path: 'wordgroups/:id', component: WordGroupDetailComponent }, + { path: 'wordgroups/:id/edit', component: WordGroupEditComponent }, + { path: 'englishwords', component: EnglishWordListComponent }, + { path: 'englishwords/:id', component: EnglishWordDetailComponent }, + { path: 'englishwords/:id/edit', component: EnglishWordEditComponent } + ]) ] }) -export class WordsModule { } +export class WordsModule {}