Add browse steps.

Fix database connection issues.

Signed-off-by: David Calavera <[email protected]>

Author: calavera

.gitignore

@@ -1 +1,2 @@
 openlandings
+.env

controllers/home.go

@@ -1,9 +1,6 @@
 package controllers
 
-import (
-	"github.com/astaxie/beego"
-	"github.com/markbates/goth"
-)
+import "github.com/astaxie/beego"
 
 type HomeController struct {
 	beego.Controller
@@ -12,12 +9,8 @@ type HomeController struct {
 func (c *HomeController) Get() {
 	u := c.GetSession("current_user")
 	if u != nil {
-		c.userDashboard(u.(*goth.User))
+		c.Redirect("/steps/browse", 302)
 	} else {
 		c.TplName = "home/index.html"
 	}
 }
-
-func (c *HomeController) userDashboard(user *goth.User) {
-	c.TplName = "home/dashboard.tmpl"
-}

controllers/login.go

@@ -17,7 +17,7 @@ var provider goth.Provider
 
 func init() {
 	url := os.Getenv("SITE_URL") + "/auth/callback"
-	provider = github.New(os.Getenv("GITHUB_KEY"), os.Getenv("GITHUB_SECRET"), url, "user:read", "user:email")
+	provider = github.New(os.Getenv("GITHUB_KEY"), os.Getenv("GITHUB_SECRET"), url, "user:read", "user:email", "read:org")
 }
 
 type LoginController struct {

controllers/steps.go

@@ -0,0 +1,51 @@
+package controllers
+
+import (
+	"github.com/astaxie/beego"
+	"github.com/calavera/openlandings/github"
+	githubapi "github.com/google/go-github/github"
+	"github.com/markbates/goth"
+)
+
+type StepsController struct {
+	beego.Controller
+}
+
+func (c *StepsController) BrowseRepositories() {
+	cu := c.GetSession("current_user").(*goth.User)
+	u := c.Ctx.Input.GetData("github_user").(*githubapi.User)
+	orgs, err := github.ListOrganizations(cu.AccessToken)
+	if err != nil {
+		beego.Error(err)
+		c.Redirect("/404.html", 302)
+		return
+	}
+
+	c.Data["steps"] = steps{
+		Browse:    newStep("current"),
+		Select:    newStep("disabled"),
+		Configure: newStep("disabled"),
+		Publish:   newStep("disabled"),
+	}
+
+	c.Data["currentUser"] = cu
+	c.Data["githubUser"] = u
+	c.Data["organizations"] = orgs
+
+	c.TplName = "steps/browse.tpl"
+}
+
+type step struct {
+	Status string
+}
+
+func newStep(status string) step {
+	return step{status}
+}
+
+type steps struct {
+	Browse    step
+	Select    step
+	Configure step
+	Publish   step
+}

filters/filters.go

@@ -3,15 +3,25 @@ package filters
 import (
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/context"
+	"github.com/calavera/openlandings/github"
+	"github.com/markbates/goth"
 )
 
 func filterUser(ctx *context.Context) {
 	u := ctx.Input.Session("current_user")
 	if u == nil {
 		ctx.Redirect(302, "/login")
 	}
+
+	if gu := ctx.Input.GetData("github_user"); gu == nil {
+		g, err := github.GetCurrentUser(u.(*goth.User).AccessToken)
+		if err != nil {
+			ctx.Redirect(302, "/404.html")
+		}
+		ctx.Input.SetData("github_user", g)
+	}
 }
 
 func Init() {
-	beego.InsertFilter("/sites/*", beego.BeforeRouter, filterUser)
+	beego.InsertFilter("/steps/*", beego.BeforeRouter, filterUser)
 }

github/github.go

@@ -25,3 +25,25 @@ func GetPrimaryEmail(accessToken string) string {
 	}
 	return email
 }
+
+func GetCurrentUser(accessToken string) (*githubapi.User, error) {
+	client := newClient(accessToken)
+	user, _, err := client.Users.Get("")
+	return user, err
+}
+
+func ListOrganizations(accessToken string) ([]*githubapi.Organization, error) {
+	client := newClient(accessToken)
+	orgs, _, err := client.Organizations.List("", nil)
+
+	var fullOrgs []*githubapi.Organization
+	for _, org := range orgs {
+		o, _, err := client.Organizations.Get(*org.Login)
+		if err != nil {
+			return nil, err
+		}
+		fullOrgs = append(fullOrgs, o)
+	}
+
+	return fullOrgs, err
+}

models/models.go

@@ -7,9 +7,15 @@ import (
 	_ "github.com/lib/pq"
 )
 
-func Init() {
+func Init() error {
+	orm.RegisterDataBase("default", "postgres", os.Getenv("DB_URL"), 30)
+
 	orm.RegisterModel(new(Owner))
 	orm.RegisterModel(new(Site))
 	orm.RegisterModel(new(User))
-	orm.RegisterDataBase("default", "postgres", os.Getenv("POSTGRES_URL"), 30)
+
+	if os.Getenv("DB_AUTO") != "" {
+		return orm.RunSyncdb("default", true, true)
+	}
+	return nil
 }

models/site.go

@@ -1,5 +1,7 @@
 package models
 
+import "time"
+
 type Site struct {
 	ID          int64
 	Name        string
@@ -8,6 +10,8 @@ type Site struct {
 	Version     string
 	Domain      string
 	Analytics   string
-	User        *User  `orm:"rel(fk)"`
-	Owner       *Owner `orm:"rel(fk)"`
+	User        *User     `orm:"rel(fk)"`
+	Owner       *Owner    `orm:"rel(fk)"`
+	Created     time.Time `orm:"auto_now_add;type(datetime)"`
+	Updated     time.Time `orm:"auto_now;type(datetime)"`
 }

models/user.go

@@ -7,6 +7,8 @@ import (
 
 	"github.com/astaxie/beego/orm"
 	"github.com/markbates/goth"
+
+	//	"github.com/markbates/goth"
 )
 
 type User struct {
@@ -16,6 +18,7 @@ type User struct {
 	AvatarURL string
 	UUID      string
 	Email     string
+	Created   time.Time `orm:"auto_now_add;type(datetime)"`
 }
 
 func RegisterUser(user *goth.User) error {

routers/router.go

@@ -1,17 +1,22 @@
 package routers
 
 import (
+	"log"
+
 	"github.com/astaxie/beego"
 	"github.com/calavera/openlandings/controllers"
 	"github.com/calavera/openlandings/filters"
 	"github.com/calavera/openlandings/models"
 )
 
 func init() {
+	if err := models.Init(); err != nil {
+		log.Fatal(err)
+	}
 	filters.Init()
-	models.Init()
 
 	beego.Router("/", &controllers.HomeController{})
+	beego.Router("/steps/browse", &controllers.StepsController{}, "get:BrowseRepositories")
 
 	beego.Router("/login", &controllers.LoginController{}, "get:NewLogin")
 	beego.Router("/auth/callback", &controllers.LoginController{}, "get:Callback")