goc_daniel/b2b
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

repair package names and other fixed

Browse Source
This commit is contained in:
Daniel Goc
2026-03-11 14:17:26 +01:00
parent b6a50ec1ca
commit 4450468145
39 changed files with 128 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/api/openapi.json
View File

@@ -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",

6
app/cmd/main.go
View File

@@ -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() {

8
app/config/config.go
View File

@@ -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{}

14
app/db/postgres.go
View File

@@ -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
}

6
app/delivery/middleware/auth.go
View File

@@ -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"
)

2
app/delivery/middleware/language.go
View File

@@ -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"
)

4
app/delivery/web/api/languages.go
View File

@@ -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"
)

12
app/delivery/web/api/public/auth.go
View File

@@ -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"
)

8
app/delivery/web/api/restricted/repo.go
View File

@@ -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"
)

12
app/delivery/web/api/settings.go
View File

@@ -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"
)

2
app/delivery/web/general/bo.go
View File

@@ -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"
)

4
app/delivery/web/general/favicon.go
View File

@@ -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"
)

2
app/delivery/web/general/health.go
View File

@@ -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"
)

2
app/delivery/web/general/swagger.go
View File

@@ -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"
)

12
app/delivery/web/init.go
View File

@@ -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"

6
app/langs/langs.go
View File

@@ -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{}

2
app/model/repo.go
View File

@@ -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

12
app/service/authService/auth.go
View File

@@ -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"

8
app/service/authService/google_oauth.go
View File

@@ -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"
)

10
app/service/emailService/email.go
View File

@@ -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

10
app/service/langsService/service.go
View File

@@ -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"
)

8
app/service/repoService/repo.go
View File

@@ -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"
)

6
app/templ/emails/emailAdminNotification.templ
View File

@@ -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]) {

6
app/templ/emails/emailAdminNotification_templ.go
View File

@@ -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 {

6
app/templ/emails/emailPasswordReset.templ
View File

@@ -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]) {

6
app/templ/emails/emailPasswordReset_templ.go
View File

@@ -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 {

6
app/templ/emails/emailVerification.templ
View File

@@ -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]) {

6
app/templ/emails/emailVerification_templ.go
View File

@@ -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 {

2
app/utils/i18n/i18n.go
View File

@@ -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"
)

2
app/utils/mapper/mapper_test.go
View File

@@ -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 ---

2
app/utils/response/messages.go
View File

@@ -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

2
app/utils/responseErrors/response_errors.go
View File

@@ -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"
)