fix: update api import paths & fix Dockerfile not copying frontend build

fixes issue #7 & #9

also remove agGrid dependency from package.json to reduce download size
This commit is contained in:
Jordan Knott
2020-07-19 17:25:58 -05:00
parent c3b1837589
commit 6f33cc5799
20 changed files with 67 additions and 125 deletions

View File

@ -9,8 +9,8 @@ import (
_ "github.com/golang-migrate/migrate/v4/source/file"
"github.com/golang-migrate/migrate/v4/source/httpfs"
"github.com/jmoiron/sqlx"
"github.com/jordanknott/project-citadel/api/internal/config"
"github.com/jordanknott/project-citadel/api/internal/migrations"
"github.com/jordanknott/project-citadel/internal/config"
"github.com/jordanknott/project-citadel/internal/migrations"
log "github.com/sirupsen/logrus"
)

View File

@ -7,8 +7,8 @@ import (
"time"
"github.com/jmoiron/sqlx"
"github.com/jordanknott/project-citadel/api/internal/config"
"github.com/jordanknott/project-citadel/api/internal/route"
"github.com/jordanknott/project-citadel/internal/config"
"github.com/jordanknott/project-citadel/internal/route"
log "github.com/sirupsen/logrus"
)

View File

@ -14,7 +14,7 @@ import (
"github.com/99designs/gqlgen/graphql"
"github.com/99designs/gqlgen/graphql/introspection"
"github.com/google/uuid"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/internal/db"
gqlparser "github.com/vektah/gqlparser/v2"
"github.com/vektah/gqlparser/v2/ast"
)

View File

@ -12,9 +12,9 @@ import (
"github.com/99designs/gqlgen/graphql/handler/transport"
"github.com/99designs/gqlgen/graphql/playground"
"github.com/google/uuid"
"github.com/jordanknott/project-citadel/api/internal/auth"
"github.com/jordanknott/project-citadel/api/internal/config"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/internal/auth"
"github.com/jordanknott/project-citadel/internal/config"
"github.com/jordanknott/project-citadel/internal/db"
)
// NewHandler returns a new graphql endpoint handler.

View File

@ -4,7 +4,7 @@ import (
"context"
"database/sql"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/internal/db"
)
func GetOwnedList(ctx context.Context, r db.Repository, user db.UserAccount) (*OwnedList, error) {

View File

@ -9,7 +9,7 @@ import (
"time"
"github.com/google/uuid"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/internal/db"
)
type AddTaskLabelInput struct {

View File

@ -5,8 +5,8 @@ package graph
import (
"sync"
"github.com/jordanknott/project-citadel/api/internal/config"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/internal/config"
"github.com/jordanknott/project-citadel/internal/db"
)
type Resolver struct {

View File

@ -11,7 +11,7 @@ import (
"time"
"github.com/google/uuid"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/internal/db"
log "github.com/sirupsen/logrus"
"github.com/vektah/gqlparser/v2/gqlerror"
"golang.org/x/crypto/bcrypt"

View File

@ -8,8 +8,8 @@ import (
"github.com/go-chi/chi"
"github.com/google/uuid"
"github.com/jordanknott/project-citadel/api/internal/auth"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/internal/auth"
"github.com/jordanknott/project-citadel/internal/db"
log "github.com/sirupsen/logrus"
"golang.org/x/crypto/bcrypt"
)

View File

@ -12,8 +12,8 @@ import (
"time"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/api/internal/frontend"
"github.com/jordanknott/project-citadel/internal/db"
"github.com/jordanknott/project-citadel/internal/frontend"
)
func (h *CitadelHandler) Frontend(w http.ResponseWriter, r *http.Request) {

View File

@ -6,7 +6,7 @@ import (
"strings"
"github.com/google/uuid"
"github.com/jordanknott/project-citadel/api/internal/auth"
"github.com/jordanknott/project-citadel/internal/auth"
log "github.com/sirupsen/logrus"
)

View File

@ -10,11 +10,11 @@ import (
"github.com/jmoiron/sqlx"
log "github.com/sirupsen/logrus"
"github.com/jordanknott/project-citadel/api/internal/config"
"github.com/jordanknott/project-citadel/api/internal/db"
"github.com/jordanknott/project-citadel/api/internal/frontend"
"github.com/jordanknott/project-citadel/api/internal/graph"
"github.com/jordanknott/project-citadel/api/internal/logger"
"github.com/jordanknott/project-citadel/internal/config"
"github.com/jordanknott/project-citadel/internal/db"
"github.com/jordanknott/project-citadel/internal/frontend"
"github.com/jordanknott/project-citadel/internal/graph"
"github.com/jordanknott/project-citadel/internal/logger"
"os"
"path/filepath"
)