diff --git a/component/navbar/navbar.templ b/component/navbar/navbar.templ index 75da30c..97a89c2 100644 --- a/component/navbar/navbar.templ +++ b/component/navbar/navbar.templ @@ -40,6 +40,50 @@ templ Navbar(dataUser models.User) { } +templ NavbarWithLogo(dataUser models.User) { +
+ +
+ +
+ + Your Brand + +
+ + +
+ +
+
+ Hi, + { dataUser.Username } + + + +
+
+ +
+ +
+ +
+} + templ NavbarMenu(datamenu []models.Menu) {
diff --git a/component/navbar/navbar_templ.go b/component/navbar/navbar_templ.go index 84e869e..6058bcb 100644 --- a/component/navbar/navbar_templ.go +++ b/component/navbar/navbar_templ.go @@ -53,7 +53,7 @@ func Navbar(dataUser models.User) templ.Component { }) } -func NavbarMenu(datamenu []models.Menu) templ.Component { +func NavbarWithLogo(dataUser models.User) templ.Component { return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) if !templ_7745c5c3_IsBuffer { @@ -66,6 +66,43 @@ func NavbarMenu(datamenu []models.Menu) templ.Component { templ_7745c5c3_Var3 = templ.NopComponent } ctx = templ.ClearChildren(ctx) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
\"Your
Hi, ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 string + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(dataUser.Username) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\navbar\navbar.templ`, Line: 73, Col: 26} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) + } + return templ_7745c5c3_Err + }) +} + +func NavbarMenu(datamenu []models.Menu) templ.Component { + return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) { + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer) + if !templ_7745c5c3_IsBuffer { + templ_7745c5c3_Buffer = templ.GetBuffer() + defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var5 := templ.GetChildren(ctx) + if templ_7745c5c3_Var5 == nil { + templ_7745c5c3_Var5 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
    ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err diff --git a/handlers/dev/employeeanalytic.handlers.go b/handlers/dev/employeeanalytic.handlers.go index b491a92..4c1ead4 100644 --- a/handlers/dev/employeeanalytic.handlers.go +++ b/handlers/dev/employeeanalytic.handlers.go @@ -38,9 +38,6 @@ func (ea *EmployeeAnalyticHandler) HandleShowEmployeeAnalyticScreen(c echo.Conte listID := utils.GenerateRandomID("listid") paginationID := utils.GenerateRandomID("paginationid") - // searchID := utils.GenerateRandomID("searchid") - // startdateID := utils.GenerateRandomID("startdateid") - // enddateID := utils.GenerateRandomID("enddateid") user, err := services.GetUserLogin() if err != nil { @@ -57,7 +54,7 @@ func (ea *EmployeeAnalyticHandler) HandleShowEmployeeAnalyticScreen(c echo.Conte } defer logger.Sync() - navbaruser := navbarmenu.Navbar(user) + navbaruser := navbarmenu.NavbarWithLogo(user) sidbaruser := sidebaruserprofile.Navbaruserprofile(user) breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb) diff --git a/layout/layout_employee_analytic.templ b/layout/layout_employee_analytic.templ index c6a1e4c..ca1554e 100644 --- a/layout/layout_employee_analytic.templ +++ b/layout/layout_employee_analytic.templ @@ -146,11 +146,11 @@ templ EmployeeAnalyticLayout(
-
-
+
+
@navbaruser
-
+
{ children... }
diff --git a/layout/layout_employee_analytic_templ.go b/layout/layout_employee_analytic_templ.go index c35cb93..177c3f2 100644 --- a/layout/layout_employee_analytic_templ.go +++ b/layout/layout_employee_analytic_templ.go @@ -50,7 +50,7 @@ func EmployeeAnalyticLayout( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
\"Logo\"
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
\"Logo\"
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -58,7 +58,7 @@ func EmployeeAnalyticLayout( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/views/dev/employeeanalytic/filteremployeeanalytic.templ b/views/dev/employeeanalytic/filteremployeeanalytic.templ index f9f854a..2e47780 100644 --- a/views/dev/employeeanalytic/filteremployeeanalytic.templ +++ b/views/dev/employeeanalytic/filteremployeeanalytic.templ @@ -10,10 +10,10 @@ templ FilterListing( hxAfterRequest templ.ComponentScript, ) {
-
+
-
+
-
+
-
+
-
+
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -122,7 +122,7 @@ func FilterListing( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -213,7 +213,7 @@ func FilterListing( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err }