diff --git a/internal/api/project_handler.go b/internal/api/project_handler.go
index e8869f4..32f79f5 100644
--- a/internal/api/project_handler.go
+++ b/internal/api/project_handler.go
@@ -3,34 +3,35 @@ package api
import (
"database/sql"
"duhweb/internal/store"
- "fmt"
"html/template"
"net/http"
)
-type ProjectHandler struct {
+type ApiHandler struct {
Templates *template.Template
ProjectStore *store.SQLiteProjectStore
+ ExperienceStore *store.SQLiteExperienceStore
}
-func (h *ProjectHandler) Render(w http.ResponseWriter, tmpl string, data interface{}) {
+func (h *ApiHandler) Render(w http.ResponseWriter, tmpl string, data interface{}) {
if err := h.Templates.ExecuteTemplate(w, tmpl, data); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
}
-
-func NewProjectHandler(db *sql.DB) *ProjectHandler {
+
+func NewApiHandler(db *sql.DB) *ApiHandler {
tmpl := template.Must(template.New("").ParseGlob("views/*.html"))
template.Must(tmpl.ParseGlob("views/partials/*.html"))
- return &ProjectHandler{
+ return &ApiHandler{
Templates: tmpl,
ProjectStore: store.NewSQLiteProjectStore(db),
+ ExperienceStore: store.NewSQLiteExperienceStore(db),
}
}
-func (h *ProjectHandler) InitPage(w http.ResponseWriter, r *http.Request) {
+func (h *ApiHandler) InitPage(w http.ResponseWriter, r *http.Request) {
var hxRequest = r.Header.Get("HX-Request")
if hxRequest != "true" {
h.Render(w, "index", nil)
@@ -39,9 +40,8 @@ func (h *ProjectHandler) InitPage(w http.ResponseWriter, r *http.Request) {
h.Render(w, "about-partial", nil)
}
-func (h *ProjectHandler) ProjectsPage(w http.ResponseWriter, r *http.Request) {
+func (h *ApiHandler) ProjectsPage(w http.ResponseWriter, r *http.Request) {
var hxRequest = r.Header.Get("HX-Request")
- fmt.Println(hxRequest)
projects, err := h.ProjectStore.GetAllProjects()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -53,3 +53,17 @@ func (h *ProjectHandler) ProjectsPage(w http.ResponseWriter, r *http.Request) {
}
h.Render(w, "projects-partial", projects)
}
+
+func (h *ApiHandler) ExperiencePage(w http.ResponseWriter, r *http.Request) {
+ var hxRequest = r.Header.Get("HX-Request")
+ experiences, err := h.ExperienceStore.GetAllExperiences()
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ return
+ }
+ if hxRequest != "true" {
+ h.Render(w, "experience", experiences)
+ return
+ }
+ h.Render(w, "experience-partial", experiences)
+}
diff --git a/internal/app/app.go b/internal/app/app.go
index 1ace923..71cab94 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -10,7 +10,7 @@ import (
type Application struct {
Logger *log.Logger
- ProjectHandler *api.ProjectHandler
+ ApiHandler *api.ApiHandler
DB *sql.DB
}
@@ -20,10 +20,10 @@ func NewApplication() (*Application, error) {
if err != nil {
return nil, err
}
- ProjectHandler := api.NewProjectHandler(sqlDB)
+ ApiHandler := api.NewApiHandler(sqlDB)
app := &Application{
Logger: logger,
- ProjectHandler: ProjectHandler,
+ ApiHandler: ApiHandler,
DB: sqlDB,
}
return app, nil
diff --git a/internal/routes/routes.go b/internal/routes/routes.go
index ecc1237..e5aa1c3 100644
--- a/internal/routes/routes.go
+++ b/internal/routes/routes.go
@@ -9,7 +9,8 @@ import (
func SetupRoutes(app *app.Application) *chi.Mux {
r := chi.NewRouter()
- r.Get("/", app.ProjectHandler.InitPage)
- r.Get("/projects", app.ProjectHandler.ProjectsPage)
+ r.Get("/", app.ApiHandler.InitPage)
+ r.Get("/projects", app.ApiHandler.ProjectsPage)
+ r.Get("/experience", app.ApiHandler.ExperiencePage)
return r
}
diff --git a/internal/store/experience_store.go b/internal/store/experience_store.go
new file mode 100644
index 0000000..d5d7280
--- /dev/null
+++ b/internal/store/experience_store.go
@@ -0,0 +1,46 @@
+package store
+
+import (
+ "database/sql"
+ "strings"
+)
+
+type Experience struct {
+ ID int `json:"id"`
+ Company string `json:"company"`
+ EmployeeType string `json:"employee_type"`
+ Position string `json:"position"`
+ Tasks []string `json:"tasks"`
+ Tools string `json:"tools"`
+ Years int `json:"years"`
+}
+
+type SQLiteExperienceStore struct {
+ db *sql.DB
+}
+
+func NewSQLiteExperienceStore(db *sql.DB) *SQLiteExperienceStore {
+ return &SQLiteExperienceStore{db: db}
+}
+
+func (s *SQLiteExperienceStore) GetAllExperiences() ([]Experience, error) {
+ rows, err := s.db.Query("SELECT id, company, employee_type, position, tasks, tools, years FROM experience")
+ if err != nil {
+ return nil, err
+ }
+ defer rows.Close()
+
+ var experience []Experience
+ for rows.Next() {
+ var e Experience
+ var tasks sql.NullString
+ if err := rows.Scan(&e.ID, &e.Company, &e.EmployeeType, &e.Position, &tasks, &e.Tools, &e.Years); err != nil {
+ return nil, err
+ }
+ if tasks.Valid {
+ e.Tasks = strings.Split(tasks.String, ",")
+ }
+ experience = append(experience, e)
+ }
+ return experience, nil
+}
\ No newline at end of file
diff --git a/my_website.db b/my_website.db
index 57a3f81..42e20b2 100644
Binary files a/my_website.db and b/my_website.db differ
diff --git a/views/experience.html b/views/experience.html
new file mode 100644
index 0000000..941419f
--- /dev/null
+++ b/views/experience.html
@@ -0,0 +1,23 @@
+{{ block "experience" . }}
+
+
+
+
+
+ My CV Website
+
+
+
+
+
+
+
+ {{ template "header" }}
+
+ {{ template "experience-partial" .}}
+
+ {{ template "footer" }}
+
+ {{ template "script" }}
+
+{{ end}}
\ No newline at end of file
diff --git a/views/partials/experience-partial.html b/views/partials/experience-partial.html
new file mode 100644
index 0000000..f3ec114
--- /dev/null
+++ b/views/partials/experience-partial.html
@@ -0,0 +1,36 @@
+{{ block "experience-partial" . }}
+Experience
+{{ range . }} {{ template "experience-partial-range" . }} {{ end}} {{ end }} {{
+block "experience-partial-range" . }}
+
+
+
+
+ | Company |
+ Position |
+ Employee Type |
+ Tasks |
+ Tools |
+ Years |
+
+
+
+
+
+ | {{ .Company }} |
+ {{ .Position }} |
+ {{ .EmployeeType }} |
+
+
+ {{ range .Tasks }}
+ - {{ . }}
+ {{ end }}
+
+ |
+ {{ .Tools }} |
+ {{ .Years }} |
+
+
+
+