Browse Source

Move assets to engine folder

Vova Tkach 5 years ago
parent
commit
d94c383d24
90 changed files with 26 additions and 26 deletions
  1. 1 1
      Makefile
  2. 0 0
      engine/assets/assets.go
  3. 0 0
      engine/assets/cp.codemirror.css
  4. 0 0
      engine/assets/cp.codemirror.css.go
  5. 0 0
      engine/assets/cp.codemirror.js
  6. 0 0
      engine/assets/cp.codemirror.js.go
  7. 0 0
      engine/assets/cp.img.load.gif
  8. 0 0
      engine/assets/cp.img.load.gif.go
  9. 0 0
      engine/assets/cp.scripts.js
  10. 0 0
      engine/assets/cp.scripts.js.go
  11. 0 0
      engine/assets/cp.styles.css
  12. 0 0
      engine/assets/cp.styles.css.go
  13. 0 0
      engine/assets/cp.wysiwyg.pell.css
  14. 0 0
      engine/assets/cp.wysiwyg.pell.css.go
  15. 0 0
      engine/assets/cp.wysiwyg.pell.js
  16. 0 0
      engine/assets/cp.wysiwyg.pell.js.go
  17. 0 0
      engine/assets/lightgallery.css
  18. 0 0
      engine/assets/lightgallery.css.go
  19. 0 0
      engine/assets/lightgallery.js
  20. 0 0
      engine/assets/lightgallery.js.go
  21. 0 0
      engine/assets/placeholder.png
  22. 0 0
      engine/assets/placeholder.png.go
  23. 0 0
      engine/assets/sys.bg.png
  24. 0 0
      engine/assets/sys.bg.png.go
  25. 0 0
      engine/assets/sys.fave.ico
  26. 0 0
      engine/assets/sys.fave.ico.go
  27. 0 0
      engine/assets/sys.logo.png
  28. 0 0
      engine/assets/sys.logo.png.go
  29. 0 0
      engine/assets/sys.logo.svg
  30. 0 0
      engine/assets/sys.logo.svg.go
  31. 0 0
      engine/assets/sys.styles.css
  32. 0 0
      engine/assets/sys.styles.css.go
  33. 0 0
      engine/assets/sys.svg.icon.go
  34. 0 0
      engine/assets/template/404_html_file.go
  35. 0 0
      engine/assets/template/blog_category_html_file.go
  36. 0 0
      engine/assets/template/blog_html_file.go
  37. 0 0
      engine/assets/template/blog_post_html_file.go
  38. 0 0
      engine/assets/template/cached_block_1_html_file.go
  39. 0 0
      engine/assets/template/cached_block_2_html_file.go
  40. 0 0
      engine/assets/template/cached_block_3_html_file.go
  41. 0 0
      engine/assets/template/cached_block_4_html_file.go
  42. 0 0
      engine/assets/template/cached_block_5_html_file.go
  43. 0 0
      engine/assets/template/email_new_order_admin_html_file.go
  44. 0 0
      engine/assets/template/email_new_order_user_html_file.go
  45. 0 0
      engine/assets/template/footer_html_file.go
  46. 0 0
      engine/assets/template/header_html_file.go
  47. 0 0
      engine/assets/template/index_html_file.go
  48. 0 0
      engine/assets/template/page_html_file.go
  49. 0 0
      engine/assets/template/robots_txt_file.go
  50. 0 0
      engine/assets/template/scripts_js_file.go
  51. 0 0
      engine/assets/template/shop_category_html_file.go
  52. 0 0
      engine/assets/template/shop_html_file.go
  53. 0 0
      engine/assets/template/shop_product_html_file.go
  54. 0 0
      engine/assets/template/sidebar_left_html_file.go
  55. 0 0
      engine/assets/template/sidebar_right_html_file.go
  56. 0 0
      engine/assets/template/styles_css_file.go
  57. 0 0
      engine/assets/template/template.go
  58. 0 0
      engine/assets/tmpl.cp.base.go
  59. 0 0
      engine/assets/tmpl.cp.base.html
  60. 0 0
      engine/assets/tmpl.cp.login.go
  61. 0 0
      engine/assets/tmpl.cp.login.html
  62. 0 0
      engine/assets/tmpl.cp.mysql.go
  63. 0 0
      engine/assets/tmpl.cp.mysql.html
  64. 0 0
      engine/assets/tmpl.page.default.go
  65. 0 0
      engine/assets/tmpl.page.default.html
  66. 0 0
      engine/assets/tmpl.page.error.404.go
  67. 0 0
      engine/assets/tmpl.page.error.404.html
  68. 0 0
      engine/assets/tmpl.page.error.engine.go
  69. 0 0
      engine/assets/tmpl.page.error.engine.html
  70. 0 0
      engine/assets/tmpl.page.error.tmpl.go
  71. 0 0
      engine/assets/tmpl.page.error.tmpl.html
  72. 1 1
      engine/builder/builder.go
  73. 1 1
      engine/engine.go
  74. 1 1
      main.go
  75. 1 1
      modules/module_api.go
  76. 1 1
      modules/module_blog.go
  77. 1 1
      modules/module_index.go
  78. 1 1
      modules/module_notify_mail.go
  79. 1 1
      modules/module_settings.go
  80. 1 1
      modules/module_shop.go
  81. 1 1
      modules/module_template.go
  82. 1 1
      modules/module_template_act_restore_file.go
  83. 1 1
      modules/module_template_act_restore_file_all.go
  84. 1 1
      modules/module_users.go
  85. 1 1
      modules/modules.go
  86. 1 1
      support/migrate/000000005.go
  87. 1 1
      support/migrate/000000009.go
  88. 1 1
      support/migrate/000000017.go
  89. 7 7
      support/template.sh
  90. 1 1
      utils/utils.go

+ 1 - 1
Makefile

@@ -55,7 +55,7 @@ version:
 
 
 template:
 template:
 	@./support/template.sh
 	@./support/template.sh
-	@gofmt -w ./assets/template/
+	@gofmt -w ./engine/assets/template/
 
 
 dockerfile:
 dockerfile:
 	@echo "FROM debian:latest" > Dockerfile
 	@echo "FROM debian:latest" > Dockerfile

+ 0 - 0
assets/assets.go → engine/assets/assets.go


+ 0 - 0
assets/cp.codemirror.css → engine/assets/cp.codemirror.css


+ 0 - 0
assets/cp.codemirror.css.go → engine/assets/cp.codemirror.css.go


+ 0 - 0
assets/cp.codemirror.js → engine/assets/cp.codemirror.js


+ 0 - 0
assets/cp.codemirror.js.go → engine/assets/cp.codemirror.js.go


+ 0 - 0
assets/cp.img.load.gif → engine/assets/cp.img.load.gif


+ 0 - 0
assets/cp.img.load.gif.go → engine/assets/cp.img.load.gif.go


+ 0 - 0
assets/cp.scripts.js → engine/assets/cp.scripts.js


+ 0 - 0
assets/cp.scripts.js.go → engine/assets/cp.scripts.js.go


+ 0 - 0
assets/cp.styles.css → engine/assets/cp.styles.css


+ 0 - 0
assets/cp.styles.css.go → engine/assets/cp.styles.css.go


+ 0 - 0
assets/cp.wysiwyg.pell.css → engine/assets/cp.wysiwyg.pell.css


+ 0 - 0
assets/cp.wysiwyg.pell.css.go → engine/assets/cp.wysiwyg.pell.css.go


+ 0 - 0
assets/cp.wysiwyg.pell.js → engine/assets/cp.wysiwyg.pell.js


+ 0 - 0
assets/cp.wysiwyg.pell.js.go → engine/assets/cp.wysiwyg.pell.js.go


+ 0 - 0
assets/lightgallery.css → engine/assets/lightgallery.css


+ 0 - 0
assets/lightgallery.css.go → engine/assets/lightgallery.css.go


+ 0 - 0
assets/lightgallery.js → engine/assets/lightgallery.js


+ 0 - 0
assets/lightgallery.js.go → engine/assets/lightgallery.js.go


+ 0 - 0
assets/placeholder.png → engine/assets/placeholder.png


+ 0 - 0
assets/placeholder.png.go → engine/assets/placeholder.png.go


+ 0 - 0
assets/sys.bg.png → engine/assets/sys.bg.png


+ 0 - 0
assets/sys.bg.png.go → engine/assets/sys.bg.png.go


+ 0 - 0
assets/sys.fave.ico → engine/assets/sys.fave.ico


+ 0 - 0
assets/sys.fave.ico.go → engine/assets/sys.fave.ico.go


+ 0 - 0
assets/sys.logo.png → engine/assets/sys.logo.png


+ 0 - 0
assets/sys.logo.png.go → engine/assets/sys.logo.png.go


+ 0 - 0
assets/sys.logo.svg → engine/assets/sys.logo.svg


+ 0 - 0
assets/sys.logo.svg.go → engine/assets/sys.logo.svg.go


+ 0 - 0
assets/sys.styles.css → engine/assets/sys.styles.css


+ 0 - 0
assets/sys.styles.css.go → engine/assets/sys.styles.css.go


+ 0 - 0
assets/sys.svg.icon.go → engine/assets/sys.svg.icon.go


+ 0 - 0
assets/template/404_html_file.go → engine/assets/template/404_html_file.go


+ 0 - 0
assets/template/blog_category_html_file.go → engine/assets/template/blog_category_html_file.go


+ 0 - 0
assets/template/blog_html_file.go → engine/assets/template/blog_html_file.go


+ 0 - 0
assets/template/blog_post_html_file.go → engine/assets/template/blog_post_html_file.go


+ 0 - 0
assets/template/cached_block_1_html_file.go → engine/assets/template/cached_block_1_html_file.go


+ 0 - 0
assets/template/cached_block_2_html_file.go → engine/assets/template/cached_block_2_html_file.go


+ 0 - 0
assets/template/cached_block_3_html_file.go → engine/assets/template/cached_block_3_html_file.go


+ 0 - 0
assets/template/cached_block_4_html_file.go → engine/assets/template/cached_block_4_html_file.go


+ 0 - 0
assets/template/cached_block_5_html_file.go → engine/assets/template/cached_block_5_html_file.go


+ 0 - 0
assets/template/email_new_order_admin_html_file.go → engine/assets/template/email_new_order_admin_html_file.go


+ 0 - 0
assets/template/email_new_order_user_html_file.go → engine/assets/template/email_new_order_user_html_file.go


+ 0 - 0
assets/template/footer_html_file.go → engine/assets/template/footer_html_file.go


+ 0 - 0
assets/template/header_html_file.go → engine/assets/template/header_html_file.go


+ 0 - 0
assets/template/index_html_file.go → engine/assets/template/index_html_file.go


+ 0 - 0
assets/template/page_html_file.go → engine/assets/template/page_html_file.go


+ 0 - 0
assets/template/robots_txt_file.go → engine/assets/template/robots_txt_file.go


+ 0 - 0
assets/template/scripts_js_file.go → engine/assets/template/scripts_js_file.go


+ 0 - 0
assets/template/shop_category_html_file.go → engine/assets/template/shop_category_html_file.go


+ 0 - 0
assets/template/shop_html_file.go → engine/assets/template/shop_html_file.go


+ 0 - 0
assets/template/shop_product_html_file.go → engine/assets/template/shop_product_html_file.go


+ 0 - 0
assets/template/sidebar_left_html_file.go → engine/assets/template/sidebar_left_html_file.go


+ 0 - 0
assets/template/sidebar_right_html_file.go → engine/assets/template/sidebar_right_html_file.go


+ 0 - 0
assets/template/styles_css_file.go → engine/assets/template/styles_css_file.go


+ 0 - 0
assets/template/template.go → engine/assets/template/template.go


+ 0 - 0
assets/tmpl.cp.base.go → engine/assets/tmpl.cp.base.go


+ 0 - 0
assets/tmpl.cp.base.html → engine/assets/tmpl.cp.base.html


+ 0 - 0
assets/tmpl.cp.login.go → engine/assets/tmpl.cp.login.go


+ 0 - 0
assets/tmpl.cp.login.html → engine/assets/tmpl.cp.login.html


+ 0 - 0
assets/tmpl.cp.mysql.go → engine/assets/tmpl.cp.mysql.go


+ 0 - 0
assets/tmpl.cp.mysql.html → engine/assets/tmpl.cp.mysql.html


+ 0 - 0
assets/tmpl.page.default.go → engine/assets/tmpl.page.default.go


+ 0 - 0
assets/tmpl.page.default.html → engine/assets/tmpl.page.default.html


+ 0 - 0
assets/tmpl.page.error.404.go → engine/assets/tmpl.page.error.404.go


+ 0 - 0
assets/tmpl.page.error.404.html → engine/assets/tmpl.page.error.404.html


+ 0 - 0
assets/tmpl.page.error.engine.go → engine/assets/tmpl.page.error.engine.go


+ 0 - 0
assets/tmpl.page.error.engine.html → engine/assets/tmpl.page.error.engine.html


+ 0 - 0
assets/tmpl.page.error.tmpl.go → engine/assets/tmpl.page.error.tmpl.go


+ 0 - 0
assets/tmpl.page.error.tmpl.html → engine/assets/tmpl.page.error.tmpl.html


+ 1 - 1
engine/builder/builder.go

@@ -1,7 +1,7 @@
 package builder
 package builder
 
 
 import (
 import (
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 )
 )
 
 
 func CheckBox(value int) string {
 func CheckBox(value int) string {

+ 1 - 1
engine/engine.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"os"
 	"strings"
 	"strings"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/cblocks"
 	"golang-fave/cblocks"
 	"golang-fave/engine/basket"
 	"golang-fave/engine/basket"
 	"golang-fave/engine/mysqlpool"
 	"golang-fave/engine/mysqlpool"

+ 1 - 1
main.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/cblocks"
 	"golang-fave/cblocks"
 	"golang-fave/domains"
 	"golang-fave/domains"
 	"golang-fave/engine"
 	"golang-fave/engine"

+ 1 - 1
modules/module_api.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"net/http"
 	"os"
 	"os"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/wrapper"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 	"golang-fave/utils"

+ 1 - 1
modules/module_blog.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"net/http"
 	"strings"
 	"strings"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/fetdata"

+ 1 - 1
modules/module_index.go

@@ -4,7 +4,7 @@ import (
 	"html"
 	"html"
 	"net/http"
 	"net/http"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/fetdata"

+ 1 - 1
modules/module_notify_mail.go

@@ -3,7 +3,7 @@ package modules
 import (
 import (
 	"html"
 	"html"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/sqlw"

+ 1 - 1
modules/module_settings.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/engine/wrapper"

+ 1 - 1
modules/module_shop.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/basket"
 	"golang-fave/engine/basket"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"

+ 1 - 1
modules/module_template.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"path/filepath"
 	"strings"
 	"strings"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/engine/wrapper"

+ 1 - 1
modules/module_template_act_restore_file.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 
 
-	ThemeFiles "golang-fave/assets/template"
+	ThemeFiles "golang-fave/engine/assets/template"
 	"golang-fave/engine/wrapper"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 	"golang-fave/utils"
 )
 )

+ 1 - 1
modules/module_template_act_restore_file_all.go

@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 
 
-	ThemeFiles "golang-fave/assets/template"
+	ThemeFiles "golang-fave/engine/assets/template"
 	"golang-fave/engine/wrapper"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 	"golang-fave/utils"
 )
 )

+ 1 - 1
modules/module_users.go

@@ -3,7 +3,7 @@ package modules
 import (
 import (
 	"html"
 	"html"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/engine/wrapper"

+ 1 - 1
modules/modules.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"strings"
 	"time"
 	"time"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 	"golang-fave/utils"

+ 1 - 1
support/migrate/000000005.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 
 
-	ThemeFiles "golang-fave/assets/template"
+	ThemeFiles "golang-fave/engine/assets/template"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/sqlw"
 )
 )
 
 

+ 1 - 1
support/migrate/000000009.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 
 
-	ThemeFiles "golang-fave/assets/template"
+	ThemeFiles "golang-fave/engine/assets/template"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/sqlw"
 )
 )
 
 

+ 1 - 1
support/migrate/000000017.go

@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 
 
-	ThemeFiles "golang-fave/assets/template"
+	ThemeFiles "golang-fave/engine/assets/template"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/sqlw"
 )
 )
 
 

+ 7 - 7
support/template.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 #!/bin/bash
 
 
-find ./assets/template/ ! -name 'template.go' -type f -exec rm -f {} +
+find ./engine/assets/template/ ! -name 'template.go' -type f -exec rm -f {} +
 
 
-echo "package template" > ./assets/template/template.go
-echo "" >> ./assets/template/template.go
-echo "var AllData = map[string][]byte{" >> ./assets/template/template.go
+echo "package template" > ./engine/assets/template/template.go
+echo "" >> ./engine/assets/template/template.go
+echo "var AllData = map[string][]byte{" >> ./engine/assets/template/template.go
 
 
 for FILE_FULL in $(find ./hosts/localhost/template/ | grep -v 'hosts/localhost/template/$' | grep -v '.keep'); do
 for FILE_FULL in $(find ./hosts/localhost/template/ | grep -v 'hosts/localhost/template/$' | grep -v '.keep'); do
 	FILE_BASE="$(basename -- $FILE_FULL)"
 	FILE_BASE="$(basename -- $FILE_FULL)"
 	FILE_GO_BASE="${FILE_BASE//[\-\.]/_}_file.go"
 	FILE_GO_BASE="${FILE_BASE//[\-\.]/_}_file.go"
-	FILE_GO_FULL="./assets/template/${FILE_GO_BASE}"
+	FILE_GO_FULL="./engine/assets/template/${FILE_GO_BASE}"
 	GO_VAR_NAME="${FILE_GO_BASE}"
 	GO_VAR_NAME="${FILE_GO_BASE}"
 	GO_VAR_NAME=$(echo "$GO_VAR_NAME" | sed -E 's/^([a-zA-Z]{1})/\U\1/g')
 	GO_VAR_NAME=$(echo "$GO_VAR_NAME" | sed -E 's/^([a-zA-Z]{1})/\U\1/g')
 	GO_VAR_NAME=$(echo "$GO_VAR_NAME" | sed -E 's/(_)([a-zA-Z]{1})/\U\2/g')
 	GO_VAR_NAME=$(echo "$GO_VAR_NAME" | sed -E 's/(_)([a-zA-Z]{1})/\U\2/g')
@@ -24,7 +24,7 @@ for FILE_FULL in $(find ./hosts/localhost/template/ | grep -v 'hosts/localhost/t
 	echo "var ${GO_VAR_NAME} = []byte(\`${FILE_CONTENT}\`)" >> ${FILE_GO_FULL}
 	echo "var ${GO_VAR_NAME} = []byte(\`${FILE_CONTENT}\`)" >> ${FILE_GO_FULL}
 
 
 	# Add files to hash
 	# Add files to hash
-	echo "	\"${FILE_BASE}\": ${GO_VAR_NAME}," >> ./assets/template/template.go
+	echo "	\"${FILE_BASE}\": ${GO_VAR_NAME}," >> ./engine/assets/template/template.go
 done
 done
 
 
-echo "}" >> ./assets/template/template.go
+echo "}" >> ./engine/assets/template/template.go

+ 1 - 1
utils/utils.go

@@ -18,7 +18,7 @@ import (
 	"time"
 	"time"
 	"unicode/utf16"
 	"unicode/utf16"
 
 
-	"golang-fave/assets"
+	"golang-fave/engine/assets"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/consts"
 )
 )