From cd18d63b08e71400fdcf4c43e9a7e761501523cf Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 10:41:50 -0400 Subject: [PATCH 01/19] Set up states.compoent.html and ts file. --- .../components/project/states.component.html | 5 +++++ .../components/project/states.component.ts | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 front/current/components/project/states.component.html create mode 100644 front/current/components/project/states.component.ts diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html new file mode 100644 index 0000000..e4fcf81 --- /dev/null +++ b/front/current/components/project/states.component.html @@ -0,0 +1,5 @@ +
+

{{currentState.name}}

+

{{currentState.description}}

+ +
diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts new file mode 100644 index 0000000..dadd4c8 --- /dev/null +++ b/front/current/components/project/states.component.ts @@ -0,0 +1,16 @@ +import { Component } from 'angular2/core'; +import { config } from '../../config'; +import { StateComponent } from './state.component'; + +@Component({ + selector: 'states', + templateUrl: config.static_url + '/components/project/states.component.html', + inputs: ['currentState'] + directives: [StateComponent] +}) + +export class StatesComponent{ + public currentState: any; /*Points to current state*/ + +}; + -- GitLab From 26f732f129e9ac3426d4e850fff636b51a5869be Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 10:43:07 -0400 Subject: [PATCH 02/19] Add states selector into detail html and StatesComponent into directives for the detail ts file. --- front/current/components/project/detail.component.html | 4 +++- front/current/components/project/detail.component.ts | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index ab19723..c00227e 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -36,4 +36,6 @@ [(document_slots)]="document_slots" [(documents)]="documents" > - + + + diff --git a/front/current/components/project/detail.component.ts b/front/current/components/project/detail.component.ts index 954ee5d..4a44f63 100644 --- a/front/current/components/project/detail.component.ts +++ b/front/current/components/project/detail.component.ts @@ -16,11 +16,12 @@ import { AddressComponent } from './address.component'; import { ContactsComponent } from './contacts.component'; import { SlotsComponent } from './slots.component'; import { StateComponent } from './state.component'; +import { StatesComponent } from './states.component'; @Component({ selector: 'project', templateUrl: config.static_url + '/components/project/detail.component.html', - directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent, StateComponent] + directives: [ROUTER_DIRECTIVES, AddressComponent, ContactsComponent, SlotsComponent, StateComponent, StatesComponent] }) export class ProjectDetailComponent implements OnInit { constructor( -- GitLab From fb68f9ae362520838b833c1bc17c48edd0ddf977 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 11:31:05 -0400 Subject: [PATCH 03/19] Add loop to states ts file to show all states on page. --- front/current/assets/styles/components/_project.scss | 2 +- front/current/components/project/state.component.html | 1 - front/current/components/project/states.component.html | 8 ++++---- front/current/components/project/states.component.ts | 8 ++++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 1c4f721..4846528 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -79,7 +79,7 @@ project { } } - state { + states { display: block; flex-basis: 300px; border-top: 5px solid black; diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index bfa404c..e0d8813 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,7 +1,6 @@

{{state.name}}


-

{{state.description}}

diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index e4fcf81..3e1b8f8 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -1,5 +1,5 @@ -
-

{{currentState.name}}

-

{{currentState.description}}

+ -
diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts index dadd4c8..76f9d15 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -1,16 +1,20 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; import { StateComponent } from './state.component'; - +import { ProjectService } from '../../services/project/project.service'; @Component({ selector: 'states', templateUrl: config.static_url + '/components/project/states.component.html', - inputs: ['currentState'] + inputs: ['currentState'], directives: [StateComponent] }) export class StatesComponent{ public currentState: any; /*Points to current state*/ + constructor( + public projectService:ProjectService + ){}; + }; -- GitLab From 7497bc6f9228ddc81f46e52c064b3cb3a0853645 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 15:09:50 -0400 Subject: [PATCH 04/19] All the states show horizontally. --- .../assets/styles/components/_project.scss | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 4846528..822f681 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -78,14 +78,29 @@ project { } } } - - states { - display: block; - flex-basis: 300px; + + .c_states{ + white-space: nowrap; + overflow-x:scroll; + } + states{ + //white-space: nowrap; + //overflow-x:scroll; + //padding-top: 100px; + flex-basis:300px; border-top: 5px solid black; - padding: 10px; - h4 { - color: $light-gray; + width:auto; + state { + display: inline-block; + //flex-basis: 300px; + //border-top: 5px solid black; + padding: 10px; + h4 { + color: $light-gray; + } + width:500px; } + } } + -- GitLab From 5eb8ccce09361a8bc56a96152e5bdcae0b35cd29 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 15:10:27 -0400 Subject: [PATCH 05/19] Create wrapper class for states html. --- front/current/components/project/states.component.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index 3e1b8f8..6fc5be4 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -1,5 +1,7 @@ - +
+ +
-- GitLab From 22a60dac98681b88bfd815d71e402cf0c70b9f4f Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 15:23:16 -0400 Subject: [PATCH 06/19] Changes to width --- front/current/assets/styles/components/_project.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 822f681..b5d8678 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -82,14 +82,15 @@ project { .c_states{ white-space: nowrap; overflow-x:scroll; + //width:auto; } states{ //white-space: nowrap; //overflow-x:scroll; //padding-top: 100px; - flex-basis:300px; + flex-basis:auto; border-top: 5px solid black; - width:auto; + //width:100%; state { display: inline-block; //flex-basis: 300px; @@ -98,7 +99,7 @@ project { h4 { color: $light-gray; } - width:500px; + width:auto; } } -- GitLab From 7089474863d0b839ef0de8072f720cc8c16b1b26 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Fri, 17 Jun 2016 17:11:22 -0400 Subject: [PATCH 07/19] Add width to project selector, which is the parent of states component. The full scrolling states layout is complete. --- front/current/assets/styles/components/_project.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b5d8678..b99d6da 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -9,6 +9,7 @@ project { display: flex; flex-direction: column; flex-grow: 1; + width:100px; header { display: flex; @@ -88,7 +89,7 @@ project { //white-space: nowrap; //overflow-x:scroll; //padding-top: 100px; - flex-basis:auto; + //flex-basis:auto; border-top: 5px solid black; //width:100%; state { -- GitLab From d71e1e7052d400103a48eb1798e78c78a5040e95 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 10:13:51 -0400 Subject: [PATCH 08/19] Remove extra lines and delete extra comments. --- .../current/assets/styles/components/_project.scss | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b99d6da..3eb4a00 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -83,26 +83,20 @@ project { .c_states{ white-space: nowrap; overflow-x:scroll; - //width:auto; } + states{ - //white-space: nowrap; - //overflow-x:scroll; - //padding-top: 100px; - //flex-basis:auto; border-top: 5px solid black; - //width:100%; + state { display: inline-block; - //flex-basis: 300px; - //border-top: 5px solid black; padding: 10px; + width: auto; + h4 { color: $light-gray; } - width:auto; } - } } -- GitLab From 8d7e38109911452871686b98d6053e690b0d8be7 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 10:17:17 -0400 Subject: [PATCH 09/19] Remove extra new lines. --- front/current/components/project/detail.component.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index c00227e..d3a9d7f 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -35,7 +35,5 @@ [project]="project" [(document_slots)]="document_slots" [(documents)]="documents" - > - - - + > + -- GitLab From 55b32d23d2d2f68e533d76b4e32368eb473b0754 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 10:18:16 -0400 Subject: [PATCH 10/19] Remove extra line. --- front/current/components/project/states.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index 6fc5be4..ce5b55c 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -4,4 +4,3 @@ [state]="state" >
- -- GitLab From 5efaac3c7e0d50967ab15e9d5faa839f63631456 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 10:21:53 -0400 Subject: [PATCH 11/19] Add 2 lines between imports and start of code --- front/current/components/project/states.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts index 76f9d15..061ded1 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -2,6 +2,8 @@ import { Component } from 'angular2/core'; import { config } from '../../config'; import { StateComponent } from './state.component'; import { ProjectService } from '../../services/project/project.service'; + + @Component({ selector: 'states', templateUrl: config.static_url + '/components/project/states.component.html', @@ -15,6 +17,4 @@ export class StatesComponent{ constructor( public projectService:ProjectService ){}; - }; - -- GitLab From c2fd63958bfd855385b17ea2980279d42a9c8ce8 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Tue, 21 Jun 2016 11:19:47 -0400 Subject: [PATCH 12/19] Remove state-wrap class --- front/current/components/project/state.component.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/front/current/components/project/state.component.html b/front/current/components/project/state.component.html index fe82d82..deeec41 100644 --- a/front/current/components/project/state.component.html +++ b/front/current/components/project/state.component.html @@ -1,17 +1,7 @@ -<<<<<<< HEAD -
-

{{state.name}}

-
-

{{state.description}}

-
- -
-=======

{{state.name}}



{{state.description}}

->>>>>>> origin/master
-- GitLab From 6087276b74dd9bb7e1d504ef0d2a207608b216fa Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:02:11 -0400 Subject: [PATCH 13/19] Delete trailing whitespace and delete extra newline. --- front/current/components/project/detail.component.html | 2 +- front/current/components/project/states.component.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index d3a9d7f..7a135a5 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -36,4 +36,4 @@ [(document_slots)]="document_slots" [(documents)]="documents" > - + diff --git a/front/current/components/project/states.component.ts b/front/current/components/project/states.component.ts index 061ded1..1b48ade 100644 --- a/front/current/components/project/states.component.ts +++ b/front/current/components/project/states.component.ts @@ -10,7 +10,6 @@ import { ProjectService } from '../../services/project/project.service'; inputs: ['currentState'], directives: [StateComponent] }) - export class StatesComponent{ public currentState: any; /*Points to current state*/ -- GitLab From d389db1ed552c07b693d4aafc74985e9479e55d6 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:04:41 -0400 Subject: [PATCH 14/19] Delete trailing whitespace. --- front/current/components/project/detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index 7a135a5..eddec1a 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -36,4 +36,4 @@ [(document_slots)]="document_slots" [(documents)]="documents" > - + -- GitLab From e554e50254cfb34c7ea25499145487dbc8e181c4 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:06:32 -0400 Subject: [PATCH 15/19] Delete trailing whitespace. --- front/current/components/project/detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/components/project/detail.component.html b/front/current/components/project/detail.component.html index eddec1a..9d19eef 100644 --- a/front/current/components/project/detail.component.html +++ b/front/current/components/project/detail.component.html @@ -35,5 +35,5 @@ [project]="project" [(document_slots)]="document_slots" [(documents)]="documents" - > + > -- GitLab From 3af0cdcd7c0e46096e1df27874a2f2ce2743edfb Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 11:41:52 -0400 Subject: [PATCH 16/19] Remove whitespace between state tag and extra newline at the end of styles --- front/current/assets/styles/components/_project.scss | 1 - front/current/components/project/states.component.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 3eb4a00..b7a6c11 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -99,4 +99,3 @@ project { } } } - diff --git a/front/current/components/project/states.component.html b/front/current/components/project/states.component.html index ce5b55c..160b4a3 100644 --- a/front/current/components/project/states.component.html +++ b/front/current/components/project/states.component.html @@ -2,5 +2,5 @@ + >
-- GitLab From b135dbcae9595eea3b30d2814c0bb324885fe6fe Mon Sep 17 00:00:00 2001 From: calvinqh Date: Wed, 22 Jun 2016 17:07:09 -0400 Subject: [PATCH 17/19] Change the width of project selector to zero. --- front/current/assets/styles/components/_project.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index b7a6c11..3deed4f 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -9,7 +9,7 @@ project { display: flex; flex-direction: column; flex-grow: 1; - width:100px; + width:0px;//Setting the width anything less than expanding width of flexgrow, causes the with of all child elements to be relative to this element's width. So we use 0 as a placeholder header { display: flex; -- GitLab From 4307fdccbb19a160b6d8ae61c405c5a4a5104e22 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Thu, 23 Jun 2016 10:03:39 -0400 Subject: [PATCH 18/19] Fix comments so that line length is less than 100. --- front/current/assets/styles/components/_project.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 3deed4f..97828d2 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -9,7 +9,9 @@ project { display: flex; flex-direction: column; flex-grow: 1; - width:0px;//Setting the width anything less than expanding width of flexgrow, causes the with of all child elements to be relative to this element's width. So we use 0 as a placeholder + width:0px;//Setting the width anything less than expanding width of flexgrow + //causes the with of all child elements to be relative to this + //element's width. So we use 0 as a placeholder. header { display: flex; -- GitLab From c56812eae04d6c1c50661c4a0a61647bd095ba71 Mon Sep 17 00:00:00 2001 From: calvinqh Date: Thu, 23 Jun 2016 10:21:12 -0400 Subject: [PATCH 19/19] Add hanging indent to comments. --- front/current/assets/styles/components/_project.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/current/assets/styles/components/_project.scss b/front/current/assets/styles/components/_project.scss index 97828d2..ebff1e9 100644 --- a/front/current/assets/styles/components/_project.scss +++ b/front/current/assets/styles/components/_project.scss @@ -10,8 +10,8 @@ project { flex-direction: column; flex-grow: 1; width:0px;//Setting the width anything less than expanding width of flexgrow - //causes the with of all child elements to be relative to this - //element's width. So we use 0 as a placeholder. + // causes the with of all child elements to be relative to this + // element's width. So we use 0 as a placeholder. header { display: flex; -- GitLab