Fellowship type pages #994

mmmavis · 2018-01-24T17:30:06Z

Related to #951

Updated comps: https://projects.invisionapp.com/share/ZJ9YTAGEA#/screens/273312988

fellowship_type.html template
science fellowship page
open web fellowship page

https://foundation-mofostaging--pr-994.herokuapp.com/fellowships/science/
https://foundation-mofostaging--pr-994.herokuapp.com/fellowships/open-web/

mmmavis · 2018-01-24T23:24:47Z

@alanmoo this is ready for review!

mmmavis · 2018-01-24T23:25:48Z

source/sass/utilities.scss

@@ -31,3 +31,29 @@
  background-repeat: no-repeat;
  background-size: contain;
 }
+
+.breadcrumb {


overriding some bootstrap's rules...

alanmoo

Some changes for the markup, though I'd like @gvn to take a look at the CSS

alanmoo · 2018-01-26T20:08:50Z

network-api/networkapi/fellows/templates/fellows_openweb.html

+{% endblock %}
+
+{% block fellowship_description %}
+{% lorem 2 p %}


alanmoo · 2018-01-26T20:11:59Z

source/js/main.js

+        name: `Firstname Surname`,
+        role: `[Area Fellowship] Fellow, [Year]`,
+        location: `City, Country`,
+        image: `https://images.pexels.com/photos/264206/pexels-photo-264206.jpeg?w=500`,


This is the secret gem of this PR

alanmoo · 2018-01-26T20:13:33Z

source/js/main.js

+      };
+
+      ReactDOM.render(<Person metadata={metadata} />, document.getElementById(`featured-open-web-fellow`));
+    }


This feels WETter than necessary...could the metadata be passed in as props on the target div (in the markup), and then render run on a generic class?

alanmoo · 2018-01-26T20:21:02Z

network-api/networkapi/templates/foundation-base.html

@@ -1,6 +1,6 @@
 <!-- This is a copy/paste of landing-page.html, modified to be useful for fellowships to start. Ideally the entire site will extend this template eventually -->
 <!DOCTYPE html>
-<html>{% load settings_value %}{% load active_nav %}
+<html>{% load settings_value %}{% load fellowship_active_nav %}


I realize I'm a bit concerned with editing of this file too much to be specific to fellows (and still calling it foundation-base). Perhaps we should abstract out a level so we can rely on a true "foundation base" generated from the original pug file? I'd say for this PR, let's start with renaming this file.

k i'll rename it to fellowships_base.html as the first step

gvn · 2018-01-26T21:20:36Z

source/js/main.js

@@ -231,6 +232,42 @@ let main = {
    if (document.querySelector(`#news`)) {
      ReactDOM.render(<News env={env}/>, document.querySelector(`#news`));
    }
+
+    // Science Fellowship


Can we put this into a new file? main.js is getting pretty large and this is fairly specific to just one section.

gvn · 2018-01-26T21:24:11Z

source/sass/type.scss

+    text-decoration: none;
+    border-bottom: 5px solid #ffed00;
+    position: relative;
+    top: 2.5px;


All browsers round subpixels differently, so its better to just use integer values with pixel units IMO.

PR updated!

mmmavis · 2018-01-26T23:09:36Z

There are some CSS tweaks I need to apply. Will flag someone to review after I'm done.

mmmavis · 2018-01-26T23:59:50Z

source/js/fellowships.js

+function injectReactComponents() {
+  // Science Fellowship
+  if (document.getElementById(`featured-science-fellow`)) {
+    let metadata = {


@alanmoo

We could feed these hardcoded metadata via HTML data-* attributes... but some of them aren't string. It's more troublesome to hardcode array and object as data-* values... and it'll make the HTML code less readable. I can't find a DRYer way to do this... at least not now as these values are hardcoded.

Now that this is in a separate file it makes a lot more sense.

mmmavis · 2018-01-27T00:00:18Z

@alanmoo this is ready for review again!

mmmavis · 2018-01-27T00:01:56Z

source/js/fellowships.js

+  }
+}
+
+export default { injectReactComponents };


Exporting a named function here. I think we'll end up having more functions in this module in the future.

alanmoo

This looks good in terms of code and a solid pass at populating the structure. Beyond content, the only glaring issue is the fellowships nav isn't responsive. Should we file that as another ticket @mmmavis?

alanmoo · 2018-01-30T14:58:21Z

source/js/fellowships.js

+function injectReactComponents() {
+  // Science Fellowship
+  if (document.getElementById(`featured-science-fellow`)) {
+    let metadata = {


Now that this is in a separate file it makes a lot more sense.

mmmavis · 2018-01-30T17:34:39Z

@alanmoo re: nav

I haven't really worked on styling yet since mockups aren't finalized yet. But yea I can file a ticket to make sure we don't forget to make the nav responsive.

mmmavis requested review from cadecairos, gideonthomas and gvn as code owners January 24, 2018 17:30

mmmavis removed request for gvn, cadecairos and gideonthomas January 24, 2018 17:30

mmmavis changed the base branch from master to fellowships January 24, 2018 17:30

cadecairos temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 17:30 Inactive

mmmavis force-pushed the issue-951-fellowship-type-page branch from a45fcd1 to 2bc979a Compare January 24, 2018 17:34

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 17:34 Inactive

mmmavis force-pushed the issue-951-fellowship-type-page branch from 2bc979a to 389c3a0 Compare January 24, 2018 17:36

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 17:36 Inactive

mmmavis force-pushed the issue-951-fellowship-type-page branch from 389c3a0 to def5811 Compare January 24, 2018 17:39

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 17:39 Inactive

mmmavis force-pushed the issue-951-fellowship-type-page branch from def5811 to 1b1dd55 Compare January 24, 2018 17:40

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 17:40 Inactive

mmmavis changed the title ~~Fellowship type page + Science fellowship page~~ (WIP) Fellowship type page + Science fellowship page Jan 24, 2018

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 22:47 Inactive

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 23:03 Inactive

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 23:05 Inactive

mmmavis changed the title ~~(WIP) Fellowship type page + Science fellowship page~~ Fellowship type page + Science fellowship page Jan 24, 2018

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 24, 2018 23:10 Inactive

mmmavis changed the title ~~Fellowship type page + Science fellowship page~~ Fellowship type pages Jan 24, 2018

mmmavis requested a review from alanmoo January 24, 2018 23:24

mmmavis commented Jan 24, 2018

View reviewed changes

mmmavis mentioned this pull request Jan 25, 2018

Fellowships support page #1006

Merged

mmmavis added 3 commits January 26, 2018 11:44

Related to #951 - Fellowship type page + Science fellowship page

d6b5c02

fellowship nav and breadcrumb

8f287ba

added fellowship directory link to <Person>

58bbe76

mmmavis added 2 commits January 26, 2018 11:44

fixed broken link

99082e1

open web fellowship

f55b029

mmmavis force-pushed the issue-951-fellowship-type-page branch from be06cb3 to f55b029 Compare January 26, 2018 19:44

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 26, 2018 19:44 Inactive

alanmoo previously requested changes Jan 26, 2018

View reviewed changes

alanmoo requested a review from gvn January 26, 2018 20:21

renamed foundation-base.html to fellows-base.html

a956e8f

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 26, 2018 21:03 Inactive

gvn reviewed Jan 26, 2018

View reviewed changes

separate fellowships related bits to its own js file

9652718

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 26, 2018 22:38 Inactive

added an inline comment

c77cc94

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 26, 2018 22:39 Inactive

css tweaks

b13feb9

mmmavis temporarily deployed to foundation-mofostaging--pr-994 January 26, 2018 23:54 Inactive

mmmavis commented Jan 26, 2018

View reviewed changes

mmmavis requested a review from alanmoo January 27, 2018 00:00

mmmavis commented Jan 27, 2018

View reviewed changes

cadecairos deployed to foundation-mofostaging--pr-994 January 30, 2018 15:31 View deployment

alanmoo approved these changes Jan 30, 2018

View reviewed changes

mmmavis merged commit 7c668bf into fellowships Jan 30, 2018

mmmavis deleted the issue-951-fellowship-type-page branch February 9, 2018 19:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fellowship type pages #994

Fellowship type pages #994

mmmavis commented Jan 24, 2018 •

edited

Loading

mmmavis commented Jan 24, 2018

mmmavis Jan 24, 2018

alanmoo left a comment

alanmoo Jan 26, 2018

alanmoo Jan 26, 2018

alanmoo Jan 26, 2018

alanmoo Jan 26, 2018

mmmavis Jan 26, 2018

gvn Jan 26, 2018

gvn Jan 26, 2018

mmmavis commented Jan 26, 2018

mmmavis Jan 26, 2018

alanmoo Jan 30, 2018

mmmavis commented Jan 27, 2018

mmmavis Jan 27, 2018

alanmoo left a comment

alanmoo Jan 30, 2018

mmmavis commented Jan 30, 2018

Fellowship type pages #994

Fellowship type pages #994

Conversation

mmmavis commented Jan 24, 2018 • edited Loading

mmmavis commented Jan 24, 2018

Choose a reason for hiding this comment

alanmoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mmmavis commented Jan 26, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mmmavis commented Jan 27, 2018

Choose a reason for hiding this comment

alanmoo left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mmmavis commented Jan 30, 2018

mmmavis commented Jan 24, 2018 •

edited

Loading