diff --git a/DOIT/.angular-cli.json b/DOIT/.angular-cli.json new file mode 100644 index 0000000..134fda9 --- /dev/null +++ b/DOIT/.angular-cli.json @@ -0,0 +1,63 @@ +{ + "$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", + "../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" + ], + "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..7d17620 --- /dev/null +++ b/DOIT/package.json @@ -0,0 +1,52 @@ +{ + "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", + "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" + }, + "devDependencies": { + "@angular/cli": "1.0.1", + "@angular/compiler-cli": "^4.0.0", + "@types/jasmine": "2.5.38", + "@types/lodash": "^4.14.64", + "@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-coverage-istanbul-reporter": "^0.2.0", + "karma-jasmine": "~1.1.0", + "karma-jasmine-html-reporter": "^0.2.2", + "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..25ee855 --- /dev/null +++ b/DOIT/src/app/app.component.css @@ -0,0 +1,3 @@ +.container{ + width: 100%; +} \ No newline at end of file diff --git a/DOIT/src/app/app.component.html b/DOIT/src/app/app.component.html new file mode 100644 index 0000000..8528eb9 --- /dev/null +++ b/DOIT/src/app/app.component.html @@ -0,0 +1,4 @@ + +
+ +
\ No newline at end of file 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..286c34b --- /dev/null +++ b/DOIT/src/app/app.module.ts @@ -0,0 +1,31 @@ +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 { MaterializeModule } from 'angular2-materialize'; + +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, ArchiveComponent, ArchiveCardComponent + ], + imports: [ + BrowserModule, + FormsModule, + HttpModule, + RouterModule.forRoot(routes), + MaterializeModule + ], + providers: [TodoService], + bootstrap: [AppComponent] +}) +export class AppModule { } 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..f81a6a1 --- /dev/null +++ b/DOIT/src/app/archive-card/archive-card.component.css @@ -0,0 +1,3 @@ +.pointer{ + cursor: pointer; +} \ No newline at end of file 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..092221d --- /dev/null +++ b/DOIT/src/app/archive-card/archive-card.component.html @@ -0,0 +1,17 @@ +
+
+ {{todo.title}} + + autorenew + close + + + Start Time: {{todo.startDate | date:'y-M-d H:mm a'}} + End Time: {{todo.endDate | date:'y-M-d H:mm a'}} +
+ +
\ 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..6737d4b --- /dev/null +++ b/DOIT/src/app/archive-card/archive-card.component.ts @@ -0,0 +1,29 @@ +import { Component, OnInit, Input, Output, EventEmitter } 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; + + @Output() renewTask: EventEmitter = new EventEmitter; + @Output() trashTask: EventEmitter = new EventEmitter; + + constructor() { } + + ngOnInit() { + } + + renew(todo: Todo){ + this.renewTask.emit(todo); + } + + trash(todo: Todo){ + this.trashTask.emit(todo); + } + +} 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..2c70250 --- /dev/null +++ b/DOIT/src/app/archive/archive.component.html @@ -0,0 +1,12 @@ +
+ + + close +
+
+
+
+ +
+
+
\ No newline at end of file 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..a27c2a4 --- /dev/null +++ b/DOIT/src/app/archive/archive.component.ts @@ -0,0 +1,42 @@ +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'; + +@Component({ + selector: 'app-archive', + templateUrl: './archive.component.html', + styleUrls: ['./archive.component.css'] +}) +export class ArchiveComponent implements OnInit { + + archiveList$: Observable; + searchSub: BehaviorSubject; + + constructor(private todoService: TodoService) { + this.searchSub = new BehaviorSubject(''); + } + + ngOnInit() { + 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){ + this.todoService.renew(todo); + } + + trashTask(todo: Todo){ + this.todoService.trash(todo); + } + + searchKeyword(search: string){ + this.searchSub.next(search); + } + +} 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..1725b85 --- /dev/null +++ b/DOIT/src/app/check-list/check-list.component.css @@ -0,0 +1,20 @@ +.checklist{ + height: 150px; + overflow-y: scroll; + display: block; + overflow: auto; +} + +.checklist::-webkit-scrollbar { + width: 5px; + height: 3px; + background-color: #aaa; /* or add it to the track */ +} + +.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 new file mode 100644 index 0000000..ec99a10 --- /dev/null +++ b/DOIT/src/app/check-list/check-list.component.html @@ -0,0 +1,20 @@ +
+
+ {{title}} + + edit + close + + +
+ +
+
+

+ + +

+
+
+
\ 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..4e2e234 --- /dev/null +++ b/DOIT/src/app/check-list/check-list.component.ts @@ -0,0 +1,36 @@ +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', + styleUrls: ['./check-list.component.css'] +}) +export class CheckListComponent implements OnInit { + + constructor(private todoService: TodoService) { } + + @Input() title: string; + @Input() checkList: string[]; + @Input() parentId: string; + + @Output() updateTask: EventEmitter = new EventEmitter; + + updateList (list: string){ + this.updateTask.emit(list); + } + + onCheck(todo: Todo){ + this.todoService.markToDoAsDone(todo); + } + + editParent(parentId){ + console.log(parentId); + } + + 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..49fd286 --- /dev/null +++ b/DOIT/src/app/home/home.component.css @@ -0,0 +1,8 @@ +.container{ + width: 100%; +} + +.add{ + position: relative; + top: 10px; +} diff --git a/DOIT/src/app/home/home.component.html b/DOIT/src/app/home/home.component.html new file mode 100644 index 0000000..3201f80 --- /dev/null +++ b/DOIT/src/app/home/home.component.html @@ -0,0 +1,8 @@ +
+
+ +
+ +
\ No newline at end of file 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..5852812 --- /dev/null +++ b/DOIT/src/app/home/home.component.ts @@ -0,0 +1,42 @@ +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', + templateUrl: './home.component.html', + styleUrls: ['./home.component.css'] +}) +export class HomeComponent implements OnInit { + + projectList: Todo[]; + parentList: Todo[]; + todoParent: TodoParent[]; + + constructor(private todoService: TodoService) { + + } + + ngOnInit() { + + this.todoService.todoParentObserver$ + .subscribe(parentList => { + this.todoParent = parentList; + }); + console.log(this.todoParent); + } + + getParentList(id: string){ + this.todoService.todoObserver$ + .subscribe(list => { + this.parentList = list.filter(todo => todo.category === id && !todo.isDone) + }); + return this.parentList; + } + + parentUpdate(task: string,parent){ + this.todoService.updateParentList(task,parent); + } +} diff --git a/DOIT/src/app/models/todo.ts b/DOIT/src/app/models/todo.ts new file mode 100644 index 0000000..364864c --- /dev/null +++ b/DOIT/src/app/models/todo.ts @@ -0,0 +1,18 @@ +export class Todo{ + id: string; + title: string; + startDate: number; + endDate: number; + isDone: boolean; + category: string; + + constructor(title: string, category: string, id: string = '',startDate: number = Date.now(), isDone: boolean = false, endDate: number = 0){ + this.startDate = startDate; + this.isDone = isDone; + this.title = title; + this.category = category; + this.id = id; + this.endDate = endDate; + } + +} \ No newline at end of file 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.css b/DOIT/src/app/nav/nav.component.css new file mode 100644 index 0000000..09755c7 --- /dev/null +++ b/DOIT/src/app/nav/nav.component.css @@ -0,0 +1,32 @@ +.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); +} + +.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 new file mode 100644 index 0000000..cf5d6f3 --- /dev/null +++ b/DOIT/src/app/nav/nav.component.html @@ -0,0 +1,27 @@ +
+ +
+ + diff --git a/DOIT/src/app/nav/nav.component.ts b/DOIT/src/app/nav/nav.component.ts new file mode 100644 index 0000000..50e8059 --- /dev/null +++ b/DOIT/src/app/nav/nav.component.ts @@ -0,0 +1,36 @@ +import { Component, EventEmitter } from '@angular/core'; +import { MaterializeAction } from 'angular2-materialize'; + +import { TodoService } from '../service/todo.service'; + +@Component ({ + selector: 'app-nav', + templateUrl: './nav.component.html', + 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); + this.closeModal(); + } + + ngOnInit(){ + } +} \ 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..1c4174c --- /dev/null +++ b/DOIT/src/app/service/todo.service.ts @@ -0,0 +1,134 @@ +import { Injectable } from '@angular/core'; +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 { + + 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.todoBaseUrl}.json`) + .subscribe(data => { + let response = data.json(); + let keys = Object.keys(response); + for(let i=0; i { + console.log(data.json()); + let todoList: Todo[] = this.todoSub.getValue(); + todo.id = data.json().name; + todoList.push(todo); + this.todoSub.next(todoList); + }) + } + + markToDoAsDone(todo: Todo){ + let doneTodo: Todo = Object.assign({}, todo); + doneTodo.isDone = true; + doneTodo.endDate = Date.now(); + this.http.put(`${this.todoBaseUrl}/${todo.id}.json`,doneTodo) + .subscribe(data => { + let todoList: Todo[] = this.todoSub.getValue(); + let response = data.json(); + _.mapValues(todoList, o => { + if(o.id == response.id) { + o.isDone = response.isDone; + o.endDate = response.endDate + } + }); + this.todoSub.next(todoList); + }) + } + + renew(todo: Todo){ + let renewTodo: Todo = Object.assign({}, todo); + renewTodo.isDone = false; + renewTodo.endDate = Date.now(); + this.http.put(`${this.todoBaseUrl}/${todo.id}.json`,renewTodo) + .subscribe(data => { + let todoList: Todo[] = this.todoSub.getValue(); + let response = data.json(); + _.mapValues(todoList, o => { + if(o.id == response.id) { + o.isDone = response.isDone; + o.endDate = response.endDate + } + }); + this.todoSub.next(todoList); + }) + } + + trash(todo: Todo){ + 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 + + + + 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 + } +} 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 f55454a..098290a 100644 --- a/Day-2/Employee.js +++ b/Day-2/Employee.js @@ -5,9 +5,11 @@ var Employee = (function () { this.id = id; this.name = name; this.salary = salary; + this.rating = 0; + this.bonus = 0; } Employee.prototype.printInfo = function () { - console.log(this.name + " gets " + this.salary); + 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 ee0002f..eb3dd3a 100644 --- a/Day-2/Employee.ts +++ b/Day-2/Employee.ts @@ -2,13 +2,17 @@ export class Employee { 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 = 0; + this.bonus = 0; } printInfo() { - console.log(`${this.name} gets ${this.salary}`); + 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/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..7b9c370 100644 --- a/Day-2/salary-upgrader.js +++ b/Day-2/salary-upgrader.js @@ -10,7 +10,16 @@ var SalaryUpgrader = (function () { emp.updateSalary(newSalary); }); }; - SalaryUpgrader.prototype.addBonus = function () { + 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; + }); }; return SalaryUpgrader; }()); diff --git a/Day-2/salary-upgrader.ts b/Day-2/salary-upgrader.ts index 7d66855..30edd01 100644 --- a/Day-2/salary-upgrader.ts +++ b/Day-2/salary-upgrader.ts @@ -10,7 +10,16 @@ export class SalaryUpgrader { emp.updateSalary(newSalary); }) } - addBonus() { + 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; + }) } } \ No newline at end of file