From e6a5925588fde873d8543b1d71c2969eaf148a22 Mon Sep 17 00:00:00 2001 From: adibwp Date: Wed, 12 Jun 2024 19:42:49 +0700 Subject: [PATCH] pindah dashboard_pic ke corp route --- .../dashboardpic.handlers.go | 36 ++++----- handlers/public/login.handlers.go | 79 +++++++++++++++++-- handlers/routes.go | 13 +-- models/login.models.go | 32 ++++++++ .../dashboardpic.services.go | 2 +- services/public/login.services.go | 53 +++++++++++++ .../dashboardpic/dashboardpic.templ | 2 +- .../dashboardpic/dashboardpic_templ.go | 2 +- .../dashboardpic/filterdashboardpic.templ | 2 +- .../dashboardpic/filterdashboardpic_templ.go | 32 ++++---- .../dashboardpic/listingdashboardpic.templ | 2 +- .../dashboardpic/listingdashboardpic_templ.go | 16 ++-- 12 files changed, 214 insertions(+), 57 deletions(-) rename handlers/{public => corporate}/dashboardpic.handlers.go (81%) rename services/{public => corporate}/dashboardpic.services.go (99%) rename views/{public => corporate}/dashboardpic/dashboardpic.templ (99%) rename views/{public => corporate}/dashboardpic/dashboardpic_templ.go (99%) rename views/{public => corporate}/dashboardpic/filterdashboardpic.templ (98%) rename views/{public => corporate}/dashboardpic/filterdashboardpic_templ.go (92%) rename views/{public => corporate}/dashboardpic/listingdashboardpic.templ (97%) rename views/{public => corporate}/dashboardpic/listingdashboardpic_templ.go (93%) diff --git a/handlers/public/dashboardpic.handlers.go b/handlers/corporate/dashboardpic.handlers.go similarity index 81% rename from handlers/public/dashboardpic.handlers.go rename to handlers/corporate/dashboardpic.handlers.go index 73e65d7..4676d70 100644 --- a/handlers/public/dashboardpic.handlers.go +++ b/handlers/corporate/dashboardpic.handlers.go @@ -1,4 +1,4 @@ -package public_handlers +package corporate_handlers import ( breadcrumadmin "cpone/component/breadcrumbadmin" @@ -8,7 +8,7 @@ import ( "cpone/models" "cpone/services" "cpone/utils" - public_dashboardpic "cpone/views/public/dashboardpic" + corporate_dashboardpic "cpone/views/corporate/dashboardpic" "strconv" "github.com/a-h/templ" @@ -64,7 +64,7 @@ func (ea *DashboardPicHandler) HandleShowEmployeeAnalyticScreen(c echo.Context) logger.Info("Error get listing data", zap.Any("error", err), zap.Any("total", totalPage)) return err } - listingcomponent := public_dashboardpic.ListingData(listingData, listID) + listingcomponent := corporate_dashboardpic.ListingData(listingData, listID) paginationcomponent := pagination.PaginationV3( totalPage, @@ -74,21 +74,21 @@ func (ea *DashboardPicHandler) HandleShowEmployeeAnalyticScreen(c echo.Context) "#listID, #paginationID, #searchID, #startdateID, #enddateID", "#"+paginationID, "outerHTML", "", "", - public_dashboardpic.BeforeRequestContent(), - public_dashboardpic.AfterRequestContent(), + corporate_dashboardpic.BeforeRequestContent(), + corporate_dashboardpic.AfterRequestContent(), ) - filtercomponent := public_dashboardpic.FilterListing( + filtercomponent := corporate_dashboardpic.FilterListing( "/dev/dashboard_pic/filter", "input changed delay:500ms", "#searchID, #startdateID, #enddateID, #listID, #paginationID", "outerHTML", "#"+paginationID, - public_dashboardpic.BeforeRequestContent(), - public_dashboardpic.AfterRequestContent(), + corporate_dashboardpic.BeforeRequestContent(), + corporate_dashboardpic.AfterRequestContent(), ) - content := public_dashboardpic.DashboardPic( + content := corporate_dashboardpic.DashboardPic( listID, paginationID, breadcrumb, @@ -96,10 +96,10 @@ func (ea *DashboardPicHandler) HandleShowEmployeeAnalyticScreen(c echo.Context) listingcomponent, paginationcomponent, ) - css := public_dashboardpic.CSSDashboardPIC() - js := public_dashboardpic.JSDashboardPIC() + css := corporate_dashboardpic.CSSDashboardPIC() + js := corporate_dashboardpic.JSDashboardPIC() - view := public_dashboardpic.ShowDashboardPic(title, content, css, js, navbaruser, sidbaruser) + view := corporate_dashboardpic.ShowDashboardPic(title, content, css, js, navbaruser, sidbaruser) return utils.View(c, view) } @@ -127,7 +127,7 @@ func (ea *DashboardPicHandler) HandlePagination(c echo.Context) error { logger.Info("Error convert page param") return err } - listcomponent := public_dashboardpic.ListingData(listdata, listID) + listcomponent := corporate_dashboardpic.ListingData(listdata, listID) paginationcomponent := pagination.PaginationV3( totalPage, @@ -137,8 +137,8 @@ func (ea *DashboardPicHandler) HandlePagination(c echo.Context) error { "#listID, #paginationID, #searchID, #startdateID, #enddateID", "#"+paginationID, "outerHTML", "", "", - public_dashboardpic.BeforeRequestContent(), - public_dashboardpic.AfterRequestContent(), + corporate_dashboardpic.BeforeRequestContent(), + corporate_dashboardpic.AfterRequestContent(), ) retVal = append(retVal, listcomponent) @@ -162,15 +162,15 @@ func (ea *DashboardPicHandler) HandleFilter(c echo.Context) error { return err } - listcomponent := public_dashboardpic.ListingData(dataList, listID) + listcomponent := corporate_dashboardpic.ListingData(dataList, listID) paginationcomponent := pagination.PaginationV3( totalPage, 1, "/dev/dashboard_pic/changepage", paginationID, "#listID, #paginationID, #searchID, #startdateID, #enddateID", "#"+paginationID, "outerHTML", "", "", - public_dashboardpic.BeforeRequestContent(), - public_dashboardpic.AfterRequestContent(), + corporate_dashboardpic.BeforeRequestContent(), + corporate_dashboardpic.AfterRequestContent(), ) var retval []templ.Component diff --git a/handlers/public/login.handlers.go b/handlers/public/login.handlers.go index c40cbca..75a73eb 100644 --- a/handlers/public/login.handlers.go +++ b/handlers/public/login.handlers.go @@ -13,6 +13,7 @@ import ( type LoginService interface { Login(username string, password string) (models.ResponseApi, error) + SignIn(username string, password string) (models.ResponseValid, models.ResponseInvalid, error) } func NewLoginHandler(us LoginService) *LoginHandler { @@ -39,7 +40,7 @@ func (lh *LoginHandler) HandlerSignIn(c echo.Context) error { password := c.FormValue("password") defer logger.Sync() - logger.Info("PArams", zap.Any("username", username), zap.Any("pass", password)) + logger.Info("Params", zap.Any("username", username), zap.Any("pass", password)) resp, err := lh.LoginService.Login(username, password) if err != nil { @@ -51,10 +52,16 @@ func (lh *LoginHandler) HandlerSignIn(c echo.Context) error { } defer logger.Sync() - url := "/one-ui" - // url := "/home" - if resp.Data.Type == "pic" { + var url string + switch resp.Data.Type { + case "cpone": + url = "/one-ui" + case "pic": url = "/dashboard_pic" + case "patient": + url = "/home" + default: + url = "/one-ui" } user, err := json.Marshal(resp.Data.User) @@ -83,7 +90,69 @@ func (lh *LoginHandler) HandlerSignIn(c echo.Context) error { ` c.Response().Header().Set("HX-Trigger", "script") - // c.Response().Header().Set("HX-Redirect", url) return c.String(http.StatusOK, storeLocal) } + +func (lh *LoginHandler) HandleSignIn(c echo.Context) error { + logger, _ := zap.NewProduction() + + username := c.FormValue("username") + password := c.FormValue("password") + defer logger.Sync() + logger.Info("Params", zap.Any("username", username), zap.Any("pass", password)) + + valid, invalid, err := lh.LoginService.SignIn(username, password) + if err != nil { + defer logger.Sync() + logger.Info("Error", zap.Error(err)) + + si := public_login.ShowLogin("Login ", public_login.MainLogin(), public_login.CssLogin(), public_login.JsLogin()) + return utils.View(c, si) + } + if invalid.Status == "ERR" { + defer logger.Sync() + logger.Info("Error", zap.Error(err)) + + si := public_login.ShowLogin("Login ", public_login.MainLogin(), public_login.CssLogin(), public_login.JsLogin()) + return utils.View(c, si) + } + + var url string + switch valid.Data.Type { + case "cpone": + url = "/one-ui" + case "pic": + url = "/corp/dashboard_pic" + case "patient": + url = "/corp/dashboard_pat" + default: + url = "/one-ui" + } + + user, err := json.Marshal(valid.Data.User) + if err != nil { + defer logger.Sync() + logger.Info("Error", zap.Error(err)) + + si := public_login.ShowLogin("Login ", public_login.MainLogin(), public_login.CssLogin(), public_login.JsLogin()) + return utils.View(c, si) + } + userString := string(user) + + store := ` + + ` + c.Response().Header().Set("HX-Trigger", "script") + return c.String(http.StatusOK, store) +} diff --git a/handlers/routes.go b/handlers/routes.go index dd4af98..8741477 100644 --- a/handlers/routes.go +++ b/handlers/routes.go @@ -77,11 +77,6 @@ func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) { public.POST("login/signin", loginHadlr.HandlerSignIn) // dashboard_pic - dashbrdPicServ := public_services.NewDashboardPicServices(appStore) - dashbrdPicHandl := public_handlers.NewDashboardPicHandler(dashbrdPicServ) - public.GET("dashboard_pic", dashbrdPicHandl.HandleShowEmployeeAnalyticScreen) - public.GET("dashboard_pic/changepage", dashbrdPicHandl.HandlePagination) - public.GET("dashboard_pic/filter", dashbrdPicHandl.HandleFilter) // kartu kontrol publicKartuKontrolServices := public_services.NewServicesKartuKontrol(appStore) @@ -108,6 +103,14 @@ func SetupRoutesCorporate(app *echo.Echo, appStore db.AppStore) { l := corporate_services.NewServicesCompany(appStore) lh := corporate_handlers.NewCompanyHandler(l) public.GET("/company", lh.ShowCompany) + + // dashboard_pic + dashbrdPicServ := corporate_services.NewDashboardPicServices(appStore) + dashbrdPicHandl := corporate_handlers.NewDashboardPicHandler(dashbrdPicServ) + public.GET("/dashboard_pic", dashbrdPicHandl.HandleShowEmployeeAnalyticScreen) + public.GET("/dashboard_pic/changepage", dashbrdPicHandl.HandlePagination) + public.GET("/dashboard_pic/filter", dashbrdPicHandl.HandleFilter) + patientHandler := corporate_handlers.NewPatientHandler(l) public.GET("/patient", patientHandler.ShowPatient) } diff --git a/models/login.models.go b/models/login.models.go index 272256e..a8d2856 100644 --- a/models/login.models.go +++ b/models/login.models.go @@ -27,3 +27,35 @@ type ResponseApi struct { Message string `json:"message"` } `json:"db_error"` } + +type ResponseInvalid struct { + Status string `json:"status"` + Message string `json:"message"` + Query string `json:"query"` + DbError struct { + Code int `json:"code"` + Message string `json:"message"` + } `json:"db_error"` +} + +type ResponseValid struct { + Status string `json:"status"` + Data struct { + User struct { + MUserID string `json:"M_UserID"` + MUserEmail string `json:"M_UserEmail"` + MUserUsername string `json:"M_UserUsername"` + MUserGroupDashboard string `json:"M_UserGroupDashboard"` + MUserDefaultTSampleStationID string `json:"M_UserDefaultT_SampleStationID"` + MStaffName string `json:"M_StaffName"` + IsCourier string `json:"is_courier"` + TimeAutologout string `json:"time_autologout"` + IP string `json:"ip"` + Agent string `json:"agent"` + Version string `json:"version"` + LastLogin string `json:"last-login"` + } `json:"user"` + Token string `json:"token"` + Type string `json:"type"` + } `json:"data"` +} diff --git a/services/public/dashboardpic.services.go b/services/corporate/dashboardpic.services.go similarity index 99% rename from services/public/dashboardpic.services.go rename to services/corporate/dashboardpic.services.go index 409e35f..5327809 100644 --- a/services/public/dashboardpic.services.go +++ b/services/corporate/dashboardpic.services.go @@ -1,4 +1,4 @@ -package public_services +package corporate_services import ( "cpone/db" diff --git a/services/public/login.services.go b/services/public/login.services.go index 0a7f6b7..57389a4 100644 --- a/services/public/login.services.go +++ b/services/public/login.services.go @@ -8,6 +8,9 @@ import ( "fmt" "io" "net/http" + "net/url" + + "go.uber.org/zap" ) type ServicesLogin struct { @@ -22,19 +25,23 @@ func NewServicesLogin(uStore db.AppStore) *ServicesLogin { } func (ls *ServicesLogin) Login(username string, password string) (models.ResponseApi, error) { + logger, _ := zap.NewProduction() url := "https://devcpone.aplikasi.web.id/one-api/v1/system/auth/login" var resp models.ResponseApi // Create a JSON payload with the username and password payload := []byte(fmt.Sprintf(`{"username": "%s", "password": "%s"}`, username, password)) + logger.Info("payload", zap.Any("data", payload)) // Make the POST request request, err := http.Post(url, "application/json", bytes.NewBuffer(payload)) if err != nil { + logger.Info("requser", zap.Any("err", err)) return resp, err } if request.StatusCode != http.StatusOK { + logger.Info("status", zap.Any("err", request.StatusCode)) return resp, fmt.Errorf("server returned non-OK status: %d", request.StatusCode) } defer request.Body.Close() @@ -42,17 +49,63 @@ func (ls *ServicesLogin) Login(username string, password string) (models.Respons // Read the response body body, err := io.ReadAll(request.Body) if err != nil { + logger.Info("body", zap.Any("data", body)) return resp, err } if err := json.Unmarshal(body, &resp); err != nil { + logger.Info("json", zap.Any("data", err)) return resp, err } // Check if status is "ERR" if resp.Status == "ERR" { + logger.Info("status", zap.Any("data", resp.Message)) return resp, fmt.Errorf("login failed: %s", resp.Message) } return resp, nil } + +func (ls *ServicesLogin) SignIn(username string, password string) (models.ResponseValid, models.ResponseInvalid, error) { + logger, _ := zap.NewProduction() + var respvalid models.ResponseValid + var respinvalid models.ResponseInvalid + uri := "https://devcpone.aplikasi.web.id/one-api/v1/system/auth/login" + + params := url.Values{} + params.Add("username", username) + params.Add("password", password) + + resp, err := http.PostForm(uri, params) + if err != nil { + defer logger.Sync() + logger.Error("error request post", zap.Any("error", err)) + return respvalid, respinvalid, err + } + defer resp.Body.Close() + + body, err := io.ReadAll(resp.Body) + if err != nil { + defer logger.Sync() + logger.Error("error read body", zap.Any("error", err)) + return respvalid, respinvalid, err + } + + var response interface{} + err = json.Unmarshal(body, &response) + if err != nil { + defer logger.Sync() + logger.Error("error parse body", zap.Any("error", err)) + return respvalid, respinvalid, err + } + + switch v := response.(type) { + case models.ResponseValid: + respvalid = v + case models.ResponseInvalid: + respinvalid = v + } + + return respvalid, respinvalid, err +} diff --git a/views/public/dashboardpic/dashboardpic.templ b/views/corporate/dashboardpic/dashboardpic.templ similarity index 99% rename from views/public/dashboardpic/dashboardpic.templ rename to views/corporate/dashboardpic/dashboardpic.templ index 32d03ed..61ca1ea 100644 --- a/views/public/dashboardpic/dashboardpic.templ +++ b/views/corporate/dashboardpic/dashboardpic.templ @@ -1,4 +1,4 @@ -package public_dashboardpic +package corporate_dashboardpic import "cpone/layout" import "cpone/component/customtextfield" diff --git a/views/public/dashboardpic/dashboardpic_templ.go b/views/corporate/dashboardpic/dashboardpic_templ.go similarity index 99% rename from views/public/dashboardpic/dashboardpic_templ.go rename to views/corporate/dashboardpic/dashboardpic_templ.go index ceca62c..6085405 100644 --- a/views/public/dashboardpic/dashboardpic_templ.go +++ b/views/corporate/dashboardpic/dashboardpic_templ.go @@ -1,7 +1,7 @@ // Code generated by templ - DO NOT EDIT. // templ: version: v0.2.663 -package public_dashboardpic +package corporate_dashboardpic //lint:file-ignore SA4006 This context is only used if a nested component is present. diff --git a/views/public/dashboardpic/filterdashboardpic.templ b/views/corporate/dashboardpic/filterdashboardpic.templ similarity index 98% rename from views/public/dashboardpic/filterdashboardpic.templ rename to views/corporate/dashboardpic/filterdashboardpic.templ index c1e2bdf..571a0ae 100644 --- a/views/public/dashboardpic/filterdashboardpic.templ +++ b/views/corporate/dashboardpic/filterdashboardpic.templ @@ -1,4 +1,4 @@ -package public_dashboardpic +package corporate_dashboardpic templ FilterListing( hxGet string, diff --git a/views/public/dashboardpic/filterdashboardpic_templ.go b/views/corporate/dashboardpic/filterdashboardpic_templ.go similarity index 92% rename from views/public/dashboardpic/filterdashboardpic_templ.go rename to views/corporate/dashboardpic/filterdashboardpic_templ.go index fc0cf65..8ce352c 100644 --- a/views/public/dashboardpic/filterdashboardpic_templ.go +++ b/views/corporate/dashboardpic/filterdashboardpic_templ.go @@ -1,7 +1,7 @@ // Code generated by templ - DO NOT EDIT. // templ: version: v0.2.663 -package public_dashboardpic +package corporate_dashboardpic //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -46,7 +46,7 @@ func FilterListing( var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 23, Col: 30} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 23, Col: 30} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { @@ -59,7 +59,7 @@ func FilterListing( var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 24, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 24, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -72,7 +72,7 @@ func FilterListing( var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 25, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 25, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { @@ -85,7 +85,7 @@ func FilterListing( var templ_7745c5c3_Var5 string templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 26, Col: 32} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 26, Col: 32} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) if templ_7745c5c3_Err != nil { @@ -98,7 +98,7 @@ func FilterListing( var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 27, Col: 36} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 27, Col: 36} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { @@ -137,7 +137,7 @@ func FilterListing( var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 42, Col: 30} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 42, Col: 30} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { @@ -150,7 +150,7 @@ func FilterListing( var templ_7745c5c3_Var10 string templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 43, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 43, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { @@ -163,7 +163,7 @@ func FilterListing( var templ_7745c5c3_Var11 string templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 44, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 44, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { @@ -176,7 +176,7 @@ func FilterListing( var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 45, Col: 32} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 45, Col: 32} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { @@ -189,7 +189,7 @@ func FilterListing( var templ_7745c5c3_Var13 string templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 46, Col: 36} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 46, Col: 36} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { @@ -228,7 +228,7 @@ func FilterListing( var templ_7745c5c3_Var16 string templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 58, Col: 30} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 58, Col: 30} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) if templ_7745c5c3_Err != nil { @@ -241,7 +241,7 @@ func FilterListing( var templ_7745c5c3_Var17 string templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 59, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 59, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) if templ_7745c5c3_Err != nil { @@ -254,7 +254,7 @@ func FilterListing( var templ_7745c5c3_Var18 string templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 60, Col: 38} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 60, Col: 38} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18)) if templ_7745c5c3_Err != nil { @@ -267,7 +267,7 @@ func FilterListing( var templ_7745c5c3_Var19 string templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 61, Col: 32} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 61, Col: 32} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) if templ_7745c5c3_Err != nil { @@ -280,7 +280,7 @@ func FilterListing( var templ_7745c5c3_Var20 string templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\filterdashboardpic.templ`, Line: 62, Col: 36} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 62, Col: 36} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20)) if templ_7745c5c3_Err != nil { diff --git a/views/public/dashboardpic/listingdashboardpic.templ b/views/corporate/dashboardpic/listingdashboardpic.templ similarity index 97% rename from views/public/dashboardpic/listingdashboardpic.templ rename to views/corporate/dashboardpic/listingdashboardpic.templ index dc390cc..b12bcd2 100644 --- a/views/public/dashboardpic/listingdashboardpic.templ +++ b/views/corporate/dashboardpic/listingdashboardpic.templ @@ -1,4 +1,4 @@ -package public_dashboardpic +package corporate_dashboardpic import "cpone/models" import "strconv" diff --git a/views/public/dashboardpic/listingdashboardpic_templ.go b/views/corporate/dashboardpic/listingdashboardpic_templ.go similarity index 93% rename from views/public/dashboardpic/listingdashboardpic_templ.go rename to views/corporate/dashboardpic/listingdashboardpic_templ.go index 2a89d33..9ac8f8c 100644 --- a/views/public/dashboardpic/listingdashboardpic_templ.go +++ b/views/corporate/dashboardpic/listingdashboardpic_templ.go @@ -1,7 +1,7 @@ // Code generated by templ - DO NOT EDIT. // templ: version: v0.2.663 -package public_dashboardpic +package corporate_dashboardpic //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -36,7 +36,7 @@ func ListingData( var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(listID) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\listingdashboardpic.templ`, Line: 10, Col: 19} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 10, Col: 19} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { @@ -55,7 +55,7 @@ func ListingData( var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID))) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\listingdashboardpic.templ`, Line: 15, Col: 64} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 15, Col: 64} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -81,7 +81,7 @@ func ListingData( var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID))) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\listingdashboardpic.templ`, Line: 19, Col: 64} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 19, Col: 64} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { @@ -132,7 +132,7 @@ func ItemCard(data models.DashboardPic) templ.Component { var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuLabel) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\listingdashboardpic.templ`, Line: 32, Col: 54} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 32, Col: 54} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { @@ -145,7 +145,7 @@ func ItemCard(data models.DashboardPic) templ.Component { var templ_7745c5c3_Var7 string templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuNote) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\listingdashboardpic.templ`, Line: 35, Col: 74} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 35, Col: 74} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) if templ_7745c5c3_Err != nil { @@ -158,7 +158,7 @@ func ItemCard(data models.DashboardPic) templ.Component { var templ_7745c5c3_Var8 string templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuStartDate) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\listingdashboardpic.templ`, Line: 38, Col: 79} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 38, Col: 79} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) if templ_7745c5c3_Err != nil { @@ -171,7 +171,7 @@ func ItemCard(data models.DashboardPic) templ.Component { var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuEndDate) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\public\dashboardpic\listingdashboardpic.templ`, Line: 38, Col: 105} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 38, Col: 105} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil {