Team page

app/controllers/team.js

@@ -0,0 +1,17 @@
+import Ember from 'ember';
+import PaginationMixin from '../mixins/pagination';
+
+const { computed } = Ember;
+
+export default Ember.Controller.extend(PaginationMixin, {
+    queryParams: ['page', 'per_page', 'sort'],
+    page: '1',
+    per_page: 10,
+    sort: 'alpha',
+
+    totalItems: computed.readOnly('model.crates.meta.total'),
+
+    currentSortBy: computed('sort', function() {
+        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
+    }),
+});

app/models/crate.js

@@ -30,6 +30,8 @@ export default DS.Model.extend({
     badge_sort: ['badge_type'],
     annotated_badges: Ember.computed.sort('enhanced_badges', 'badge_sort'),
     owners: DS.hasMany('users', { async: true }),
+    owner_team: DS.hasMany('teams', { async: true }),
+    owner_user: DS.hasMany('users', { async: true }),
     version_downloads: DS.hasMany('version-download', { async: true }),
     keywords: DS.hasMany('keywords', { async: true }),
     categories: DS.hasMany('categories', { async: true }),

app/models/team.js

@@ -0,0 +1,17 @@
+import DS from 'ember-data';
+import Ember from 'ember';
+
+export default DS.Model.extend({
+    email: DS.attr('string'),
+    name: DS.attr('string'),
+    login: DS.attr('string'),
+    api_token: DS.attr('string'),
+    avatar: DS.attr('string'),
+    url: DS.attr('string'),
+    kind: DS.attr('string'),
+    org_name: Ember.computed('login', function() {
+        let login = this.get('login');
+        let login_split = login.split(':');
+        return login_split[1];
+    })
+});

app/models/user.js

@@ -7,4 +7,5 @@ export default DS.Model.extend({
     api_token: DS.attr('string'),
     avatar: DS.attr('string'),
     url: DS.attr('string'),
+    kind: DS.attr('string'),
 });

app/router.js

@@ -44,6 +44,7 @@ Router.map(function() {
     });
     this.route('category_slugs');
     this.route('catchAll', { path: '*path' });
+    this.route('team', { path: '/teams/:team_id' });
 });
 
 export default Router;

app/routes/team.js

@@ -0,0 +1,37 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+    queryParams: {
+        page: { refreshedModel: true },
+        sort: { refreshedModel: true },
+    },
+    data: {},
+
+    setupController(controller, model) {
+        this._super(controller, model);
+
+        controller.set('fetchingFeed', true);
+        controller.set('crates', this.get('data.crates'));
+    },
+
+    model(params) {
+        const { team_id } = params;
+        return this.store.find('team', team_id).then(
+            (team) => {
+                params.team_id = team.get('id');
+                return Ember.RSVP.hash({
+                    crates: this.store.query('crate', params),
+                    team
+                });
+            },
+            (e) => {
+                if (e.errors.any(e => e.detail === 'Not Found')) {
+                    this
+                        .controllerFor('application')
+                        .set('nextFlashError', `User '${params.team_id}' does not exist`);
+                    return this.replaceWith('index');
+                }
+            }
+        );
+    },
+});

app/styles/crate.scss

@@ -22,6 +22,9 @@
         img {
             @include align-self(center);
         }
+        .team-info {
+            @include flex-direction(column);
+        }
     }
     h1 {
         padding-left: 10px;

app/templates/crate/version.hbs

@@ -148,11 +148,19 @@
             <div>
                 <h3>Owners</h3>
                 <ul class='owners'>
-                    {{#each crate.owners as |owner|}}
+                   {{#each crate.owner_team as |team|}}
                         <li>
-                          {{#link-to 'user' owner.login}}
-                              {{user-avatar user=owner size='medium-small'}}
-                          {{/link-to}}
+                            {{#link-to team.kind team.login}}
+                                {{user-avatar user=team size='medium-small'}}
+                            {{/link-to}}
+                        </li>
+                    {{/each}}
+
+                    {{#each crate.owner_user as |user|}}
+                        <li>
+                            {{#link-to user.kind user.login}}
+                                {{user-avatar user=user size='medium-small'}}
+                            {{/link-to}}
                         </li>
                     {{/each}}
                 </ul>

app/templates/team.hbs

@@ -0,0 +1,76 @@
+<div id='crates-heading'>
+    <div class="wide">
+        <div class='info'>
+            {{user-avatar user=model.team size='medium'}}
+            <div class='team-info'>
+                <h1>
+                    {{ model.team.org_name }}
+                </h1>
+                <h2>
+                    {{ model.team.name }}
+                </h2>
+            </div>
+            {{#user-link user=model.team}}
+                <img alt="GitHub profile" title="GitHub profile" src="/assets/GitHub-Mark-32px.png"/>
+            {{/user-link}}
+        </div>
+    </div>
+</div>
+
+<div id='user-profile'>
+    <div class='info'>
+        {{! TODO: reduce duplication with templates/crates.hbs }}
+
+        <div id='results'>
+            <div class='nav'>
+                <span class='amt small'>
+                    Displaying
+                    <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
+                    of <span class='total'>{{ totalItems }}</span> total results
+                </span>
+            </div>
+
+            <div class='sort'>
+                <span class='small'>Sort by</span>
+                {{#rl-dropdown-container class="dropdown-container"}}
+                    {{#rl-dropdown-toggle tagName="a" class="dropdown"}}
+                        <img class="sort" src="/assets/sort.png"/>
+                        {{ currentSortBy }}
+                        <span class='arrow'></span>
+                    {{/rl-dropdown-toggle}}
+
+                    {{#rl-dropdown tagName="ul" class="dropdown" closeOnChildClick="a:link"}}
+                        <li>
+                            {{#link-to (query-params sort="alpha")}}
+                                Alphabetical
+                            {{/link-to}}
+                        </li>
+                        <li>
+                            {{#link-to (query-params sort="downloads")}}
+                                Downloads
+                            {{/link-to}}
+                        </li>
+                    {{/rl-dropdown}}
+                {{/rl-dropdown-container}}
+            </div>
+        </div>
+
+        <div id='crates' class='white-rows'>
+            {{#each model.crates as |crate|}}
+                {{crate-row crate=crate}}
+            {{/each}}
+        </div>
+
+        <div class='pagination'>
+            {{#link-to (query-params page=prevPage) class="prev" rel="prev" title="previous page"}}
+                <img class="left-pag" src="/assets/left-pag.png"/>
+            {{/link-to}}
+            {{#each pages as |page|}}
+                {{#link-to (query-params page=page)}}{{ page }}{{/link-to}}
+                {{/each}}
+                {{#link-to (query-params page=nextPage) class="next" rel="next" title="next page"}}
+                    <img class="right-pag" src="/assets/right-pag.png"/>
+                {{/link-to}}
+        </div>
+    </div>
+</div>

mirage/config.js

@@ -5,10 +5,13 @@ import crateFixture from '../mirage/fixtures/crate';
 import crateVersionsFixture from '../mirage/fixtures/crate_versions';
 import crateAuthorsFixture from '../mirage/fixtures/crate_authors';
 import crateOwnersFixture from '../mirage/fixtures/crate_owners';
+import crateTeamsFixture from '../mirage/fixtures/crate_teams';
 import crateReverseDependenciesFixture from '../mirage/fixtures/crate_reverse_dependencies';
 import crateDependenciesFixture from '../mirage/fixtures/crate_dependencies';
 import crateDownloadsFixture from '../mirage/fixtures/crate_downloads';
 import keywordFixture from '../mirage/fixtures/keyword';
+import teamFixture from '../mirage/fixtures/team';
+import userFixture from '../mirage/fixtures/user';
 
 export default function() {
     this.get('/summary', () => summaryFixture);
@@ -20,6 +23,20 @@ export default function() {
                 crates: searchFixture.crates.slice(start, end),
                 meta: searchFixture.meta,
             };
+        } else if (request.queryParams.team_id) {
+            const { start, end } = pageParams(request);
+            return {
+                team: teamFixture.team,
+                crates: searchFixture.crates.slice(start, end),
+                meta: searchFixture.meta,
+            };
+        } else if (request.queryParams.user_id) {
+            const { start, end } = pageParams(request);
+            return {
+                user: userFixture.user,
+                crates: searchFixture.crates.slice(start, end),
+                meta: searchFixture.meta,
+            };
         }
     });
 
@@ -28,11 +45,14 @@ export default function() {
     this.get('/api/v1/crates/nanomsg', () => crateFixture);
     this.get('/api/v1/crates/nanomsg/versions', () => crateVersionsFixture);
     this.get('/api/v1/crates/nanomsg/:version_num/authors', () => crateAuthorsFixture);
-    this.get('/api/v1/crates/nanomsg/owners', () => crateOwnersFixture);
+    this.get('/api/v1/crates/nanomsg/owner_user', () => crateOwnersFixture);
+    this.get('/api/v1/crates/nanomsg/owner_team', () => crateTeamsFixture);
     this.get('/api/v1/crates/nanomsg/reverse_dependencies', () => crateReverseDependenciesFixture);
     this.get('/api/v1/crates/nanomsg/:version_num/dependencies', () => crateDependenciesFixture);
     this.get('/api/v1/crates/nanomsg/downloads', () => crateDownloadsFixture);
     this.get('/api/v1/keywords/network', () => keywordFixture);
+    this.get('/api/v1/teams/:team_id', () => teamFixture);
+    this.get('/api/v1/users/:user_id', () => userFixture);
 }
 
 function pageParams(request) {

mirage/fixtures/crate.js

@@ -15,7 +15,8 @@ export default {
         ],
         "license": "MIT",
         "links": {
-            "owners": "/api/v1/crates/nanomsg/owners",
+            "owner_user": "/api/v1/crates/nanomsg/owner_user",
+            "owner_team": "/api/v1/crates/nanomsg/owner_team",
             "reverse_dependencies": "/api/v1/crates/nanomsg/reverse_dependencies",
             "version_downloads": "/api/v1/crates/nanomsg/downloads",
             "versions": null

mirage/fixtures/crate_teams.js

@@ -0,0 +1,23 @@
+// jscs:disable validateQuoteMarks
+export default {
+    "teams": [
+        {
+            "avatar": "https://avatars.githubusercontent.com/u/565790?v=3",
+            "email": "[email protected]",
+            "id": 2,
+            "kind": "team",
+            "login": "github:org:thehydroimpulse",
+            "name": "Team Daniel Fagnan",
+            "url": "https://github.com/thehydroimpulse"
+        },
+        {
+            "avatar": "https://avatars.githubusercontent.com/u/9447137?v=3",
+            "email": null,
+            "id": 303,
+            "kind": "team",
+            "login": "github:org:blabaere",
+            "name": "Team Benoît Labaere",
+            "url": "https://github.com/blabaere"
+        }
+    ]
+};

mirage/fixtures/team.js

@@ -0,0 +1,10 @@
+// jscs:disable validateQuoteMarks
+export default {
+    "team": {
+        "avatar": "https://avatars.githubusercontent.com/u/565790?v=3",
+        "id": 1,
+        "login": "github:org_test:thehydroimpulseteam",
+        "name": "thehydroimpulseteam",
+        "url": "https://github.com/thehydroimpulse",
+    }
+};

mirage/fixtures/user.js

@@ -0,0 +1,11 @@
+// jscs:disable validateQuoteMarks
+export default {
+    "user": {
+        "avatar": "https://avatars.githubusercontent.com/u/565790?v=3",
+        "email": "[email protected]",
+        "id": 1,
+        "login": "thehydroimpulse",
+        "name": "Daniel Fagnan",
+        "url": "https://github.com/thehydroimpulse"
+    }
+};

src/krate.rs

@@ -114,6 +114,8 @@ pub struct CrateLinks {
     pub version_downloads: String,
     pub versions: Option<String>,
     pub owners: Option<String>,
+    pub owner_team: Option<String>,
+    pub owner_user: Option<String>,
     pub reverse_dependencies: String,
 }
 
@@ -535,6 +537,8 @@ impl Crate {
                 version_downloads: format!("/api/v1/crates/{}/downloads", name),
                 versions: versions_link,
                 owners: Some(format!("/api/v1/crates/{}/owners", name)),
+                owner_team: Some(format!("/api/v1/crates/{}/owner_team", name)),
+                owner_user: Some(format!("/api/v1/crates/{}/owner_user", name)),
                 reverse_dependencies: format!("/api/v1/crates/{}/reverse_dependencies", name),
             },
         }
@@ -864,6 +868,15 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
                     .filter(crate_owners::owner_kind.eq(OwnerKind::User as i32)),
             ),
         );
+    } else if let Some(team_id) = params.get("team_id").and_then(|s| s.parse::<i32>().ok()) {
+        query = query.filter(
+            crates::id.eq_any(
+                crate_owners::table
+                    .select(crate_owners::crate_id)
+                    .filter(crate_owners::owner_id.eq(team_id))
+                    .filter(crate_owners::owner_kind.eq(OwnerKind::Team as i32)),
+            ),
+        );
     } else if params.get("following").is_some() {
         query = query.filter(crates::id.eq_any(
             follows::table.select(follows::crate_id).filter(
@@ -1423,6 +1436,40 @@ pub fn owners(req: &mut Request) -> CargoResult<Response> {
     Ok(req.json(&R { users: owners }))
 }
 
+/// Handles the `GET /crates/:crate_id/owner_team` route.
+pub fn owner_team(req: &mut Request) -> CargoResult<Response> {
+    let crate_name = &req.params()["crate_id"];
+    let conn = req.db_conn()?;
+    let krate = Crate::by_name(crate_name).first::<Crate>(&*conn)?;
+    let owners = Team::owning(&krate, &conn)?
+        .into_iter()
+        .map(Owner::encodable)
+        .collect();
+
+    #[derive(RustcEncodable)]
+    struct R {
+        teams: Vec<EncodableOwner>,
+    }
+    Ok(req.json(&R { teams: owners }))
+}
+
+/// Handles the `GET /crates/:crate_id/owner_user` route.
+pub fn owner_user(req: &mut Request) -> CargoResult<Response> {
+    let crate_name = &req.params()["crate_id"];
+    let conn = req.db_conn()?;
+    let krate = Crate::by_name(crate_name).first::<Crate>(&*conn)?;
+    let owners = User::owning(&krate, &conn)?
+        .into_iter()
+        .map(Owner::encodable)
+        .collect();
+
+    #[derive(RustcEncodable)]
+    struct R {
+        users: Vec<EncodableOwner>,
+    }
+    Ok(req.json(&R { users: owners }))
+}
+
 /// Handles the `PUT /crates/:crate_id/owners` route.
 pub fn add_owners(req: &mut Request) -> CargoResult<Response> {
     modify_owners(req, true)