a commit that changes nothing?

backend/internal/db/db.go

@@ -1,38 +1,38 @@
-package db
-
-import (
-	"log"
-
-	"github.com/glebarez/sqlite"
-	"github.com/wisplite/raster/internal/models"
-	"gorm.io/gorm"
-)
-
-var db *gorm.DB
-
-func Init() bool {
-	database, err := gorm.Open(sqlite.Open("raster.db"), &gorm.Config{})
-	if err != nil {
-		log.Fatal("failed to connect database: ", err)
-		return false
-	}
-
-	// Run migrations
-	err = database.AutoMigrate(
-		&models.Album{},
-		&models.User{},
-		&models.AccessToken{},
-	)
-	if err != nil {
-		log.Fatal("failed to migrate database: ", err)
-		return false
-	}
-
-	db = database
-
-	return true
-}
-
-func GetDB() *gorm.DB {
-	return db
-}
+package db
+
+import (
+	"log"
+
+	"github.com/glebarez/sqlite"
+	"github.com/wisplite/raster/internal/models"
+	"gorm.io/gorm"
+)
+
+var db *gorm.DB
+
+func Init() bool {
+	database, err := gorm.Open(sqlite.Open("raster.db"), &gorm.Config{})
+	if err != nil {
+		log.Fatal("failed to connect database: ", err)
+		return false
+	}
+
+	// Run migrations
+	err = database.AutoMigrate(
+		&models.Album{},
+		&models.User{},
+		&models.AccessToken{},
+	)
+	if err != nil {
+		log.Fatal("failed to migrate database: ", err)
+		return false
+	}
+
+	db = database
+
+	return true
+}
+
+func GetDB() *gorm.DB {
+	return db
+}

backend/internal/models/accessTokens.go

@@ -1,9 +1,9 @@
-package models
-
-import "time"
-
-type AccessToken struct {
-	Token   string    `gorm:"primaryKey"`
-	UserID  string    `gorm:"not null"`
-	Expires time.Time `gorm:"not null"`
-}
+package models
+
+import "time"
+
+type AccessToken struct {
+	Token   string    `gorm:"primaryKey"`
+	UserID  string    `gorm:"not null"`
+	Expires time.Time `gorm:"not null"`
+}

backend/internal/models/album.go

@@ -1,17 +1,17 @@
-package models
-
-import (
-	"time"
-
-	"gorm.io/datatypes"
-)
-
-type Album struct {
-	ID          string         `gorm:"primaryKey"`
-	Title       string         `gorm:"not null"`
-	Description string         `gorm:"not null"`
-	Tags        datatypes.JSON `gorm:"type:json"`
-	Private     bool           `gorm:"not null"`
-	CreatedAt   time.Time
-	UpdatedAt   time.Time
-}
+package models
+
+import (
+	"time"
+
+	"gorm.io/datatypes"
+)
+
+type Album struct {
+	ID          string         `gorm:"primaryKey"`
+	Title       string         `gorm:"not null"`
+	Description string         `gorm:"not null"`
+	Tags        datatypes.JSON `gorm:"type:json"`
+	Private     bool           `gorm:"not null"`
+	CreatedAt   time.Time
+	UpdatedAt   time.Time
+}

backend/internal/models/user.go

@@ -1,13 +1,13 @@
-package models
-
-import "time"
-
-type User struct {
-	ID        string `gorm:"primaryKey"`
-	Username  string `gorm:"not null"`
-	Password  string `gorm:"not null"`
-	IsAdmin   bool   `gorm:"not null"`
-	IsActive  bool   `gorm:"not null"`
-	CreatedAt time.Time
-	UpdatedAt time.Time
-}
+package models
+
+import "time"
+
+type User struct {
+	ID        string `gorm:"primaryKey"`
+	Username  string `gorm:"not null"`
+	Password  string `gorm:"not null"`
+	IsAdmin   bool   `gorm:"not null"`
+	IsActive  bool   `gorm:"not null"`
+	CreatedAt time.Time
+	UpdatedAt time.Time
+}

backend/internal/routes/album.go

@@ -1,20 +1,20 @@
-package routes
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"github.com/wisplite/raster/internal/services"
-)
-
-func RegisterAlbumRoutes(rg *gin.RouterGroup) {
-	album := rg.Group("/albums")
-	album.GET("/getPublic", func(c *gin.Context) {
-		albums, err := services.GetPublicAlbums()
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.JSON(http.StatusOK, albums)
-	})
-}
+package routes
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/wisplite/raster/internal/services"
+)
+
+func RegisterAlbumRoutes(rg *gin.RouterGroup) {
+	album := rg.Group("/albums")
+	album.GET("/getPublic", func(c *gin.Context) {
+		albums, err := services.GetPublicAlbums()
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		c.JSON(http.StatusOK, albums)
+	})
+}

backend/internal/routes/routes.go

@@ -1,8 +1,8 @@
-package routes
-
-import "github.com/gin-gonic/gin"
-
-func RegisterRoutes(r *gin.Engine) {
-	rg := r.Group("/api")
-	RegisterAlbumRoutes(rg)
-}
+package routes
+
+import "github.com/gin-gonic/gin"
+
+func RegisterRoutes(r *gin.Engine) {
+	rg := r.Group("/api")
+	RegisterAlbumRoutes(rg)
+}

backend/internal/routes/user.go

@@ -1,32 +1,32 @@
-package routes
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-	"github.com/wisplite/raster/internal/services"
-)
-
-func RegisterUserRoutes(rg *gin.RouterGroup) {
-	user := rg.Group("/user")
-	user.POST("/createUser", func(c *gin.Context) {
-		username := c.PostForm("username")
-		password := c.PostForm("password")
-		err := services.CreateUser(username, password)
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.JSON(http.StatusOK, gin.H{"message": "User created successfully"})
-	})
-	user.POST("/login", func(c *gin.Context) {
-		username := c.PostForm("username")
-		password := c.PostForm("password")
-		accessToken, err := services.Login(username, password)
-		if err != nil {
-			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-			return
-		}
-		c.JSON(http.StatusOK, gin.H{"message": "Login successful", "accessToken": accessToken.Token})
-	})
-}
+package routes
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"github.com/wisplite/raster/internal/services"
+)
+
+func RegisterUserRoutes(rg *gin.RouterGroup) {
+	user := rg.Group("/user")
+	user.POST("/createUser", func(c *gin.Context) {
+		username := c.PostForm("username")
+		password := c.PostForm("password")
+		err := services.CreateUser(username, password)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		c.JSON(http.StatusOK, gin.H{"message": "User created successfully"})
+	})
+	user.POST("/login", func(c *gin.Context) {
+		username := c.PostForm("username")
+		password := c.PostForm("password")
+		accessToken, err := services.Login(username, password)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		c.JSON(http.StatusOK, gin.H{"message": "Login successful", "accessToken": accessToken.Token})
+	})
+}

backend/internal/services/accessTokens.go

@@ -1,24 +1,24 @@
-package services
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/wisplite/raster/internal/db"
-	"github.com/wisplite/raster/internal/models"
-)
-
-func CreateAccessToken(userID string) (models.AccessToken, error) {
-	token := uuid.New().String()
-	expires := time.Now().Add(time.Hour * 24 * 30)
-	accessToken := models.AccessToken{
-		Token:   token,
-		UserID:  userID,
-		Expires: expires,
-	}
-	result := db.GetDB().Create(&accessToken)
-	if result.Error != nil {
-		return models.AccessToken{}, result.Error
-	}
-	return accessToken, nil
-}
+package services
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/wisplite/raster/internal/db"
+	"github.com/wisplite/raster/internal/models"
+)
+
+func CreateAccessToken(userID string) (models.AccessToken, error) {
+	token := uuid.New().String()
+	expires := time.Now().Add(time.Hour * 24 * 30)
+	accessToken := models.AccessToken{
+		Token:   token,
+		UserID:  userID,
+		Expires: expires,
+	}
+	result := db.GetDB().Create(&accessToken)
+	if result.Error != nil {
+		return models.AccessToken{}, result.Error
+	}
+	return accessToken, nil
+}

backend/internal/services/album.go

@@ -1,25 +1,25 @@
-package services
-
-import (
-	"github.com/wisplite/raster/internal/db"
-	"github.com/wisplite/raster/internal/models"
-)
-
-func GetPublicAlbums() ([]models.Album, error) {
-	albums := []models.Album{}
-	result := db.GetDB().Where("private = ?", false).Find(&albums)
-	if result.Error != nil {
-		return []models.Album{}, result.Error
-	}
-	return albums, nil
-}
-
-func GetAlbum(id string, authToken string) (models.Album, error) {
-	// TODO: Add authentication
-	album := models.Album{}
-	result := db.GetDB().First(&album, "id = ?", id)
-	if result.Error != nil {
-		return models.Album{}, result.Error
-	}
-	return album, nil
-}
+package services
+
+import (
+	"github.com/wisplite/raster/internal/db"
+	"github.com/wisplite/raster/internal/models"
+)
+
+func GetPublicAlbums() ([]models.Album, error) {
+	albums := []models.Album{}
+	result := db.GetDB().Where("private = ?", false).Find(&albums)
+	if result.Error != nil {
+		return []models.Album{}, result.Error
+	}
+	return albums, nil
+}
+
+func GetAlbum(id string, authToken string) (models.Album, error) {
+	// TODO: Add authentication
+	album := models.Album{}
+	result := db.GetDB().First(&album, "id = ?", id)
+	if result.Error != nil {
+		return models.Album{}, result.Error
+	}
+	return album, nil
+}

backend/internal/services/user.go

@@ -1,45 +1,45 @@
-package services
-
-import (
-	"log"
-
-	"github.com/wisplite/raster/internal/db"
-	"github.com/wisplite/raster/internal/models"
-	"golang.org/x/crypto/bcrypt"
-)
-
-func CreateUser(username string, password string) error {
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
-	if err != nil {
-		log.Fatal("failed to hash password: ", err)
-		return err
-	}
-	user := models.User{
-		Username: username,
-		Password: string(hashedPassword),
-		IsAdmin:  false,
-		IsActive: false,
-	}
-	result := db.GetDB().Create(&user)
-	if result.Error != nil {
-		return result.Error
-	}
-	return nil
-}
-
-func Login(username string, password string) (models.AccessToken, error) {
-	user := models.User{}
-	result := db.GetDB().First(&user, "username = ?", username)
-	if result.Error != nil {
-		return models.AccessToken{}, result.Error
-	}
-	err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password))
-	if err != nil {
-		return models.AccessToken{}, err
-	}
-	accessToken, err := CreateAccessToken(user.ID)
-	if err != nil {
-		return models.AccessToken{}, err
-	}
-	return accessToken, nil
-}
+package services
+
+import (
+	"log"
+
+	"github.com/wisplite/raster/internal/db"
+	"github.com/wisplite/raster/internal/models"
+	"golang.org/x/crypto/bcrypt"
+)
+
+func CreateUser(username string, password string) error {
+	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		log.Fatal("failed to hash password: ", err)
+		return err
+	}
+	user := models.User{
+		Username: username,
+		Password: string(hashedPassword),
+		IsAdmin:  false,
+		IsActive: false,
+	}
+	result := db.GetDB().Create(&user)
+	if result.Error != nil {
+		return result.Error
+	}
+	return nil
+}
+
+func Login(username string, password string) (models.AccessToken, error) {
+	user := models.User{}
+	result := db.GetDB().First(&user, "username = ?", username)
+	if result.Error != nil {
+		return models.AccessToken{}, result.Error
+	}
+	err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(password))
+	if err != nil {
+		return models.AccessToken{}, err
+	}
+	accessToken, err := CreateAccessToken(user.ID)
+	if err != nil {
+		return models.AccessToken{}, err
+	}
+	return accessToken, nil
+}