From eac884a92d6ddd01711f6a81833e6b2458ab1b5c Mon Sep 17 00:00:00 2001 From: Erick Date: Sat, 17 Dec 2016 20:57:57 -0800 Subject: [PATCH 1/7] pill tabs --- ..._homepage_project_cell-content-picker.jade | 22 +++++++++++++++++-- .../homepage/_homepage_project_spotlight.jade | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/views/partials/homepage/_homepage_project_cell-content-picker.jade b/views/partials/homepage/_homepage_project_cell-content-picker.jade index 15a82ae..678c0ea 100644 --- a/views/partials/homepage/_homepage_project_cell-content-picker.jade +++ b/views/partials/homepage/_homepage_project_cell-content-picker.jade @@ -1,3 +1,21 @@ #project-cell-content-picker - h2 Description - p= project.description_short + .tab-content + .tab-pane(id=p+"content-description" role="tabpanel") + a(data-toggle="tab" href="#"+p+"content-members" role="tab") + h2 Description + p= project.description_short + .tab-pane(id=p+"content-members" role="tabpanel") + a(data-toggle="tab" href="#"+p+"content-positions" role="tab") + h2 Members + p members + .tab-pane.active(id=p+"content-positions" role="tabpanel") + a(data-toggle="tab" href="#"+p+"content-events" role="tab") + h2 Area Requests + - var block_requests = project.areaRequests + .scroll-y(style="height: 132px;") + include ../../partials/atoms/area_requests-table + .tab-pane(id=p+"content-events" role="tabpanel") + a(data-toggle="tab" href="#"+p+"content-description" role="tab") + h2 Events + - var block_events = project.events + include ../../partials/atoms/events-table diff --git a/views/partials/homepage/_homepage_project_spotlight.jade b/views/partials/homepage/_homepage_project_spotlight.jade index fc04231..a627490 100644 --- a/views/partials/homepage/_homepage_project_spotlight.jade +++ b/views/partials/homepage/_homepage_project_spotlight.jade @@ -2,5 +2,6 @@ .col-lg-12 h1 Project Spotlight each project in projects + - var p = "p"+project.id+"-"; include ./_homepage_project_cell hr From 7524a1ef60ea1262de8a43371578d82631995fd3 Mon Sep 17 00:00:00 2001 From: Erick Date: Sat, 17 Dec 2016 21:05:19 -0800 Subject: [PATCH 2/7] area requests --- sass/assets/tables.scss | 5 +++++ sass/partials/_index_page.scss | 2 ++ views/partials/atoms/area_requests-table.jade | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 views/partials/atoms/area_requests-table.jade diff --git a/sass/assets/tables.scss b/sass/assets/tables.scss index 45421a0..01a95a4 100644 --- a/sass/assets/tables.scss +++ b/sass/assets/tables.scss @@ -14,3 +14,8 @@ a.cell { background-color: $highlighted; } } + +.scroll-y { + overflow-y: auto; + overflow-x: hidden; +} diff --git a/sass/partials/_index_page.scss b/sass/partials/_index_page.scss index ddb4c2c..6c8b469 100644 --- a/sass/partials/_index_page.scss +++ b/sass/partials/_index_page.scss @@ -50,7 +50,9 @@ } #project-cell-content-picker { p { + text-align: center; font-size: .75em; + margin-bottom: 0; } } diff --git a/views/partials/atoms/area_requests-table.jade b/views/partials/atoms/area_requests-table.jade new file mode 100644 index 0000000..9a9f892 --- /dev/null +++ b/views/partials/atoms/area_requests-table.jade @@ -0,0 +1,13 @@ +table.table + tbody + each request in block_requests + tr + td.title + p + a(href="/projects/"+project.id+"#areaRequest-list")= request.title + //TODO Tooltips/Popovers + - var assets = []; + each asset in request.assets + - assets.push(asset.title + "— level " + asset.experience + "\n") + td(title=assets style=" background-color: " +request.project_interest_color) + p!= helper.pluralize('position', request.nPositions, true) From f1aed75d34b035f95fcff39ab561acde1eae5c59 Mon Sep 17 00:00:00 2001 From: Erick Date: Sat, 17 Dec 2016 21:21:54 -0800 Subject: [PATCH 3/7] events --- sass/partials/_index_page.scss | 4 ++++ views/partials/atoms/events-table.jade | 9 +++++++++ .../homepage/_homepage_project_cell-content-picker.jade | 5 +++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 views/partials/atoms/events-table.jade diff --git a/sass/partials/_index_page.scss b/sass/partials/_index_page.scss index 6c8b469..ed062bf 100644 --- a/sass/partials/_index_page.scss +++ b/sass/partials/_index_page.scss @@ -49,11 +49,15 @@ } } #project-cell-content-picker { + .table { + margin-bottom: 0; + } p { text-align: center; font-size: .75em; margin-bottom: 0; } + margin-bottom: $margin-md; } .link { diff --git a/views/partials/atoms/events-table.jade b/views/partials/atoms/events-table.jade new file mode 100644 index 0000000..f604612 --- /dev/null +++ b/views/partials/atoms/events-table.jade @@ -0,0 +1,9 @@ +table.table + tbody + each event in block_events + tr + td.title + p + a(href="/events/"+event.id)= event.title + td + p= event.date_range diff --git a/views/partials/homepage/_homepage_project_cell-content-picker.jade b/views/partials/homepage/_homepage_project_cell-content-picker.jade index 678c0ea..dccc8f6 100644 --- a/views/partials/homepage/_homepage_project_cell-content-picker.jade +++ b/views/partials/homepage/_homepage_project_cell-content-picker.jade @@ -12,10 +12,11 @@ a(data-toggle="tab" href="#"+p+"content-events" role="tab") h2 Area Requests - var block_requests = project.areaRequests - .scroll-y(style="height: 132px;") + .scroll-y(style="max-height: 132px;") include ../../partials/atoms/area_requests-table .tab-pane(id=p+"content-events" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-description" role="tab") h2 Events - var block_events = project.events - include ../../partials/atoms/events-table + .scroll-y(style="max-height: 132px;") + include ../../partials/atoms/events-table From 4e31aea7419cb19b5a516826184dd86e973f326f Mon Sep 17 00:00:00 2001 From: Erick Date: Sat, 17 Dec 2016 22:05:19 -0800 Subject: [PATCH 4/7] members grid --- sass/assets/atoms.scss | 13 +++++++++++++ sass/main.scss | 1 + views/partials/atoms/members-grid.jade | 5 +++++ .../_homepage_project_cell-content-picker.jade | 6 ++++-- 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 sass/assets/atoms.scss create mode 100644 views/partials/atoms/members-grid.jade diff --git a/sass/assets/atoms.scss b/sass/assets/atoms.scss new file mode 100644 index 0000000..caf51ef --- /dev/null +++ b/sass/assets/atoms.scss @@ -0,0 +1,13 @@ +a.members-grid { + @extend .float-xs-left; + font-size: .75em; + margin: $margin-sm; + margin-bottom: $margin-sm; + padding: $margin-xs $margin-md; + background-color: $gray; + border-radius: 16px; + +} +a.members-grid:hover { + text-decoration: none; +} diff --git a/sass/main.scss b/sass/main.scss index db4808a..a42b686 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -70,6 +70,7 @@ p.header { @import 'assets/tables'; @import 'assets/media'; +@import 'assets/atoms'; @import 'partials/navbar'; @import 'partials/index_page'; diff --git a/views/partials/atoms/members-grid.jade b/views/partials/atoms/members-grid.jade new file mode 100644 index 0000000..9f01927 --- /dev/null +++ b/views/partials/atoms/members-grid.jade @@ -0,0 +1,5 @@ +if (block_members.length > 0) + each member in block_members + a.members-grid(href="/members/"+member.id)= member.first_name + " " + member.last_name[0] +else + span no participating members diff --git a/views/partials/homepage/_homepage_project_cell-content-picker.jade b/views/partials/homepage/_homepage_project_cell-content-picker.jade index dccc8f6..aa5f8f6 100644 --- a/views/partials/homepage/_homepage_project_cell-content-picker.jade +++ b/views/partials/homepage/_homepage_project_cell-content-picker.jade @@ -7,8 +7,10 @@ .tab-pane(id=p+"content-members" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-positions" role="tab") h2 Members - p members - .tab-pane.active(id=p+"content-positions" role="tabpanel") + - var block_members = project.members + .scroll-y(style="max-height: 132px;") + include ../../partials/atoms/members-grid + .tab-pane(id=p+"content-positions" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-events" role="tab") h2 Area Requests - var block_requests = project.areaRequests From 054f75b7afef0ca8337b3c5a55a40ac16df385c0 Mon Sep 17 00:00:00 2001 From: Erick Date: Sat, 17 Dec 2016 22:05:36 -0800 Subject: [PATCH 5/7] data validation --- views/partials/atoms/area_requests-table.jade | 29 ++++++++++--------- views/partials/atoms/events-table.jade | 21 ++++++++------ 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/views/partials/atoms/area_requests-table.jade b/views/partials/atoms/area_requests-table.jade index 9a9f892..584e9ed 100644 --- a/views/partials/atoms/area_requests-table.jade +++ b/views/partials/atoms/area_requests-table.jade @@ -1,13 +1,16 @@ -table.table - tbody - each request in block_requests - tr - td.title - p - a(href="/projects/"+project.id+"#areaRequest-list")= request.title - //TODO Tooltips/Popovers - - var assets = []; - each asset in request.assets - - assets.push(asset.title + "— level " + asset.experience + "\n") - td(title=assets style=" background-color: " +request.project_interest_color) - p!= helper.pluralize('position', request.nPositions, true) +if (block_requests.length > 0) + table.table + tbody + each request in block_requests + tr + td.title + p + a(href="/projects/"+project.id+"#areaRequest-list")= request.title + //TODO Tooltips/Popovers + - var assets = []; + each asset in request.assets + - assets.push(asset.title + "— level " + asset.experience + "\n") + td(title=assets style=" background-color: " +request.project_interest_color) + p!= helper.pluralize('position', request.nPositions, true) +else + span no current requests at this moment diff --git a/views/partials/atoms/events-table.jade b/views/partials/atoms/events-table.jade index f604612..1a1b72a 100644 --- a/views/partials/atoms/events-table.jade +++ b/views/partials/atoms/events-table.jade @@ -1,9 +1,12 @@ -table.table - tbody - each event in block_events - tr - td.title - p - a(href="/events/"+event.id)= event.title - td - p= event.date_range +if (block_events.length > 0) + table.table + tbody + each event in block_events + tr + td.title + p + a(href="/events/"+event.id)= event.title + td + p= event.date_range +else + span no current events From e464923bb53f9f21ca89f97bc35235afe18d6135 Mon Sep 17 00:00:00 2001 From: Erick Date: Sat, 17 Dec 2016 22:29:24 -0800 Subject: [PATCH 6/7] comments :) --- .../homepage/_homepage_project_cell-content-picker.jade | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/views/partials/homepage/_homepage_project_cell-content-picker.jade b/views/partials/homepage/_homepage_project_cell-content-picker.jade index aa5f8f6..ed8fbc0 100644 --- a/views/partials/homepage/_homepage_project_cell-content-picker.jade +++ b/views/partials/homepage/_homepage_project_cell-content-picker.jade @@ -1,24 +1,29 @@ #project-cell-content-picker .tab-content - .tab-pane(id=p+"content-description" role="tabpanel") + //Description + .tab-pane.active(id=p+"content-description" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-members" role="tab") h2 Description p= project.description_short + //Members .tab-pane(id=p+"content-members" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-positions" role="tab") h2 Members - var block_members = project.members .scroll-y(style="max-height: 132px;") include ../../partials/atoms/members-grid + //Area Requests .tab-pane(id=p+"content-positions" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-events" role="tab") h2 Area Requests - var block_requests = project.areaRequests .scroll-y(style="max-height: 132px;") include ../../partials/atoms/area_requests-table + //Events .tab-pane(id=p+"content-events" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-description" role="tab") h2 Events - var block_events = project.events .scroll-y(style="max-height: 132px;") include ../../partials/atoms/events-table + From f9f44c76b714680c4093998f58b7a98e23953066 Mon Sep 17 00:00:00 2001 From: Erick Date: Wed, 28 Dec 2016 12:24:49 -0800 Subject: [PATCH 7/7] DRY : area requests using the same table --- sass/assets/tables.scss | 10 ++++-- sass/partials/_index_page.scss | 10 ------ ..._homepage_project_cell-content-picker.jade | 4 +-- .../homepage/_homepage_project_cell.jade | 32 ++++--------------- 4 files changed, 15 insertions(+), 41 deletions(-) diff --git a/sass/assets/tables.scss b/sass/assets/tables.scss index 01a95a4..3380745 100644 --- a/sass/assets/tables.scss +++ b/sass/assets/tables.scss @@ -1,5 +1,10 @@ @import './node_modules/bootstrap/scss/bootstrap'; +.scroll-y { + overflow-y: auto; + overflow-x: hidden; +} + .cell { @extend .card; >.context { @@ -15,7 +20,6 @@ a.cell { } } -.scroll-y { - overflow-y: auto; - overflow-x: hidden; +.table { + } diff --git a/sass/partials/_index_page.scss b/sass/partials/_index_page.scss index ed062bf..b1b42e4 100644 --- a/sass/partials/_index_page.scss +++ b/sass/partials/_index_page.scss @@ -121,16 +121,6 @@ } } - .position-requests, .events { - .table { - margin-bottom: 0; - } - .table td.title { - font-weight: bold; - text-align: left; - } - - } } .project-banner-headline { diff --git a/views/partials/homepage/_homepage_project_cell-content-picker.jade b/views/partials/homepage/_homepage_project_cell-content-picker.jade index ed8fbc0..744ce23 100644 --- a/views/partials/homepage/_homepage_project_cell-content-picker.jade +++ b/views/partials/homepage/_homepage_project_cell-content-picker.jade @@ -1,7 +1,7 @@ #project-cell-content-picker .tab-content //Description - .tab-pane.active(id=p+"content-description" role="tabpanel") + .tab-pane(id=p+"content-description" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-members" role="tab") h2 Description p= project.description_short @@ -13,7 +13,7 @@ .scroll-y(style="max-height: 132px;") include ../../partials/atoms/members-grid //Area Requests - .tab-pane(id=p+"content-positions" role="tabpanel") + .tab-pane.active(id=p+"content-positions" role="tabpanel") a(data-toggle="tab" href="#"+p+"content-events" role="tab") h2 Area Requests - var block_requests = project.areaRequests diff --git a/views/partials/homepage/_homepage_project_cell.jade b/views/partials/homepage/_homepage_project_cell.jade index 41e45e9..ed79018 100644 --- a/views/partials/homepage/_homepage_project_cell.jade +++ b/views/partials/homepage/_homepage_project_cell.jade @@ -1,13 +1,13 @@ //Tablet-Desktop-HD Desktop .row.card.project-banner.hidden-sm-down - .col-lg-9.project-banner-img + .col-lg-8.project-banner-img img.img-fluid(src= 'images/projects/' + project.title.toLowerCase() + '/banner.jpg') h1.project-banner-headline= project.title .project-cell h3= project.post p.status= project.status a.link(href='/projects/' + project.id ) - .col-lg-3.project-banner-description + .col-lg-4.project-banner-description include ./_homepage_project_cell-content-picker //Phone landscape sm #device-phone.row.card.project-banner.hidden-md-up.hidden-xs-down @@ -79,32 +79,12 @@ span no images .position-requests p.header Position Requests - if (project.areaRequests.length > 0) - table.table - tbody - each request in project.areaRequests - tr - td.title - a(href="/projects/"+project.id+"#areaRequest-list")= request.title - //TODO Tooltips/Popovers - - var assets = []; - each asset in request.assets - - assets.push(asset.title + "— level " + asset.experience + "\n") - td(title=assets style=" background-color: " +request.project_interest_color)!= helper.pluralize('position', request.nPositions, true) - else - span no current requests at this moment + - var block_requests = project.areaRequests + include ../../partials/atoms/area_requests-table .events p.header Events - if (project.events.length > 0) - table.table - tbody - each event in project.events - tr - td.title - a(href="/events/"+event.id)= event.title - td= event.date_range - else - span no listed events + - var block_events = project.events + include ../../partials/atoms/events-table //Phone xs #device-phone.row.card.project-banner.hidden-sm-up