diff --git a/.gitignore b/.gitignore index 9589158..c052e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ *.dll *.so *.dylib -sprechstundentool +officeHours #Databases *.db @@ -20,5 +20,3 @@ vendor/ # Go workspace file go.work -go.mod -go.sum diff --git a/config/config.json b/config/config.json index 009bc61..b96993d 100644 --- a/config/config.json +++ b/config/config.json @@ -13,8 +13,8 @@ }, "mailer": { "type": "Stdout", - "fromAddress": "sprechstunden@localhost", - "fromName": "Sprechstunden ", + "fromAddress": "officeHours@localhost", + "fromName": "Office hours ", "smtpHost": "localhost", "smtpPort": 25, "smtpUseAuth": false, @@ -33,4 +33,4 @@ "tutor": { "mailSuffix": "" } -} \ No newline at end of file +} diff --git a/controllers/addOfficeHourHandler.go b/controllers/addOfficeHourHandler.go index 5c55303..33322b8 100644 --- a/controllers/addOfficeHourHandler.go +++ b/controllers/addOfficeHourHandler.go @@ -5,8 +5,8 @@ import ( "log" "net/http" "net/mail" - "sprechstundentool/config" - "sprechstundentool/models" + "officeHours/config" + "officeHours/models" "strconv" "strings" ) diff --git a/controllers/baseHandler.go b/controllers/baseHandler.go index 99b217b..0ab921c 100644 --- a/controllers/baseHandler.go +++ b/controllers/baseHandler.go @@ -1,8 +1,8 @@ package controllers import ( - "sprechstundentool/config" - "sprechstundentool/models" + "officeHours/config" + "officeHours/models" ) // BaseHandler will hold everything that controller needs diff --git a/controllers/deleteOfficeHourHandler.go b/controllers/deleteOfficeHourHandler.go index 391981e..c38162e 100644 --- a/controllers/deleteOfficeHourHandler.go +++ b/controllers/deleteOfficeHourHandler.go @@ -3,7 +3,7 @@ package controllers import ( "net/http" - "sprechstundentool/models" + "officeHours/models" "strconv" ) diff --git a/controllers/getHandlers.go b/controllers/getHandlers.go index 8575008..ca410f4 100644 --- a/controllers/getHandlers.go +++ b/controllers/getHandlers.go @@ -4,7 +4,7 @@ import ( "fmt" "html/template" "net/http" - "sprechstundentool/models" + "officeHours/models" "strconv" ) diff --git a/controllers/templates.go b/controllers/templates.go index 6648603..c87fd8c 100644 --- a/controllers/templates.go +++ b/controllers/templates.go @@ -2,7 +2,7 @@ package controllers import ( "html/template" - "sprechstundentool/models" + "officeHours/models" ) var Templates, _ = template.Must(template.ParseFiles( diff --git a/controllers/timetable.go b/controllers/timetable.go index 342d1a7..a16ba21 100644 --- a/controllers/timetable.go +++ b/controllers/timetable.go @@ -5,7 +5,7 @@ import ( "bytes" "fmt" "html/template" - "sprechstundentool/models" + "officeHours/models" ) func (b *BaseHandler) GetTimetable(officeHours []models.OfficeHour) (timetable map[models.Date]map[int]models.OfficeHour, slots []int) { diff --git a/doc.go b/doc.go deleted file mode 100644 index f961580..0000000 --- a/doc.go +++ /dev/null @@ -1,6 +0,0 @@ -// sprechstundentool project doc.go - -/* -sprechstundentool document -*/ -package main diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..c39cf84 --- /dev/null +++ b/go.mod @@ -0,0 +1,7 @@ +module officeHours + +go 1.18 + +require github.com/mattn/go-sqlite3 v1.14.15 + +require github.com/go-sql-driver/mysql v1.6.0 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..4be5cea --- /dev/null +++ b/go.sum @@ -0,0 +1,4 @@ +github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= +github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= diff --git a/main.go b/main.go index 6499bcc..1a88bc9 100644 --- a/main.go +++ b/main.go @@ -8,10 +8,10 @@ import ( "log/syslog" "net/http" "os" - "sprechstundentool/config" - "sprechstundentool/controllers" - "sprechstundentool/repositories" - "sprechstundentool/sqldb" + "officeHours/config" + "officeHours/controllers" + "officeHours/repositories" + "officeHours/sqldb" ) func main() { diff --git a/sprechstundenMysql.sql b/officeHoursMysql.sql similarity index 100% rename from sprechstundenMysql.sql rename to officeHoursMysql.sql diff --git a/repositories/course.go b/repositories/course.go index bb3970d..68dd801 100644 --- a/repositories/course.go +++ b/repositories/course.go @@ -3,7 +3,7 @@ package repositories import ( "database/sql" - "sprechstundentool/models" + "officeHours/models" ) type CourseRepo struct { diff --git a/repositories/officeHour.go b/repositories/officeHour.go index ec2ac9d..dae2213 100644 --- a/repositories/officeHour.go +++ b/repositories/officeHour.go @@ -4,8 +4,8 @@ package repositories import ( "database/sql" "fmt" - "sprechstundentool/config" - "sprechstundentool/models" + "officeHours/config" + "officeHours/models" ) type OfficeHourRepo struct { diff --git a/repositories/request.go b/repositories/request.go index 6aae154..20bd06b 100644 --- a/repositories/request.go +++ b/repositories/request.go @@ -9,9 +9,9 @@ import ( "log" "math/big" "net/smtp" - "sprechstundentool/config" - "sprechstundentool/controllers" - "sprechstundentool/models" + "officeHours/config" + "officeHours/controllers" + "officeHours/models" ) type RequestRepo struct { diff --git a/repositories/room.go b/repositories/room.go index 63f434b..2ad0c69 100644 --- a/repositories/room.go +++ b/repositories/room.go @@ -3,7 +3,7 @@ package repositories import ( "database/sql" - "sprechstundentool/models" + "officeHours/models" ) type RoomRepo struct { diff --git a/repositories/tutor.go b/repositories/tutor.go index ef49861..c5693c1 100644 --- a/repositories/tutor.go +++ b/repositories/tutor.go @@ -3,7 +3,7 @@ package repositories import ( "database/sql" - "sprechstundentool/models" + "officeHours/models" ) type TutorRepo struct { diff --git a/sqldb/sqldb.go b/sqldb/sqldb.go index e556870..783ba88 100644 --- a/sqldb/sqldb.go +++ b/sqldb/sqldb.go @@ -4,7 +4,7 @@ import ( "database/sql" "fmt" "log" - "sprechstundentool/config" + "officeHours/config" _ "github.com/go-sql-driver/mysql" _ "github.com/mattn/go-sqlite3" diff --git a/templates/deleteSuccess.html b/templates/deleteSuccess.html index 01162c6..02b14a5 100644 --- a/templates/deleteSuccess.html +++ b/templates/deleteSuccess.html @@ -5,7 +5,8 @@ {{template "head.html" .}} - Du solltest eine Mail mit einem Bestätigungslink erhalten haben. + Du solltest eine Mail mit einem Bestätigungslink erhalten haben.
+ Sie wurde an die Adresse geschickt, mit der die Sprechstunde angelegt wurde.
{{template "footer.html" .}}