📚 The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
fix: add embeded files (migrations + config) to avoid path errors
Smaug6739d97b87dc73b4
diff --git a/backend/app/app.go b/backend/app/app.goindex 8930759c..0c36c680 100644--- a/backend/app/app.go+++ b/backend/app/app.go@@ -59,6 +59,7 @@ func InitApp(config Config) *App {if err != nil {log.Fatalf("Failed to initialize repository manager: %v", err)}+app.Repos = repoManager// Initialize service managerdiff --git a/backend/app/migrations.go b/backend/app/migrations.goindex 671977ce..c683c9ce 100644--- a/backend/app/migrations.go+++ b/backend/app/migrations.go@@ -1,26 +1,28 @@package appimport (+ "alexandrie/pkg/logger"+ "embed""fmt"- "os"- "path/filepath""github.com/golang-migrate/migrate/v4""github.com/golang-migrate/migrate/v4/database/mysql"_ "github.com/golang-migrate/migrate/v4/source/file"+ "github.com/golang-migrate/migrate/v4/source/iofs")+//go:embed migrations/*.sql+var migrationsFS embed.FS+func Migrate(config *Config) {- workingDir, _ := os.Getwd()- absPath := filepath.Join(workingDir, os.Getenv("CONFIG_CPWD"), "migrations")- absPath = filepath.ToSlash(absPath)db := DBConnection(*config, true) // Use multiStatements for migrationdefer db.Close()// Test the database connectionif err := db.Ping(); err != nil {- panic(fmt.Sprintf("failed to ping database: %v", err))+ logger.Error("database", "Failed to ping database: "+err.Error())+ panic(err)}driver, err := mysql.WithInstance(db.DB, &mysql.Config{@@ -30,8 +32,14 @@ func Migrate(config *Config) {panic(fmt.Sprintf("failed to create mysql driver: %v", err))}- m, err := migrate.NewWithDatabaseInstance(- fmt.Sprintf("file://%s", absPath),+ source, err := iofs.New(migrationsFS, "migrations")+ if err != nil {+ panic(fmt.Sprintf("failed to create iofs source: %v", err))+ }++ m, err := migrate.NewWithInstance(+ "iofs",+ source,"alexandrie",driver,)diff --git a/backend/migrations/000001_init.down.sql b/backend/app/migrations/000001_init.down.sqlsimilarity index 100%rename from backend/migrations/000001_init.down.sqlrename to backend/app/migrations/000001_init.down.sqldiff --git a/backend/migrations/000001_init.up.sql b/backend/app/migrations/000001_init.up.sqlsimilarity index 100%rename from backend/migrations/000001_init.up.sqlrename to backend/app/migrations/000001_init.up.sqldiff --git a/backend/migrations/000002_change_ids_to_bigints.down.sql b/backend/app/migrations/000002_change_ids_to_bigints.down.sqlsimilarity index 100%rename from backend/migrations/000002_change_ids_to_bigints.down.sqlrename to backend/app/migrations/000002_change_ids_to_bigints.down.sqldiff --git a/backend/migrations/000002_change_ids_to_bigints.up.sql b/backend/app/migrations/000002_change_ids_to_bigints.up.sqlsimilarity index 100%rename from backend/migrations/000002_change_ids_to_bigints.up.sqlrename to backend/app/migrations/000002_change_ids_to_bigints.up.sqldiff --git a/backend/migrations/000003_add_ip_indx.down.sql b/backend/app/migrations/000003_add_ip_indx.down.sqlsimilarity index 100%rename from backend/migrations/000003_add_ip_indx.down.sqlrename to backend/app/migrations/000003_add_ip_indx.down.sqldiff --git a/backend/migrations/000003_add_ip_indx.up.sql b/backend/app/migrations/000003_add_ip_indx.up.sqlsimilarity index 100%rename from backend/migrations/000003_add_ip_indx.up.sqlrename to backend/app/migrations/000003_add_ip_indx.up.sqldiff --git a/backend/migrations/000004_add_category_color.down.sql b/backend/app/migrations/000004_add_category_color.down.sqlsimilarity index 100%rename from backend/migrations/000004_add_category_color.down.sqlrename to backend/app/migrations/000004_add_category_color.down.sqldiff --git a/backend/migrations/000004_add_category_color.up.sql b/backend/app/migrations/000004_add_category_color.up.sqlsimilarity index 100%rename from backend/migrations/000004_add_category_color.up.sqlrename to backend/app/migrations/000004_add_category_color.up.sqldiff --git a/backend/migrations/000005_ressource_parent.down.sql b/backend/app/migrations/000005_ressource_parent.down.sqlsimilarity index 100%rename from backend/migrations/000005_ressource_parent.down.sqlrename to backend/app/migrations/000005_ressource_parent.down.sqldiff --git a/backend/migrations/000005_ressource_parent.up.sql b/backend/app/migrations/000005_ressource_parent.up.sqlsimilarity index 100%rename from backend/migrations/000005_ressource_parent.up.sqlrename to backend/app/migrations/000005_ressource_parent.up.sqldiff --git a/backend/migrations/000006_file_parent_id_constraint_rmdoc.down.sql b/backend/app/migrations/000006_file_parent_id_constraint_rmdoc.down.sqlsimilarity index 100%rename from backend/migrations/000006_file_parent_id_constraint_rmdoc.down.sqlrename to backend/app/migrations/000006_file_parent_id_constraint_rmdoc.down.sqldiff --git a/backend/migrations/000006_file_parent_id_constraint_rmdoc.up.sql b/backend/app/migrations/000006_file_parent_id_constraint_rmdoc.up.sqlsimilarity index 100%rename from backend/migrations/000006_file_parent_id_constraint_rmdoc.up.sqlrename to backend/app/migrations/000006_file_parent_id_constraint_rmdoc.up.sqldiff --git a/backend/migrations/000007_pin_doc.down.sql b/backend/app/migrations/000007_pin_doc.down.sqlsimilarity index 100%rename from backend/migrations/000007_pin_doc.down.sqlrename to backend/app/migrations/000007_pin_doc.down.sqldiff --git a/backend/migrations/000007_pin_doc.up.sql b/backend/app/migrations/000007_pin_doc.up.sqlsimilarity index 100%rename from backend/migrations/000007_pin_doc.up.sqlrename to backend/app/migrations/000007_pin_doc.up.sqldiff --git a/backend/migrations/000008_reset_pass.down.sql b/backend/app/migrations/000008_reset_pass.down.sqlsimilarity index 100%rename from backend/migrations/000008_reset_pass.down.sqlrename to backend/app/migrations/000008_reset_pass.down.sqldiff --git a/backend/migrations/000008_reset_pass.up.sql b/backend/app/migrations/000008_reset_pass.up.sqlsimilarity index 100%rename from backend/migrations/000008_reset_pass.up.sqlrename to backend/app/migrations/000008_reset_pass.up.sqldiff --git a/backend/migrations/000009_doc_meta.down.sql b/backend/app/migrations/000009_doc_meta.down.sqlsimilarity index 100%rename from backend/migrations/000009_doc_meta.down.sqlrename to backend/app/migrations/000009_doc_meta.down.sqldiff --git a/backend/migrations/000009_doc_meta.up.sql b/backend/app/migrations/000009_doc_meta.up.sqlsimilarity index 100%rename from backend/migrations/000009_doc_meta.up.sqlrename to backend/app/migrations/000009_doc_meta.up.sqldiff --git a/backend/migrations/000010_nodes.down.sql b/backend/app/migrations/000010_nodes.down.sqlsimilarity index 100%rename from backend/migrations/000010_nodes.down.sqlrename to backend/app/migrations/000010_nodes.down.sqldiff --git a/backend/migrations/000010_nodes.up.sql b/backend/app/migrations/000010_nodes.up.sqlsimilarity index 100%rename from backend/migrations/000010_nodes.up.sqlrename to backend/app/migrations/000010_nodes.up.sqldiff --git a/backend/migrations/000011_permissions.up.sql b/backend/app/migrations/000011_permissions.up.sqlsimilarity index 100%rename from backend/migrations/000011_permissions.up.sqlrename to backend/app/migrations/000011_permissions.up.sqldiff --git a/backend/migrations/000012_index_creation.down.sql b/backend/app/migrations/000012_index_creation.down.sqlsimilarity index 100%rename from backend/migrations/000012_index_creation.down.sqlrename to backend/app/migrations/000012_index_creation.down.sqldiff --git a/backend/migrations/000012_index_creation.up.sql b/backend/app/migrations/000012_index_creation.up.sqlsimilarity index 100%rename from backend/migrations/000012_index_creation.up.sqlrename to backend/app/migrations/000012_index_creation.up.sqldiff --git a/backend/migrations/000013_fulltext_search.down.sql b/backend/app/migrations/000013_fulltext_search.down.sqlsimilarity index 100%rename from backend/migrations/000013_fulltext_search.down.sqlrename to backend/app/migrations/000013_fulltext_search.down.sqldiff --git a/backend/migrations/000013_fulltext_search.up.sql b/backend/app/migrations/000013_fulltext_search.up.sqlsimilarity index 100%rename from backend/migrations/000013_fulltext_search.up.sqlrename to backend/app/migrations/000013_fulltext_search.up.sqldiff --git a/backend/migrations/000014_oidc_providers.down.sql b/backend/app/migrations/000014_oidc_providers.down.sqlsimilarity index 100%rename from backend/migrations/000014_oidc_providers.down.sqlrename to backend/app/migrations/000014_oidc_providers.down.sqldiff --git a/backend/migrations/000014_oidc_providers.up.sql b/backend/app/migrations/000014_oidc_providers.up.sqlsimilarity index 100%rename from backend/migrations/000014_oidc_providers.up.sqlrename to backend/app/migrations/000014_oidc_providers.up.sqldiff --git a/backend/migrations/000015_oidc_session_refactor.up.sql b/backend/app/migrations/000015_oidc_session_refactor.up.sqlsimilarity index 100%rename from backend/migrations/000015_oidc_session_refactor.up.sqlrename to backend/app/migrations/000015_oidc_session_refactor.up.sqldiff --git a/backend/main.go b/backend/main.goindex 3f75d695..48eb2dfd 100644--- a/backend/main.go+++ b/backend/main.go@@ -1,27 +1,67 @@package mainimport (- "alexandrie/pkg/logger"- "alexandrie/server"+ _ "embed""os"+ "alexandrie/app"+ "alexandrie/pkg/logger"+ "alexandrie/router"++ "github.com/BurntSushi/toml""github.com/joho/godotenv")-func main() {+//go:embed config.toml+var configData []byte+func main() {logger.Info("app", "Initializing Alexandrie backend...")- godotenv.Load() // Load .env file if present++ loadEnv()++ port := os.Getenv("BACKEND_PORT")++ config := loadConfig()+ application := app.InitApp(config)+ server := router.InitRouter(application)++ logger.Info("app", "Starting server on port: "+port)+ defer application.DB.Close()++ server.Run(":" + port)+}++func loadEnv() {+ _ = godotenv.Load() // facultatif : pas d’erreur si absentport := os.Getenv("BACKEND_PORT")if port == "" {logger.Error("app", "BACKEND_PORT environment variable not set")os.Exit(1)}- server, application := server.SetupServer()+}- logger.Info("app", "Starting server on port: "+port)- defer application.DB.Close()+func loadConfig() app.Config {+ var config app.Config- server.Run(":" + port)+ // 1: Check for CONFIG_PATH environment variable+ if path := os.Getenv("CONFIG_PATH"); path != "" {+ if _, err := toml.DecodeFile(path, &config); err != nil {+ logger.Error("server", "Error loading config from CONFIG_PATH: "+err.Error())+ os.Exit(1)+ }++ logger.Success("server", "Configuration loaded from CONFIG_PATH: "+path)+ return config+ }++ // 2: Fallback to embedded config.toml+ if err := toml.Unmarshal(configData, &config); err != nil {+ logger.Error("server", "Error loading embedded config: "+err.Error())+ os.Exit(1)+ }++ logger.Success("server", "Embedded configuration loaded successfully")+ return config}diff --git a/backend/server/server.go b/backend/server/server.godeleted file mode 100644index 2ecf581c..00000000--- a/backend/server/server.go+++ /dev/null@@ -1,36 +0,0 @@-package server--import (- "alexandrie/app"- "alexandrie/pkg/logger"- "alexandrie/router"- "fmt"- "os"- "path/filepath"-- "github.com/BurntSushi/toml"- "github.com/gin-gonic/gin"- _ "github.com/go-sql-driver/mysql"-)--func SetupServer() (*gin.Engine, *app.App) {-- workingDir, err := os.Getwd()- if err != nil {- logger.Error("server", "Error getting cwd: "+err.Error())- os.Exit(1)- }- absPath := filepath.Join(workingDir, fmt.Sprintf("%sconfig.toml", os.Getenv("CONFIG_CPWD")))- config := app.Config{}- _, err = toml.DecodeFile(absPath, &config)- if err != nil {- logger.Error("server", "Error loading config: "+err.Error())- os.Exit(1)- }- logger.Success("server", "Loaded configuration from: "+absPath+" successfully")-- application := app.InitApp(config)- appRouter := router.InitRouter(application)-- return appRouter, application-}diff --git a/config.toml b/config.tomlnew file mode 100644index 00000000..92233e26--- /dev/null+++ b/config.toml@@ -0,0 +1,64 @@+[Database]+Driver = "mysql"+Host = "localhost"+Name = "alexandrie"+Port = 3306++[Cdn]+MaxSize = 2e+7 # 20MB+MaxUploadsSize = 1073741824 # 1GB+SupportedTypesImages = [+ "image/png",+ "image/jpeg",+ "image/gif",+ "image/bmp",+ "image/webp",+ "image/avif",+ "image/svg+xml",+ "image/vnd.microsoft.icon",+]+SupportedTypes = [+ # image formats+ "image/png",+ "image/jpeg",+ "image/gif",+ "image/bmp",+ "image/webp",+ "image/avif",+ "image/svg+xml",+ "image/vnd.microsoft.icon",+ # video formats+ "video/mp4",+ "video/x-msvideo", # .avi+ "video/quicktime", # .mov+ "video/x-ms-wmv", # .wmv+ "video/x-flv", # .flv+ "video/x-matroska", # .mkv+ "video/webm", # .webm+ # document formats+ "application/pdf", # .pdf+ "application/msword", # .doc+ "application/vnd.openxmlformats-officedocument.wordprocessingml.document", # .docx+ "application/vnd.ms-excel", # .xls+ "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", # .xlsx+ "application/vnd.ms-powerpoint", # .ppt+ "application/vnd.openxmlformats-officedocument.presentationml.presentation", # .pptx+ "text/plain", # .txt+ "text/csv", # .csv+ "application/json", # .json+ # all other classic formats+ "application/xml", # .xml+ "application/xhtml+xml", # .xhtml++ # archive formats+ "application/zip", # .zip+ "application/x-rar-compressed", # .rar+ "application/x-tar", # .tar+ "application/gzip", # .gz+ "application/x-bzip2", # .bz2+]++[Auth]+AccessTokenExpiry = 1800 # 30 minutes+RefreshTokenExpiry = 604800 # 7 days+diff --git a/ecosystem.config.js b/ecosystem.config.jsindex 18f3e4ba..e6147f39 100644--- a/ecosystem.config.js+++ b/ecosystem.config.js@@ -19,7 +19,6 @@ module.exports = {DATABASE_NAME: 'alexandrie',CPWD: './backend/',- CONFIG_CPWD: '',GIN_MODE: 'release',},},diff --git a/frontend/app/styles/_variables.scss b/frontend/app/styles/_variables.scssindex 061b87d4..f4f4940c 100644--- a/frontend/app/styles/_variables.scss+++ b/frontend/app/styles/_variables.scss@@ -43,7 +43,7 @@ $radius-lg: 14px;--blue-bg: #cce0ff;--blue-bg-light: #f3f5fc;--blue-border: rgb(0 123 255 / 30%);- --green: #198754;+ --green: #1c8f59;--green-dark: #007a63;--green-bg: rgb(40 167 69 / 15%);--green-bg-light: rgb(40 167 69 / 5%);