add experience
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
46
internal/store/experience_store.go
Normal file
46
internal/store/experience_store.go
Normal file
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user