From 7842dba7d37776e00408d1b067cef5cef117fdad Mon Sep 17 00:00:00 2001
From: serr <sc7227484@gmail.com>
Date: Sat, 5 Apr 2025 21:15:19 +0300
Subject: [PATCH] pages folder add

---
 main.go                                         | 3 ++-
 mvc/controllers/{main_page.go => pages/main.go} | 7 ++++---
 mvc/models/{main_page.go => pages/main.go}      | 2 +-
 mvc/views/{main_page.gohtml => main.gohtml}     | 0
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename mvc/controllers/{main_page.go => pages/main.go} (76%)
 rename mvc/models/{main_page.go => pages/main.go} (92%)
 rename mvc/views/{main_page.gohtml => main.gohtml} (100%)

diff --git a/main.go b/main.go
index 817c6c4..a10aa7e 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"log"
 	"main/mvc/controllers"
+	controllers_pages "main/mvc/controllers/pages"
 	"main/mvc/models"
 	"main/tools"
 	"net/http"
@@ -53,7 +54,7 @@ func setupRoutes(a *models.App) *http.ServeMux {
 	router.Handle(a.Config.AssetsPath, controllers.StaticHandler())
 
 	// Обработка главной страницы
-	router.Handle("/", controllers.MainPageHandler(a))
+	router.Handle("/", controllers_pages.MainPageHandler(a))
 
 	return router
 }
diff --git a/mvc/controllers/main_page.go b/mvc/controllers/pages/main.go
similarity index 76%
rename from mvc/controllers/main_page.go
rename to mvc/controllers/pages/main.go
index 6f4b566..6fc27dd 100644
--- a/mvc/controllers/main_page.go
+++ b/mvc/controllers/pages/main.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"main/mvc/models"
+	models_pages "main/mvc/models/pages"
 	"net/http"
 )
 
@@ -11,14 +12,14 @@ func MainPageHandler(a *models.App) http.HandlerFunc {
 		var err error
 
 		// Страничка рендерится только если ее нет в кэше
-		pageData, ok := a.Cache.Get(models.MainPageTmplName)
+		pageData, ok := a.Cache.Get(models_pages.MainPageTmplName)
 		if !ok {
-			pageData, err = models.RenderMainPage(a.Templates, a.Version)
+			pageData, err = models_pages.RenderMainPage(a.Templates, a.Version)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
-			a.Cache.Set(models.MainPageTmplName, pageData)
+			a.Cache.Set(models_pages.MainPageTmplName, pageData)
 		}
 
 		SendMainPage(w, pageData.([]byte))
diff --git a/mvc/models/main_page.go b/mvc/models/pages/main.go
similarity index 92%
rename from mvc/models/main_page.go
rename to mvc/models/pages/main.go
index b603ae6..fca61b6 100644
--- a/mvc/models/main_page.go
+++ b/mvc/models/pages/main.go
@@ -8,7 +8,7 @@ import (
 
 const (
 	// Имя соответствующего шаблона
-	MainPageTmplName = "main_page.gohtml"
+	MainPageTmplName = "main.gohtml"
 )
 
 func RenderMainPage(templates *template.Template, version int64) ([]byte, error) {
diff --git a/mvc/views/main_page.gohtml b/mvc/views/main.gohtml
similarity index 100%
rename from mvc/views/main_page.gohtml
rename to mvc/views/main.gohtml