Dropdowns to sort public pursuances and navigate your pursuances by v-stickykeys · Pull Request #111 · PursuanceProject/pursuance

v-stickykeys · 2018-02-08T06:46:10Z

I did a pass at the styling

… into develop :x

elimisteve · 2018-02-08T08:04:55Z

src/components/Content/TaskHierarchy/TaskHierarchy.js

  }

+  produceOptions = () => {
+    const pursuanceArr = Object.values(this.props.pursuances);


@thevaleriemack Want to sort the pursuances by ID here?

elimisteve · 2018-02-10T12:54:46Z

src/components/Content/TaskHierarchy/TaskHierarchy.js

+  produceOptions = () => {
+    const pursuanceArr = Object.values(this.props.pursuances);
+    pursuanceArr.sort((p1, p2) => {
+      return p1.name.localeCompare(p2.name);


@thevaleriemack .toLowerCase() please :-)

elimisteve · 2018-02-10T12:56:32Z

src/components/PublicPursuances/PublicPursuanceList.js

+  orderByDateDesc = (p1, p2) => {
+    p1["parsedDate"] = Date.parse(p1.created);
+    p2["parsedDate"] = Date.parse(p2.created);
+    return p2.parsedDate - p1.parsedDate;


@thevaleriemack How about we call it created_parsed, so we know which date this is the parsed version of?

elimisteve · 2018-02-10T12:58:48Z

src/reducers/publicOrderReducer.js

+  switch (action.type) {
+    case 'SET_PUBLIC_ORDER':
+      state = action.publicOrder;
+      return state;


@thevaleriemack return action.publicOrder 👍 then this is clearly a pure function, as reducers ought to be (and is!)

elimisteve · 2018-02-11T01:10:53Z

@thevaleriemack Hey I tried this out and it works great! Could you just move it from the TaskHierarchy page and into the top nav bar? Then people can switch pursuances from any screen at any time, not just from the TaskHierarchy.

stay up to date

… into develop stay up to date

v-stickykeys · 2018-03-11T03:23:32Z

@elimisteve updated to complete #122

elimisteve · 2018-03-14T09:05:17Z

src/components/Content/TaskHierarchy/TaskHierarchy.js

-                pursuances[currentPursuanceId] && pursuances[currentPursuanceId].name
-              }
-            </h2>
+            <h2 id="tasks-title">{ this.getPursuanceName(pursuances, currentPursuanceId) }</h2>


@thevaleriemack Looks like id should probably be pursuance-title, not tasks-title :-)

elimisteve · 2018-03-14T09:06:32Z

src/components/NavBar/NavBar.js

 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Navbar, NavItem, Nav, OverlayTrigger, Tooltip } from 'react-bootstrap';
+import { Nav, Navbar, NavDropdown, NavItem, OverlayTrigger, Tooltip } from 'react-bootstrap';


@thevaleriemack @MartyTheeMartian @Moe-Shoman How about we alphabetically order imports, as Val did here? Makes sense to me.

elimisteve · 2018-03-14T09:09:18Z

src/components/NavBar/NavBar.js

  );

+  showCurrentPursuance = (pursuances) => {
+    let id = parseInt(window.location.pathname.slice(-1), 10);


@thevaleriemack You can get the pursuance ID from this.props.match.params.pursuanceId, like this:

pursuance/src/components/Content/Pursuance/views/DiscussView.js

Lines 16 to 24 in 6a8af04

const {

match: { params: { pursuanceId, taskGid } },

tasks,

getTasks

} = this.props;

if (!tasks.taskMap[taskGid]) {

getTasks(pursuanceId);

}

Not sure how to do this. "match" is coming up undefined I think because Navbar isn't being rendered using Route

I can try getting PursuancePage to push its state up to Navbar? Not sure how that works with redux but I'll give it a shot.

I see. Rendering NavBar using Route is probably the way to go, it seems to me. Luckily everything being passed to it manually is in Redux anyway, so how about reduxifying NavBar then having Route render it on every page?

Finally got this to work!

match is populated but the match is not exact because NavBar path is always root "/" so the params end up empty even when on PursuancePage.

Now I'm using location passed by react router but I still have to slice the pathname to get the id.

currentPursuanceId won't work either because it doesn't change when moving from a pursuance page to a non pursuance page like Dashboard.

elimisteve · 2018-03-14T09:19:03Z

src/components/PublicPursuances/PublicPursuanceList.js

+    return p1.name.localeCompare(p2.name);
+  }
+  orderByNameDesc = (p1, p2) => {
+    return p2.name.localeCompare(p1.name);


@thevaleriemack Please do the comparison after a .toLowerCase() on each name so that a pursuance with this name doesn't show up after This pursuance name due to capitalization differences.

…into develop stay up to date

elimisteve · 2018-03-26T00:13:28Z

src/App.js

-            onRemoveNotification={this.props.removeNotification}
-            onIncreaseContributionAmount={this.props.increaseContributionAmount}
-            />
+        <Route component={NavBar} />


Sweet 👍 . Very clean

elimisteve · 2018-04-25T07:45:21Z

Hey @thevaleriemack , I made a couple tweaks so that a hard refresh isn't required (via history.go()) and put them in a new branch -- namely https://github.com/PursuanceProject/pursuance/tree/val-dev-merged-reordered -- but I'm running into a couple CSS issues I'm having trouble with:

The spacing of the elements on the top nav bar is different
The top nav bar's elements are blue rather than white like in develop
The Assign button's dropdown's elements are indented from the left side and also wrap around to the next line

Maybe it has something to do with a merge conflict you ran into? I don't know.

Any idea what's up (and yes I remember that you probably don't have time to fix it personally)? Thanks.

v-stickykeys · 2018-04-25T14:13:45Z

!! I’ll look into them when I get a chance. Nav spacing is different because I tried to employ the bootstrap nav and center the jump to drop down. Changing the links to white should be fine. I don’t think I messed with the assign button. But if it was using styling from nav css maybe that’s where the problem occurred.

On Wed, Apr 25, 2018 at 12:45 AM Steve Phillips ***@***.***> wrote: Hey @thevaleriemack <https://github.com/thevaleriemack> , I made a couple tweaks so that a hard refresh isn't required (via history.go()) and put them in a new branch -- namely https://github.com/PursuanceProject/pursuance/tree/val-dev-merged-reordered -- but I'm running into a couple CSS issues I'm having trouble with: 1. The spacing of the elements on the top nav bar is different 2. The top nav bar's elements are blue rather than white like in develop 3. The Assign button's dropdown's elements are indented from the left side and also wrap around to the next line Maybe it has something to do with a merge conflict you ran into? I don't know. Any idea what's up (and yes I remember that you probably don't have time to fix it personally)? Thanks. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#111 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AIDeqktQlM7bJ6qYpwvH4gOABjUdeCInks5tsCmSgaJpZM4R94Dh> .

-- Thank you, Val

v-stickykeys added 12 commits January 10, 2018 19:58

test travis multi language

2b6d9d3

attempt 2 for travis multi language

dfcc175

attempt 3

5b1982c

filter all WIP

a53b3b5

Merge branch 'develop' of https://github.com/PursuanceProject/pursuance…

1439f05

… into develop :x

ordering public pursuances. wip

df3ff98

merge upstream to stay up to date

49c34dd

order public pursuances

dc0d762

refine public order reducer

9352a43

merge upstream

cc0fd5c

revert travis.yml and create dropdown for pursuances

49a262a

add newline char

f98e0f9

v-stickykeys changed the title ~~Dropdowns to sort public pursuances and navigate you pursuances~~ Dropdowns to sort public pursuances and navigate your pursuances Feb 8, 2018

elimisteve reviewed Feb 8, 2018

View reviewed changes

sort your pursuances a..z

f247b02

elimisteve reviewed Feb 10, 2018

View reviewed changes

v-stickykeys added 6 commits February 21, 2018 18:53

ignore pursuance-insert.txt'

371aea5

Merge https://github.com/PursuanceProject/pursuance into develop

69142aa

stay up to date

jump to pursuance from navbar

12c42ac

Merge branch 'develop' of https://github.com/PursuanceProject/pursuance…

4563477

… into develop stay up to date

pursuance name in tasks and jump to dropdown

148b5a6

add radix to parseInt

b1469ef

add about view for each pursuance

7a85f00

elimisteve reviewed Mar 14, 2018

View reviewed changes

v-stickykeys added 23 commits March 14, 2018 08:58

change id on taskhierarchy. use lowercase to compare

14e82c7

fix typos

8bfbd9c

route and reduxify navbar

29c52b3

test travis multi language

30a19a9

attempt 2 for travis multi language

d9810ec

attempt 3

1974d79

filter all WIP

673883f

ordering public pursuances. wip

647aa1c

order public pursuances

92a5327

refine public order reducer

e5b92f1

revert travis.yml and create dropdown for pursuances

5f6158d

add newline char

f0c17ba

sort your pursuances a..z

28c24ff

ignore pursuance-insert.txt'

2393459

jump to pursuance from navbar

ffbed0d

pursuance name in tasks and jump to dropdown

c23a867

add radix to parseInt

fd813e5

add about view for each pursuance

d7a41d6

change id on taskhierarchy. use lowercase to compare

ae72a7d

fix typos

7f08188

route and reduxify navbar

37bbef3

Merge branch 'develop' of https://github.com/thevaleriemack/pursuance …

a4e8b7c

…into develop stay up to date

refreshing page shows correct pursuance in dropdown

6fe4487

elimisteve reviewed Mar 26, 2018

View reviewed changes

v-stickykeys added 3 commits March 28, 2018 22:59

styling for about view and navbar

f0f1abd

Merge branch 'develop' into develop

773d09b

Merge branch 'develop' into develop

ae600e8

	const {
	match: { params: { pursuanceId, taskGid } },
	tasks,
	getTasks
	} = this.props;

	if (!tasks.taskMap[taskGid]) {
	getTasks(pursuanceId);
	}

Conversation

v-stickykeys commented Feb 8, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elimisteve commented Feb 11, 2018

Uh oh!

v-stickykeys commented Mar 11, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elimisteve commented Apr 25, 2018

Uh oh!

v-stickykeys commented Apr 25, 2018 via email

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants