diff --git a/.env b/.env index fa691d2..a11d0de 100644 --- a/.env +++ b/.env @@ -6,7 +6,7 @@ DB_HOST=localhost DB_PORT=3306 DB_USER=root DB_PASSWORD=Maal12345678 -DB_NAME=presta +DB_NAME=nalu PROJECT_NAME=nalu_b2b DB_SERVICE_NAME=nalu_b2b DB_SSLMODE=disable diff --git a/app/api/openapi.json b/app/api/openapi.json index 4ae7e46..f3715cb 100644 --- a/app/api/openapi.json +++ b/app/api/openapi.json @@ -1,7 +1,7 @@ { "openapi": "3.0.3", "info": { - "title": "timeTracker API", + "title": "b2b API", "description": "Authentication, user management, and repository time tracking API", "version": "1.0.0", "contact": { @@ -62,7 +62,7 @@ }, "app": { "type": "string", - "example": "timeTracker" + "example": "b2b" }, "version": { "type": "string", diff --git a/app/cmd/main.go b/app/cmd/main.go index 5b5e3f6..420f44c 100644 --- a/app/cmd/main.go +++ b/app/cmd/main.go @@ -4,9 +4,9 @@ import ( "flag" "log" - "git.ma-al.com/goc_marek/timetracker/app/delivery/web" - "git.ma-al.com/goc_marek/timetracker/app/service/langsService" - "git.ma-al.com/goc_marek/timetracker/app/utils/version" + "git.ma-al.com/goc_daniel/b2b/app/delivery/web" + "git.ma-al.com/goc_daniel/b2b/app/service/langsService" + "git.ma-al.com/goc_daniel/b2b/app/utils/version" ) func main() { diff --git a/app/config/config.go b/app/config/config.go index 2750ca1..191c1e4 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -97,16 +97,14 @@ func Get() *Config { // GetDSN returns the database connection string func (c *DatabaseConfig) GetDSN() string { return fmt.Sprintf( - "host=%s port=%d user=%s password=%s dbname=%s sslmode=%s", - c.Host, - c.Port, + "%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", c.User, c.Password, + c.Host, + c.Port, c.Name, - c.SSLMode, ) } - func load() *Config { cfg := &Config{} diff --git a/app/db/postgres.go b/app/db/postgres.go index 01aa2e4..aca8b53 100644 --- a/app/db/postgres.go +++ b/app/db/postgres.go @@ -5,9 +5,9 @@ import ( "log" "log/slog" - "git.ma-al.com/goc_marek/timetracker/app/config" + "git.ma-al.com/goc_daniel/b2b/app/config" - "gorm.io/driver/postgres" + "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" ) @@ -16,7 +16,7 @@ var DB *gorm.DB func init() { if DB == nil { - dbconn, err := newPostgresDB(&config.Get().Database) + dbconn, err := newMySQLDB(&config.Get().Database) if err != nil { slog.Error("⚠️ No connection to database was possible to establish", "error", err.Error()) } @@ -28,11 +28,12 @@ func Get() *gorm.DB { return DB } -// newPostgresDB creates a new PostgreSQL database connection -func newPostgresDB(cfg *config.DatabaseConfig) (*gorm.DB, error) { +// newMySQLDB creates a new MariaDB/MySQL database connection +func newMySQLDB(cfg *config.DatabaseConfig) (*gorm.DB, error) { + dsn := cfg.GetDSN() - db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{ + db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{ Logger: logger.Default.LogMode(logger.Error), }) @@ -51,6 +52,7 @@ func newPostgresDB(cfg *config.DatabaseConfig) (*gorm.DB, error) { sqlDB.SetConnMaxLifetime(cfg.ConnMaxLifetime) log.Println("✓ Database connection established successfully") + return db, nil } diff --git a/app/delivery/middleware/auth.go b/app/delivery/middleware/auth.go index 26cff90..7098ebf 100644 --- a/app/delivery/middleware/auth.go +++ b/app/delivery/middleware/auth.go @@ -3,9 +3,9 @@ package middleware import ( "strings" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/model" - "git.ma-al.com/goc_marek/timetracker/app/service/authService" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/service/authService" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/middleware/language.go b/app/delivery/middleware/language.go index 3e4ac81..e3fd5ca 100644 --- a/app/delivery/middleware/language.go +++ b/app/delivery/middleware/language.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "git.ma-al.com/goc_marek/timetracker/app/service/langsService" + "git.ma-al.com/goc_daniel/b2b/app/service/langsService" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/web/api/languages.go b/app/delivery/web/api/languages.go index 3802d50..85cff68 100644 --- a/app/delivery/web/api/languages.go +++ b/app/delivery/web/api/languages.go @@ -3,8 +3,8 @@ package api import ( "strconv" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/service/langsService" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/service/langsService" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/web/api/public/auth.go b/app/delivery/web/api/public/auth.go index 0146529..8de03c4 100644 --- a/app/delivery/web/api/public/auth.go +++ b/app/delivery/web/api/public/auth.go @@ -4,12 +4,12 @@ import ( "log" "time" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/delivery/middleware" - "git.ma-al.com/goc_marek/timetracker/app/model" - "git.ma-al.com/goc_marek/timetracker/app/service/authService" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" - "git.ma-al.com/goc_marek/timetracker/app/utils/responseErrors" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware" + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/service/authService" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/web/api/restricted/repo.go b/app/delivery/web/api/restricted/repo.go index a0c68c4..3284fd1 100644 --- a/app/delivery/web/api/restricted/repo.go +++ b/app/delivery/web/api/restricted/repo.go @@ -3,10 +3,10 @@ package restricted import ( "strconv" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/service/repoService" - "git.ma-al.com/goc_marek/timetracker/app/utils/pagination" - "git.ma-al.com/goc_marek/timetracker/app/utils/responseErrors" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/service/repoService" + "git.ma-al.com/goc_daniel/b2b/app/utils/pagination" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/web/api/settings.go b/app/delivery/web/api/settings.go index 45ca9d3..ef29c08 100644 --- a/app/delivery/web/api/settings.go +++ b/app/delivery/web/api/settings.go @@ -1,12 +1,12 @@ package api import ( - "git.ma-al.com/goc_marek/timetracker/app/config" - constdata "git.ma-al.com/goc_marek/timetracker/app/utils/const_data" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" - "git.ma-al.com/goc_marek/timetracker/app/utils/nullable" - "git.ma-al.com/goc_marek/timetracker/app/utils/response" - "git.ma-al.com/goc_marek/timetracker/app/utils/version" + "git.ma-al.com/goc_daniel/b2b/app/config" + constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/utils/nullable" + "git.ma-al.com/goc_daniel/b2b/app/utils/response" + "git.ma-al.com/goc_daniel/b2b/app/utils/version" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/web/general/bo.go b/app/delivery/web/general/bo.go index 56b00e0..e34b8e0 100644 --- a/app/delivery/web/general/bo.go +++ b/app/delivery/web/general/bo.go @@ -1,7 +1,7 @@ package general import ( - "git.ma-al.com/goc_marek/timetracker/assets" + "git.ma-al.com/goc_daniel/b2b/assets" "github.com/gofiber/fiber/v3" "github.com/gofiber/fiber/v3/middleware/static" ) diff --git a/app/delivery/web/general/favicon.go b/app/delivery/web/general/favicon.go index bd2a3ba..470ab9d 100644 --- a/app/delivery/web/general/favicon.go +++ b/app/delivery/web/general/favicon.go @@ -1,8 +1,8 @@ package general import ( - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/assets" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/assets" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/web/general/health.go b/app/delivery/web/general/health.go index 122d6ac..4b2dcc4 100644 --- a/app/delivery/web/general/health.go +++ b/app/delivery/web/general/health.go @@ -1,7 +1,7 @@ package general import ( - "git.ma-al.com/goc_marek/timetracker/app/config" + "git.ma-al.com/goc_daniel/b2b/app/config" "github.com/gofiber/fiber/v3" ) diff --git a/app/delivery/web/general/swagger.go b/app/delivery/web/general/swagger.go index 70f12bb..9e0876c 100644 --- a/app/delivery/web/general/swagger.go +++ b/app/delivery/web/general/swagger.go @@ -1,7 +1,7 @@ package general import ( - "git.ma-al.com/goc_marek/timetracker/app/api" + "git.ma-al.com/goc_daniel/b2b/app/api" "github.com/gofiber/fiber/v3" "github.com/gofiber/fiber/v3/middleware/static" ) diff --git a/app/delivery/web/init.go b/app/delivery/web/init.go index b8337e4..d334970 100644 --- a/app/delivery/web/init.go +++ b/app/delivery/web/init.go @@ -9,12 +9,12 @@ import ( "syscall" "time" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/delivery/middleware" - "git.ma-al.com/goc_marek/timetracker/app/delivery/web/api" - "git.ma-al.com/goc_marek/timetracker/app/delivery/web/api/public" - "git.ma-al.com/goc_marek/timetracker/app/delivery/web/api/restricted" - "git.ma-al.com/goc_marek/timetracker/app/delivery/web/general" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware" + "git.ma-al.com/goc_daniel/b2b/app/delivery/web/api" + "git.ma-al.com/goc_daniel/b2b/app/delivery/web/api/public" + "git.ma-al.com/goc_daniel/b2b/app/delivery/web/api/restricted" + "git.ma-al.com/goc_daniel/b2b/app/delivery/web/general" // "github.com/gofiber/fiber/v2/middleware/filesystem" "github.com/gofiber/fiber/v3" diff --git a/app/langs/langs.go b/app/langs/langs.go index 5ac0afe..8915069 100644 --- a/app/langs/langs.go +++ b/app/langs/langs.go @@ -1,9 +1,9 @@ package langs_repo import ( - "git.ma-al.com/goc_marek/timetracker/app/db" - "git.ma-al.com/goc_marek/timetracker/app/model" - "git.ma-al.com/goc_marek/timetracker/app/view" + "git.ma-al.com/goc_daniel/b2b/app/db" + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/view" ) type LangsRepo struct{} diff --git a/app/model/repo.go b/app/model/repo.go index 4860d6c..8026638 100644 --- a/app/model/repo.go +++ b/app/model/repo.go @@ -3,7 +3,7 @@ package model import ( "time" - "git.ma-al.com/goc_marek/timetracker/app/utils/pagination" + "git.ma-al.com/goc_daniel/b2b/app/utils/pagination" ) // LoginRequest represents the login form data diff --git a/app/service/authService/auth.go b/app/service/authService/auth.go index 04dd063..d6c070c 100644 --- a/app/service/authService/auth.go +++ b/app/service/authService/auth.go @@ -8,12 +8,12 @@ import ( "fmt" "time" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/db" - "git.ma-al.com/goc_marek/timetracker/app/model" - "git.ma-al.com/goc_marek/timetracker/app/service/emailService" - constdata "git.ma-al.com/goc_marek/timetracker/app/utils/const_data" - "git.ma-al.com/goc_marek/timetracker/app/utils/responseErrors" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/db" + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/service/emailService" + constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" "github.com/dlclark/regexp2" "github.com/golang-jwt/jwt/v5" diff --git a/app/service/authService/google_oauth.go b/app/service/authService/google_oauth.go index d52eaaf..fda609b 100644 --- a/app/service/authService/google_oauth.go +++ b/app/service/authService/google_oauth.go @@ -10,10 +10,10 @@ import ( "net/http" "time" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/model" - "git.ma-al.com/goc_marek/timetracker/app/utils/responseErrors" - "git.ma-al.com/goc_marek/timetracker/app/view" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" + "git.ma-al.com/goc_daniel/b2b/app/view" "golang.org/x/oauth2" "golang.org/x/oauth2/google" ) diff --git a/app/service/emailService/email.go b/app/service/emailService/email.go index 293c4ed..6b1e082 100644 --- a/app/service/emailService/email.go +++ b/app/service/emailService/email.go @@ -7,11 +7,11 @@ import ( "net/smtp" "strings" - "git.ma-al.com/goc_marek/timetracker/app/config" - "git.ma-al.com/goc_marek/timetracker/app/service/langsService" - "git.ma-al.com/goc_marek/timetracker/app/templ/emails" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" - "git.ma-al.com/goc_marek/timetracker/app/view" + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/service/langsService" + "git.ma-al.com/goc_daniel/b2b/app/templ/emails" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/view" ) // EmailService handles sending emails diff --git a/app/service/langsService/service.go b/app/service/langsService/service.go index d4c500e..78e2fbd 100644 --- a/app/service/langsService/service.go +++ b/app/service/langsService/service.go @@ -1,11 +1,11 @@ package langsService import ( - langs_repo "git.ma-al.com/goc_marek/timetracker/app/langs" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" - "git.ma-al.com/goc_marek/timetracker/app/utils/nullable" - "git.ma-al.com/goc_marek/timetracker/app/utils/response" - "git.ma-al.com/goc_marek/timetracker/app/view" + langs_repo "git.ma-al.com/goc_daniel/b2b/app/langs" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/utils/nullable" + "git.ma-al.com/goc_daniel/b2b/app/utils/response" + "git.ma-al.com/goc_daniel/b2b/app/view" "github.com/gofiber/fiber/v3" ) diff --git a/app/service/repoService/repo.go b/app/service/repoService/repo.go index 6c38e53..b301141 100644 --- a/app/service/repoService/repo.go +++ b/app/service/repoService/repo.go @@ -4,10 +4,10 @@ import ( "fmt" "slices" - "git.ma-al.com/goc_marek/timetracker/app/db" - "git.ma-al.com/goc_marek/timetracker/app/model" - "git.ma-al.com/goc_marek/timetracker/app/utils/pagination" - "git.ma-al.com/goc_marek/timetracker/app/utils/responseErrors" + "git.ma-al.com/goc_daniel/b2b/app/db" + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/utils/pagination" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" "gorm.io/gorm" ) diff --git a/app/templ/emails/emailAdminNotification.templ b/app/templ/emails/emailAdminNotification.templ index ff0d78f..74f2885 100644 --- a/app/templ/emails/emailAdminNotification.templ +++ b/app/templ/emails/emailAdminNotification.templ @@ -1,9 +1,9 @@ package emails import ( - "git.ma-al.com/goc_marek/timetracker/app/templ/layout" - "git.ma-al.com/goc_marek/timetracker/app/view" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/templ/layout" + "git.ma-al.com/goc_daniel/b2b/app/view" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" ) templ EmailAdminNotificationWrapper(data view.EmailLayout[view.EmailAdminNotificationData]) { diff --git a/app/templ/emails/emailAdminNotification_templ.go b/app/templ/emails/emailAdminNotification_templ.go index 7125bf2..c82a7ea 100644 --- a/app/templ/emails/emailAdminNotification_templ.go +++ b/app/templ/emails/emailAdminNotification_templ.go @@ -9,9 +9,9 @@ import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" import ( - "git.ma-al.com/goc_marek/timetracker/app/templ/layout" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" - "git.ma-al.com/goc_marek/timetracker/app/view" + "git.ma-al.com/goc_daniel/b2b/app/templ/layout" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/view" ) func EmailAdminNotificationWrapper(data view.EmailLayout[view.EmailAdminNotificationData]) templ.Component { diff --git a/app/templ/emails/emailPasswordReset.templ b/app/templ/emails/emailPasswordReset.templ index 0a59405..93c705d 100644 --- a/app/templ/emails/emailPasswordReset.templ +++ b/app/templ/emails/emailPasswordReset.templ @@ -1,9 +1,9 @@ package emails import ( - "git.ma-al.com/goc_marek/timetracker/app/templ/layout" - "git.ma-al.com/goc_marek/timetracker/app/view" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/templ/layout" + "git.ma-al.com/goc_daniel/b2b/app/view" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" ) templ EmailPasswordResetWrapper(data view.EmailLayout[view.EmailPasswordResetData]) { diff --git a/app/templ/emails/emailPasswordReset_templ.go b/app/templ/emails/emailPasswordReset_templ.go index 889721b..196dab6 100644 --- a/app/templ/emails/emailPasswordReset_templ.go +++ b/app/templ/emails/emailPasswordReset_templ.go @@ -9,9 +9,9 @@ import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" import ( - "git.ma-al.com/goc_marek/timetracker/app/templ/layout" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" - "git.ma-al.com/goc_marek/timetracker/app/view" + "git.ma-al.com/goc_daniel/b2b/app/templ/layout" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/view" ) func EmailPasswordResetWrapper(data view.EmailLayout[view.EmailPasswordResetData]) templ.Component { diff --git a/app/templ/emails/emailVerification.templ b/app/templ/emails/emailVerification.templ index f4a34f9..1bfbc7e 100644 --- a/app/templ/emails/emailVerification.templ +++ b/app/templ/emails/emailVerification.templ @@ -1,9 +1,9 @@ package emails import ( - "git.ma-al.com/goc_marek/timetracker/app/templ/layout" - "git.ma-al.com/goc_marek/timetracker/app/view" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/templ/layout" + "git.ma-al.com/goc_daniel/b2b/app/view" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" ) templ EmailVerificationWrapper(data view.EmailLayout[view.EmailVerificationData]) { diff --git a/app/templ/emails/emailVerification_templ.go b/app/templ/emails/emailVerification_templ.go index fa2a2fa..1d30cb5 100644 --- a/app/templ/emails/emailVerification_templ.go +++ b/app/templ/emails/emailVerification_templ.go @@ -9,9 +9,9 @@ import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" import ( - "git.ma-al.com/goc_marek/timetracker/app/templ/layout" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" - "git.ma-al.com/goc_marek/timetracker/app/view" + "git.ma-al.com/goc_daniel/b2b/app/templ/layout" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/view" ) func EmailVerificationWrapper(data view.EmailLayout[view.EmailVerificationData]) templ.Component { diff --git a/app/utils/i18n/i18n.go b/app/utils/i18n/i18n.go index 8280014..3dfec66 100644 --- a/app/utils/i18n/i18n.go +++ b/app/utils/i18n/i18n.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "git.ma-al.com/goc_marek/timetracker/app/model" + "git.ma-al.com/goc_daniel/b2b/app/model" "github.com/gofiber/fiber/v3" ) diff --git a/app/utils/mapper/mapper_test.go b/app/utils/mapper/mapper_test.go index d4abfbf..41e6916 100644 --- a/app/utils/mapper/mapper_test.go +++ b/app/utils/mapper/mapper_test.go @@ -3,7 +3,7 @@ package mapper_test import ( "testing" - "git.ma-al.com/goc_marek/timetracker/app/utils/mapper" + "git.ma-al.com/goc_daniel/b2b/app/utils/mapper" ) // --- example structs --- diff --git a/app/utils/response/messages.go b/app/utils/response/messages.go index 761ed0b..33dafa2 100644 --- a/app/utils/response/messages.go +++ b/app/utils/response/messages.go @@ -1,6 +1,6 @@ package response -import "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" +import "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" type ResponseMessage i18n.I18nTranslation diff --git a/app/utils/responseErrors/response_errors.go b/app/utils/responseErrors/response_errors.go index e17c884..de1737e 100644 --- a/app/utils/responseErrors/response_errors.go +++ b/app/utils/responseErrors/response_errors.go @@ -3,7 +3,7 @@ package responseErrors import ( "errors" - "git.ma-al.com/goc_marek/timetracker/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" "github.com/gofiber/fiber/v3" ) diff --git a/bin/timetracker b/bin/timetracker deleted file mode 100755 index 4d7106e..0000000 Binary files a/bin/timetracker and /dev/null differ diff --git a/go.mod b/go.mod index 2a8b43b..872b50d 100644 --- a/go.mod +++ b/go.mod @@ -1,32 +1,35 @@ -module git.ma-al.com/goc_marek/timetracker +module git.ma-al.com/goc_daniel/b2b go 1.26.0 require ( github.com/a-h/templ v0.3.1001 + github.com/dlclark/regexp2 v1.11.5 github.com/go-git/go-git/v5 v5.17.0 github.com/gofiber/fiber/v3 v3.1.0 github.com/golang-jwt/jwt/v5 v5.3.1 github.com/joho/godotenv v1.5.1 golang.org/x/crypto v0.48.0 + golang.org/x/oauth2 v0.36.0 gorm.io/driver/postgres v1.6.0 gorm.io/gorm v1.31.1 ) require ( - cloud.google.com/go/compute/metadata v0.3.0 // indirect + cloud.google.com/go/compute/metadata v0.9.0 // indirect dario.cat/mergo v1.0.2 // indirect + filippo.io/edwards25519 v1.1.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.4.0 // indirect github.com/andybalholm/brotli v1.2.0 // indirect github.com/cloudflare/circl v1.6.3 // indirect github.com/cyphar/filepath-securejoin v0.6.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/dlclark/regexp2 v1.11.5 // indirect github.com/elazarl/goproxy v1.8.2 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.8.0 // indirect + github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/gofiber/schema v1.7.0 // indirect github.com/gofiber/utils/v2 v2.0.2 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect @@ -55,9 +58,9 @@ require ( github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xyproto/randomstring v1.2.0 // indirect golang.org/x/net v0.51.0 // indirect - golang.org/x/oauth2 v0.35.0 // indirect - golang.org/x/sync v0.19.0 // indirect - golang.org/x/sys v0.41.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.42.0 // indirect + golang.org/x/text v0.35.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect + gorm.io/driver/mysql v1.6.0 // indirect ) diff --git a/go.sum b/go.sum index 42531fb..253bb1c 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,9 @@ -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= +cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs= +cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10= dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= @@ -41,6 +43,8 @@ github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMj github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= github.com/go-git/go-git/v5 v5.17.0 h1:AbyI4xf+7DsjINHMu35quAh4wJygKBKBuXVjV/pxesM= github.com/go-git/go-git/v5 v5.17.0/go.mod h1:f82C4YiLx+Lhi8eHxltLeGC5uBTXSFa6PC5WW9o4SjI= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/gofiber/fiber/v3 v3.1.0 h1:1p4I820pIa+FGxfwWuQZ5rAyX0WlGZbGT6Hnuxt6hKY= github.com/gofiber/fiber/v3 v3.1.0/go.mod h1:n2nYQovvL9z3Too/FGOfgtERjW3GQcAUqgfoezGBZdU= github.com/gofiber/schema v1.7.0 h1:yNM+FNRZjyYEli9Ey0AXRBrAY9jTnb+kmGs3lJGPvKg= @@ -135,10 +139,10 @@ golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVo golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= -golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ= -golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= -golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= -golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= +golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -146,14 +150,14 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= -golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= +golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= +golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -166,6 +170,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= +gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= diff --git a/package-lock.json b/package-lock.json index 01724f5..06db83f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "timetracker", + "name": "b2b", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/tmp/build-errors.log b/tmp/build-errors.log index efad4cb..244c62f 100644 --- a/tmp/build-errors.log +++ b/tmp/build-errors.log @@ -1 +1 @@ -exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1 \ No newline at end of file +exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1exit status 1 \ No newline at end of file diff --git a/tmp/main b/tmp/main index e125b53..3e64d12 100755 Binary files a/tmp/main and b/tmp/main differ