Skip to content

Commit

Permalink
Migrate repos.
Browse files Browse the repository at this point in the history
  • Loading branch information
@octavore
octavore committed Apr 24, 2017
1 parent 145bbfe commit ca445d0
Show file tree
Hide file tree
Showing 49 changed files with 111 additions and 111 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ prepare-vendor:
govendor sync

goimports:
@goimports -w -local github.com/octavore/ketchup $(GO_DIRS)
@goimports -w -local github.com/ketchuphq/ketchup $(GO_DIRS)

test:
@go test $(GO_DIRS)
Expand Down
4 changes: 2 additions & 2 deletions db/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package db
import (
"io"

"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

// Backend interface for models.
Expand Down
8 changes: 4 additions & 4 deletions db/bolt/bolt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/octavore/naga/service"
"github.com/octavore/nagax/logger"

"github.com/octavore/ketchup/db"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/octavore/ketchup/server/config"
"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/db"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/server/config"
"github.com/ketchuphq/ketchup/util/errors"
)

type BoltConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion db/bolt/bolt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/octavore/naga/service"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

func TestRoutes(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions db/bolt/pages.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"

"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

const PAGE_BUCKET = "pages"
Expand Down
2 changes: 1 addition & 1 deletion db/bolt/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/satori/go.uuid"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

const ROUTE_BUCKET = "routes"
Expand Down
4 changes: 2 additions & 2 deletions db/bolt/users.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"github.com/golang/protobuf/proto"
uuid "github.com/satori/go.uuid"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/util/errors"
)

const USER_BUCKET = "users"
Expand Down
2 changes: 1 addition & 1 deletion db/bolt/users_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/octavore/naga/service"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

func TestUser(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions db/dummy/dummy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package dummy
import (
"io"

"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

type DummyDB struct {
Expand Down
2 changes: 1 addition & 1 deletion db/export.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/golang/protobuf/jsonpb"
"github.com/octavore/naga/service"

"github.com/octavore/ketchup/proto/ketchup/models/export"
"github.com/ketchuphq/ketchup/proto/ketchup/models/export"
)

var marshaler = &jsonpb.Marshaler{
Expand Down
2 changes: 1 addition & 1 deletion db/interfaces.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package db
import (
"github.com/golang/protobuf/proto"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

type AddressableProto interface {
Expand Down
2 changes: 1 addition & 1 deletion db/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/octavore/naga/service"

"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/util/errors"
)

type Module struct {
Expand Down
2 changes: 1 addition & 1 deletion db/sort.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package db
import (
"sort"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

var _ sort.Interface = &sortPages{}
Expand Down
2 changes: 1 addition & 1 deletion db/sort_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

func TestSort(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package main
import (
"github.com/octavore/naga/service"

"github.com/octavore/ketchup/admin"
"github.com/octavore/ketchup/db/bolt"
"github.com/octavore/ketchup/server/api"
"github.com/octavore/ketchup/server/backup"
"github.com/octavore/ketchup/server/content"
"github.com/octavore/ketchup/server/tls"
"github.com/ketchuphq/ketchup/admin"
"github.com/ketchuphq/ketchup/db/bolt"
"github.com/ketchuphq/ketchup/server/api"
"github.com/ketchuphq/ketchup/server/backup"
"github.com/ketchuphq/ketchup/server/content"
"github.com/ketchuphq/ketchup/server/tls"
)

// set by goreleaser
Expand Down
2 changes: 1 addition & 1 deletion make/proto.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PROTO_FILES=$(shell find . -name "*.proto")
INCL_PROTO_DIR=$(shell find . -name "*.proto" -exec dirname {} \; | sort -u | sed -e 's/^/-I/')
INCL_WKT=-I $$GOPATH/src/github.com/golang/protobuf/ptypes/struct

PROTO_PREFIX=import_prefix_proto=github.com/octavore/ketchup/proto/
PROTO_PREFIX=import_prefix_proto=github.com/ketchuphq/ketchup/proto/

protos:
@mkdir -p proto
Expand Down
2 changes: 1 addition & 1 deletion plugins/pkg/clone.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/object"
"gopkg.in/src-d/go-git.v4/storage/memory"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

// Clone the given repo to {data_dir}/{dir}/{name}
Expand Down
6 changes: 3 additions & 3 deletions plugins/pkg/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (

"github.com/octavore/naga/service"

"github.com/octavore/ketchup/proto/ketchup/packages"
"github.com/octavore/ketchup/server/config"
"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/proto/ketchup/packages"
"github.com/ketchuphq/ketchup/server/config"
"github.com/ketchuphq/ketchup/util/errors"
)

// Module pkg manages downloading pkg
Expand Down
4 changes: 2 additions & 2 deletions plugins/pkg/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/golang/protobuf/proto"

"github.com/octavore/ketchup/proto/ketchup/packages"
"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/proto/ketchup/packages"
"github.com/ketchuphq/ketchup/util/errors"
)

type Registry struct {
Expand Down
4 changes: 2 additions & 2 deletions proto/ketchup/api/api.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proto/ketchup/models/export/export.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions server/api/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"github.com/octavore/naga/service"
"github.com/octavore/nagax/logger"

"github.com/octavore/ketchup/db"
"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/server/config"
"github.com/octavore/ketchup/server/content"
"github.com/octavore/ketchup/server/content/templates"
"github.com/octavore/ketchup/server/router"
"github.com/octavore/ketchup/server/tls"
"github.com/octavore/ketchup/server/users"
"github.com/ketchuphq/ketchup/db"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/server/config"
"github.com/ketchuphq/ketchup/server/content"
"github.com/ketchuphq/ketchup/server/content/templates"
"github.com/ketchuphq/ketchup/server/router"
"github.com/ketchuphq/ketchup/server/tls"
"github.com/ketchuphq/ketchup/server/users"
)

var KetchupVersion = ""
Expand Down
12 changes: 6 additions & 6 deletions server/api/pages.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/golang/protobuf/jsonpb"
"github.com/julienschmidt/httprouter"

"github.com/octavore/ketchup/db"
"github.com/octavore/ketchup/db/bolt"
"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/octavore/ketchup/proto/structpb"
"github.com/octavore/ketchup/server/router"
"github.com/ketchuphq/ketchup/db"
"github.com/ketchuphq/ketchup/db/bolt"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/structpb"
"github.com/ketchuphq/ketchup/server/router"
)

func (m *Module) getPage(par httprouter.Params, fn func(*models.Page) error) (*models.Page, error) {
Expand Down
8 changes: 4 additions & 4 deletions server/api/routes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"github.com/julienschmidt/httprouter"

"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/octavore/ketchup/server/router"
"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/server/router"
"github.com/ketchuphq/ketchup/util/errors"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions server/api/themes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/julienschmidt/httprouter"

"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/server/router"
"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/server/router"
"github.com/ketchuphq/ketchup/util/errors"
)

func (m *Module) ListThemes(rw http.ResponseWriter, req *http.Request, _ httprouter.Params) error {
Expand Down
8 changes: 4 additions & 4 deletions server/api/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/julienschmidt/httprouter"
"github.com/octavore/nagax/users"

"github.com/octavore/ketchup/proto/ketchup/api"
"github.com/octavore/ketchup/server/router"
"github.com/octavore/ketchup/server/tls"
"github.com/octavore/ketchup/util/errors"
"github.com/ketchuphq/ketchup/proto/ketchup/api"
"github.com/ketchuphq/ketchup/server/router"
"github.com/ketchuphq/ketchup/server/tls"
"github.com/ketchuphq/ketchup/util/errors"
)

func (m *Module) GetUser(rw http.ResponseWriter, req *http.Request, par httprouter.Params) error {
Expand Down
4 changes: 2 additions & 2 deletions server/backup/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/octavore/naga/service"
"github.com/octavore/nagax/logger"

"github.com/octavore/ketchup/db"
"github.com/octavore/ketchup/server/config"
"github.com/ketchuphq/ketchup/db"
"github.com/ketchuphq/ketchup/server/config"
)

type BackupConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion server/content/engines/engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"io"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

// Engines contain maps extensions to template rendering engines
Expand Down
2 changes: 1 addition & 1 deletion server/content/engines/engine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/golang/protobuf/proto"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

func TestRenderTemplate(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions server/content/module.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/octavore/naga/service"
"github.com/octavore/nagax/logger"

"github.com/octavore/ketchup/db"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/octavore/ketchup/server/content/templates"
"github.com/octavore/ketchup/server/router"
"github.com/ketchuphq/ketchup/db"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/server/content/templates"
"github.com/ketchuphq/ketchup/server/router"
)

// Module server is responsible for serving published content
Expand Down
12 changes: 6 additions & 6 deletions server/content/module_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"github.com/octavore/naga/service"
"github.com/octavore/nagax/logger"

"github.com/octavore/ketchup/db"
dummydb "github.com/octavore/ketchup/db/dummy"
"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/octavore/ketchup/server/content/templates"
dummytmpl "github.com/octavore/ketchup/server/content/templates/dummystore"
"github.com/octavore/ketchup/server/router"
"github.com/ketchuphq/ketchup/db"
dummydb "github.com/ketchuphq/ketchup/db/dummy"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/server/content/templates"
dummytmpl "github.com/ketchuphq/ketchup/server/content/templates/dummystore"
"github.com/ketchuphq/ketchup/server/router"
)

var page = &models.Page{
Expand Down
2 changes: 1 addition & 1 deletion server/content/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/russross/blackfriday"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

func (m *Module) render(w io.Writer, page *models.Page) error {
Expand Down
2 changes: 1 addition & 1 deletion server/content/render_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/golang/protobuf/proto"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
)

type renderTextContentCase struct {
Expand Down
4 changes: 2 additions & 2 deletions server/content/templates/defaultstore/defaultstore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/golang/protobuf/proto"

"github.com/octavore/ketchup/proto/ketchup/models"
"github.com/octavore/ketchup/server/content/engines"
"github.com/ketchuphq/ketchup/proto/ketchup/models"
"github.com/ketchuphq/ketchup/server/content/engines"
)

var noneTemplate = `<html>
Expand Down
Loading

0 comments on commit ca445d0

Please sign in to comment.