From 0b4f77505fb01ab16ccc1565bf345bff8d724d64 Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Thu, 4 May 2017 15:53:18 +0530 Subject: [PATCH 01/20] Add Bonus Functionality --- Day-2/Employee.js | 6 ++++-- Day-2/Employee.ts | 8 ++++++-- Day-2/Organization.js | 2 +- Day-2/Organization.ts | 2 +- Day-2/salary-updater.js | 4 +++- Day-2/salary-updater.ts | 5 +++-- Day-2/salary-upgrader.js | 5 ++++- Day-2/salary-upgrader.ts | 6 ++++-- 8 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Day-2/Employee.js b/Day-2/Employee.js index f55454a..fede150 100644 --- a/Day-2/Employee.js +++ b/Day-2/Employee.js @@ -1,13 +1,15 @@ "use strict"; exports.__esModule = true; var Employee = (function () { - function Employee(id, name, salary) { + function Employee(id, name, salary, rating, bonus) { this.id = id; this.name = name; this.salary = salary; + this.rating = rating; + this.bonus = bonus; } Employee.prototype.printInfo = function () { - console.log(this.name + " gets " + this.salary); + console.log(this.name + " gets " + this.salary + " and bonus " + this.bonus); }; Employee.prototype.updateSalary = function (newSalary) { this.salary = newSalary; diff --git a/Day-2/Employee.ts b/Day-2/Employee.ts index ee0002f..711bf86 100644 --- a/Day-2/Employee.ts +++ b/Day-2/Employee.ts @@ -2,13 +2,17 @@ export class Employee { id: number; name: string; salary: number; - constructor(id: number, name: string, salary: number) { + rating: number; + bonus: number; + constructor(id: number, name: string, salary: number, rating: number, bonus: number) { this.id = id; this.name = name; this.salary = salary; + this.rating = rating; + this.bonus = bonus; } printInfo() { - console.log(`${this.name} gets ${this.salary}`); + console.log(`${this.name} gets ${this.salary} and bonus ${this.bonus}`); } updateSalary(newSalary: number) { this.salary = newSalary; diff --git a/Day-2/Organization.js b/Day-2/Organization.js index 4ec45dd..9c02055 100644 --- a/Day-2/Organization.js +++ b/Day-2/Organization.js @@ -8,7 +8,7 @@ var Organization = (function () { } Organization.prototype.createEmployees = function () { for (var i = 1; i <= 10; i++) { - var emp = new Employee_1.Employee(i, 'A' + i, i * 1000); + var emp = new Employee_1.Employee(i, 'A' + i, i * 1000, i / 2, 0); this.listOfEmployees.push(emp); } }; diff --git a/Day-2/Organization.ts b/Day-2/Organization.ts index 165daaf..05e37de 100644 --- a/Day-2/Organization.ts +++ b/Day-2/Organization.ts @@ -8,7 +8,7 @@ export class Organization { } createEmployees() { for (let i = 1; i <= 10; i++) { - let emp: Employee = new Employee(i, 'A' + i, i * 1000); + let emp: Employee = new Employee(i, 'A' + i, i * 1000, i / 2, 0); this.listOfEmployees.push(emp); } } diff --git a/Day-2/salary-updater.js b/Day-2/salary-updater.js index a3a77b9..c01e8f2 100644 --- a/Day-2/salary-updater.js +++ b/Day-2/salary-updater.js @@ -4,7 +4,9 @@ var Organization_1 = require("./Organization"); var salary_upgrader_1 = require("./salary-upgrader"); var org = new Organization_1.Organization('ABC'); org.createEmployees(); -org.printEmployeesInfo(); +//org.printEmployeesInfo(); var salaryUpgrader = new salary_upgrader_1.SalaryUpgrader(); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); +salaryUpgrader.addBonus(org.getEmployeeList()); +org.printEmployeesInfo(); diff --git a/Day-2/salary-updater.ts b/Day-2/salary-updater.ts index 159e761..0e08be1 100644 --- a/Day-2/salary-updater.ts +++ b/Day-2/salary-updater.ts @@ -3,8 +3,9 @@ import { SalaryUpgrader } from './salary-upgrader'; let org: Organization = new Organization('ABC'); org.createEmployees(); -org.printEmployeesInfo(); +//org.printEmployeesInfo(); let salaryUpgrader: SalaryUpgrader = new SalaryUpgrader(); salaryUpgrader.incrementSalary(10, org.getEmployeeList()); org.printEmployeesInfo(); - +salaryUpgrader.addBonus(org.getEmployeeList()); +org.printEmployeesInfo(); \ No newline at end of file diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index cc82f12..2dff9c4 100644 --- a/Day-2/salary-upgrader.js +++ b/Day-2/salary-upgrader.js @@ -10,7 +10,10 @@ var SalaryUpgrader = (function () { emp.updateSalary(newSalary); }); }; - SalaryUpgrader.prototype.addBonus = function () { + SalaryUpgrader.prototype.addBonus = function (empList) { + empList.map(function (emp) { + emp.rating >= 4 ? emp.bonus = 1000 : emp.bonus = 0; + }); }; return SalaryUpgrader; }()); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..6976855 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -10,7 +10,9 @@ export class SalaryUpgrader { emp.updateSalary(newSalary); }) } - addBonus() { - + addBonus(empList: Employee[]) { + empList.map(emp => { + emp.rating >= 4 ? emp.bonus = 1000 : emp.bonus = 0; + }) } } \ No newline at end of file From 54aa1bbeb0ef028d11de50d4097a04af6baddeb7 Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Thu, 4 May 2017 16:21:49 +0530 Subject: [PATCH 02/20] Rating Modification --- Day-2/Employee.js | 8 ++++---- Day-2/Employee.ts | 8 ++++---- Day-2/Organization.js | 2 +- Day-2/Organization.ts | 2 +- Day-2/salary-upgrader.js | 6 ++++++ Day-2/salary-upgrader.ts | 7 +++++++ 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Day-2/Employee.js b/Day-2/Employee.js index fede150..b6d90c1 100644 --- a/Day-2/Employee.js +++ b/Day-2/Employee.js @@ -1,15 +1,15 @@ "use strict"; exports.__esModule = true; var Employee = (function () { - function Employee(id, name, salary, rating, bonus) { + function Employee(id, name, salary) { this.id = id; this.name = name; this.salary = salary; - this.rating = rating; - this.bonus = bonus; + this.rating = 1; + this.bonus = 0; } Employee.prototype.printInfo = function () { - console.log(this.name + " gets " + this.salary + " and bonus " + this.bonus); + console.log(this.name + " gets " + this.salary + " and bonus " + this.bonus + " with rating " + this.rating); }; Employee.prototype.updateSalary = function (newSalary) { this.salary = newSalary; diff --git a/Day-2/Employee.ts b/Day-2/Employee.ts index 711bf86..eb43967 100644 --- a/Day-2/Employee.ts +++ b/Day-2/Employee.ts @@ -4,15 +4,15 @@ export class Employee { salary: number; rating: number; bonus: number; - constructor(id: number, name: string, salary: number, rating: number, bonus: number) { + constructor(id: number, name: string, salary: number) { this.id = id; this.name = name; this.salary = salary; - this.rating = rating; - this.bonus = bonus; + this.rating = 1; + this.bonus = 0; } printInfo() { - console.log(`${this.name} gets ${this.salary} and bonus ${this.bonus}`); + console.log(`${this.name} gets ${this.salary} and bonus ${this.bonus} with rating ${this.rating}`); } updateSalary(newSalary: number) { this.salary = newSalary; diff --git a/Day-2/Organization.js b/Day-2/Organization.js index 9c02055..4ec45dd 100644 --- a/Day-2/Organization.js +++ b/Day-2/Organization.js @@ -8,7 +8,7 @@ var Organization = (function () { } Organization.prototype.createEmployees = function () { for (var i = 1; i <= 10; i++) { - var emp = new Employee_1.Employee(i, 'A' + i, i * 1000, i / 2, 0); + var emp = new Employee_1.Employee(i, 'A' + i, i * 1000); this.listOfEmployees.push(emp); } }; diff --git a/Day-2/Organization.ts b/Day-2/Organization.ts index 05e37de..165daaf 100644 --- a/Day-2/Organization.ts +++ b/Day-2/Organization.ts @@ -8,7 +8,7 @@ export class Organization { } createEmployees() { for (let i = 1; i <= 10; i++) { - let emp: Employee = new Employee(i, 'A' + i, i * 1000, i / 2, 0); + let emp: Employee = new Employee(i, 'A' + i, i * 1000); this.listOfEmployees.push(emp); } } diff --git a/Day-2/salary-upgrader.js b/Day-2/salary-upgrader.js index 2dff9c4..7b9c370 100644 --- a/Day-2/salary-upgrader.js +++ b/Day-2/salary-upgrader.js @@ -10,7 +10,13 @@ var SalaryUpgrader = (function () { emp.updateSalary(newSalary); }); }; + SalaryUpgrader.prototype.rateEmployee = function (empList) { + empList.map(function (emp, i) { + emp.rating = (i + 1) / 2; + }); + }; SalaryUpgrader.prototype.addBonus = function (empList) { + this.rateEmployee(empList); empList.map(function (emp) { emp.rating >= 4 ? emp.bonus = 1000 : emp.bonus = 0; }); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 6976855..30edd01 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -10,7 +10,14 @@ export class SalaryUpgrader { emp.updateSalary(newSalary); }) } + + rateEmployee(empList){ + empList.map((emp,i) => { + emp.rating = (i+1)/2; + }) + } addBonus(empList: Employee[]) { + this.rateEmployee(empList); empList.map(emp => { emp.rating >= 4 ? emp.bonus = 1000 : emp.bonus = 0; }) From a496b5eaf3607485f91f881d735baf09a1f75500 Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Thu, 4 May 2017 16:38:44 +0530 Subject: [PATCH 03/20] Day 1 Solutions --- Day-1/solutions/fifth.js | 8 ++++++++ Day-1/solutions/second.js | 4 ++++ Day-1/solutions/sixth.js | 14 ++++++++++++++ Day-1/solutions/third.js | 7 +++++++ Day-2/Employee.js | 2 +- Day-2/Employee.ts | 2 +- 6 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 Day-1/solutions/fifth.js create mode 100644 Day-1/solutions/second.js create mode 100644 Day-1/solutions/sixth.js create mode 100644 Day-1/solutions/third.js diff --git a/Day-1/solutions/fifth.js b/Day-1/solutions/fifth.js new file mode 100644 index 0000000..3039ef4 --- /dev/null +++ b/Day-1/solutions/fifth.js @@ -0,0 +1,8 @@ +console.log(printFizz(1,30)); + +function printFizz(n,m){ + check35 = (n % 3 == 0 && n % 5 == 0); + check3 = (n % 3 == 0); + check5 = (n % 5 == 0); + return n <= m ? ( check35 ? 'FizzBuzz' : check3 ? 'Fizz' : check5 ? 'Buzz' : n) + ',' + printFizz(n+1,m) : ''; +} \ No newline at end of file diff --git a/Day-1/solutions/second.js b/Day-1/solutions/second.js new file mode 100644 index 0000000..d7a6918 --- /dev/null +++ b/Day-1/solutions/second.js @@ -0,0 +1,4 @@ +console.log(getSum(500)); +function getSum(n) { + return n == 1 ? 1 : n + getSum(n-1); +} \ No newline at end of file diff --git a/Day-1/solutions/sixth.js b/Day-1/solutions/sixth.js new file mode 100644 index 0000000..cff6aac --- /dev/null +++ b/Day-1/solutions/sixth.js @@ -0,0 +1,14 @@ +var arr = [1, 4, 3, 5, 4, 6, 7, 8, 3]; +console.log(findSum(8,arr)); + +function findSum(n,arr){ + arr.sort(function(a, b){return a - b}); + len = arr.length - 1; + res = []; + for ( i=0 ; i <= len; i++){ + if(arr[i] + arr[len] == n){ + res.push(arr[i] + ',' + arr[len]); + } + } + return res; +} \ No newline at end of file diff --git a/Day-1/solutions/third.js b/Day-1/solutions/third.js new file mode 100644 index 0000000..f46e9ce --- /dev/null +++ b/Day-1/solutions/third.js @@ -0,0 +1,7 @@ +console.log(getMulSum(10)); + +function getMulSum(n){ + check = ( n % 3 == 0 || n % 5 == 0); + return n > 0 ? check ? n + getMulSum(n-1) : 0 + getMulSum(n-1) : 0; + +} \ No newline at end of file diff --git a/Day-2/Employee.js b/Day-2/Employee.js index b6d90c1..098290a 100644 --- a/Day-2/Employee.js +++ b/Day-2/Employee.js @@ -5,7 +5,7 @@ var Employee = (function () { this.id = id; this.name = name; this.salary = salary; - this.rating = 1; + this.rating = 0; this.bonus = 0; } Employee.prototype.printInfo = function () { diff --git a/Day-2/Employee.ts b/Day-2/Employee.ts index eb43967..eb3dd3a 100644 --- a/Day-2/Employee.ts +++ b/Day-2/Employee.ts @@ -8,7 +8,7 @@ export class Employee { this.id = id; this.name = name; this.salary = salary; - this.rating = 1; + this.rating = 0; this.bonus = 0; } printInfo() { From 585828a5caf4774ef7c8f7a20112e0944f6b307d Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Fri, 5 May 2017 14:46:43 +0530 Subject: [PATCH 04/20] set-up commit --- DOIT/.angular-cli.json | 57 +++++++++++ DOIT/.editorconfig | 13 +++ DOIT/.gitignore | 42 ++++++++ DOIT/README.md | 28 ++++++ DOIT/e2e/app.e2e-spec.ts | 14 +++ DOIT/e2e/app.po.ts | 11 ++ DOIT/e2e/tsconfig.e2e.json | 12 +++ DOIT/karma.conf.js | 44 ++++++++ DOIT/package.json | 46 +++++++++ DOIT/protractor.conf.js | 30 ++++++ DOIT/src/app/app.component.css | 0 DOIT/src/app/app.component.html | 3 + DOIT/src/app/app.component.spec.ts | 32 ++++++ DOIT/src/app/app.component.ts | 10 ++ DOIT/src/app/app.module.ts | 20 ++++ DOIT/src/assets/.gitkeep | 0 DOIT/src/environments/environment.prod.ts | 3 + DOIT/src/environments/environment.ts | 8 ++ DOIT/src/favicon.ico | Bin 0 -> 5430 bytes DOIT/src/index.html | 14 +++ DOIT/src/main.ts | 11 ++ DOIT/src/polyfills.ts | 68 +++++++++++++ DOIT/src/styles.css | 1 + DOIT/src/test.ts | 32 ++++++ DOIT/src/tsconfig.app.json | 13 +++ DOIT/src/tsconfig.spec.json | 20 ++++ DOIT/src/typings.d.ts | 5 + DOIT/tsconfig.json | 20 ++++ DOIT/tslint.json | 116 ++++++++++++++++++++++ 29 files changed, 673 insertions(+) create mode 100644 DOIT/.angular-cli.json create mode 100644 DOIT/.editorconfig create mode 100644 DOIT/.gitignore create mode 100644 DOIT/README.md create mode 100644 DOIT/e2e/app.e2e-spec.ts create mode 100644 DOIT/e2e/app.po.ts create mode 100644 DOIT/e2e/tsconfig.e2e.json create mode 100644 DOIT/karma.conf.js create mode 100644 DOIT/package.json create mode 100644 DOIT/protractor.conf.js create mode 100644 DOIT/src/app/app.component.css create mode 100644 DOIT/src/app/app.component.html create mode 100644 DOIT/src/app/app.component.spec.ts create mode 100644 DOIT/src/app/app.component.ts create mode 100644 DOIT/src/app/app.module.ts create mode 100644 DOIT/src/assets/.gitkeep create mode 100644 DOIT/src/environments/environment.prod.ts create mode 100644 DOIT/src/environments/environment.ts create mode 100644 DOIT/src/favicon.ico create mode 100644 DOIT/src/index.html create mode 100644 DOIT/src/main.ts create mode 100644 DOIT/src/polyfills.ts create mode 100644 DOIT/src/styles.css create mode 100644 DOIT/src/test.ts create mode 100644 DOIT/src/tsconfig.app.json create mode 100644 DOIT/src/tsconfig.spec.json create mode 100644 DOIT/src/typings.d.ts create mode 100644 DOIT/tsconfig.json create mode 100644 DOIT/tslint.json diff --git a/DOIT/.angular-cli.json b/DOIT/.angular-cli.json new file mode 100644 index 0000000..142304f --- /dev/null +++ b/DOIT/.angular-cli.json @@ -0,0 +1,57 @@ +{ + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "project": { + "name": "doit" + }, + "apps": [ + { + "root": "src", + "outDir": "dist", + "assets": [ + "assets", + "favicon.ico" + ], + "index": "index.html", + "main": "main.ts", + "polyfills": "polyfills.ts", + "test": "test.ts", + "tsconfig": "tsconfig.app.json", + "testTsconfig": "tsconfig.spec.json", + "prefix": "app", + "styles": [ + "styles.css" + ], + "scripts": [], + "environmentSource": "environments/environment.ts", + "environments": { + "dev": "environments/environment.ts", + "prod": "environments/environment.prod.ts" + } + } + ], + "e2e": { + "protractor": { + "config": "./protractor.conf.js" + } + }, + "lint": [ + { + "project": "src/tsconfig.app.json" + }, + { + "project": "src/tsconfig.spec.json" + }, + { + "project": "e2e/tsconfig.e2e.json" + } + ], + "test": { + "karma": { + "config": "./karma.conf.js" + } + }, + "defaults": { + "styleExt": "css", + "component": {} + } +} diff --git a/DOIT/.editorconfig b/DOIT/.editorconfig new file mode 100644 index 0000000..6e87a00 --- /dev/null +++ b/DOIT/.editorconfig @@ -0,0 +1,13 @@ +# Editor configuration, see http://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/DOIT/.gitignore b/DOIT/.gitignore new file mode 100644 index 0000000..54bfd20 --- /dev/null +++ b/DOIT/.gitignore @@ -0,0 +1,42 @@ +# See http://help.github.com/ignore-files/ for more about ignoring files. + +# compiled output +/dist +/tmp +/out-tsc + +# dependencies +/node_modules + +# 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 +testem.log +/typings + +# e2e +/e2e/*.js +/e2e/*.map + +# System Files +.DS_Store +Thumbs.db diff --git a/DOIT/README.md b/DOIT/README.md new file mode 100644 index 0000000..7dc421c --- /dev/null +++ b/DOIT/README.md @@ -0,0 +1,28 @@ +# DOIT + +This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.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|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/). +Before running the tests make sure you are serving the app via `ng serve`. + +## 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/DOIT/e2e/app.e2e-spec.ts b/DOIT/e2e/app.e2e-spec.ts new file mode 100644 index 0000000..9d44f52 --- /dev/null +++ b/DOIT/e2e/app.e2e-spec.ts @@ -0,0 +1,14 @@ +import { DOITPage } from './app.po'; + +describe('doit App', () => { + let page: DOITPage; + + beforeEach(() => { + page = new DOITPage(); + }); + + it('should display message saying app works', () => { + page.navigateTo(); + expect(page.getParagraphText()).toEqual('app works!'); + }); +}); diff --git a/DOIT/e2e/app.po.ts b/DOIT/e2e/app.po.ts new file mode 100644 index 0000000..4355ef7 --- /dev/null +++ b/DOIT/e2e/app.po.ts @@ -0,0 +1,11 @@ +import { browser, element, by } from 'protractor'; + +export class DOITPage { + navigateTo() { + return browser.get('/'); + } + + getParagraphText() { + return element(by.css('app-root h1')).getText(); + } +} diff --git a/DOIT/e2e/tsconfig.e2e.json b/DOIT/e2e/tsconfig.e2e.json new file mode 100644 index 0000000..ac7a373 --- /dev/null +++ b/DOIT/e2e/tsconfig.e2e.json @@ -0,0 +1,12 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/e2e", + "module": "commonjs", + "target": "es5", + "types":[ + "jasmine", + "node" + ] + } +} diff --git a/DOIT/karma.conf.js b/DOIT/karma.conf.js new file mode 100644 index 0000000..84b4cd5 --- /dev/null +++ b/DOIT/karma.conf.js @@ -0,0 +1,44 @@ +// Karma configuration file, see link for more information +// https://karma-runner.github.io/0.13/config/configuration-file.html + +module.exports = function (config) { + config.set({ + basePath: '', + frameworks: ['jasmine', '@angular/cli'], + plugins: [ + require('karma-jasmine'), + require('karma-chrome-launcher'), + require('karma-jasmine-html-reporter'), + require('karma-coverage-istanbul-reporter'), + require('@angular/cli/plugins/karma') + ], + client:{ + clearContext: false // leave Jasmine Spec Runner output visible in browser + }, + files: [ + { pattern: './src/test.ts', watched: false } + ], + preprocessors: { + './src/test.ts': ['@angular/cli'] + }, + mime: { + 'text/x-typescript': ['ts','tsx'] + }, + coverageIstanbulReporter: { + reports: [ 'html', 'lcovonly' ], + fixWebpackSourcePaths: true + }, + angularCli: { + environment: 'dev' + }, + reporters: config.angularCli && config.angularCli.codeCoverage + ? ['progress', 'coverage-istanbul'] + : ['progress', 'kjhtml'], + port: 9876, + colors: true, + logLevel: config.LOG_INFO, + autoWatch: true, + browsers: ['Chrome'], + singleRun: false + }); +}; diff --git a/DOIT/package.json b/DOIT/package.json new file mode 100644 index 0000000..5dcf519 --- /dev/null +++ b/DOIT/package.json @@ -0,0 +1,46 @@ +{ + "name": "doit", + "version": "0.0.0", + "license": "MIT", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/common": "^4.0.0", + "@angular/compiler": "^4.0.0", + "@angular/core": "^4.0.0", + "@angular/forms": "^4.0.0", + "@angular/http": "^4.0.0", + "@angular/platform-browser": "^4.0.0", + "@angular/platform-browser-dynamic": "^4.0.0", + "@angular/router": "^4.0.0", + "core-js": "^2.4.1", + "rxjs": "^5.1.0", + "zone.js": "^0.8.4" + }, + "devDependencies": { + "@angular/cli": "1.0.1", + "@angular/compiler-cli": "^4.0.0", + "@types/jasmine": "2.5.38", + "@types/node": "~6.0.60", + "codelyzer": "~2.0.0", + "jasmine-core": "~2.5.2", + "jasmine-spec-reporter": "~3.2.0", + "karma": "~1.4.1", + "karma-chrome-launcher": "~2.0.0", + "karma-cli": "~1.0.1", + "karma-jasmine": "~1.1.0", + "karma-jasmine-html-reporter": "^0.2.2", + "karma-coverage-istanbul-reporter": "^0.2.0", + "protractor": "~5.1.0", + "ts-node": "~2.0.0", + "tslint": "~4.5.0", + "typescript": "~2.2.0" + } +} diff --git a/DOIT/protractor.conf.js b/DOIT/protractor.conf.js new file mode 100644 index 0000000..1c5e1e5 --- /dev/null +++ b/DOIT/protractor.conf.js @@ -0,0 +1,30 @@ +// 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: [ + './e2e/**/*.e2e-spec.ts' + ], + capabilities: { + 'browserName': 'chrome' + }, + directConnect: true, + baseUrl: 'http://localhost:4200/', + framework: 'jasmine', + jasmineNodeOpts: { + showColors: true, + defaultTimeoutInterval: 30000, + print: function() {} + }, + beforeLaunch: function() { + require('ts-node').register({ + project: 'e2e/tsconfig.e2e.json' + }); + }, + onPrepare() { + jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + } +}; diff --git a/DOIT/src/app/app.component.css b/DOIT/src/app/app.component.css new file mode 100644 index 0000000..e69de29 diff --git a/DOIT/src/app/app.component.html b/DOIT/src/app/app.component.html new file mode 100644 index 0000000..b6931b5 --- /dev/null +++ b/DOIT/src/app/app.component.html @@ -0,0 +1,3 @@ +

+ {{title}} +

diff --git a/DOIT/src/app/app.component.spec.ts b/DOIT/src/app/app.component.spec.ts new file mode 100644 index 0000000..c740bcd --- /dev/null +++ b/DOIT/src/app/app.component.spec.ts @@ -0,0 +1,32 @@ +import { TestBed, async } from '@angular/core/testing'; + +import { AppComponent } from './app.component'; + +describe('AppComponent', () => { + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ + AppComponent + ], + }).compileComponents(); + })); + + it('should create the app', async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app).toBeTruthy(); + })); + + it(`should have as title 'app works!'`, async(() => { + const fixture = TestBed.createComponent(AppComponent); + const app = fixture.debugElement.componentInstance; + expect(app.title).toEqual('app works!'); + })); + + it('should render title in a h1 tag', async(() => { + const fixture = TestBed.createComponent(AppComponent); + fixture.detectChanges(); + const compiled = fixture.debugElement.nativeElement; + expect(compiled.querySelector('h1').textContent).toContain('app works!'); + })); +}); diff --git a/DOIT/src/app/app.component.ts b/DOIT/src/app/app.component.ts new file mode 100644 index 0000000..ff63e05 --- /dev/null +++ b/DOIT/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.css'] +}) +export class AppComponent { + title = 'app works!'; +} diff --git a/DOIT/src/app/app.module.ts b/DOIT/src/app/app.module.ts new file mode 100644 index 0000000..67ae491 --- /dev/null +++ b/DOIT/src/app/app.module.ts @@ -0,0 +1,20 @@ +import { BrowserModule } from '@angular/platform-browser'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { HttpModule } from '@angular/http'; + +import { AppComponent } from './app.component'; + +@NgModule({ + declarations: [ + AppComponent + ], + imports: [ + BrowserModule, + FormsModule, + HttpModule + ], + providers: [], + bootstrap: [AppComponent] +}) +export class AppModule { } diff --git a/DOIT/src/assets/.gitkeep b/DOIT/src/assets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/DOIT/src/environments/environment.prod.ts b/DOIT/src/environments/environment.prod.ts new file mode 100644 index 0000000..3612073 --- /dev/null +++ b/DOIT/src/environments/environment.prod.ts @@ -0,0 +1,3 @@ +export const environment = { + production: true +}; diff --git a/DOIT/src/environments/environment.ts b/DOIT/src/environments/environment.ts new file mode 100644 index 0000000..b7f639a --- /dev/null +++ b/DOIT/src/environments/environment.ts @@ -0,0 +1,8 @@ +// The file contents for the current environment will overwrite these during build. +// The build system defaults to the dev environment which uses `environment.ts`, but if you do +// `ng build --env=prod` then `environment.prod.ts` will be used instead. +// The list of which env maps to which file can be found in `.angular-cli.json`. + +export const environment = { + production: false +}; diff --git a/DOIT/src/favicon.ico b/DOIT/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- + + + + DOIT + + + + + + + Loading... + + diff --git a/DOIT/src/main.ts b/DOIT/src/main.ts new file mode 100644 index 0000000..a9ca1ca --- /dev/null +++ b/DOIT/src/main.ts @@ -0,0 +1,11 @@ +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); diff --git a/DOIT/src/polyfills.ts b/DOIT/src/polyfills.ts new file mode 100644 index 0000000..53bdaf1 --- /dev/null +++ b/DOIT/src/polyfills.ts @@ -0,0 +1,68 @@ +/** + * 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/docs/ts/latest/guide/browser-support.html + */ + +/*************************************************************************************************** + * 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/set'; + +/** 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 to support `@angular/animation`. */ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + + +/** Evergreen browsers require these. **/ +import 'core-js/es6/reflect'; +import 'core-js/es7/reflect'; + + +/** ALL Firefox browsers require the following to support `@angular/animation`. **/ +// import 'web-animations-js'; // Run `npm install --save web-animations-js`. + + + +/*************************************************************************************************** + * Zone JS is required by Angular itself. + */ +import 'zone.js/dist/zone'; // Included with Angular CLI. + + + +/*************************************************************************************************** + * APPLICATION IMPORTS + */ + +/** + * Date, currency, decimal and percent pipes. + * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10 + */ +// import 'intl'; // Run `npm install --save intl`. diff --git a/DOIT/src/styles.css b/DOIT/src/styles.css new file mode 100644 index 0000000..90d4ee0 --- /dev/null +++ b/DOIT/src/styles.css @@ -0,0 +1 @@ +/* You can add global styles to this file, and also import other style files */ diff --git a/DOIT/src/test.ts b/DOIT/src/test.ts new file mode 100644 index 0000000..9bf7226 --- /dev/null +++ b/DOIT/src/test.ts @@ -0,0 +1,32 @@ +// This file is required by karma.conf.js and loads recursively all the .spec and framework files + +import 'zone.js/dist/long-stack-trace-zone'; +import 'zone.js/dist/proxy.js'; +import 'zone.js/dist/sync-test'; +import 'zone.js/dist/jasmine-patch'; +import 'zone.js/dist/async-test'; +import 'zone.js/dist/fake-async-test'; +import { getTestBed } from '@angular/core/testing'; +import { + BrowserDynamicTestingModule, + platformBrowserDynamicTesting +} from '@angular/platform-browser-dynamic/testing'; + +// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any. +declare var __karma__: any; +declare var require: any; + +// Prevent Karma from running prematurely. +__karma__.loaded = function () {}; + +// 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); +// Finally, start Karma to run the tests. +__karma__.start(); diff --git a/DOIT/src/tsconfig.app.json b/DOIT/src/tsconfig.app.json new file mode 100644 index 0000000..5e2507d --- /dev/null +++ b/DOIT/src/tsconfig.app.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/app", + "module": "es2015", + "baseUrl": "", + "types": [] + }, + "exclude": [ + "test.ts", + "**/*.spec.ts" + ] +} diff --git a/DOIT/src/tsconfig.spec.json b/DOIT/src/tsconfig.spec.json new file mode 100644 index 0000000..510e3f1 --- /dev/null +++ b/DOIT/src/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../out-tsc/spec", + "module": "commonjs", + "target": "es5", + "baseUrl": "", + "types": [ + "jasmine", + "node" + ] + }, + "files": [ + "test.ts" + ], + "include": [ + "**/*.spec.ts", + "**/*.d.ts" + ] +} diff --git a/DOIT/src/typings.d.ts b/DOIT/src/typings.d.ts new file mode 100644 index 0000000..ef5c7bd --- /dev/null +++ b/DOIT/src/typings.d.ts @@ -0,0 +1,5 @@ +/* SystemJS module definition */ +declare var module: NodeModule; +interface NodeModule { + id: string; +} diff --git a/DOIT/tsconfig.json b/DOIT/tsconfig.json new file mode 100644 index 0000000..a35a8ee --- /dev/null +++ b/DOIT/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "outDir": "./dist/out-tsc", + "baseUrl": "src", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "target": "es5", + "typeRoots": [ + "node_modules/@types" + ], + "lib": [ + "es2016", + "dom" + ] + } +} diff --git a/DOIT/tslint.json b/DOIT/tslint.json new file mode 100644 index 0000000..9113f13 --- /dev/null +++ b/DOIT/tslint.json @@ -0,0 +1,116 @@ +{ + "rulesDirectory": [ + "node_modules/codelyzer" + ], + "rules": { + "callable-types": true, + "class-name": true, + "comment-format": [ + true, + "check-space" + ], + "curly": true, + "eofline": true, + "forin": true, + "import-blacklist": [true, "rxjs"], + "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, + "static-before-instance", + "variables-before-functions" + ], + "no-arg": 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-empty-interface": true, + "no-eval": true, + "no-inferrable-types": [true, "ignore-params"], + "no-shadowed-variable": true, + "no-string-literal": false, + "no-string-throw": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": 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": [ + "always" + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "typeof-compare": true, + "unified-signatures": true, + "variable-name": false, + "whitespace": [ + true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type" + ], + + "directive-selector": [true, "attribute", "app", "camelCase"], + "component-selector": [true, "element", "app", "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 + } +} From 5d83468cd1e66687bfa63b0997bfb1495772854c Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Fri, 5 May 2017 14:59:01 +0530 Subject: [PATCH 05/20] Navbar functionality --- DOIT/src/app/app.component.html | 4 +--- DOIT/src/app/app.module.ts | 3 ++- DOIT/src/app/nav/nav.component.html | 9 +++++++++ DOIT/src/app/nav/nav.component.ts | 8 ++++++++ DOIT/src/index.html | 1 + 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 DOIT/src/app/nav/nav.component.html create mode 100644 DOIT/src/app/nav/nav.component.ts diff --git a/DOIT/src/app/app.component.html b/DOIT/src/app/app.component.html index b6931b5..6d22242 100644 --- a/DOIT/src/app/app.component.html +++ b/DOIT/src/app/app.component.html @@ -1,3 +1 @@ -

- {{title}} -

+ diff --git a/DOIT/src/app/app.module.ts b/DOIT/src/app/app.module.ts index 67ae491..0b81d62 100644 --- a/DOIT/src/app/app.module.ts +++ b/DOIT/src/app/app.module.ts @@ -4,10 +4,11 @@ import { FormsModule } from '@angular/forms'; import { HttpModule } from '@angular/http'; import { AppComponent } from './app.component'; +import { Nav } from "./nav/nav.component"; @NgModule({ declarations: [ - AppComponent + AppComponent,Nav ], imports: [ BrowserModule, diff --git a/DOIT/src/app/nav/nav.component.html b/DOIT/src/app/nav/nav.component.html new file mode 100644 index 0000000..b999cb2 --- /dev/null +++ b/DOIT/src/app/nav/nav.component.html @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/DOIT/src/app/nav/nav.component.ts b/DOIT/src/app/nav/nav.component.ts new file mode 100644 index 0000000..4d7df21 --- /dev/null +++ b/DOIT/src/app/nav/nav.component.ts @@ -0,0 +1,8 @@ +import { Component } from '@angular/core' + +@Component ({ + selector: 'app-nav', + templateUrl: './nav.component.html', +}) + +export class Nav {} \ No newline at end of file diff --git a/DOIT/src/index.html b/DOIT/src/index.html index d0143a3..5c6a821 100644 --- a/DOIT/src/index.html +++ b/DOIT/src/index.html @@ -7,6 +7,7 @@ + Loading... From 6ce474a5f364da0ba58335a209d3a8843f96bdff Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Fri, 5 May 2017 15:18:05 +0530 Subject: [PATCH 06/20] checklist commit --- DOIT/src/app/app.component.html | 1 + DOIT/src/app/app.module.ts | 4 ++- .../app/check-list/check-list.component.css | 0 .../app/check-list/check-list.component.html | 7 ++++++ .../check-list/check-list.component.spec.ts | 25 +++++++++++++++++++ .../app/check-list/check-list.component.ts | 18 +++++++++++++ DOIT/src/app/home/home.component.css | 0 DOIT/src/app/home/home.component.html | 10 ++++++++ DOIT/src/app/home/home.component.spec.ts | 25 +++++++++++++++++++ DOIT/src/app/home/home.component.ts | 15 +++++++++++ DOIT/src/app/nav/nav.component.html | 2 +- 11 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 DOIT/src/app/check-list/check-list.component.css create mode 100644 DOIT/src/app/check-list/check-list.component.html create mode 100644 DOIT/src/app/check-list/check-list.component.spec.ts create mode 100644 DOIT/src/app/check-list/check-list.component.ts create mode 100644 DOIT/src/app/home/home.component.css create mode 100644 DOIT/src/app/home/home.component.html create mode 100644 DOIT/src/app/home/home.component.spec.ts create mode 100644 DOIT/src/app/home/home.component.ts diff --git a/DOIT/src/app/app.component.html b/DOIT/src/app/app.component.html index 6d22242..3ccaa31 100644 --- a/DOIT/src/app/app.component.html +++ b/DOIT/src/app/app.component.html @@ -1 +1,2 @@ + diff --git a/DOIT/src/app/app.module.ts b/DOIT/src/app/app.module.ts index 0b81d62..5402517 100644 --- a/DOIT/src/app/app.module.ts +++ b/DOIT/src/app/app.module.ts @@ -5,10 +5,12 @@ import { HttpModule } from '@angular/http'; import { AppComponent } from './app.component'; import { Nav } from "./nav/nav.component"; +import { HomeComponent } from './home/home.component'; +import { CheckListComponent } from './check-list/check-list.component'; @NgModule({ declarations: [ - AppComponent,Nav + AppComponent,Nav, HomeComponent, CheckListComponent ], imports: [ BrowserModule, diff --git a/DOIT/src/app/check-list/check-list.component.css b/DOIT/src/app/check-list/check-list.component.css new file mode 100644 index 0000000..e69de29 diff --git a/DOIT/src/app/check-list/check-list.component.html b/DOIT/src/app/check-list/check-list.component.html new file mode 100644 index 0000000..5868646 --- /dev/null +++ b/DOIT/src/app/check-list/check-list.component.html @@ -0,0 +1,7 @@ +

{{title}}

+
+ +
+ + + \ No newline at end of file diff --git a/DOIT/src/app/check-list/check-list.component.spec.ts b/DOIT/src/app/check-list/check-list.component.spec.ts new file mode 100644 index 0000000..91f81a3 --- /dev/null +++ b/DOIT/src/app/check-list/check-list.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CheckListComponent } from './check-list.component'; + +describe('CheckListComponent', () => { + let component: CheckListComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CheckListComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CheckListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/DOIT/src/app/check-list/check-list.component.ts b/DOIT/src/app/check-list/check-list.component.ts new file mode 100644 index 0000000..bdf468e --- /dev/null +++ b/DOIT/src/app/check-list/check-list.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit, Input } from '@angular/core'; + +@Component({ + selector: 'app-check-list', + templateUrl: './check-list.component.html', + styleUrls: ['./check-list.component.css'] +}) +export class CheckListComponent implements OnInit { + + constructor() { } + + @Input() + title: string; + + ngOnInit() { + } + +} diff --git a/DOIT/src/app/home/home.component.css b/DOIT/src/app/home/home.component.css new file mode 100644 index 0000000..e69de29 diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html new file mode 100644 index 0000000..f35322a --- /dev/null +++ b/DOIT/src/app/home/home.component.html @@ -0,0 +1,10 @@ +
+
+
+ +
+
+ +
+
+
diff --git a/DOIT/src/app/home/home.component.spec.ts b/DOIT/src/app/home/home.component.spec.ts new file mode 100644 index 0000000..490e81b --- /dev/null +++ b/DOIT/src/app/home/home.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HomeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/DOIT/src/app/home/home.component.ts b/DOIT/src/app/home/home.component.ts new file mode 100644 index 0000000..33fd770 --- /dev/null +++ b/DOIT/src/app/home/home.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.css'] +}) +export class HomeComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/DOIT/src/app/nav/nav.component.html b/DOIT/src/app/nav/nav.component.html index b999cb2..4761912 100644 --- a/DOIT/src/app/nav/nav.component.html +++ b/DOIT/src/app/nav/nav.component.html @@ -6,4 +6,4 @@
  • About
    • - \ No newline at end of file + \ No newline at end of file From 96572c48a66bb087db7f62ab0c3e1b9285665685 Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Fri, 5 May 2017 15:45:36 +0530 Subject: [PATCH 07/20] dynamic list functionality --- DOIT/src/app/check-list/check-list.component.html | 7 ++++--- DOIT/src/app/check-list/check-list.component.ts | 4 ++-- DOIT/src/app/home/home.component.html | 4 ++-- DOIT/src/app/home/home.component.ts | 10 +++++++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/DOIT/src/app/check-list/check-list.component.html b/DOIT/src/app/check-list/check-list.component.html index 5868646..3ddffaa 100644 --- a/DOIT/src/app/check-list/check-list.component.html +++ b/DOIT/src/app/check-list/check-list.component.html @@ -2,6 +2,7 @@

    {{title}}

    - - - \ No newline at end of file +

    + + +

    \ No newline at end of file diff --git a/DOIT/src/app/check-list/check-list.component.ts b/DOIT/src/app/check-list/check-list.component.ts index bdf468e..c461791 100644 --- a/DOIT/src/app/check-list/check-list.component.ts +++ b/DOIT/src/app/check-list/check-list.component.ts @@ -9,8 +9,8 @@ export class CheckListComponent implements OnInit { constructor() { } - @Input() - title: string; + @Input() title: string; + @Input() checkList : string[]; ngOnInit() { } diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html index f35322a..a01f476 100644 --- a/DOIT/src/app/home/home.component.html +++ b/DOIT/src/app/home/home.component.html @@ -1,10 +1,10 @@
    - +
    - +
    diff --git a/DOIT/src/app/home/home.component.ts b/DOIT/src/app/home/home.component.ts index 33fd770..0fdf947 100644 --- a/DOIT/src/app/home/home.component.ts +++ b/DOIT/src/app/home/home.component.ts @@ -7,9 +7,17 @@ import { Component, OnInit } from '@angular/core'; }) export class HomeComponent implements OnInit { - constructor() { } +projectList: string[]; +personalList: string[]; + + constructor() { + this.projectList = []; + this.personalList = []; + } ngOnInit() { + this.projectList = ['Qatar Airways', 'CITI']; + this.personalList = ['Complete Task', 'Prepare Angular4']; } } From a8a937d1d8f1ddcf44292680f5c4da0b75abc72f Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Mon, 8 May 2017 16:06:50 +0530 Subject: [PATCH 08/20] add event emitter --- DOIT/src/app/check-list/check-list.component.html | 2 +- DOIT/src/app/check-list/check-list.component.ts | 10 ++++++++-- DOIT/src/app/home/home.component.html | 4 ++-- DOIT/src/app/home/home.component.ts | 15 +++++++++++---- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/DOIT/src/app/check-list/check-list.component.html b/DOIT/src/app/check-list/check-list.component.html index 3ddffaa..5345241 100644 --- a/DOIT/src/app/check-list/check-list.component.html +++ b/DOIT/src/app/check-list/check-list.component.html @@ -1,6 +1,6 @@

    {{title}}

    - +

    diff --git a/DOIT/src/app/check-list/check-list.component.ts b/DOIT/src/app/check-list/check-list.component.ts index c461791..6c55f17 100644 --- a/DOIT/src/app/check-list/check-list.component.ts +++ b/DOIT/src/app/check-list/check-list.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; @Component({ selector: 'app-check-list', @@ -10,7 +10,13 @@ export class CheckListComponent implements OnInit { constructor() { } @Input() title: string; - @Input() checkList : string[]; + @Input() checkList: string[]; + + @Output() updateTask: EventEmitter = new EventEmitter; + + updateList (list: string){ + this.updateTask.emit(list); + } ngOnInit() { } diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html index a01f476..afe7c7d 100644 --- a/DOIT/src/app/home/home.component.html +++ b/DOIT/src/app/home/home.component.html @@ -1,10 +1,10 @@

    - +
    - +
    diff --git a/DOIT/src/app/home/home.component.ts b/DOIT/src/app/home/home.component.ts index 0fdf947..2cf12d0 100644 --- a/DOIT/src/app/home/home.component.ts +++ b/DOIT/src/app/home/home.component.ts @@ -11,13 +11,20 @@ projectList: string[]; personalList: string[]; constructor() { - this.projectList = []; - this.personalList = []; + this.projectList = ['Qatar Airways', 'CITI']; + this.personalList = ['Complete Task', 'Prepare Angular4']; } ngOnInit() { - this.projectList = ['Qatar Airways', 'CITI']; - this.personalList = ['Complete Task', 'Prepare Angular4']; + + } + + projectUpdate(task: string){ + this.projectList.push(task); + } + + personalUpdate(task: string){ + this.personalList.push(task); } } From 6eb0778610b31b4d3cb1c8d71ed00a7c8a408e10 Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Mon, 8 May 2017 17:46:21 +0530 Subject: [PATCH 09/20] Implemented service and model --- DOIT/src/app/app.module.ts | 3 +- .../app/check-list/check-list.component.html | 4 +- DOIT/src/app/home/home.component.ts | 18 +++++---- DOIT/src/app/models/todo.ts | 16 ++++++++ DOIT/src/app/service/todo.service.spec.ts | 15 +++++++ DOIT/src/app/service/todo.service.ts | 39 +++++++++++++++++++ 6 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 DOIT/src/app/models/todo.ts create mode 100644 DOIT/src/app/service/todo.service.spec.ts create mode 100644 DOIT/src/app/service/todo.service.ts diff --git a/DOIT/src/app/app.module.ts b/DOIT/src/app/app.module.ts index 5402517..079a9fd 100644 --- a/DOIT/src/app/app.module.ts +++ b/DOIT/src/app/app.module.ts @@ -7,6 +7,7 @@ import { AppComponent } from './app.component'; import { Nav } from "./nav/nav.component"; import { HomeComponent } from './home/home.component'; import { CheckListComponent } from './check-list/check-list.component'; +import { TodoService } from './service/todo.service'; @NgModule({ declarations: [ @@ -17,7 +18,7 @@ import { CheckListComponent } from './check-list/check-list.component'; FormsModule, HttpModule ], - providers: [], + providers: [TodoService], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/DOIT/src/app/check-list/check-list.component.html b/DOIT/src/app/check-list/check-list.component.html index 5345241..2281df1 100644 --- a/DOIT/src/app/check-list/check-list.component.html +++ b/DOIT/src/app/check-list/check-list.component.html @@ -4,5 +4,5 @@

    {{title}}

    - -

    \ No newline at end of file + +

    diff --git a/DOIT/src/app/home/home.component.ts b/DOIT/src/app/home/home.component.ts index 2cf12d0..0bd9685 100644 --- a/DOIT/src/app/home/home.component.ts +++ b/DOIT/src/app/home/home.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { TodoService } from '../service/todo.service'; +import { Todo } from '../models/todo'; @Component({ selector: 'app-home', @@ -7,24 +9,24 @@ import { Component, OnInit } from '@angular/core'; }) export class HomeComponent implements OnInit { -projectList: string[]; -personalList: string[]; +projectList: Todo[]; +personalList: Todo[]; - constructor() { - this.projectList = ['Qatar Airways', 'CITI']; - this.personalList = ['Complete Task', 'Prepare Angular4']; + constructor(private todoService: TodoService) { + } ngOnInit() { - + this.projectList = this.todoService.getProjectList(); + this.personalList = this.todoService.getPersonalList() } projectUpdate(task: string){ - this.projectList.push(task); + this.todoService.updateProjectList(task); } personalUpdate(task: string){ - this.personalList.push(task); + this.todoService.updatePersonalList(task); } } diff --git a/DOIT/src/app/models/todo.ts b/DOIT/src/app/models/todo.ts new file mode 100644 index 0000000..b1f2247 --- /dev/null +++ b/DOIT/src/app/models/todo.ts @@ -0,0 +1,16 @@ +export class Todo{ + id: number; + title: string; + startDate: number; + endDate: number; + isDone: boolean; + category: string; + + constructor(title: string, category: string){ + this.startDate = new Date().getTime(); + this.isDone = false; + this.title = title; + this.category = category; + } + +} \ No newline at end of file diff --git a/DOIT/src/app/service/todo.service.spec.ts b/DOIT/src/app/service/todo.service.spec.ts new file mode 100644 index 0000000..8a91b55 --- /dev/null +++ b/DOIT/src/app/service/todo.service.spec.ts @@ -0,0 +1,15 @@ +import { TestBed, inject } from '@angular/core/testing'; + +import { TodoService } from './todo.service'; + +describe('TodoService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [TodoService] + }); + }); + + it('should ...', inject([TodoService], (service: TodoService) => { + expect(service).toBeTruthy(); + })); +}); diff --git a/DOIT/src/app/service/todo.service.ts b/DOIT/src/app/service/todo.service.ts new file mode 100644 index 0000000..e2455d4 --- /dev/null +++ b/DOIT/src/app/service/todo.service.ts @@ -0,0 +1,39 @@ +import { Injectable } from '@angular/core'; +import { Todo } from '../models/todo' + +@Injectable() +export class TodoService { + + projectList: Todo[] = []; + personalList: Todo[] = []; + + todoList: Todo[] = []; + + constructor() { + let todo1 = new Todo('Qatar analysis','project'); + this.todoList.push(todo1); + let todo2 = new Todo('Angular learning','project'); + this.todoList.push(todo2); + let todo3 = new Todo('Start at 8:00 AM','personal'); + this.todoList.push(todo3); + let todo4= new Todo('Leave by 6:00 PM','personal'); + this.todoList.push(todo4); + } + + getProjectList(){ + return this.todoList.filter(todo => todo.category === 'project'); + } + + getPersonalList(){ + return this.todoList.filter(todo => todo.category === 'personal'); + } + + updateProjectList(task){ + this.projectList.push(task); + } + + updatePersonalList(task){ + this.personalList.push(task); + } + +} From 23080ae6b2e4858d750824fedc1eab64b8921632 Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Mon, 8 May 2017 17:53:01 +0530 Subject: [PATCH 10/20] update list code in progress --- DOIT/src/app/service/todo.service.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/DOIT/src/app/service/todo.service.ts b/DOIT/src/app/service/todo.service.ts index e2455d4..a670e77 100644 --- a/DOIT/src/app/service/todo.service.ts +++ b/DOIT/src/app/service/todo.service.ts @@ -3,9 +3,6 @@ import { Todo } from '../models/todo' @Injectable() export class TodoService { - - projectList: Todo[] = []; - personalList: Todo[] = []; todoList: Todo[] = []; @@ -29,11 +26,13 @@ export class TodoService { } updateProjectList(task){ - this.projectList.push(task); + let todo = new Todo(task,'project'); + this.todoList.push(todo); } updatePersonalList(task){ - this.personalList.push(task); + let todo = new Todo(task,'personal'); + this.todoList.push(todo); } } From fd87b53594b2e798d61a98c3d11f83837a29d1ef Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Tue, 9 May 2017 12:02:33 +0530 Subject: [PATCH 11/20] implemented firebase communication --- .../app/check-list/check-list.component.html | 2 +- DOIT/src/app/home/home.component.html | 4 +- DOIT/src/app/home/home.component.ts | 7 ++-- DOIT/src/app/service/todo.service.ts | 37 +++++++++++++------ 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/DOIT/src/app/check-list/check-list.component.html b/DOIT/src/app/check-list/check-list.component.html index 2281df1..76cf0be 100644 --- a/DOIT/src/app/check-list/check-list.component.html +++ b/DOIT/src/app/check-list/check-list.component.html @@ -1,6 +1,6 @@

    {{title}}

    - +

    diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html index afe7c7d..b220023 100644 --- a/DOIT/src/app/home/home.component.html +++ b/DOIT/src/app/home/home.component.html @@ -1,10 +1,10 @@

    - +
    - +
    diff --git a/DOIT/src/app/home/home.component.ts b/DOIT/src/app/home/home.component.ts index 0bd9685..9e801a0 100644 --- a/DOIT/src/app/home/home.component.ts +++ b/DOIT/src/app/home/home.component.ts @@ -9,16 +9,17 @@ import { Todo } from '../models/todo'; }) export class HomeComponent implements OnInit { -projectList: Todo[]; -personalList: Todo[]; + projectList: Todo[]; + personalList: Todo[]; constructor(private todoService: TodoService) { } ngOnInit() { + this.todoService.fetchTodoData(); this.projectList = this.todoService.getProjectList(); - this.personalList = this.todoService.getPersonalList() + this.personalList = this.todoService.getPersonalList(); } projectUpdate(task: string){ diff --git a/DOIT/src/app/service/todo.service.ts b/DOIT/src/app/service/todo.service.ts index a670e77..5148715 100644 --- a/DOIT/src/app/service/todo.service.ts +++ b/DOIT/src/app/service/todo.service.ts @@ -1,38 +1,51 @@ import { Injectable } from '@angular/core'; -import { Todo } from '../models/todo' +import { Todo } from '../models/todo'; +import { Http } from '@angular/http'; @Injectable() export class TodoService { todoList: Todo[] = []; - constructor() { - let todo1 = new Todo('Qatar analysis','project'); - this.todoList.push(todo1); - let todo2 = new Todo('Angular learning','project'); - this.todoList.push(todo2); - let todo3 = new Todo('Start at 8:00 AM','personal'); - this.todoList.push(todo3); - let todo4= new Todo('Leave by 6:00 PM','personal'); - this.todoList.push(todo4); + constructor(private http: Http) { + + } + + fetchTodoData(){ + return this.http.get('https://doit-32d5b.firebaseio.com/todo.json') + .subscribe(data => { + let response = data.json(); + let keys = Object.keys(response); + for(let i=0; i todo.category === 'project'); } + getPersonalList(){ return this.todoList.filter(todo => todo.category === 'personal'); } updateProjectList(task){ let todo = new Todo(task,'project'); - this.todoList.push(todo); + this.postTaskList(todo); } updatePersonalList(task){ let todo = new Todo(task,'personal'); - this.todoList.push(todo); + this.postTaskList(todo); } + postTaskList(todo : Todo){ + this.http.post('https://doit-32d5b.firebaseio.com/todo.json',todo) + .subscribe(data => { + console.log(data.json()); + this.todoList.push(todo); + }) + } } From c481f42a56a20f4dd8db1d562cfe24ae0321bfd9 Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Tue, 9 May 2017 16:20:02 +0530 Subject: [PATCH 12/20] added styles --- DOIT/src/app/home/home.component.css | 8 ++++++++ DOIT/src/app/home/home.component.html | 6 +++--- DOIT/src/app/nav/nav.component.css | 25 +++++++++++++++++++++++++ DOIT/src/app/nav/nav.component.html | 11 +++++++++-- DOIT/src/app/nav/nav.component.ts | 1 + DOIT/src/index.html | 1 + 6 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 DOIT/src/app/nav/nav.component.css diff --git a/DOIT/src/app/home/home.component.css b/DOIT/src/app/home/home.component.css index e69de29..d0c9ef6 100644 --- a/DOIT/src/app/home/home.component.css +++ b/DOIT/src/app/home/home.component.css @@ -0,0 +1,8 @@ +.container{ + width: 100%; +} + +.add{ + position: relative; + top: 10px; +} \ No newline at end of file diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html index b220023..06c35a6 100644 --- a/DOIT/src/app/home/home.component.html +++ b/DOIT/src/app/home/home.component.html @@ -3,8 +3,8 @@
    -
    - -
    +
    + +
    diff --git a/DOIT/src/app/nav/nav.component.css b/DOIT/src/app/nav/nav.component.css new file mode 100644 index 0000000..10ffc6d --- /dev/null +++ b/DOIT/src/app/nav/nav.component.css @@ -0,0 +1,25 @@ +.input-field input[type=search] { + /* display: block; */ + /* line-height: inherit; */ + padding-left: 4rem; + width: calc(100% - 4rem); +} + +nav .input-field input { + height: 30px; + font-size: 1.2rem; + border: none; + display: inline-block; + /* padding-left: 2rem; */ + /* margin-top: 10px; */ +} + +nav .input-field label { + top: 0; + right: 0px; +} + +.input-field[_ngcontent-c1] input[type=search][_ngcontent-c1] { + padding-left: 1em; + width: calc(100% - 1rem); +} \ No newline at end of file diff --git a/DOIT/src/app/nav/nav.component.html b/DOIT/src/app/nav/nav.component.html index 4761912..8caeb3f 100644 --- a/DOIT/src/app/nav/nav.component.html +++ b/DOIT/src/app/nav/nav.component.html @@ -1,9 +1,16 @@ - + \ No newline at end of file diff --git a/DOIT/src/app/nav/nav.component.ts b/DOIT/src/app/nav/nav.component.ts index 4d7df21..3b61ff3 100644 --- a/DOIT/src/app/nav/nav.component.ts +++ b/DOIT/src/app/nav/nav.component.ts @@ -3,6 +3,7 @@ import { Component } from '@angular/core' @Component ({ selector: 'app-nav', templateUrl: './nav.component.html', + styleUrls: ['./nav.component.css'] }) export class Nav {} \ No newline at end of file diff --git a/DOIT/src/index.html b/DOIT/src/index.html index 5c6a821..3279b35 100644 --- a/DOIT/src/index.html +++ b/DOIT/src/index.html @@ -8,6 +8,7 @@ + Loading... From 09a943869fe51597197cd4032550824c80b7f4be Mon Sep 17 00:00:00 2001 From: Lasya Priya Sivalenka Date: Wed, 10 May 2017 15:44:41 +0530 Subject: [PATCH 13/20] Archive and routing implementation --- DOIT/src/app/app.component.html | 4 ++- DOIT/src/app/app.module.ts | 9 ++++-- DOIT/src/app/app.routes.ts | 20 ++++++++++++ .../archive-card/archive-card.component.css | 0 .../archive-card/archive-card.component.html | 17 ++++++++++ .../archive-card.component.spec.ts | 25 +++++++++++++++ .../archive-card/archive-card.component.ts | 18 +++++++++++ DOIT/src/app/archive/archive.component.css | 0 DOIT/src/app/archive/archive.component.html | 10 ++++++ .../src/app/archive/archive.component.spec.ts | 25 +++++++++++++++ DOIT/src/app/archive/archive.component.ts | 16 ++++++++++ .../app/check-list/check-list.component.html | 9 +++--- .../app/check-list/check-list.component.ts | 9 +++++- DOIT/src/app/home/home.component.html | 14 ++++----- DOIT/src/app/home/home.component.ts | 1 - DOIT/src/app/models/todo.ts | 7 +++-- DOIT/src/app/nav/nav.component.html | 4 +-- DOIT/src/app/nav/nav.component.ts | 2 +- DOIT/src/app/service/todo.service.ts | 31 +++++++++++++++---- 19 files changed, 192 insertions(+), 29 deletions(-) create mode 100644 DOIT/src/app/app.routes.ts create mode 100644 DOIT/src/app/archive-card/archive-card.component.css create mode 100644 DOIT/src/app/archive-card/archive-card.component.html create mode 100644 DOIT/src/app/archive-card/archive-card.component.spec.ts create mode 100644 DOIT/src/app/archive-card/archive-card.component.ts create mode 100644 DOIT/src/app/archive/archive.component.css create mode 100644 DOIT/src/app/archive/archive.component.html create mode 100644 DOIT/src/app/archive/archive.component.spec.ts create mode 100644 DOIT/src/app/archive/archive.component.ts diff --git a/DOIT/src/app/app.component.html b/DOIT/src/app/app.component.html index 3ccaa31..8528eb9 100644 --- a/DOIT/src/app/app.component.html +++ b/DOIT/src/app/app.component.html @@ -1,2 +1,4 @@ - +
    + +
    \ No newline at end of file diff --git a/DOIT/src/app/app.module.ts b/DOIT/src/app/app.module.ts index 079a9fd..db42e3b 100644 --- a/DOIT/src/app/app.module.ts +++ b/DOIT/src/app/app.module.ts @@ -2,21 +2,26 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { HttpModule } from '@angular/http'; +import { RouterModule } from '@angular/router'; import { AppComponent } from './app.component'; import { Nav } from "./nav/nav.component"; import { HomeComponent } from './home/home.component'; import { CheckListComponent } from './check-list/check-list.component'; import { TodoService } from './service/todo.service'; +import { ArchiveComponent } from './archive/archive.component'; +import { routes } from './app.routes'; +import { ArchiveCardComponent } from './archive-card/archive-card.component'; @NgModule({ declarations: [ - AppComponent,Nav, HomeComponent, CheckListComponent + AppComponent,Nav, HomeComponent, CheckListComponent, ArchiveComponent, ArchiveCardComponent ], imports: [ BrowserModule, FormsModule, - HttpModule + HttpModule, + RouterModule.forRoot(routes) ], providers: [TodoService], bootstrap: [AppComponent] diff --git a/DOIT/src/app/app.routes.ts b/DOIT/src/app/app.routes.ts new file mode 100644 index 0000000..e9acd69 --- /dev/null +++ b/DOIT/src/app/app.routes.ts @@ -0,0 +1,20 @@ +import { Routes } from '@angular/router'; + +import { HomeComponent } from './home/home.component'; +import { ArchiveComponent } from './archive/archive.component'; + +export const routes: Routes = [ + { + path: '', + pathMatch: 'full', + redirectTo: 'home' + }, + { + path: 'home', + component: HomeComponent + }, + { + path: 'archive', + component: ArchiveComponent + } +] \ No newline at end of file diff --git a/DOIT/src/app/archive-card/archive-card.component.css b/DOIT/src/app/archive-card/archive-card.component.css new file mode 100644 index 0000000..e69de29 diff --git a/DOIT/src/app/archive-card/archive-card.component.html b/DOIT/src/app/archive-card/archive-card.component.html new file mode 100644 index 0000000..829a1d6 --- /dev/null +++ b/DOIT/src/app/archive-card/archive-card.component.html @@ -0,0 +1,17 @@ +
    +
    + {{todo.title}} + + autorenew + close + + + Start Time: {{todo.startDate}} + End Time: {{todo.endDate}} +
    + +
    \ No newline at end of file diff --git a/DOIT/src/app/archive-card/archive-card.component.spec.ts b/DOIT/src/app/archive-card/archive-card.component.spec.ts new file mode 100644 index 0000000..5d66bf2 --- /dev/null +++ b/DOIT/src/app/archive-card/archive-card.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ArchiveCardComponent } from './archive-card.component'; + +describe('ArchiveCardComponent', () => { + let component: ArchiveCardComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ArchiveCardComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ArchiveCardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/DOIT/src/app/archive-card/archive-card.component.ts b/DOIT/src/app/archive-card/archive-card.component.ts new file mode 100644 index 0000000..25b7279 --- /dev/null +++ b/DOIT/src/app/archive-card/archive-card.component.ts @@ -0,0 +1,18 @@ +import { Component, OnInit, Input } from '@angular/core'; +import { Todo } from '../models/todo'; + +@Component({ + selector: 'app-archive-card', + templateUrl: './archive-card.component.html', + styleUrls: ['./archive-card.component.css'] +}) +export class ArchiveCardComponent implements OnInit { + + @Input() todo: Todo; + + constructor() { } + + ngOnInit() { + } + +} diff --git a/DOIT/src/app/archive/archive.component.css b/DOIT/src/app/archive/archive.component.css new file mode 100644 index 0000000..e69de29 diff --git a/DOIT/src/app/archive/archive.component.html b/DOIT/src/app/archive/archive.component.html new file mode 100644 index 0000000..8354db8 --- /dev/null +++ b/DOIT/src/app/archive/archive.component.html @@ -0,0 +1,10 @@ +
    + + + close +
    +
    +

    + +

    +
    diff --git a/DOIT/src/app/archive/archive.component.spec.ts b/DOIT/src/app/archive/archive.component.spec.ts new file mode 100644 index 0000000..d986929 --- /dev/null +++ b/DOIT/src/app/archive/archive.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ArchiveComponent } from './archive.component'; + +describe('ArchiveComponent', () => { + let component: ArchiveComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ArchiveComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ArchiveComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/DOIT/src/app/archive/archive.component.ts b/DOIT/src/app/archive/archive.component.ts new file mode 100644 index 0000000..606391c --- /dev/null +++ b/DOIT/src/app/archive/archive.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit } from '@angular/core'; +import { TodoService } from '../service/todo.service'; + +@Component({ + selector: 'app-archive', + templateUrl: './archive.component.html', + styleUrls: ['./archive.component.css'] +}) +export class ArchiveComponent implements OnInit { + + constructor(private todoService: TodoService) { } + + ngOnInit() { + } + +} diff --git a/DOIT/src/app/check-list/check-list.component.html b/DOIT/src/app/check-list/check-list.component.html index 76cf0be..b0f1cbd 100644 --- a/DOIT/src/app/check-list/check-list.component.html +++ b/DOIT/src/app/check-list/check-list.component.html @@ -1,8 +1,9 @@

    {{title}}

    - +

    - - -

    + + +

    \ No newline at end of file diff --git a/DOIT/src/app/check-list/check-list.component.ts b/DOIT/src/app/check-list/check-list.component.ts index 6c55f17..8e7f2b1 100644 --- a/DOIT/src/app/check-list/check-list.component.ts +++ b/DOIT/src/app/check-list/check-list.component.ts @@ -1,5 +1,8 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { Todo } from '../models/todo'; +import { TodoService } from '../service/todo.service'; + @Component({ selector: 'app-check-list', templateUrl: './check-list.component.html', @@ -7,7 +10,7 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; }) export class CheckListComponent implements OnInit { - constructor() { } + constructor(private todoService: TodoService) { } @Input() title: string; @Input() checkList: string[]; @@ -18,6 +21,10 @@ export class CheckListComponent implements OnInit { this.updateTask.emit(list); } + onCheck(todo: Todo){ + this.todoService.markToDoAsDone(todo); + } + ngOnInit() { } diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html index 06c35a6..0157ef2 100644 --- a/DOIT/src/app/home/home.component.html +++ b/DOIT/src/app/home/home.component.html @@ -1,10 +1,8 @@ -
    -
    -
    - -
    -
    - +
    +
    +
    +
    +
    -
    +
    \ No newline at end of file diff --git a/DOIT/src/app/home/home.component.ts b/DOIT/src/app/home/home.component.ts index 9e801a0..63aa1dd 100644 --- a/DOIT/src/app/home/home.component.ts +++ b/DOIT/src/app/home/home.component.ts @@ -17,7 +17,6 @@ export class HomeComponent implements OnInit { } ngOnInit() { - this.todoService.fetchTodoData(); this.projectList = this.todoService.getProjectList(); this.personalList = this.todoService.getPersonalList(); } diff --git a/DOIT/src/app/models/todo.ts b/DOIT/src/app/models/todo.ts index b1f2247..894b1b5 100644 --- a/DOIT/src/app/models/todo.ts +++ b/DOIT/src/app/models/todo.ts @@ -1,16 +1,17 @@ export class Todo{ - id: number; + id: string; title: string; startDate: number; endDate: number; isDone: boolean; category: string; - constructor(title: string, category: string){ - this.startDate = new Date().getTime(); + constructor(title: string, category: string, id: string = ''){ + this.startDate = Date.now(); this.isDone = false; this.title = title; this.category = category; + this.id = id; } } \ No newline at end of file diff --git a/DOIT/src/app/nav/nav.component.html b/DOIT/src/app/nav/nav.component.html index 8caeb3f..01d1049 100644 --- a/DOIT/src/app/nav/nav.component.html +++ b/DOIT/src/app/nav/nav.component.html @@ -1,14 +1,14 @@
    \ No newline at end of file diff --git a/DOIT/src/app/home/home.component.ts b/DOIT/src/app/home/home.component.ts index 107af81..1d68b3d 100644 --- a/DOIT/src/app/home/home.component.ts +++ b/DOIT/src/app/home/home.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { TodoService } from '../service/todo.service'; import { Todo } from '../models/todo'; +import { TodoParent } from '../models/todoParent'; @Component({ selector: 'app-home', @@ -11,29 +12,31 @@ import { Todo } from '../models/todo'; export class HomeComponent implements OnInit { projectList: Todo[]; - personalList: Todo[]; + parentList: Todo[]; + todoParent: TodoParent[]; constructor(private todoService: TodoService) { } ngOnInit() { + + this.todoService.todoParentObserver$ + .subscribe(parentList => { + this.todoParent = parentList; + }); + console.log(this.todoParent); + } + + getParentList(name: string){ this.todoService.todoObserver$ .subscribe(list => { - this.projectList = list.filter(todo => todo.category === 'project' && !todo.isDone) + this.parentList = list.filter(todo => todo.category === name && !todo.isDone) }); - this.todoService.todoObserver$ - .subscribe(list => { - this.personalList = list.filter(todo => todo.category === 'personal' && !todo.isDone) - }) + return this.parentList; } - projectUpdate(task: string){ - this.todoService.updateProjectList(task); + parentUpdate(task: string,parent){ + this.todoService.updateParentList(task,parent); } - - personalUpdate(task: string){ - this.todoService.updatePersonalList(task); - } - } diff --git a/DOIT/src/app/models/todoParent.ts b/DOIT/src/app/models/todoParent.ts new file mode 100644 index 0000000..b1b2ea9 --- /dev/null +++ b/DOIT/src/app/models/todoParent.ts @@ -0,0 +1,15 @@ +export class TodoParent { + id: string; + name: string; + created_at: number; + update_at: number; + is_active: boolean; + + constructor(name: string, created_at: number = Date.now(), id: string = ''){ + this.id = id; + this.name = name; + this.created_at = created_at; + this.update_at = Date.now(); + this.is_active = true; + } +} \ No newline at end of file diff --git a/DOIT/src/app/nav/nav.component.html b/DOIT/src/app/nav/nav.component.html index 01d1049..d4d9410 100644 --- a/DOIT/src/app/nav/nav.component.html +++ b/DOIT/src/app/nav/nav.component.html @@ -7,7 +7,10 @@
    --> -
  • add
    • +
  • + +
    • +
  • add
  • Archive
  • About
    • diff --git a/DOIT/src/app/nav/nav.component.ts b/DOIT/src/app/nav/nav.component.ts index 677867b..7e9b844 100644 --- a/DOIT/src/app/nav/nav.component.ts +++ b/DOIT/src/app/nav/nav.component.ts @@ -1,9 +1,23 @@ import { Component } from '@angular/core'; +import { TodoService } from '../service/todo.service'; + @Component ({ selector: 'app-nav', templateUrl: './nav.component.html', styleUrls: ['./nav.component.css'] }) -export class Nav {} \ No newline at end of file +export class Nav { + addTitle: boolean; + constructor(private todoService: TodoService){ + this.addTitle = false; + } + + addParentTask(parentTask: string){ + this.todoService.addParentTask(parentTask); + } + + ngOnInit(){ + } +} \ No newline at end of file diff --git a/DOIT/src/app/service/todo.service.ts b/DOIT/src/app/service/todo.service.ts index ce8deff..1c4174c 100644 --- a/DOIT/src/app/service/todo.service.ts +++ b/DOIT/src/app/service/todo.service.ts @@ -3,26 +3,33 @@ import { Http } from '@angular/http'; import { Observable, BehaviorSubject } from 'rxjs'; import { Todo } from '../models/todo'; +import { TodoParent } from '../models/todoParent'; declare var _: any; @Injectable() export class TodoService { - baseUrl: string = 'https://doit-32d5b.firebaseio.com/todo'; + todoBaseUrl: string = 'https://doit-32d5b.firebaseio.com/todo'; + todoParentUrl: string = 'https://doit-32d5b.firebaseio.com/todoParent'; private todoSub: BehaviorSubject; public todoObserver$: Observable; + private todoParentSub: BehaviorSubject; + public todoParentObserver$ : Observable; constructor(private http: Http) { this.todoSub = new BehaviorSubject([]); this.todoObserver$ = this.todoSub.asObservable(); + this.todoParentSub = new BehaviorSubject([]); + this.todoParentObserver$ = this.todoParentSub.asObservable(); this.fetchTodoData(); + this.fetchParentData(); } fetchTodoData(){ let todoList = []; - return this.http.get(`${this.baseUrl}.json`) + return this.http.get(`${this.todoBaseUrl}.json`) .subscribe(data => { let response = data.json(); let keys = Object.keys(response); @@ -36,26 +43,13 @@ export class TodoService { }) } - getArchiveList(){ - let todoList = []; - return this.todoObserver$ - .subscribe(list => { - return list.filter(todo => todo.isDone) - }) - } - - updateProjectList(task){ - let todo = new Todo(task,'project'); - this.postTaskList(todo); - } - - updatePersonalList(task){ - let todo = new Todo(task,'personal'); + updateParentList(task,parent){ + let todo = new Todo(task,parent); this.postTaskList(todo); } postTaskList(todo : Todo){ - this.http.post(`${this.baseUrl}.json`,todo) + this.http.post(`${this.todoBaseUrl}.json`,todo) .subscribe(data => { console.log(data.json()); let todoList: Todo[] = this.todoSub.getValue(); @@ -69,11 +63,11 @@ export class TodoService { let doneTodo: Todo = Object.assign({}, todo); doneTodo.isDone = true; doneTodo.endDate = Date.now(); - this.http.put(`${this.baseUrl}/${todo.id}.json`,doneTodo) + this.http.put(`${this.todoBaseUrl}/${todo.id}.json`,doneTodo) .subscribe(data => { let todoList: Todo[] = this.todoSub.getValue(); let response = data.json(); - _.mapValues(todoList, function(o) { + _.mapValues(todoList, o => { if(o.id == response.id) { o.isDone = response.isDone; o.endDate = response.endDate @@ -87,7 +81,7 @@ export class TodoService { let renewTodo: Todo = Object.assign({}, todo); renewTodo.isDone = false; renewTodo.endDate = Date.now(); - this.http.put(`${this.baseUrl}/${todo.id}.json`,renewTodo) + this.http.put(`${this.todoBaseUrl}/${todo.id}.json`,renewTodo) .subscribe(data => { let todoList: Todo[] = this.todoSub.getValue(); let response = data.json(); @@ -102,11 +96,39 @@ export class TodoService { } trash(todo: Todo){ - this.http.delete(`${this.baseUrl}/${todo.id}.json`) + this.http.delete(`${this.todoBaseUrl}/${todo.id}.json`) .subscribe(data => { let todoList: Todo[] = this.todoSub.getValue(); _.remove(todoList, list => list.id == todo.id); this.todoSub.next(todoList); }) } + + addParentTask(parentTask: string){ + let todoParent = new TodoParent(parentTask); + this.http.post(`${this.todoParentUrl}.json`,todoParent) + .subscribe(data => { + console.log(data.json()); + let todoParentList: TodoParent[] = this.todoParentSub.getValue(); + todoParent.id = data.json().name; + todoParentList.push(todoParent); + this.todoParentSub.next(todoParentList); + }) + } + + fetchParentData(){ + let parentList = []; + this.http.get(`${this.todoParentUrl}.json`) + .subscribe(data => { + let response = data.json(); + let keys = Object.keys(response); + for(let i=0; i Date: Fri, 12 May 2017 17:40:56 +0530 Subject: [PATCH 19/20] implemented search --- DOIT/.angular-cli.json | 10 +++++++-- DOIT/package.json | 4 ++++ DOIT/src/app/app.module.ts | 4 +++- DOIT/src/app/archive/archive.component.html | 4 ++-- DOIT/src/app/archive/archive.component.ts | 23 +++++++++++++++------ DOIT/src/app/nav/nav.component.css | 7 +++++++ DOIT/src/app/nav/nav.component.html | 16 ++++++++++---- DOIT/src/app/nav/nav.component.ts | 14 ++++++++++++- DOIT/src/index.html | 1 - 9 files changed, 66 insertions(+), 17 deletions(-) diff --git a/DOIT/.angular-cli.json b/DOIT/.angular-cli.json index eadebf5..134fda9 100644 --- a/DOIT/.angular-cli.json +++ b/DOIT/.angular-cli.json @@ -19,9 +19,15 @@ "testTsconfig": "tsconfig.spec.json", "prefix": "app", "styles": [ - "styles.css" + "styles.css", + "../node_modules/materialize-css/dist/css/materialize.css" + ], + "scripts": [ + "../node_modules/lodash/lodash.js", + "../node_modules/jquery/dist/jquery.js", + "../node_modules/hammerjs/hammer.js", + "../node_modules/materialize-css/dist/js/materialize.js" ], - "scripts": ["../node_modules/lodash/lodash.js"], "environmentSource": "environments/environment.ts", "environments": { "dev": "environments/environment.ts", diff --git a/DOIT/package.json b/DOIT/package.json index 7ac1485..7d17620 100644 --- a/DOIT/package.json +++ b/DOIT/package.json @@ -20,8 +20,12 @@ "@angular/platform-browser": "^4.0.0", "@angular/platform-browser-dynamic": "^4.0.0", "@angular/router": "^4.0.0", + "angular2-materialize": "^15.0.1", "core-js": "^2.4.1", + "hammerjs": "^2.0.8", + "jquery": "^2.2.4", "lodash": "^4.17.4", + "materialize-css": "^0.98.2", "rxjs": "^5.1.0", "zone.js": "^0.8.4" }, diff --git a/DOIT/src/app/app.module.ts b/DOIT/src/app/app.module.ts index db42e3b..286c34b 100644 --- a/DOIT/src/app/app.module.ts +++ b/DOIT/src/app/app.module.ts @@ -3,6 +3,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { HttpModule } from '@angular/http'; import { RouterModule } from '@angular/router'; +import { MaterializeModule } from 'angular2-materialize'; import { AppComponent } from './app.component'; import { Nav } from "./nav/nav.component"; @@ -21,7 +22,8 @@ import { ArchiveCardComponent } from './archive-card/archive-card.component'; BrowserModule, FormsModule, HttpModule, - RouterModule.forRoot(routes) + RouterModule.forRoot(routes), + MaterializeModule ], providers: [TodoService], bootstrap: [AppComponent] diff --git a/DOIT/src/app/archive/archive.component.html b/DOIT/src/app/archive/archive.component.html index e001c6c..2c70250 100644 --- a/DOIT/src/app/archive/archive.component.html +++ b/DOIT/src/app/archive/archive.component.html @@ -1,10 +1,10 @@
    - + close
    -
    +
    diff --git a/DOIT/src/app/archive/archive.component.ts b/DOIT/src/app/archive/archive.component.ts index 380b51c..a27c2a4 100644 --- a/DOIT/src/app/archive/archive.component.ts +++ b/DOIT/src/app/archive/archive.component.ts @@ -1,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { Observable } from 'rxjs/Observable'; import { TodoService } from '../service/todo.service'; import { Todo } from '../models/todo'; @@ -10,14 +12,19 @@ import { Todo } from '../models/todo'; }) export class ArchiveComponent implements OnInit { - constructor(private todoService: TodoService) { } - archiveList: Todo[]; + archiveList$: Observable; + searchSub: BehaviorSubject; + + constructor(private todoService: TodoService) { + this.searchSub = new BehaviorSubject(''); + } ngOnInit() { - this.todoService.todoObserver$ - .subscribe(data => { - this.archiveList = data.filter(todo => todo.isDone ); - }) + this.archiveList$ = this.todoService.todoObserver$ + .combineLatest(this.searchSub, (list,search) => { + return list.filter(todo => todo.isDone && todo.title.includes(search)) + }); + console.log(this.archiveList$); } taskRenew(todo: Todo){ @@ -28,4 +35,8 @@ export class ArchiveComponent implements OnInit { this.todoService.trash(todo); } + searchKeyword(search: string){ + this.searchSub.next(search); + } + } diff --git a/DOIT/src/app/nav/nav.component.css b/DOIT/src/app/nav/nav.component.css index 10ffc6d..09755c7 100644 --- a/DOIT/src/app/nav/nav.component.css +++ b/DOIT/src/app/nav/nav.component.css @@ -22,4 +22,11 @@ nav .input-field label { .input-field[_ngcontent-c1] input[type=search][_ngcontent-c1] { padding-left: 1em; width: calc(100% - 1rem); +} + +.addTask{ + right: 10px; + left: 75%; + width: 20%; + top: 13% !important; } \ No newline at end of file diff --git a/DOIT/src/app/nav/nav.component.html b/DOIT/src/app/nav/nav.component.html index d4d9410..cf5d6f3 100644 --- a/DOIT/src/app/nav/nav.component.html +++ b/DOIT/src/app/nav/nav.component.html @@ -1,5 +1,7 @@
    -
    \ No newline at end of file +
    + + diff --git a/DOIT/src/app/nav/nav.component.ts b/DOIT/src/app/nav/nav.component.ts index 7e9b844..a03588d 100644 --- a/DOIT/src/app/nav/nav.component.ts +++ b/DOIT/src/app/nav/nav.component.ts @@ -1,4 +1,5 @@ -import { Component } from '@angular/core'; +import { Component, EventEmitter } from '@angular/core'; +import { MaterializeAction } from 'angular2-materialize'; import { TodoService } from '../service/todo.service'; @@ -8,12 +9,23 @@ import { TodoService } from '../service/todo.service'; styleUrls: ['./nav.component.css'] }) + export class Nav { + addTitle: boolean; + modalActions = new EventEmitter(); + constructor(private todoService: TodoService){ this.addTitle = false; } + openModal() { + this.modalActions.emit({action:"modal",params:['open']}); + } + closeModal() { + this.modalActions.emit({action:"modal",params:['close']}); + } + addParentTask(parentTask: string){ this.todoService.addParentTask(parentTask); } diff --git a/DOIT/src/index.html b/DOIT/src/index.html index 3279b35..9bae84a 100644 --- a/DOIT/src/index.html +++ b/DOIT/src/index.html @@ -7,7 +7,6 @@ - From db06d9dda5f2e809e9484ccf538856b1a72b5008 Mon Sep 17 00:00:00 2001 From: "lasya.sivalenka" Date: Mon, 15 May 2017 09:11:32 +0530 Subject: [PATCH 20/20] latest --- DOIT/src/app/check-list/check-list.component.css | 4 ++++ DOIT/src/app/check-list/check-list.component.html | 7 ++++++- DOIT/src/app/check-list/check-list.component.ts | 5 +++++ DOIT/src/app/home/home.component.html | 2 +- DOIT/src/app/home/home.component.ts | 4 ++-- DOIT/src/app/nav/nav.component.ts | 1 + 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/DOIT/src/app/check-list/check-list.component.css b/DOIT/src/app/check-list/check-list.component.css index 816cddc..1725b85 100644 --- a/DOIT/src/app/check-list/check-list.component.css +++ b/DOIT/src/app/check-list/check-list.component.css @@ -13,4 +13,8 @@ .checklist::-webkit-scrollbar-thumb { background: rgba(49, 43, 43, 0.87); +} + +.pointer{ + cursor: pointer; } \ No newline at end of file diff --git a/DOIT/src/app/check-list/check-list.component.html b/DOIT/src/app/check-list/check-list.component.html index 2a5a7c8..ec99a10 100644 --- a/DOIT/src/app/check-list/check-list.component.html +++ b/DOIT/src/app/check-list/check-list.component.html @@ -1,6 +1,11 @@
    - {{title}} + {{title}} + + edit + close + +
    diff --git a/DOIT/src/app/check-list/check-list.component.ts b/DOIT/src/app/check-list/check-list.component.ts index 8e7f2b1..4e2e234 100644 --- a/DOIT/src/app/check-list/check-list.component.ts +++ b/DOIT/src/app/check-list/check-list.component.ts @@ -14,6 +14,7 @@ export class CheckListComponent implements OnInit { @Input() title: string; @Input() checkList: string[]; + @Input() parentId: string; @Output() updateTask: EventEmitter = new EventEmitter; @@ -25,6 +26,10 @@ export class CheckListComponent implements OnInit { this.todoService.markToDoAsDone(todo); } + editParent(parentId){ + console.log(parentId); + } + ngOnInit() { } diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html index 0b11386..3201f80 100644 --- a/DOIT/src/app/home/home.component.html +++ b/DOIT/src/app/home/home.component.html @@ -1,6 +1,6 @@
    - +