diff --git a/Makefile b/Makefile index e615f01..a6d7d0e 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,9 @@ DB_USER=test DB_PASS=test DB_DSN_DEV=postgres://$(DB_USER):$(DB_PASS)@127.0.0.1:5432/dev?sslmode=disable -DB_DSN_TEST=postgres://$(DB_USER):$(DB_PASS)@127.0.0.1:5432/test?sslmode=disable MIGRATION=migrate -database '$(DB_DSN_DEV)' -MIGRATION_SCHEMA=./sql/migration -MIGRATION_TEST_DATA=./sql/dev +MIGRATION_SCHEMA=./migrations DOCKER_COMPOSE_FILE=./docker/docker-compose.yml DOCKER_COMPOSE=docker-compose -f $(DOCKER_COMPOSE_FILE) @@ -28,10 +26,10 @@ build_docker_image: rm -rf canapeapp mkdir canapeapp cp -R docker/run.sh canapeapp/run.sh - cp -R sql/migration canapeapp/migrations + cp -R migrations canapeapp/migrations cp $$GOPATH/bin/migrate canapeapp/migrate yarn build - go build -v -o canapeapp/app src/*.go + go build -v -o canapeapp/app backend/*.go docker build --tag canapeapp:latest --file docker/Dockerfile-production . rm -rf canapeapp @@ -46,6 +44,3 @@ clean: -rm -r ./build $(DOCKER_COMPOSE) stop $(DOCKER_COMPOSE) rm --force -v - -test: docker - POSTGRES_DSN="$(DB_DSN_TEST)" go test -v -p=1 ./... diff --git a/backend/admins/stats.go b/backend/admins/stats.go index 10e0422..1177333 100644 --- a/backend/admins/stats.go +++ b/backend/admins/stats.go @@ -5,7 +5,7 @@ import ( "github.com/jmoiron/sqlx" "github.com/sirupsen/logrus" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) const ( diff --git a/backend/admins/users.go b/backend/admins/users.go index 04947bd..726d718 100644 --- a/backend/admins/users.go +++ b/backend/admins/users.go @@ -5,9 +5,9 @@ import ( "fmt" "net/http" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/config" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" "github.com/sirupsen/logrus" ) diff --git a/backend/backend/backend.go b/backend/backend/backend.go index 4fac62d..5e1db45 100644 --- a/backend/backend/backend.go +++ b/backend/backend/backend.go @@ -1,8 +1,8 @@ package backend import ( - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" "github.com/jmoiron/sqlx" ) diff --git a/backend/backend/explorer.go b/backend/backend/explorer.go index c229649..fb2e96d 100644 --- a/backend/backend/explorer.go +++ b/backend/backend/explorer.go @@ -1,10 +1,9 @@ package backend import ( - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/sqly" - "github.com/jmoiron/sqlx" "github.com/lib/pq" + "gitlab.quimbo.fr/odwrtw/canape/backend/sqly" ) const ( diff --git a/backend/external_medias/external_medias.go b/backend/external_medias/external_medias.go index fc864b2..8075007 100644 --- a/backend/external_medias/external_medias.go +++ b/backend/external_medias/external_medias.go @@ -3,13 +3,12 @@ package extmedias import ( "fmt" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/movies" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/shows" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" - polochon "github.com/odwrtw/polochon/lib" "github.com/sirupsen/logrus" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/movies" + "gitlab.quimbo.fr/odwrtw/canape/backend/shows" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // NewExplorer returns a polochon.Explorer from the list of Explorers in the config diff --git a/backend/external_medias/handlers.go b/backend/external_medias/handlers.go index 05ffab2..3533c1b 100644 --- a/backend/external_medias/handlers.go +++ b/backend/external_medias/handlers.go @@ -4,15 +4,14 @@ import ( "errors" "net/http" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/movies" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/shows" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" - polochon "github.com/odwrtw/polochon/lib" "github.com/sirupsen/logrus" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/movies" + "gitlab.quimbo.fr/odwrtw/canape/backend/shows" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // RefreshHandler refresh the explored movies diff --git a/backend/main.go b/backend/main.go index 554c46e..9e1ab1c 100644 --- a/backend/main.go +++ b/backend/main.go @@ -5,11 +5,11 @@ import ( "net/http" "os" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config" - extmedias "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/external_medias" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/config" + extmedias "gitlab.quimbo.fr/odwrtw/canape/backend/external_medias" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" "github.com/jmoiron/sqlx" _ "github.com/lib/pq" diff --git a/backend/movies/handlers.go b/backend/movies/handlers.go index d9424ee..958c44e 100644 --- a/backend/movies/handlers.go +++ b/backend/movies/handlers.go @@ -10,13 +10,12 @@ import ( "github.com/odwrtw/papi" polochon "github.com/odwrtw/polochon/lib" "github.com/sirupsen/logrus" - - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/subtitles" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/config" + "gitlab.quimbo.fr/odwrtw/canape/backend/subtitles" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // PolochonMoviesHandler will returns movies from Polochon diff --git a/backend/movies/movies.go b/backend/movies/movies.go index b69d161..1d5d2a0 100644 --- a/backend/movies/movies.go +++ b/backend/movies/movies.go @@ -10,11 +10,10 @@ import ( "github.com/odwrtw/papi" "github.com/odwrtw/polochon/lib" "github.com/sirupsen/logrus" - - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/subtitles" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/subtitles" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // Movie represents a movie diff --git a/backend/routes.go b/backend/routes.go index b2af6c0..e972443 100644 --- a/backend/routes.go +++ b/backend/routes.go @@ -1,13 +1,13 @@ package main import ( - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/admins" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/external_medias" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/movies" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/shows" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/torrents" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + admin "gitlab.quimbo.fr/odwrtw/canape/backend/admins" + extmedias "gitlab.quimbo.fr/odwrtw/canape/backend/external_medias" + "gitlab.quimbo.fr/odwrtw/canape/backend/movies" + "gitlab.quimbo.fr/odwrtw/canape/backend/shows" + "gitlab.quimbo.fr/odwrtw/canape/backend/torrents" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) func setupRoutes(env *web.Env) { diff --git a/backend/shows/episodes.go b/backend/shows/episodes.go index c1904db..c8ba9c6 100644 --- a/backend/shows/episodes.go +++ b/backend/shows/episodes.go @@ -7,10 +7,9 @@ import ( "github.com/odwrtw/papi" polochon "github.com/odwrtw/polochon/lib" "github.com/sirupsen/logrus" - - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/subtitles" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/subtitles" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // Episode represents an episode diff --git a/backend/shows/handlers.go b/backend/shows/handlers.go index 7b12ea0..7924c14 100644 --- a/backend/shows/handlers.go +++ b/backend/shows/handlers.go @@ -7,17 +7,16 @@ import ( "log" "strconv" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/subtitles" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" - "net/http" "github.com/gorilla/mux" "github.com/odwrtw/papi" polochon "github.com/odwrtw/polochon/lib" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/subtitles" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // ErrPolochonUnavailable is an error returned if the polochon server is not available diff --git a/backend/shows/shows.go b/backend/shows/shows.go index a2f4b3d..2efd663 100644 --- a/backend/shows/shows.go +++ b/backend/shows/shows.go @@ -7,13 +7,12 @@ import ( "path/filepath" "strings" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/backend" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" - "github.com/odwrtw/papi" "github.com/odwrtw/polochon/lib" "github.com/sirupsen/logrus" + "gitlab.quimbo.fr/odwrtw/canape/backend/backend" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // Show represents a show diff --git a/backend/torrents/handlers.go b/backend/torrents/handlers.go index ca124a8..3a17c9a 100644 --- a/backend/torrents/handlers.go +++ b/backend/torrents/handlers.go @@ -10,10 +10,9 @@ import ( "github.com/gorilla/mux" "github.com/odwrtw/polochon/lib" "github.com/sirupsen/logrus" - - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/users" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/users" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // DownloadHandler downloads a movie via polochon diff --git a/backend/users/handlers.go b/backend/users/handlers.go index d07223c..2815ca2 100644 --- a/backend/users/handlers.go +++ b/backend/users/handlers.go @@ -8,9 +8,9 @@ import ( jwt "github.com/dgrijalva/jwt-go" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/web" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/config" + "gitlab.quimbo.fr/odwrtw/canape/backend/web" ) // SignupPOSTHandler handles the user's Signup diff --git a/backend/users/users.go b/backend/users/users.go index 90633de..00ba547 100644 --- a/backend/users/users.go +++ b/backend/users/users.go @@ -10,9 +10,9 @@ import ( "github.com/jmoiron/sqlx/types" "github.com/odwrtw/papi" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/random" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/sqly" + "gitlab.quimbo.fr/odwrtw/canape/backend/config" + "gitlab.quimbo.fr/odwrtw/canape/backend/random" + "gitlab.quimbo.fr/odwrtw/canape/backend/sqly" ) const ( diff --git a/backend/web/env.go b/backend/web/env.go index a235a89..4d8388b 100644 --- a/backend/web/env.go +++ b/backend/web/env.go @@ -1,8 +1,8 @@ package web import ( - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/auth" - "gitlab.quimbo.fr/odwrtw/canape-sql/src/internal/config" + "gitlab.quimbo.fr/odwrtw/canape/backend/auth" + "gitlab.quimbo.fr/odwrtw/canape/backend/config" "github.com/gorilla/mux" "github.com/jmoiron/sqlx" diff --git a/fresh.conf b/fresh.conf index ac8617c..d184255 100644 --- a/fresh.conf +++ b/fresh.conf @@ -1,5 +1,6 @@ -ignored: node_modules,src/public build_name: dev-build build_log: dev-build.log tmp_path: ./build -root: ./src +valid_ext: .go +root: ./backend +colors: 1 diff --git a/webpack.config.js b/webpack.config.js index 6f62ca2..5562033 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,7 +6,7 @@ if (process.env.NODE_ENV === "production") { BUILD_DIR = path.resolve(__dirname, "canapeapp/public/"); } -var SRC_DIR = path.resolve(__dirname, "src/public/js"); +var SRC_DIR = path.resolve(__dirname, "frontend/js"); const config = { entry: path.join(SRC_DIR, "app.js"),