From bef26a980bbceffe5c3c76c0506510668e5428c7 Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Wed, 29 Jul 2020 17:27:36 +0200 Subject: [PATCH] fix import paths --- go.mod | 11 +++++------ init/init.go | 2 +- main.go | 2 +- res/template/fragments/page_wrap.html | 2 +- webcontroller/ad_click.go | 4 ++-- webcontroller/admin_panel.go | 2 +- webcontroller/file_preview.go | 4 ++-- webcontroller/file_viewer.go | 4 ++-- webcontroller/opengraph.go | 2 +- webcontroller/templates.go | 6 +++--- webcontroller/user_account.go | 2 +- webcontroller/user_settings.go | 2 +- webcontroller/web_controller.go | 2 +- 13 files changed, 22 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 78a6770..cbd2a50 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,15 @@ -module fornaxian.com/pixeldrain-web +module fornaxian.tech/pixeldrain_web go 1.14 replace ( - fornaxian.com/pd_database => ../pd_database - fornaxian.com/pixeldrain-api => ../pixeldrain-api - fornaxian.com/pixeldrain-web => ../pixeldrain-web - fornaxian.com/pixelstore => ../pixelstore + fornaxian.tech/pd_database => ../pd_database + fornaxian.tech/pixeldrain_server/api => ../pixeldrain_server/api + fornaxian.tech/pixeldrain_web => ../pixeldrain_web + fornaxian.tech/pixeldrain_server/pixelstore => ../pixeldrain_server/pixelstore ) require ( - fornaxian.com/pixeldrain-api v0.0.0-20200607143707-5b697aff6c1e github.com/Fornaxian/config v0.0.0-20180915150834-ac41cf746a70 github.com/Fornaxian/log v0.0.0-20190617093801-1c7ce9a7c9b3 github.com/Fornaxian/pd_mime_type v0.0.0-20200204165508-2815edf3a145 diff --git a/init/init.go b/init/init.go index 0705439..37c9b67 100644 --- a/init/init.go +++ b/init/init.go @@ -5,7 +5,7 @@ import ( "os" "time" - "fornaxian.com/pixeldrain-web/webcontroller" + "fornaxian.tech/pixeldrain_web/webcontroller" "github.com/Fornaxian/config" "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" diff --git a/main.go b/main.go index 869786a..1da7902 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ import ( "flag" "net/http" - web "fornaxian.com/pixeldrain-web/init" + web "fornaxian.tech/pixeldrain_web/init" "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" diff --git a/res/template/fragments/page_wrap.html b/res/template/fragments/page_wrap.html index 14e6e38..880cc80 100644 --- a/res/template/fragments/page_wrap.html +++ b/res/template/fragments/page_wrap.html @@ -43,7 +43,7 @@ {{define "page_bottom"}}
- Pixeldrain is a product by Fornaxian Technologies + Pixeldrain is a product by Fornaxian Technologies
( diff --git a/webcontroller/ad_click.go b/webcontroller/ad_click.go index f8fb4a4..38c0359 100644 --- a/webcontroller/ad_click.go +++ b/webcontroller/ad_click.go @@ -4,8 +4,8 @@ import ( "net/http" "time" - "fornaxian.com/pixeldrain-api/api/apiclient" - "fornaxian.com/pixeldrain-api/util" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" + "fornaxian.tech/pixeldrain_server/api/util" "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/admin_panel.go b/webcontroller/admin_panel.go index 7604e39..a302e95 100644 --- a/webcontroller/admin_panel.go +++ b/webcontroller/admin_panel.go @@ -5,7 +5,7 @@ import ( "html/template" "net/http" - "fornaxian.com/pixeldrain-api/api/apiclient" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" "github.com/Fornaxian/log" ) diff --git a/webcontroller/file_preview.go b/webcontroller/file_preview.go index 8b2255e..d143352 100644 --- a/webcontroller/file_preview.go +++ b/webcontroller/file_preview.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "fornaxian.com/pixeldrain-api/api/apiclient" - "fornaxian.com/pixeldrain-api/util" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" + "fornaxian.tech/pixeldrain_server/api/util" "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" "github.com/microcosm-cc/bluemonday" diff --git a/webcontroller/file_viewer.go b/webcontroller/file_viewer.go index 1dcf6d2..9b000a0 100644 --- a/webcontroller/file_viewer.go +++ b/webcontroller/file_viewer.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "fornaxian.com/pixeldrain-api/api/apiclient" - "fornaxian.com/pixeldrain-api/api/apitype" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" + "fornaxian.tech/pixeldrain_server/api/restapi/apitype" "github.com/Fornaxian/log" pdmimetype "github.com/Fornaxian/pd_mime_type" "github.com/julienschmidt/httprouter" diff --git a/webcontroller/opengraph.go b/webcontroller/opengraph.go index 053de8f..3693f83 100644 --- a/webcontroller/opengraph.go +++ b/webcontroller/opengraph.go @@ -4,7 +4,7 @@ import ( "html/template" "strings" - "fornaxian.com/pixeldrain-api/api/apitype" + "fornaxian.tech/pixeldrain_server/api/restapi/apitype" ) type ogRule struct { diff --git a/webcontroller/templates.go b/webcontroller/templates.go index 9f86fdb..2f1b761 100644 --- a/webcontroller/templates.go +++ b/webcontroller/templates.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "fornaxian.com/pixeldrain-api/api/apiclient" - "fornaxian.com/pixeldrain-api/api/apitype" - "fornaxian.com/pixeldrain-api/util" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" + "fornaxian.tech/pixeldrain_server/api/restapi/apitype" + "fornaxian.tech/pixeldrain_server/api/util" "github.com/Fornaxian/log" ) diff --git a/webcontroller/user_account.go b/webcontroller/user_account.go index 17a11e7..1f99728 100644 --- a/webcontroller/user_account.go +++ b/webcontroller/user_account.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "fornaxian.com/pixeldrain-api/api/apiclient" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/user_settings.go b/webcontroller/user_settings.go index db2b30e..6dad9fe 100644 --- a/webcontroller/user_settings.go +++ b/webcontroller/user_settings.go @@ -5,7 +5,7 @@ import ( "html/template" "net/http" - "fornaxian.com/pixeldrain-api/api/apiclient" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" "github.com/Fornaxian/log" "github.com/julienschmidt/httprouter" ) diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go index 6b9ef8a..ee85a1e 100644 --- a/webcontroller/web_controller.go +++ b/webcontroller/web_controller.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "fornaxian.com/pixeldrain-api/api/apiclient" + "fornaxian.tech/pixeldrain_server/api/restapi/apiclient" "github.com/Fornaxian/log" "github.com/google/uuid" "github.com/julienschmidt/httprouter"