Skip to content
This repository has been archived by the owner on Aug 30, 2021. It is now read-only.

feat(users): Modify users module to implement style guidelines. #1208

Merged
merged 1 commit into from
Mar 14, 2016

Conversation

itelo
Copy link
Contributor

@itelo itelo commented Feb 12, 2016

No description provided.

@rhutchison
Copy link
Contributor

Can you please fix the tests.

@itelo itelo force-pushed the users-styleguide branch 5 times, most recently from a4870ba to ee13207 Compare February 12, 2016 17:22
@lirantal
Copy link
Member

@ilanbiala @codydaig one of you to review it? a big client-side PR so it's best to merge soon before we're having conflicts there from other merged PRs

@lirantal lirantal added this to the 0.5.0 milestone Feb 13, 2016
@itelo
Copy link
Contributor Author

itelo commented Mar 5, 2016

Someone is looking to this PR?

@mleanos mleanos self-assigned this Mar 5, 2016
@mleanos
Copy link
Member

mleanos commented Mar 5, 2016

Yes. Rebase, and I'll start reviewing & testing.

@itelo itelo force-pushed the users-styleguide branch from ee13207 to c74badd Compare March 5, 2016 01:26
@itelo
Copy link
Contributor Author

itelo commented Mar 5, 2016

@mleanos check now (:

@@ -2,13 +2,13 @@
<div class="page-header">
<div class="row">
<div class="col-md-6">
<h1 ng-bind="user.username"></h1>
<h1 ng-bind="vm.user.username"></h1>
</div>
<div class="col-md-4">
<a class="btn btn-primary" ui-sref="admin.user-edit({userId: user._id})">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing vm should be {userId: vm.user._id} for the state param.

@mleanos
Copy link
Member

mleanos commented Mar 6, 2016

@itelo I pulled this down & tested. Didn't notice any issues, other than the missing () in a few places & one missing vm reference, where I commented. Once I fixed those locally, everything seemed to function as expected.

Overall, this looks really good. Awesome job! Can someone else do a review here? Quite a bit of code, so I could have missed something.

@itelo itelo force-pushed the users-styleguide branch from c74badd to 173b702 Compare March 6, 2016 15:22
@itelo
Copy link
Contributor Author

itelo commented Mar 6, 2016

@mleanos i re-checked everything and discover bugs, i already fixed them...

@mleanos
Copy link
Member

mleanos commented Mar 10, 2016

@meanjs/contributors More eyes on this?

I haven't tested since the issues were taken care of, but I plan to in the next couple of days.

@@ -26,7 +26,7 @@
function compileDirective(template) {
// function to compile a fresh directive with the given template, or a default one
// input form with directive
if (!template) template = '<input type="password" id="newPassword" name="newPassword" class="form-control" ng-model="passwordMock.newPassword" placeholder="New Password" autocomplete="new-password" uib-popover="{{popoverMsg}}" uib-popover-trigger="focus" uib-popover-placement="top" password-validator required>' +
if (!template) template = '<input type="password" id="newPassword" name="newPassword" class="form-control" ng-model="passwordMock.newPassword" placeholder="New Password" autocomplete="new-password" uib-popover="{{getPopoverMsg}}" uib-popover-trigger="focus" uib-popover-placement="top" password-validator required>' +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not vm.?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think vm is relevant here. We're only testing the directive, and there's no context for a controller here. IIRC, from working with these tests, I think this is the correct way to write isolated tests for directives.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ilanbiala
Copy link
Member

LGTM.

@mleanos
Copy link
Member

mleanos commented Mar 14, 2016

I just pulled this down again, and tested. Everything seems good to me. Didn't notice any issues.

I think this is ready. I'll try to merge soon, pending one or two more LGTM's.

@ilanbiala
Copy link
Member

Yep, you can merge.

mleanos added a commit that referenced this pull request Mar 14, 2016
feat(users): Modify users module to implement style guidelines.
@mleanos mleanos merged commit 4c89ce7 into meanjs:master Mar 14, 2016
@mleanos
Copy link
Member

mleanos commented Mar 14, 2016

@itelo This is a huge huge help. Thanks! It's nice to have the style-guide here now :)

@lirantal lirantal mentioned this pull request Mar 23, 2016
8 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants