added avatar to repository

This commit is contained in:
Brad Rydzewski 2015-08-03 00:10:43 -07:00
parent a3b6759cf9
commit 653cb0e7a7
6 changed files with 103 additions and 78 deletions

View file

@ -24,9 +24,9 @@
</div> </div>
<ul class="list cozy" ng-show="!waiting && !error"> <ul class="list cozy" ng-show="!waiting && !error">
<a class="row row-repo" ng-repeat="repo in repos | filter: search_text" ng-href="/{{ repo.full_name }}"> <a class="row row-repo" ng-repeat="repo in repos | orderBy:'full_name' | filter: search_text" ng-href="/{{ repo.full_name }}">
<div class="column-avatar"> <div class="column-avatar">
<img ng-src="https://avatars1.githubusercontent.com/u/2181346" /> <img ng-src="{{ repo.avatar }}" />
</div> </div>
<div class="column-fill"> <div class="column-fill">
<h2>{{ repo.name }}</h2> <h2>{{ repo.name }}</h2>

View file

@ -124,6 +124,7 @@ func (g *GitHub) Repo(u *common.User, owner, name string) (*common.Repo, error)
repo.Private = *repo_.Private repo.Private = *repo_.Private
repo.Clone = *repo_.CloneURL repo.Clone = *repo_.CloneURL
repo.Branch = "master" repo.Branch = "master"
repo.Avatar = *repo_.Owner.AvatarURL
if repo_.DefaultBranch != nil { if repo_.DefaultBranch != nil {
repo.Branch = *repo_.DefaultBranch repo.Branch = *repo_.DefaultBranch

View file

@ -52,6 +52,7 @@ CREATE TABLE IF NOT EXISTS repos (
,repo_user_id INTEGER ,repo_user_id INTEGER
,repo_owner VARCHAR(255) ,repo_owner VARCHAR(255)
,repo_name VARCHAR(255) ,repo_name VARCHAR(255)
,repo_avatar VARCHAR(1024)
,repo_full_name VARCHAR(1024) ,repo_full_name VARCHAR(1024)
,repo_self VARCHAR(1024) ,repo_self VARCHAR(1024)
,repo_link VARCHAR(1024) ,repo_link VARCHAR(1024)
@ -96,7 +97,7 @@ CREATE TABLE IF NOT EXISTS builds (
,build_commit_sha VARCHAR(512) ,build_commit_sha VARCHAR(512)
,build_commit_ref VARCHAR(512) ,build_commit_ref VARCHAR(512)
,build_commit_branch VARCHAR(512) ,build_commit_branch VARCHAR(512)
,build_commit_message VARCHAR(512) ,build_commit_message VARCHAR(2048)
,build_commit_timestamp VARCHAR(512) ,build_commit_timestamp VARCHAR(512)
,build_commit_remote VARCHAR(512) ,build_commit_remote VARCHAR(512)
,build_commit_author_login VARCHAR(512) ,build_commit_author_login VARCHAR(512)
@ -106,7 +107,7 @@ CREATE TABLE IF NOT EXISTS builds (
,build_pull_request_base_sha VARCHAR(512) ,build_pull_request_base_sha VARCHAR(512)
,build_pull_request_base_ref VARCHAR(512) ,build_pull_request_base_ref VARCHAR(512)
,build_pull_request_base_branch VARCHAR(512) ,build_pull_request_base_branch VARCHAR(512)
,build_pull_request_base_message VARCHAR(512) ,build_pull_request_base_message VARCHAR(2048)
,build_pull_request_base_timestamp VARCHAR(512) ,build_pull_request_base_timestamp VARCHAR(512)
,build_pull_request_base_remote VARCHAR(512) ,build_pull_request_base_remote VARCHAR(512)
,build_pull_request_base_author_login VARCHAR(512) ,build_pull_request_base_author_login VARCHAR(512)

View file

@ -57,6 +57,7 @@ SELECT
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone

View file

@ -42,36 +42,38 @@ func createRepo(db repoDB, query string, v *Repo) error {
var v5 string var v5 string
var v6 string var v6 string
var v7 string var v7 string
var v8 bool var v8 string
var v9 bool var v9 bool
var v10 int64 var v10 bool
var v11 string var v11 int64
var v12 string var v12 string
var v13 bool var v13 string
var v14 bool var v14 bool
var v15 bool var v15 bool
var v16 []byte var v16 bool
var v17 []byte
v0 = v.UserID v0 = v.UserID
v1 = v.Owner v1 = v.Owner
v2 = v.Name v2 = v.Name
v3 = v.FullName v3 = v.FullName
v4 = v.Self v4 = v.Avatar
v5 = v.Link v5 = v.Self
v6 = v.Clone v6 = v.Link
v7 = v.Branch v7 = v.Clone
v8 = v.Private v8 = v.Branch
v9 = v.Trusted v9 = v.Private
v10 = v.Timeout v10 = v.Trusted
v11 = v.Timeout
if v.Keys != nil { if v.Keys != nil {
v11 = v.Keys.Public v12 = v.Keys.Public
v12 = v.Keys.Private v13 = v.Keys.Private
} }
if v.Hooks != nil { if v.Hooks != nil {
v13 = v.Hooks.PullRequest v14 = v.Hooks.PullRequest
v14 = v.Hooks.Push v15 = v.Hooks.Push
v15 = v.Hooks.Tags v16 = v.Hooks.Tags
} }
v16, _ = json.Marshal(v.Params) v17, _ = json.Marshal(v.Params)
res, err := db.Exec(query, res, err := db.Exec(query,
&v0, &v0,
@ -91,6 +93,7 @@ func createRepo(db repoDB, query string, v *Repo) error {
&v14, &v14,
&v15, &v15,
&v16, &v16,
&v17,
) )
if err != nil { if err != nil {
return err return err
@ -110,37 +113,39 @@ func updateRepo(db repoDB, query string, v *Repo) error {
var v6 string var v6 string
var v7 string var v7 string
var v8 string var v8 string
var v9 bool var v9 string
var v10 bool var v10 bool
var v11 int64 var v11 bool
var v12 string var v12 int64
var v13 string var v13 string
var v14 bool var v14 string
var v15 bool var v15 bool
var v16 bool var v16 bool
var v17 []byte var v17 bool
var v18 []byte
v0 = v.ID v0 = v.ID
v1 = v.UserID v1 = v.UserID
v2 = v.Owner v2 = v.Owner
v3 = v.Name v3 = v.Name
v4 = v.FullName v4 = v.FullName
v5 = v.Self v5 = v.Avatar
v6 = v.Link v6 = v.Self
v7 = v.Clone v7 = v.Link
v8 = v.Branch v8 = v.Clone
v9 = v.Private v9 = v.Branch
v10 = v.Trusted v10 = v.Private
v11 = v.Timeout v11 = v.Trusted
v12 = v.Timeout
if v.Keys != nil { if v.Keys != nil {
v12 = v.Keys.Public v13 = v.Keys.Public
v13 = v.Keys.Private v14 = v.Keys.Private
} }
if v.Hooks != nil { if v.Hooks != nil {
v14 = v.Hooks.PullRequest v15 = v.Hooks.PullRequest
v15 = v.Hooks.Push v16 = v.Hooks.Push
v16 = v.Hooks.Tags v17 = v.Hooks.Tags
} }
v17, _ = json.Marshal(v.Params) v18, _ = json.Marshal(v.Params)
_, err := db.Exec(query, _, err := db.Exec(query,
&v1, &v1,
@ -160,6 +165,7 @@ func updateRepo(db repoDB, query string, v *Repo) error {
&v15, &v15,
&v16, &v16,
&v17, &v17,
&v18,
&v0, &v0,
) )
return err return err
@ -175,15 +181,16 @@ func scanRepo(row *sql.Row) (*Repo, error) {
var v6 string var v6 string
var v7 string var v7 string
var v8 string var v8 string
var v9 bool var v9 string
var v10 bool var v10 bool
var v11 int64 var v11 bool
var v12 string var v12 int64
var v13 string var v13 string
var v14 bool var v14 string
var v15 bool var v15 bool
var v16 bool var v16 bool
var v17 []byte var v17 bool
var v18 []byte
err := row.Scan( err := row.Scan(
&v0, &v0,
@ -204,6 +211,7 @@ func scanRepo(row *sql.Row) (*Repo, error) {
&v15, &v15,
&v16, &v16,
&v17, &v17,
&v18,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -215,21 +223,22 @@ func scanRepo(row *sql.Row) (*Repo, error) {
v.Owner = v2 v.Owner = v2
v.Name = v3 v.Name = v3
v.FullName = v4 v.FullName = v4
v.Self = v5 v.Avatar = v5
v.Link = v6 v.Self = v6
v.Clone = v7 v.Link = v7
v.Branch = v8 v.Clone = v8
v.Private = v9 v.Branch = v9
v.Trusted = v10 v.Private = v10
v.Timeout = v11 v.Trusted = v11
v.Timeout = v12
v.Keys = &Keypair{} v.Keys = &Keypair{}
v.Keys.Public = v12 v.Keys.Public = v13
v.Keys.Private = v13 v.Keys.Private = v14
v.Hooks = &Hooks{} v.Hooks = &Hooks{}
v.Hooks.PullRequest = v14 v.Hooks.PullRequest = v15
v.Hooks.Push = v15 v.Hooks.Push = v16
v.Hooks.Tags = v16 v.Hooks.Tags = v17
json.Unmarshal(v17, &v.Params) json.Unmarshal(v18, &v.Params)
return v, nil return v, nil
} }
@ -247,15 +256,16 @@ func scanRepos(rows *sql.Rows) ([]*Repo, error) {
var v6 string var v6 string
var v7 string var v7 string
var v8 string var v8 string
var v9 bool var v9 string
var v10 bool var v10 bool
var v11 int64 var v11 bool
var v12 string var v12 int64
var v13 string var v13 string
var v14 bool var v14 string
var v15 bool var v15 bool
var v16 bool var v16 bool
var v17 []byte var v17 bool
var v18 []byte
err = rows.Scan( err = rows.Scan(
&v0, &v0,
&v1, &v1,
@ -275,6 +285,7 @@ func scanRepos(rows *sql.Rows) ([]*Repo, error) {
&v15, &v15,
&v16, &v16,
&v17, &v17,
&v18,
) )
if err != nil { if err != nil {
return vv, err return vv, err
@ -286,21 +297,22 @@ func scanRepos(rows *sql.Rows) ([]*Repo, error) {
v.Owner = v2 v.Owner = v2
v.Name = v3 v.Name = v3
v.FullName = v4 v.FullName = v4
v.Self = v5 v.Avatar = v5
v.Link = v6 v.Self = v6
v.Clone = v7 v.Link = v7
v.Branch = v8 v.Clone = v8
v.Private = v9 v.Branch = v9
v.Trusted = v10 v.Private = v10
v.Timeout = v11 v.Trusted = v11
v.Timeout = v12
v.Keys = &Keypair{} v.Keys = &Keypair{}
v.Keys.Public = v12 v.Keys.Public = v13
v.Keys.Private = v13 v.Keys.Private = v14
v.Hooks = &Hooks{} v.Hooks = &Hooks{}
v.Hooks.PullRequest = v14 v.Hooks.PullRequest = v15
v.Hooks.Push = v15 v.Hooks.Push = v16
v.Hooks.Tags = v16 v.Hooks.Tags = v17
json.Unmarshal(v17, &v.Params) json.Unmarshal(v18, &v.Params)
vv = append(vv, v) vv = append(vv, v)
} }
return vv, rows.Err() return vv, rows.Err()
@ -313,6 +325,7 @@ SELECT
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone
@ -336,6 +349,7 @@ SELECT
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone
@ -360,6 +374,7 @@ SELECT
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone
@ -384,6 +399,7 @@ SELECT
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone
@ -408,6 +424,7 @@ SELECT
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone
@ -433,6 +450,7 @@ SELECT
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone
@ -461,6 +479,7 @@ INSERT INTO repos (
,repo_owner ,repo_owner
,repo_name ,repo_name
,repo_full_name ,repo_full_name
,repo_avatar
,repo_self ,repo_self
,repo_link ,repo_link
,repo_clone ,repo_clone
@ -474,7 +493,7 @@ INSERT INTO repos (
,repo_hooks_push ,repo_hooks_push
,repo_hooks_tags ,repo_hooks_tags
,repo_params ,repo_params
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);
` `
const stmtRepoUpdate = ` const stmtRepoUpdate = `
@ -483,6 +502,7 @@ UPDATE repos SET
,repo_owner = ? ,repo_owner = ?
,repo_name = ? ,repo_name = ?
,repo_full_name = ? ,repo_full_name = ?
,repo_avatar = ?
,repo_self = ? ,repo_self = ?
,repo_link = ? ,repo_link = ?
,repo_clone = ? ,repo_clone = ?
@ -511,6 +531,7 @@ CREATE TABLE IF NOT EXISTS repos (
,repo_owner VARCHAR ,repo_owner VARCHAR
,repo_name VARCHAR ,repo_name VARCHAR
,repo_full_name VARCHAR ,repo_full_name VARCHAR
,repo_avatar VARCHAR
,repo_self VARCHAR ,repo_self VARCHAR
,repo_link VARCHAR ,repo_link VARCHAR
,repo_clone VARCHAR ,repo_clone VARCHAR

View file

@ -6,6 +6,7 @@ type Repo struct {
Owner string `meddler:"repo_owner" json:"owner" sql:"unique:ux_repo_owner_name"` Owner string `meddler:"repo_owner" json:"owner" sql:"unique:ux_repo_owner_name"`
Name string `meddler:"repo_name" json:"name" sql:"unique:ux_repo_owner_name"` Name string `meddler:"repo_name" json:"name" sql:"unique:ux_repo_owner_name"`
FullName string `meddler:"repo_full_name" json:"full_name" sql:"unique:ux_repo_full_name"` FullName string `meddler:"repo_full_name" json:"full_name" sql:"unique:ux_repo_full_name"`
Avatar string `meddler:"repo_avatar" json:"avatar"`
Self string `meddler:"repo_self" json:"self_url"` Self string `meddler:"repo_self" json:"self_url"`
Link string `meddler:"repo_link" json:"link_url"` Link string `meddler:"repo_link" json:"link_url"`
Clone string `meddler:"repo_clone" json:"clone_url"` Clone string `meddler:"repo_clone" json:"clone_url"`