Tweaked project structure (thomiceli#88)

.gitattributes

@@ -1,2 +1,4 @@
 templates/**/* linguist-vendored
 public/**/*.css linguist-vendored
+public/**/*.scss linguist-vendored
+*.config.js linguist-vendored

Makefile

@@ -3,7 +3,7 @@
 # Specify the name of your Go binary output
 BINARY_NAME := opengist
 
-all: install build
+all: clean install build
 
 install:
  @echo "Installing NPM dependencies..."

internal/models/admin_setting.go → internal/db/admin_setting.go

@@ -1,4 +1,4 @@
-package models
+package db
 
 import (
  "gorm.io/gorm/clause"

internal/models/db.go → internal/db/db.go

@@ -1,4 +1,4 @@
-package models
+package db
 
 import (
  "errors"

internal/models/gist.go → internal/db/gist.go

@@ -1,4 +1,4 @@
-package models
+package db
 
 import (
  "github.com/thomiceli/opengist/internal/git"

internal/models/migration.go → internal/db/migration.go

@@ -1,4 +1,4 @@
-package models
+package db
 
 import (
  "fmt"

internal/models/sshkey.go → internal/db/sshkey.go

@@ -1,4 +1,4 @@
-package models
+package db
 
 import (
  "crypto/sha256"

internal/models/user.go → internal/db/user.go

@@ -1,4 +1,4 @@
-package models
+package db
 
 import (
  "gorm.io/gorm"

internal/ssh/git_ssh.go

@@ -3,8 +3,8 @@ package ssh
 import (
  "errors"
  "github.com/rs/zerolog/log"
+ "github.com/thomiceli/opengist/internal/db"
  "github.com/thomiceli/opengist/internal/git"
- "github.com/thomiceli/opengist/internal/models"
  "golang.org/x/crypto/ssh"
  "gorm.io/gorm"
  "io"
@@ -32,12 +32,12 @@ func runGitCommand(ch ssh.Channel, gitCmd string, key string, ip string) error {
  userName := strings.ToLower(repoFields[0])
  gistName := strings.TrimSuffix(strings.ToLower(repoFields[1]), ".git")
 
- gist, err := models.GetGist(userName, gistName)
+ gist, err := db.GetGist(userName, gistName)
  if err != nil {
  return errors.New("gist not found")
  }
 
- requireLogin, err := models.GetSetting(models.SettingRequireLogin)
+ requireLogin, err := db.GetSetting(db.SettingRequireLogin)
  if err != nil {
  return errors.New("internal server error")
  }
@@ -52,7 +52,7 @@ func runGitCommand(ch ssh.Channel, gitCmd string, key string, ip string) error {
  gist.ID == 0 ||
  requireLogin == "1" {
 
- pubKey, err := models.SSHKeyExistsForUser(key, gist.UserID)
+ pubKey, err := db.SSHKeyExistsForUser(key, gist.UserID)
  if err != nil {
  if errors.Is(err, gorm.ErrRecordNotFound) {
  log.Warn().Msg("Invalid SSH authentication attempt from " + ip)
@@ -61,7 +61,7 @@ func runGitCommand(ch ssh.Channel, gitCmd string, key string, ip string) error {
  errorSsh("Failed to get user by SSH key id", err)
  return errors.New("internal server error")
  }
- _ = models.SSHKeyLastUsedNow(pubKey.Content)
+ _ = db.SSHKeyLastUsedNow(pubKey.Content)
  }
 
  repositoryPath := git.RepositoryPath(gist.User.Username, gist.Uuid)

internal/ssh/run.go

@@ -4,7 +4,7 @@ import (
  "errors"
  "github.com/rs/zerolog/log"
  "github.com/thomiceli/opengist/internal/config"
- "github.com/thomiceli/opengist/internal/models"
+ "github.com/thomiceli/opengist/internal/db"
  "golang.org/x/crypto/ssh"
  "gorm.io/gorm"
  "io"
@@ -24,7 +24,7 @@ func Start() {
  sshConfig := &ssh.ServerConfig{
  PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
  strKey := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(key)))
- _, err := models.SSHKeyDoesExists(strKey)
+ _, err := db.SSHKeyDoesExists(strKey)
  if err != nil {
  if !errors.Is(err, gorm.ErrRecordNotFound) {
  return nil, err

internal/web/admin.go

@@ -4,8 +4,8 @@ import (
  "github.com/labstack/echo/v4"
  "github.com/rs/zerolog/log"
  "github.com/thomiceli/opengist/internal/config"
+ "github.com/thomiceli/opengist/internal/db"
  "github.com/thomiceli/opengist/internal/git"
- "github.com/thomiceli/opengist/internal/models"
  "os"
  "path/filepath"
  "runtime"
@@ -31,19 +31,19 @@ func adminIndex(ctx echo.Context) error {
  }
  setData(ctx, "gitVersion", gitVersion)
 
- countUsers, err := models.CountAll(&models.User{})
+ countUsers, err := db.CountAll(&db.User{})
  if err != nil {
  return errorRes(500, "Cannot count users", err)
  }
  setData(ctx, "countUsers", countUsers)
 
- countGists, err := models.CountAll(&models.Gist{})
+ countGists, err := db.CountAll(&db.Gist{})
  if err != nil {
  return errorRes(500, "Cannot count gists", err)
  }
  setData(ctx, "countGists", countGists)
 
- countKeys, err := models.CountAll(&models.SSHKey{})
+ countKeys, err := db.CountAll(&db.SSHKey{})
  if err != nil {
  return errorRes(500, "Cannot count SSH keys", err)
  }
@@ -60,9 +60,9 @@ func adminUsers(ctx echo.Context) error {
  setData(ctx, "adminHeaderPage", "users")
  pageInt := getPage(ctx)
 
- var data []*models.User
+ var data []*db.User
  var err error
- if data, err = models.GetAllUsers(pageInt - 1); err != nil {
+ if data, err = db.GetAllUsers(pageInt - 1); err != nil {
  return errorRes(500, "Cannot get users", err)
  }
 
@@ -79,9 +79,9 @@ func adminGists(ctx echo.Context) error {
  setData(ctx, "adminHeaderPage", "gists")
  pageInt := getPage(ctx)
 
- var data []*models.Gist
+ var data []*db.Gist
  var err error
- if data, err = models.GetAllGists(pageInt - 1); err != nil {
+ if data, err = db.GetAllGists(pageInt - 1); err != nil {
  return errorRes(500, "Cannot get gists", err)
  }
 
@@ -94,7 +94,7 @@ func adminGists(ctx echo.Context) error {
 
 func adminUserDelete(ctx echo.Context) error {
  userId, _ := strconv.ParseUint(ctx.Param("user"), 10, 64)
- user, err := models.GetUserById(uint(userId))
+ user, err := db.GetUserById(uint(userId))
  if err != nil {
  return errorRes(500, "Cannot retrieve user", err)
  }
@@ -108,7 +108,7 @@ func adminUserDelete(ctx echo.Context) error {
 }
 
 func adminGistDelete(ctx echo.Context) error {
- gist, err := models.GetGistByID(ctx.Param("gist"))
+ gist, err := db.GetGistByID(ctx.Param("gist"))
  if err != nil {
  return errorRes(500, "Cannot retrieve gist", err)
  }
@@ -133,7 +133,7 @@ func adminSyncReposFromFS(ctx echo.Context) error {
  }
  syncReposFromFS = true
 
- gists, err := models.GetAllGistsRows()
+ gists, err := db.GetAllGistsRows()
  if err != nil {
  log.Error().Err(err).Msg("Cannot get gists")
  syncReposFromFS = false
@@ -170,7 +170,7 @@ func adminSyncReposFromDB(ctx echo.Context) error {
 
  for _, e := range entries {
  path := strings.Split(e, string(os.PathSeparator))
- gist, _ := models.GetGist(path[len(path)-2], path[len(path)-1])
+ gist, _ := db.GetGist(path[len(path)-2], path[len(path)-1])
 
  if gist.ID == 0 {
  if err := git.DeleteRepository(path[len(path)-2], path[len(path)-1]); err != nil {
@@ -197,7 +197,7 @@ func adminSetConfig(ctx echo.Context) error {
  key := ctx.FormValue("key")
  value := ctx.FormValue("value")
 
- if err := models.UpdateSetting(key, value); err != nil {
+ if err := db.UpdateSetting(key, value); err != nil {
  return errorRes(500, "Cannot set setting", err)
  }
 

internal/web/auth.go

@@ -18,7 +18,7 @@ import (
  "github.com/markbates/goth/providers/github"
  "github.com/rs/zerolog/log"
  "github.com/thomiceli/opengist/internal/config"
- "github.com/thomiceli/opengist/internal/models"
+ "github.com/thomiceli/opengist/internal/db"
  "golang.org/x/text/cases"
  "golang.org/x/text/language"
  "gorm.io/gorm"
@@ -47,7 +47,7 @@ func processRegister(ctx echo.Context) error {
 
  sess := getSession(ctx)
 
- dto := new(models.UserDTO)
+ dto := new(db.UserDTO)
  if err := ctx.Bind(dto); err != nil {
  return errorRes(400, "Cannot bind data", err)
  }
@@ -57,7 +57,7 @@ func processRegister(ctx echo.Context) error {
  return html(ctx, "auth_form.html")
  }
 
- if exists, err := models.UserExists(dto.Username); err != nil || exists {
+ if exists, err := db.UserExists(dto.Username); err != nil || exists {
  addFlash(ctx, "Username already exists", "error")
  return html(ctx, "auth_form.html")
  }
@@ -101,15 +101,15 @@ func processLogin(ctx echo.Context) error {
  var err error
  sess := getSession(ctx)
 
- dto := &models.UserDTO{}
+ dto := &db.UserDTO{}
  if err = ctx.Bind(dto); err != nil {
  return errorRes(400, "Cannot bind data", err)
  }
  password := dto.Password
 
- var user *models.User
+ var user *db.User
 
- if user, err = models.GetUserByUsername(dto.Username); err != nil {
+ if user, err = db.GetUserByUsername(dto.Username); err != nil {
  if !errors.Is(err, gorm.ErrRecordNotFound) {
  return errorRes(500, "Cannot get user", err)
  }
@@ -161,7 +161,7 @@ func oauthCallback(ctx echo.Context) error {
  }
 
  // if user is not in database, create it
- userDB, err := models.GetUserByProvider(user.UserID, user.Provider)
+ userDB, err := db.GetUserByProvider(user.UserID, user.Provider)
  if err != nil {
  if getData(ctx, "DisableSignup") == true {
  return errorRes(403, "Signing up is disabled", nil)
@@ -171,7 +171,7 @@ func oauthCallback(ctx echo.Context) error {
  return errorRes(500, "Cannot get user", err)
  }
 
- userDB = &models.User{
+ userDB = &db.User{
  Username: user.NickName,
  Email: user.Email,
  MD5Hash: fmt.Sprintf("%x", md5.Sum([]byte(strings.ToLower(strings.TrimSpace(user.Email))))),
@@ -188,7 +188,7 @@ func oauthCallback(ctx echo.Context) error {
  }
 
  if err = userDB.Create(); err != nil {
- if models.IsUniqueConstraintViolation(err) {
+ if db.IsUniqueConstraintViolation(err) {
  addFlash(ctx, "Username "+user.NickName+" already exists in Opengist", "error")
  return redirect(ctx, "/login")
  }
@@ -224,7 +224,7 @@ func oauthCallback(ctx echo.Context) error {
  keys = keys[:len(keys)-1]
  }
  for _, key := range keys {
- sshKey := models.SSHKey{
+ sshKey := db.SSHKey{
  Title: "Added from " + user.Provider,
  Content: key,
  User: *userDB,