From fd8b6bcdc1683811dd73c2498a9f66b4ebf74b4d Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Fri, 26 Jan 2024 20:45:07 -0500 Subject: [PATCH] feat(logging): improve logging & migrate to json logger --- README.md | 28 ++- api/api.go | 50 ++-- api/app-routes.go | 403 +++++++++++++++++++++----------- api/auth.go | 8 +- api/common.go | 18 +- api/ko-routes.go | 76 +++--- api/opds-routes.go | 2 +- assets/style.css | 2 +- config/config.go | 65 ++++-- config/logger.go | 54 +++++ database/manager.go | 12 +- go.mod | 3 +- go.sum | 2 - metadata/gbooks.go | 26 +-- metadata/olib.go | 18 +- search/search.go | 18 +- server/server.go | 24 +- templates/pages/admin-logs.tmpl | 2 +- 18 files changed, 529 insertions(+), 282 deletions(-) create mode 100644 config/logger.go diff --git a/README.md b/README.md index b160d03..62fa93d 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,8 @@ The OPDS API endpoint is located at: `http(s):///api/opds` ### Quick Start +**NOTE**: If you're accessing your instance over HTTP (not HTTPS), you must set `COOKIE_SECURE=false`, otherwise you will not be able to login. + ```bash # Make Data Directory mkdir -p antholume_data @@ -71,6 +73,7 @@ mkdir -p antholume_data # Run Server docker run \ -p 8585:8585 \ + -e COOKIE_SECURE=false \ -e REGISTRATION_ENABLED=true \ -v ./antholume_data:/config \ -v ./antholume_data:/data \ @@ -81,18 +84,19 @@ The service is now accessible at: `http://localhost:8585`. I recommend registeri ### Configuration -| Environment Variable | Default Value | Description | -| -------------------- | ------------- | ------------------------------------------------------------------- | -| DATABASE_TYPE | SQLite | Currently only "SQLite" is supported | -| DATABASE_NAME | antholume | The database name, or in SQLite's case, the filename | -| CONFIG_PATH | /config | Directory where to store SQLite's DB | -| DATA_PATH | /data | Directory where to store the documents and cover metadata | -| LISTEN_PORT | 8585 | Port the server listens at | -| LOG_LEVEL | info | Set server log level | -| REGISTRATION_ENABLED | false | Whether to allow registration (applies to both WebApp & KOSync API) | -| COOKIE_SESSION_KEY | | Optional secret cookie session key (auto generated if not provided) | -| COOKIE_SECURE | true | Set Cookie `Secure` attribute (i.e. only works over HTTPS) | -| COOKIE_HTTP_ONLY | true | Set Cookie `HttpOnly` attribute (i.e. inacessible via JavaScript) | +| Environment Variable | Default Value | Description | +| -------------------- | ------------- | -------------------------------------------------------------------------- | +| DATABASE_TYPE | SQLite | Currently only "SQLite" is supported | +| DATABASE_NAME | antholume | The database name, or in SQLite's case, the filename | +| CONFIG_PATH | /config | Directory where to store SQLite's DB | +| DATA_PATH | /data | Directory where to store the documents and cover metadata | +| LISTEN_PORT | 8585 | Port the server listens at | +| LOG_LEVEL | info | Set server log level | +| REGISTRATION_ENABLED | false | Whether to allow registration (applies to both WebApp & KOSync API) | +| COOKIE_AUTH_KEY | | Optional secret cookie authentication key (auto generated if not provided) | +| COOKIE_ENC_KEY | | Optional secret cookie encryption key (16 or 32 bytes) | +| COOKIE_SECURE | true | Set Cookie `Secure` attribute (i.e. only works over HTTPS) | +| COOKIE_HTTP_ONLY | true | Set Cookie `HttpOnly` attribute (i.e. inacessible via JavaScript) | ## Security diff --git a/api/api.go b/api/api.go index ea1cd00..4ede92c 100644 --- a/api/api.go +++ b/api/api.go @@ -46,23 +46,32 @@ func NewApi(db *database.DBManager, c *config.Config, assets *embed.FS) *API { assetsDir, _ := fs.Sub(assets, "assets") api.Router.StaticFS("/assets", http.FS(assetsDir)) - // Generate Secure Token + // Generate Auth Token var newToken []byte var err error - - if c.CookieSessionKey != "" { - log.Info("[NewApi] Utilizing Environment Cookie Session Key") - newToken = []byte(c.CookieSessionKey) + if c.CookieAuthKey != "" { + log.Info("Utilizing environment cookie auth key") + newToken = []byte(c.CookieAuthKey) } else { - log.Info("[NewApi] Generating Cookie Session Key") + log.Info("Generating cookie auth key") newToken, err = generateToken(64) if err != nil { - panic("Unable to generate secure token") + log.Panic("Unable to generate cookie auth key") + } + } + + // Set Enc Token + store := cookie.NewStore(newToken) + if c.CookieEncKey != "" { + if len(c.CookieEncKey) == 16 || len(c.CookieEncKey) == 32 { + log.Info("Utilizing environment cookie encryption key") + store = cookie.NewStore(newToken, []byte(c.CookieEncKey)) + } else { + log.Panic("Invalid cookie encryption key (must be 16 or 32 bytes)") } } // Configure Cookie Session Store - store := cookie.NewStore(newToken) store.Options(sessions.Options{ MaxAge: 60 * 60 * 24 * 7, Secure: c.CookieSecure, @@ -251,26 +260,29 @@ func apiLogger() gin.HandlerFunc { endTime := time.Now() latency := endTime.Sub(startTime).Round(time.Microsecond) + // Log Data + logData := log.Fields{ + "type": "access", + "ip": c.ClientIP(), + "latency": fmt.Sprintf("%s", latency), + "status": c.Writer.Status(), + "method": c.Request.Method, + "path": c.Request.URL.Path, + } + // Get Username var auth authData if data, _ := c.Get("Authorization"); data != nil { auth = data.(authData) } - username := auth.UserName - if username != "" { - username = " (" + username + ")" + // Log User + if auth.UserName != "" { + logData["user"] = auth.UserName } // Log Result - log.Infof("[HTTPRouter] %-15s (%10s) %d %7s %s%s", - c.ClientIP(), - latency, - c.Writer.Status(), - c.Request.Method, - c.Request.URL.Path, - username, - ) + log.WithFields(logData).Info(fmt.Sprintf("%s %s", c.Request.Method, c.Request.URL.Path)) } } diff --git a/api/app-routes.go b/api/app-routes.go index 25069fc..3045a83 100644 --- a/api/app-routes.go +++ b/api/app-routes.go @@ -5,6 +5,7 @@ import ( "bufio" "crypto/md5" "database/sql" + "encoding/json" "fmt" "io" "io/fs" @@ -152,20 +153,20 @@ func (api *API) appGetDocuments(c *gin.Context) { Limit: *qParams.Limit, }) if err != nil { - log.Error("[appGetDocuments] GetDocumentsWithStats DB Error: ", err) + log.Error("GetDocumentsWithStats DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err)) return } length, err := api.DB.Queries.GetDocumentsSize(api.DB.Ctx, query) if err != nil { - log.Error("[appGetDocuments] GetDocumentsSize DB Error: ", err) + log.Error("GetDocumentsSize DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsSize DB Error: %v", err)) return } if err = api.getDocumentsWordCount(documents); err != nil { - log.Error("[appGetDocuments] Unable to Get Word Counts: ", err) + log.Error("Unable to Get Word Counts: ", err) } totalPages := int64(math.Ceil(float64(length) / float64(*qParams.Limit))) @@ -191,7 +192,7 @@ func (api *API) appGetDocument(c *gin.Context) { var rDocID requestDocumentID if err := c.ShouldBindUri(&rDocID); err != nil { - log.Error("[appGetDocument] Invalid URI Bind") + log.Error("Invalid URI Bind") errorPage(c, http.StatusNotFound, "Invalid document.") return } @@ -201,7 +202,7 @@ func (api *API) appGetDocument(c *gin.Context) { DocumentID: rDocID.DocumentID, }) if err != nil { - log.Error("[appGetDocument] GetDocumentWithStats DB Error: ", err) + log.Error("GetDocumentWithStats DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err)) return } @@ -230,7 +231,7 @@ func (api *API) appGetProgress(c *gin.Context) { progress, err := api.DB.Queries.GetProgress(api.DB.Ctx, progressFilter) if err != nil { - log.Error("[appGetProgress] GetProgress DB Error: ", err) + log.Error("GetProgress DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err)) return } @@ -257,7 +258,7 @@ func (api *API) appGetActivity(c *gin.Context) { activity, err := api.DB.Queries.GetActivity(api.DB.Ctx, activityFilter) if err != nil { - log.Error("[appGetActivity] GetActivity DB Error: ", err) + log.Error("GetActivity DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err)) return } @@ -273,38 +274,38 @@ func (api *API) appGetHome(c *gin.Context) { start := time.Now() graphData, err := api.DB.Queries.GetDailyReadStats(api.DB.Ctx, auth.UserName) if err != nil { - log.Error("[appGetHome] GetDailyReadStats DB Error: ", err) + log.Error("GetDailyReadStats DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDailyReadStats DB Error: %v", err)) return } - log.Debug("[appGetHome] GetDailyReadStats DB Performance: ", time.Since(start)) + log.Debug("GetDailyReadStats DB Performance: ", time.Since(start)) start = time.Now() databaseInfo, err := api.DB.Queries.GetDatabaseInfo(api.DB.Ctx, auth.UserName) if err != nil { - log.Error("[appGetHome] GetDatabaseInfo DB Error: ", err) + log.Error("GetDatabaseInfo DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDatabaseInfo DB Error: %v", err)) return } - log.Debug("[appGetHome] GetDatabaseInfo DB Performance: ", time.Since(start)) + log.Debug("GetDatabaseInfo DB Performance: ", time.Since(start)) start = time.Now() streaks, err := api.DB.Queries.GetUserStreaks(api.DB.Ctx, auth.UserName) if err != nil { - log.Error("[appGetHome] GetUserStreaks DB Error: ", err) + log.Error("GetUserStreaks DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUserStreaks DB Error: %v", err)) return } - log.Debug("[appGetHome] GetUserStreaks DB Performance: ", time.Since(start)) + log.Debug("GetUserStreaks DB Performance: ", time.Since(start)) start = time.Now() userStatistics, err := api.DB.Queries.GetUserStatistics(api.DB.Ctx) if err != nil { - log.Error("[appGetHome] GetUserStatistics DB Error: ", err) + log.Error("GetUserStatistics DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUserStatistics DB Error: %v", err)) return } - log.Debug("[appGetHome] GetUserStatistics DB Performance: ", time.Since(start)) + log.Debug("GetUserStatistics DB Performance: ", time.Since(start)) templateVars["Data"] = gin.H{ "Streaks": streaks, @@ -321,14 +322,14 @@ func (api *API) appGetSettings(c *gin.Context) { user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName) if err != nil { - log.Error("[appGetSettings] GetUser DB Error: ", err) + log.Error("GetUser DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err)) return } devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName) if err != nil { - log.Error("[appGetSettings] GetDevices DB Error: ", err) + log.Error("GetDevices DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) return } @@ -362,7 +363,23 @@ func (api *API) appGetAdminLogs(c *gin.Context) { var logLines []string scanner := bufio.NewScanner(logFile) for scanner.Scan() { - logLines = append(logLines, scanner.Text()) + rawLog := scanner.Text() + + // Attempt JSON Pretty + var jsonMap map[string]interface{} + err := json.Unmarshal([]byte(rawLog), &jsonMap) + if err != nil { + logLines = append(logLines, scanner.Text()) + continue + } + + prettyJSON, err := json.MarshalIndent(jsonMap, "", " ") + if err != nil { + logLines = append(logLines, scanner.Text()) + continue + } + + logLines = append(logLines, string(prettyJSON)) } templateVars["Data"] = logLines @@ -374,7 +391,7 @@ func (api *API) appGetAdminUsers(c *gin.Context) { users, err := api.DB.Queries.GetUsers(api.DB.Ctx) if err != nil { - log.Error("[appGetAdminUsers] GetUsers DB Error: ", err) + log.Error("GetUsers DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUsers DB Error: %v", err)) return } @@ -393,7 +410,7 @@ func (api *API) appPerformAdminAction(c *gin.Context) { var rAdminAction requestAdminAction if err := c.ShouldBind(&rAdminAction); err != nil { - log.Error("[appPerformAdminAction] Invalid Form Bind") + log.Error("Invalid Form Bind: ", err) errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -401,81 +418,33 @@ func (api *API) appPerformAdminAction(c *gin.Context) { switch rAdminAction.Action { case adminImport: // TODO - case adminCacheTables: - go api.DB.CacheTempTables() case adminMetadataMatch: // TODO // 1. Documents xref most recent metadata table? // 2. Select all / deselect? + case adminCacheTables: + go api.DB.CacheTempTables() case adminRestore: - // TODO - // 1. Consume backup ZIP - // 2. Move existing to "backup" folder (db, wal, shm, covers, documents) - // 3. Extract backup zip - // 4. Invalidate cookies (see in auth.go logout) - // 5. Restart server? + api.processRestoreFile(rAdminAction, c) case adminBackup: - // Get File Paths - fileName := fmt.Sprintf("%s.db", api.Config.DBName) - dbLocation := path.Join(api.Config.ConfigPath, fileName) - c.Header("Content-type", "application/octet-stream") - c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"AnthoLumeExport_%s.zip\"", time.Now().Format("20060102"))) + c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"AnthoLumeBackup_%s.zip\"", time.Now().Format("20060102"))) // Stream Backup ZIP Archive c.Stream(func(w io.Writer) bool { - ar := zip.NewWriter(w) - - exportWalker := func(currentPath string, f fs.DirEntry, err error) error { - if err != nil { - return err - } - if f.IsDir() { - return nil - } - - // Open File on Disk - file, err := os.Open(currentPath) - if err != nil { - return err - } - defer file.Close() - - // Derive Export Structure - fileName := filepath.Base(currentPath) - folderName := filepath.Base(filepath.Dir(currentPath)) - - // Create File in Export - newF, err := ar.Create(path.Join(folderName, fileName)) - if err != nil { - return err - } - - // Copy File in Export - _, err = io.Copy(newF, file) - if err != nil { - return err - } - - return nil - } - - // Copy Database File - dbFile, _ := os.Open(dbLocation) - newDbFile, _ := ar.Create(fileName) - io.Copy(newDbFile, dbFile) - - // Backup Covers & Documents + var directories []string for _, item := range rAdminAction.BackupTypes { if item == backupCovers { - filepath.WalkDir(path.Join(api.Config.DataPath, "covers"), exportWalker) - + directories = append(directories, "covers") } else if item == backupDocuments { - filepath.WalkDir(path.Join(api.Config.DataPath, "documents"), exportWalker) + directories = append(directories, "documents") } } - ar.Close() + err := api.createBackup(w, directories) + if err != nil { + log.Error("Backup Error: ", err) + } return false }) @@ -535,7 +504,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) { var rDoc requestDocumentID if err := c.ShouldBindUri(&rDoc); err != nil { - log.Error("[appGetDocumentProgress] Invalid URI Bind") + log.Error("Invalid URI Bind") errorPage(c, http.StatusNotFound, "Invalid document.") return } @@ -546,7 +515,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) { }) if err != nil && err != sql.ErrNoRows { - log.Error("[appGetDocumentProgress] UpsertDocument DB Error: ", err) + log.Error("UpsertDocument DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err)) return } @@ -556,7 +525,7 @@ func (api *API) appGetDocumentProgress(c *gin.Context) { DocumentID: rDoc.DocumentID, }) if err != nil { - log.Error("[appGetDocumentProgress] GetDocumentWithStats DB Error: ", err) + log.Error("GetDocumentWithStats DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err)) return } @@ -580,7 +549,7 @@ func (api *API) appGetDevices(c *gin.Context) { devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName) if err != nil && err != sql.ErrNoRows { - log.Error("[appGetDevices] GetDevices DB Error: ", err) + log.Error("GetDevices DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) return } @@ -591,7 +560,7 @@ func (api *API) appGetDevices(c *gin.Context) { func (api *API) appUploadNewDocument(c *gin.Context) { var rDocUpload requestDocumentUpload if err := c.ShouldBind(&rDocUpload); err != nil { - log.Error("[appUploadNewDocument] Invalid Form Bind") + log.Error("Invalid Form Bind") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -604,14 +573,14 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Validate Type & Derive Extension on MIME uploadedFile, err := rDocUpload.DocumentFile.Open() if err != nil { - log.Error("[appUploadNewDocument] File Error: ", err) + log.Error("File Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to open file.") return } fileMime, err := mimetype.DetectReader(uploadedFile) if err != nil { - log.Error("[appUploadNewDocument] MIME Error") + log.Error("MIME Error") errorPage(c, http.StatusInternalServerError, "Unable to detect filetype.") return } @@ -619,7 +588,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Validate Extension if !slices.Contains([]string{".epub"}, fileExtension) { - log.Error("[appUploadNewDocument] Invalid FileType: ", fileExtension) + log.Error("Invalid FileType: ", fileExtension) errorPage(c, http.StatusBadRequest, "Invalid filetype.") return } @@ -627,7 +596,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Create Temp File tempFile, err := os.CreateTemp("", "book") if err != nil { - log.Warn("[appUploadNewDocument] Temp File Create Error: ", err) + log.Warn("Temp File Create Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to create temp file.") return } @@ -637,7 +606,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Save Temp err = c.SaveUploadedFile(rDocUpload.DocumentFile, tempFile.Name()) if err != nil { - log.Error("[appUploadNewDocument] File Error: ", err) + log.Error("File Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to save file.") return } @@ -645,7 +614,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Get Metadata metadataInfo, err := metadata.GetMetadata(tempFile.Name()) if err != nil { - log.Warn("[appUploadNewDocument] GetMetadata Error: ", err) + log.Warn("GetMetadata Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to acquire file metadata.") return } @@ -653,7 +622,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Calculate Partial MD5 ID partialMD5, err := utils.CalculatePartialMD5(tempFile.Name()) if err != nil { - log.Warn("[appUploadNewDocument] Partial MD5 Error: ", err) + log.Warn("Partial MD5 Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to calculate partial MD5.") return } @@ -668,7 +637,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Calculate Actual MD5 fileHash, err := getFileMD5(tempFile.Name()) if err != nil { - log.Error("[appUploadNewDocument] MD5 Hash Failure: ", err) + log.Error("MD5 Hash Failure: ", err) errorPage(c, http.StatusInternalServerError, "Unable to calculate MD5.") return } @@ -676,7 +645,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Get Word Count wordCount, err := metadata.GetWordCount(tempFile.Name()) if err != nil { - log.Error("[appUploadNewDocument] Word Count Failure: ", err) + log.Error("Word Count Failure: ", err) errorPage(c, http.StatusInternalServerError, "Unable to calculate word count.") return } @@ -705,7 +674,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { safePath := filepath.Join(api.Config.DataPath, "documents", fileName) destFile, err := os.Create(safePath) if err != nil { - log.Error("[appUploadNewDocument] Dest File Error: ", err) + log.Error("Dest File Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to save file.") return } @@ -713,7 +682,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { // Copy File if _, err = io.Copy(destFile, tempFile); err != nil { - log.Error("[appUploadNewDocument] Copy Temp File Error: ", err) + log.Error("Copy Temp File Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to save file.") return } @@ -728,7 +697,7 @@ func (api *API) appUploadNewDocument(c *gin.Context) { Md5: fileHash, Filepath: &fileName, }); err != nil { - log.Error("[appUploadNewDocument] UpsertDocument DB Error: ", err) + log.Error("UpsertDocument DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err)) return } @@ -739,14 +708,14 @@ func (api *API) appUploadNewDocument(c *gin.Context) { func (api *API) appEditDocument(c *gin.Context) { var rDocID requestDocumentID if err := c.ShouldBindUri(&rDocID); err != nil { - log.Error("[appEditDocument] Invalid URI Bind") + log.Error("Invalid URI Bind") errorPage(c, http.StatusNotFound, "Invalid document.") return } var rDocEdit requestDocumentEdit if err := c.ShouldBind(&rDocEdit); err != nil { - log.Error("[appEditDocument] Invalid Form Bind") + log.Error("Invalid Form Bind") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -760,7 +729,7 @@ func (api *API) appEditDocument(c *gin.Context) { rDocEdit.RemoveCover == nil && rDocEdit.CoverGBID == nil && rDocEdit.CoverFile == nil { - log.Error("[appEditDocument] Missing Form Values") + log.Error("Missing Form Values") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -774,14 +743,14 @@ func (api *API) appEditDocument(c *gin.Context) { // Validate Type & Derive Extension on MIME uploadedFile, err := rDocEdit.CoverFile.Open() if err != nil { - log.Error("[appEditDocument] File Error") + log.Error("File Error") errorPage(c, http.StatusInternalServerError, "Unable to open file.") return } fileMime, err := mimetype.DetectReader(uploadedFile) if err != nil { - log.Error("[appEditDocument] MIME Error") + log.Error("MIME Error") errorPage(c, http.StatusInternalServerError, "Unable to detect filetype.") return } @@ -789,7 +758,7 @@ func (api *API) appEditDocument(c *gin.Context) { // Validate Extension if !slices.Contains([]string{".jpg", ".png"}, fileExtension) { - log.Error("[appEditDocument] Invalid FileType: ", fileExtension) + log.Error("Invalid FileType: ", fileExtension) errorPage(c, http.StatusBadRequest, "Invalid filetype.") return } @@ -801,7 +770,7 @@ func (api *API) appEditDocument(c *gin.Context) { // Save err = c.SaveUploadedFile(rDocEdit.CoverFile, safePath) if err != nil { - log.Error("[appEditDocument] File Error: ", err) + log.Error("File Error: ", err) errorPage(c, http.StatusInternalServerError, "Unable to save file.") return } @@ -825,7 +794,7 @@ func (api *API) appEditDocument(c *gin.Context) { Isbn13: api.sanitizeInput(rDocEdit.ISBN13), Coverfile: coverFileName, }); err != nil { - log.Error("[appEditDocument] UpsertDocument DB Error: ", err) + log.Error("UpsertDocument DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpsertDocument DB Error: %v", err)) return } @@ -837,18 +806,18 @@ func (api *API) appEditDocument(c *gin.Context) { func (api *API) appDeleteDocument(c *gin.Context) { var rDocID requestDocumentID if err := c.ShouldBindUri(&rDocID); err != nil { - log.Error("[appDeleteDocument] Invalid URI Bind") + log.Error("Invalid URI Bind") errorPage(c, http.StatusNotFound, "Invalid document.") return } changed, err := api.DB.Queries.DeleteDocument(api.DB.Ctx, rDocID.DocumentID) if err != nil { - log.Error("[appDeleteDocument] DeleteDocument DB Error") + log.Error("DeleteDocument DB Error") errorPage(c, http.StatusInternalServerError, fmt.Sprintf("DeleteDocument DB Error: %v", err)) return } if changed == 0 { - log.Error("[appDeleteDocument] DeleteDocument DB Error") + log.Error("DeleteDocument DB Error") errorPage(c, http.StatusNotFound, "Invalid document.") return } @@ -859,14 +828,14 @@ func (api *API) appDeleteDocument(c *gin.Context) { func (api *API) appIdentifyDocument(c *gin.Context) { var rDocID requestDocumentID if err := c.ShouldBindUri(&rDocID); err != nil { - log.Error("[appIdentifyDocument] Invalid URI Bind") + log.Error("Invalid URI Bind") errorPage(c, http.StatusNotFound, "Invalid document.") return } var rDocIdentify requestDocumentIdentify if err := c.ShouldBind(&rDocIdentify); err != nil { - log.Error("[appIdentifyDocument] Invalid Form Bind") + log.Error("Invalid Form Bind") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -884,7 +853,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) { // Validate Values if rDocIdentify.ISBN == nil && rDocIdentify.Title == nil && rDocIdentify.Author == nil { - log.Error("[appIdentifyDocument] Invalid Form") + log.Error("Invalid Form") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -913,12 +882,12 @@ func (api *API) appIdentifyDocument(c *gin.Context) { Isbn10: firstResult.ISBN10, Isbn13: firstResult.ISBN13, }); err != nil { - log.Error("[appIdentifyDocument] AddMetadata DB Error: ", err) + log.Error("AddMetadata DB Error: ", err) } templateVars["Metadata"] = firstResult } else { - log.Warn("[appIdentifyDocument] Metadata Error") + log.Warn("Metadata Error") templateVars["MetadataError"] = "No Metadata Found" } @@ -927,7 +896,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) { DocumentID: rDocID.DocumentID, }) if err != nil { - log.Error("[appIdentifyDocument] GetDocumentWithStats DB Error: ", err) + log.Error("GetDocumentWithStats DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentWithStats DB Error: %v", err)) return } @@ -941,7 +910,7 @@ func (api *API) appIdentifyDocument(c *gin.Context) { func (api *API) appSaveNewDocument(c *gin.Context) { var rDocAdd requestDocumentAdd if err := c.ShouldBind(&rDocAdd); err != nil { - log.Error("[appSaveNewDocument] Invalid Form Bind") + log.Error("Invalid Form Bind") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -980,7 +949,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { // Save Book tempFilePath, err := search.SaveBook(rDocAdd.ID, rDocAdd.Source) if err != nil { - log.Warn("[appSaveNewDocument] Temp File Error: ", err) + log.Warn("Temp File Error: ", err) sendDownloadMessage("Unable to download file", gin.H{"Error": true}) return } @@ -991,7 +960,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { // Calculate Partial MD5 ID partialMD5, err := utils.CalculatePartialMD5(tempFilePath) if err != nil { - log.Warn("[appSaveNewDocument] Partial MD5 Error: ", err) + log.Warn("Partial MD5 Error: ", err) sendDownloadMessage("Unable to calculate partial MD5", gin.H{"Error": true}) } @@ -1025,7 +994,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { // Open Source File sourceFile, err := os.Open(tempFilePath) if err != nil { - log.Error("[appSaveNewDocument] Source File Error: ", err) + log.Error("Source File Error: ", err) sendDownloadMessage("Unable to open file", gin.H{"Error": true}) return } @@ -1036,7 +1005,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { safePath := filepath.Join(api.Config.DataPath, "documents", fileName) destFile, err := os.Create(safePath) if err != nil { - log.Error("[appSaveNewDocument] Dest File Error: ", err) + log.Error("Dest File Error: ", err) sendDownloadMessage("Unable to create file", gin.H{"Error": true}) return } @@ -1044,7 +1013,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { // Copy File if _, err = io.Copy(destFile, sourceFile); err != nil { - log.Error("[appSaveNewDocument] Copy Temp File Error: ", err) + log.Error("Copy Temp File Error: ", err) sendDownloadMessage("Unable to save file", gin.H{"Error": true}) return } @@ -1055,7 +1024,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { // Get MD5 Hash fileHash, err := getFileMD5(safePath) if err != nil { - log.Error("[appSaveNewDocument] Hash Failure: ", err) + log.Error("Hash Failure: ", err) sendDownloadMessage("Unable to calculate MD5", gin.H{"Error": true}) return } @@ -1066,7 +1035,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { // Get Word Count wordCount, err := metadata.GetWordCount(safePath) if err != nil { - log.Error("[appSaveNewDocument] Word Count Failure: ", err) + log.Error("Word Count Failure: ", err) sendDownloadMessage("Unable to calculate word count", gin.H{"Error": true}) return } @@ -1083,7 +1052,7 @@ func (api *API) appSaveNewDocument(c *gin.Context) { Filepath: &fileName, Words: &wordCount, }); err != nil { - log.Error("[appSaveNewDocument] UpsertDocument DB Error: ", err) + log.Error("UpsertDocument DB Error: ", err) sendDownloadMessage("Unable to save to database", gin.H{"Error": true}) return } @@ -1099,14 +1068,14 @@ func (api *API) appSaveNewDocument(c *gin.Context) { func (api *API) appEditSettings(c *gin.Context) { var rUserSettings requestSettingsEdit if err := c.ShouldBind(&rUserSettings); err != nil { - log.Error("[appEditSettings] Invalid Form Bind") + log.Error("Invalid Form Bind") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } // Validate Something Exists if rUserSettings.Password == nil && rUserSettings.NewPassword == nil && rUserSettings.TimeOffset == nil { - log.Error("[appEditSettings] Missing Form Values") + log.Error("Missing Form Values") errorPage(c, http.StatusBadRequest, "Invalid or missing form values.") return } @@ -1144,7 +1113,7 @@ func (api *API) appEditSettings(c *gin.Context) { // Update User _, err := api.DB.Queries.UpdateUser(api.DB.Ctx, newUserSettings) if err != nil { - log.Error("[appEditSettings] UpdateUser DB Error: ", err) + log.Error("UpdateUser DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpdateUser DB Error: %v", err)) return } @@ -1152,7 +1121,7 @@ func (api *API) appEditSettings(c *gin.Context) { // Get User user, err := api.DB.Queries.GetUser(api.DB.Ctx, auth.UserName) if err != nil { - log.Error("[appEditSettings] GetUser DB Error: ", err) + log.Error("GetUser DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err)) return } @@ -1160,7 +1129,7 @@ func (api *API) appEditSettings(c *gin.Context) { // Get Devices devices, err := api.DB.Queries.GetDevices(api.DB.Ctx, auth.UserName) if err != nil { - log.Error("[appEditSettings] GetDevices DB Error: ", err) + log.Error("GetDevices DB Error: ", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) return } @@ -1181,7 +1150,7 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats // Do Transaction tx, err := api.DB.DB.Begin() if err != nil { - log.Error("[getDocumentsWordCount] Transaction Begin DB Error: ", err) + log.Error("Transaction Begin DB Error: ", err) return err } @@ -1194,13 +1163,13 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats filePath := filepath.Join(api.Config.DataPath, "documents", *item.Filepath) wordCount, err := metadata.GetWordCount(filePath) if err != nil { - log.Warn("[getDocumentsWordCount] Word Count Error: ", err) + log.Warn("Word Count Error: ", err) } else { if _, err := qtx.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{ ID: item.ID, Words: &wordCount, }); err != nil { - log.Error("[getDocumentsWordCount] UpsertDocument DB Error: ", err) + log.Error("UpsertDocument DB Error: ", err) return err } } @@ -1209,7 +1178,7 @@ func (api *API) getDocumentsWordCount(documents []database.GetDocumentsWithStats // Commit Transaction if err := tx.Commit(); err != nil { - log.Error("[getDocumentsWordCount] Transaction Commit DB Error: ", err) + log.Error("Transaction Commit DB Error: ", err) return err } @@ -1349,3 +1318,175 @@ func arrangeUserStatistics(userStatistics []database.GetUserStatisticsRow) gin.H }, } } + +func (api *API) processRestoreFile(rAdminAction requestAdminAction, c *gin.Context) { + // Validate Type & Derive Extension on MIME + uploadedFile, err := rAdminAction.RestoreFile.Open() + if err != nil { + log.Error("File Error: ", err) + errorPage(c, http.StatusInternalServerError, "Unable to open file.") + return + } + + fileMime, err := mimetype.DetectReader(uploadedFile) + if err != nil { + log.Error("MIME Error") + errorPage(c, http.StatusInternalServerError, "Unable to detect filetype.") + return + } + fileExtension := fileMime.Extension() + + // Validate Extension + if !slices.Contains([]string{".zip"}, fileExtension) { + log.Error("Invalid FileType: ", fileExtension) + errorPage(c, http.StatusBadRequest, "Invalid filetype.") + return + } + + // Create Temp File + tempFile, err := os.CreateTemp("", "restore") + if err != nil { + log.Warn("Temp File Create Error: ", err) + errorPage(c, http.StatusInternalServerError, "Unable to create temp file.") + return + } + defer os.Remove(tempFile.Name()) + defer tempFile.Close() + + // Save Temp + err = c.SaveUploadedFile(rAdminAction.RestoreFile, tempFile.Name()) + if err != nil { + log.Error("File Error: ", err) + errorPage(c, http.StatusInternalServerError, "Unable to save file.") + return + } + + // ZIP Info + fileInfo, err := tempFile.Stat() + if err != nil { + log.Error("File Error: ", err) + errorPage(c, http.StatusInternalServerError, "Unable to read file.") + return + } + + // Create ZIP Reader + r, err := zip.NewReader(tempFile, fileInfo.Size()) + if err != nil { + log.Error("ZIP Error: ", err) + errorPage(c, http.StatusInternalServerError, "Unable to read zip.") + return + } + + // Validate ZIP Contents + hasDBFile := false + hasUnknownFile := false + for _, f := range r.File { + fileName := strings.TrimPrefix(f.Name, "/") + if fileName == "antholume.db" { + hasDBFile = true + break + } else if !strings.HasPrefix(fileName, "covers/") && !strings.HasPrefix(fileName, "documents/") { + hasUnknownFile = true + break + } + } + + // Invalid ZIP + if !hasDBFile { + log.Error("Invalid ZIP File - Missing DB") + errorPage(c, http.StatusInternalServerError, "Invalid Restore ZIP - Missing DB") + return + } else if hasUnknownFile { + log.Error("Invalid ZIP File - Invalid File(s)") + errorPage(c, http.StatusInternalServerError, "Invalid Restore ZIP - Invalid File(s)") + return + } + + // Create Backup File + backupFilePath := path.Join(api.Config.ConfigPath, fmt.Sprintf("backup/AnthoLumeBackup_%s.zip", time.Now().Format("20060102"))) + backupFile, err := os.Create(backupFilePath) + if err != nil { + log.Error("Unable to create backup file: ", err) + errorPage(c, http.StatusInternalServerError, "Unable to create backup file.") + return + } + defer backupFile.Close() + + // Save Backup File + w := bufio.NewWriter(backupFile) + err = api.createBackup(w, []string{"covers", "documents"}) + if err != nil { + log.Error("Unable to save backup file: ", err) + errorPage(c, http.StatusInternalServerError, "Unable to save backup file.") + return + } + + // TODO: + // - Extract from temp directory +} + +func (api *API) createBackup(w io.Writer, directories []string) error { + ar := zip.NewWriter(w) + + exportWalker := func(currentPath string, f fs.DirEntry, err error) error { + if err != nil { + return err + } + if f.IsDir() { + return nil + } + + // Open File on Disk + file, err := os.Open(currentPath) + if err != nil { + return err + } + defer file.Close() + + // Derive Export Structure + fileName := filepath.Base(currentPath) + folderName := filepath.Base(filepath.Dir(currentPath)) + + // Create File in Export + newF, err := ar.Create(path.Join(folderName, fileName)) + if err != nil { + return err + } + + // Copy File in Export + _, err = io.Copy(newF, file) + if err != nil { + return err + } + + return nil + } + + // Get DB Path + fileName := fmt.Sprintf("%s.db", api.Config.DBName) + dbLocation := path.Join(api.Config.ConfigPath, fileName) + + // Copy Database File + dbFile, err := os.Open(dbLocation) + if err != nil { + return err + } + defer dbFile.Close() + + newDbFile, err := ar.Create(fileName) + if err != nil { + return err + } + io.Copy(newDbFile, dbFile) + + // Backup Covers & Documents + for _, dir := range directories { + err = filepath.WalkDir(path.Join(api.Config.DataPath, dir), exportWalker) + if err != nil { + return err + } + } + + ar.Close() + return nil +} diff --git a/api/auth.go b/api/auth.go index a9da3ea..03596a6 100644 --- a/api/auth.go +++ b/api/auth.go @@ -206,7 +206,7 @@ func (api *API) appAuthFormRegister(c *gin.Context) { // SQL Error if err != nil { - log.Error("[appAuthFormRegister] CreateUser DB Error:", err) + log.Error("CreateUser DB Error:", err) templateVars["Error"] = "Registration Disabled or User Already Exists" c.HTML(http.StatusBadRequest, "page/login", templateVars) return @@ -214,7 +214,7 @@ func (api *API) appAuthFormRegister(c *gin.Context) { // User Already Exists if rows == 0 { - log.Warn("[appAuthFormRegister] User Already Exists:", username) + log.Warn("User Already Exists:", username) templateVars["Error"] = "Registration Disabled or User Already Exists" c.HTML(http.StatusBadRequest, "page/login", templateVars) return @@ -223,7 +223,7 @@ func (api *API) appAuthFormRegister(c *gin.Context) { // Get User user, err := api.DB.Queries.GetUser(api.DB.Ctx, username) if err != nil { - log.Error("[appAuthFormRegister] GetUser DB Error:", err) + log.Error("GetUser DB Error:", err) templateVars["Error"] = "Registration Disabled or User Already Exists" c.HTML(http.StatusBadRequest, "page/login", templateVars) return @@ -268,7 +268,7 @@ func getSession(session sessions.Session) (auth authData, ok bool) { // Refresh if expiresAt.(int64)-time.Now().Unix() < 60*60*24 { - log.Info("[getSession] Refreshing Session") + log.Info("Refreshing Session") setSession(session, auth) } diff --git a/api/common.go b/api/common.go index 7d6074b..3bbffa5 100644 --- a/api/common.go +++ b/api/common.go @@ -14,7 +14,7 @@ import ( func (api *API) downloadDocument(c *gin.Context) { var rDoc requestDocumentID if err := c.ShouldBindUri(&rDoc); err != nil { - log.Error("[downloadDocument] Invalid URI Bind") + log.Error("Invalid URI Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -22,13 +22,13 @@ func (api *API) downloadDocument(c *gin.Context) { // Get Document document, err := api.DB.Queries.GetDocument(api.DB.Ctx, rDoc.DocumentID) if err != nil { - log.Error("[downloadDocument] GetDocument DB Error:", err) + log.Error("GetDocument DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Document"}) return } if document.Filepath == nil { - log.Error("[downloadDocument] Document Doesn't Have File:", rDoc.DocumentID) + log.Error("Document Doesn't Have File:", rDoc.DocumentID) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Document Doesn't Exist"}) return } @@ -39,7 +39,7 @@ func (api *API) downloadDocument(c *gin.Context) { // Validate File Exists _, err = os.Stat(filePath) if os.IsNotExist(err) { - log.Error("[downloadDocument] File Doesn't Exist:", rDoc.DocumentID) + log.Error("File Doesn't Exist:", rDoc.DocumentID) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Document Doesn't Exists"}) return } @@ -52,7 +52,7 @@ func (api *API) downloadDocument(c *gin.Context) { func (api *API) getDocumentCover(c *gin.Context) { var rDoc requestDocumentID if err := c.ShouldBindUri(&rDoc); err != nil { - log.Error("[getDocumentCover] Invalid URI Bind") + log.Error("Invalid URI Bind") errorPage(c, http.StatusNotFound, "Invalid cover.") return } @@ -60,7 +60,7 @@ func (api *API) getDocumentCover(c *gin.Context) { // Validate Document Exists in DB document, err := api.DB.Queries.GetDocument(api.DB.Ctx, rDoc.DocumentID) if err != nil { - log.Error("[getDocumentCover] GetDocument DB Error:", err) + log.Error("GetDocument DB Error:", err) errorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocument DB Error: %v", err)) return } @@ -78,7 +78,7 @@ func (api *API) getDocumentCover(c *gin.Context) { // Validate File Exists _, err = os.Stat(safePath) if err != nil { - log.Error("[getDocumentCover] File Should But Doesn't Exist:", err) + log.Error("File Should But Doesn't Exist:", err) c.FileFromFS("assets/images/no-cover.jpg", http.FS(api.Assets)) return } @@ -117,7 +117,7 @@ func (api *API) getDocumentCover(c *gin.Context) { Isbn10: firstResult.ISBN10, Isbn13: firstResult.ISBN13, }); err != nil { - log.Error("[getDocumentCover] AddMetadata DB Error:", err) + log.Error("AddMetadata DB Error:", err) } } @@ -126,7 +126,7 @@ func (api *API) getDocumentCover(c *gin.Context) { ID: document.ID, Coverfile: &coverFile, }); err != nil { - log.Warn("[getDocumentCover] UpsertDocument DB Error:", err) + log.Warn("UpsertDocument DB Error:", err) } // Return Unknown Cover diff --git a/api/ko-routes.go b/api/ko-routes.go index 08d17a7..b6ee58c 100644 --- a/api/ko-routes.go +++ b/api/ko-routes.go @@ -89,20 +89,20 @@ func (api *API) koCreateUser(c *gin.Context) { var rUser requestUser if err := c.ShouldBindJSON(&rUser); err != nil { - log.Error("[koCreateUser] Invalid JSON Bind") + log.Error("Invalid JSON Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid User Data"}) return } if rUser.Username == "" || rUser.Password == "" { - log.Error("[koCreateUser] Invalid User - Empty Username or Password") + log.Error("Invalid User - Empty Username or Password") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid User Data"}) return } hashedPassword, err := argon2.CreateHash(rUser.Password, argon2.DefaultParams) if err != nil { - log.Error("[koCreateUser] Argon2 Hash Failure:", err) + log.Error("Argon2 Hash Failure:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"}) return } @@ -112,7 +112,7 @@ func (api *API) koCreateUser(c *gin.Context) { Pass: &hashedPassword, }) if err != nil { - log.Error("[koCreateUser] CreateUser DB Error:", err) + log.Error("CreateUser DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid User Data"}) return } @@ -136,7 +136,7 @@ func (api *API) koSetProgress(c *gin.Context) { var rPosition requestPosition if err := c.ShouldBindJSON(&rPosition); err != nil { - log.Error("[koSetProgress] Invalid JSON Bind") + log.Error("Invalid JSON Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Progress Data"}) return } @@ -148,14 +148,14 @@ func (api *API) koSetProgress(c *gin.Context) { DeviceName: rPosition.Device, LastSynced: time.Now().UTC().Format(time.RFC3339), }); err != nil { - log.Error("[koSetProgress] UpsertDevice DB Error:", err) + log.Error("UpsertDevice DB Error:", err) } // Upsert Document if _, err := api.DB.Queries.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{ ID: rPosition.DocumentID, }); err != nil { - log.Error("[koSetProgress] UpsertDocument DB Error:", err) + log.Error("UpsertDocument DB Error:", err) } // Create or Replace Progress @@ -167,7 +167,7 @@ func (api *API) koSetProgress(c *gin.Context) { Progress: rPosition.Progress, }) if err != nil { - log.Error("[koSetProgress] UpdateProgress DB Error:", err) + log.Error("UpdateProgress DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -186,7 +186,7 @@ func (api *API) koGetProgress(c *gin.Context) { var rDocID requestDocumentID if err := c.ShouldBindUri(&rDocID); err != nil { - log.Error("[koGetProgress] Invalid URI Bind") + log.Error("Invalid URI Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -201,7 +201,7 @@ func (api *API) koGetProgress(c *gin.Context) { c.JSON(http.StatusOK, gin.H{}) return } else if err != nil { - log.Error("[koGetProgress] GetDocumentProgress DB Error:", err) + log.Error("GetDocumentProgress DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document"}) return } @@ -223,7 +223,7 @@ func (api *API) koAddActivities(c *gin.Context) { var rActivity requestActivity if err := c.ShouldBindJSON(&rActivity); err != nil { - log.Error("[koAddActivities] Invalid JSON Bind") + log.Error("Invalid JSON Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Activity"}) return } @@ -231,7 +231,7 @@ func (api *API) koAddActivities(c *gin.Context) { // Do Transaction tx, err := api.DB.DB.Begin() if err != nil { - log.Error("[koAddActivities] Transaction Begin DB Error:", err) + log.Error("Transaction Begin DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"}) return } @@ -252,7 +252,7 @@ func (api *API) koAddActivities(c *gin.Context) { if _, err := qtx.UpsertDocument(api.DB.Ctx, database.UpsertDocumentParams{ ID: doc, }); err != nil { - log.Error("[koAddActivities] UpsertDocument DB Error:", err) + log.Error("UpsertDocument DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document"}) return } @@ -265,7 +265,7 @@ func (api *API) koAddActivities(c *gin.Context) { DeviceName: rActivity.Device, LastSynced: time.Now().UTC().Format(time.RFC3339), }); err != nil { - log.Error("[koAddActivities] UpsertDevice DB Error:", err) + log.Error("UpsertDevice DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Device"}) return } @@ -281,7 +281,7 @@ func (api *API) koAddActivities(c *gin.Context) { StartPercentage: float64(item.Page) / float64(item.Pages), EndPercentage: float64(item.Page+1) / float64(item.Pages), }); err != nil { - log.Error("[koAddActivities] AddActivity DB Error:", err) + log.Error("AddActivity DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Activity"}) return } @@ -289,7 +289,7 @@ func (api *API) koAddActivities(c *gin.Context) { // Commit Transaction if err := tx.Commit(); err != nil { - log.Error("[koAddActivities] Transaction Commit DB Error:", err) + log.Error("Transaction Commit DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"}) return } @@ -307,7 +307,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) { var rCheckActivity requestCheckActivitySync if err := c.ShouldBindJSON(&rCheckActivity); err != nil { - log.Error("[koCheckActivitySync] Invalid JSON Bind") + log.Error("Invalid JSON Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -319,7 +319,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) { DeviceName: rCheckActivity.Device, LastSynced: time.Now().UTC().Format(time.RFC3339), }); err != nil { - log.Error("[koCheckActivitySync] UpsertDevice DB Error", err) + log.Error("UpsertDevice DB Error", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Device"}) return } @@ -332,7 +332,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) { if err == sql.ErrNoRows { lastActivity = time.UnixMilli(0).Format(time.RFC3339) } else if err != nil { - log.Error("[koCheckActivitySync] GetLastActivity DB Error:", err) + log.Error("GetLastActivity DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"}) return } @@ -340,7 +340,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) { // Parse Time parsedTime, err := time.Parse(time.RFC3339, lastActivity) if err != nil { - log.Error("[koCheckActivitySync] Time Parse Error:", err) + log.Error("Time Parse Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"}) return } @@ -353,7 +353,7 @@ func (api *API) koCheckActivitySync(c *gin.Context) { func (api *API) koAddDocuments(c *gin.Context) { var rNewDocs requestDocument if err := c.ShouldBindJSON(&rNewDocs); err != nil { - log.Error("[koAddDocuments] Invalid JSON Bind") + log.Error("Invalid JSON Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document(s)"}) return } @@ -361,7 +361,7 @@ func (api *API) koAddDocuments(c *gin.Context) { // Do Transaction tx, err := api.DB.DB.Begin() if err != nil { - log.Error("[koAddDocuments] Transaction Begin DB Error:", err) + log.Error("Transaction Begin DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"}) return } @@ -382,7 +382,7 @@ func (api *API) koAddDocuments(c *gin.Context) { Description: api.sanitizeInput(doc.Description), }) if err != nil { - log.Error("[koAddDocuments] UpsertDocument DB Error:", err) + log.Error("UpsertDocument DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Document"}) return } @@ -390,7 +390,7 @@ func (api *API) koAddDocuments(c *gin.Context) { // Commit Transaction if err := tx.Commit(); err != nil { - log.Error("[koAddDocuments] Transaction Commit DB Error:", err) + log.Error("Transaction Commit DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Error"}) return } @@ -408,7 +408,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) { var rCheckDocs requestCheckDocumentSync if err := c.ShouldBindJSON(&rCheckDocs); err != nil { - log.Error("[koCheckDocumentsSync] Invalid JSON Bind") + log.Error("Invalid JSON Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -421,7 +421,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) { LastSynced: time.Now().UTC().Format(time.RFC3339), }) if err != nil { - log.Error("[koCheckDocumentsSync] UpsertDevice DB Error", err) + log.Error("UpsertDevice DB Error", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Device"}) return } @@ -432,7 +432,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) { // Get Missing Documents missingDocs, err = api.DB.Queries.GetMissingDocuments(api.DB.Ctx, rCheckDocs.Have) if err != nil { - log.Error("[koCheckDocumentsSync] GetMissingDocuments DB Error", err) + log.Error("GetMissingDocuments DB Error", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -440,7 +440,7 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) { // Get Deleted Documents deletedDocIDs, err = api.DB.Queries.GetDeletedDocuments(api.DB.Ctx, rCheckDocs.Have) if err != nil { - log.Error("[koCheckDocumentsSync] GetDeletedDocuments DB Error", err) + log.Error("GetDeletedDocuments DB Error", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -448,14 +448,14 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) { // Get Wanted Documents jsonHaves, err := json.Marshal(rCheckDocs.Have) if err != nil { - log.Error("[koCheckDocumentsSync] JSON Marshal Error", err) + log.Error("JSON Marshal Error", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } wantedDocs, err := api.DB.Queries.GetWantedDocuments(api.DB.Ctx, string(jsonHaves)) if err != nil { - log.Error("[koCheckDocumentsSync] GetWantedDocuments DB Error", err) + log.Error("GetWantedDocuments DB Error", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } @@ -499,14 +499,14 @@ func (api *API) koCheckDocumentsSync(c *gin.Context) { func (api *API) koUploadExistingDocument(c *gin.Context) { var rDoc requestDocumentID if err := c.ShouldBindUri(&rDoc); err != nil { - log.Error("[koUploadExistingDocument] Invalid URI Bind") + log.Error("Invalid URI Bind") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Request"}) return } fileData, err := c.FormFile("file") if err != nil { - log.Error("[koUploadExistingDocument] File Error:", err) + log.Error("File Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"}) return } @@ -517,7 +517,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) { fileExtension := fileMime.Extension() if !slices.Contains([]string{".epub", ".html"}, fileExtension) { - log.Error("[koUploadExistingDocument] Invalid FileType:", fileExtension) + log.Error("Invalid FileType:", fileExtension) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Invalid Filetype"}) return } @@ -525,7 +525,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) { // Validate Document Exists in DB document, err := api.DB.Queries.GetDocument(api.DB.Ctx, rDoc.DocumentID) if err != nil { - log.Error("[koUploadExistingDocument] GetDocument DB Error:", err) + log.Error("GetDocument DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Unknown Document"}) return } @@ -558,7 +558,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) { if os.IsNotExist(err) { err = c.SaveUploadedFile(fileData, safePath) if err != nil { - log.Error("[koUploadExistingDocument] Save Failure:", err) + log.Error("Save Failure:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"}) return } @@ -567,7 +567,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) { // Get MD5 Hash fileHash, err := getFileMD5(safePath) if err != nil { - log.Error("[koUploadExistingDocument] Hash Failure:", err) + log.Error("Hash Failure:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"}) return } @@ -575,7 +575,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) { // Get Word Count wordCount, err := metadata.GetWordCount(safePath) if err != nil { - log.Error("[koUploadExistingDocument] Word Count Failure:", err) + log.Error("Word Count Failure:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "File Error"}) return } @@ -587,7 +587,7 @@ func (api *API) koUploadExistingDocument(c *gin.Context) { Filepath: &fileName, Words: &wordCount, }); err != nil { - log.Error("[koUploadExistingDocument] UpsertDocument DB Error:", err) + log.Error("UpsertDocument DB Error:", err) c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Document Error"}) return } diff --git a/api/opds-routes.go b/api/opds-routes.go index ddd0762..85505e8 100644 --- a/api/opds-routes.go +++ b/api/opds-routes.go @@ -84,7 +84,7 @@ func (api *API) opdsDocuments(c *gin.Context) { Limit: *qParams.Limit, }) if err != nil { - log.Error("[opdsDocuments] GetDocumentsWithStats DB Error:", err) + log.Error("GetDocumentsWithStats DB Error:", err) c.AbortWithStatus(http.StatusBadRequest) return } diff --git a/assets/style.css b/assets/style.css index 5e6d4bc..6eab254 100644 --- a/assets/style.css +++ b/assets/style.css @@ -1 +1 @@ -/*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.visible{visibility:visible}.invisible{visibility:hidden}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.-bottom-28{bottom:-7rem}.-bottom-5{bottom:-1.25rem}.-top-2{top:-.5rem}.bottom-0{bottom:0}.bottom-4{bottom:1rem}.bottom-6{bottom:1.5rem}.bottom-7{bottom:1.75rem}.left-0{left:0}.left-1\/2{left:50%}.left-4{left:1rem}.left-5{left:1.25rem}.right-0{right:0}.right-4{right:1rem}.right-6{right:1.5rem}.top-0{top:0}.top-1{top:.25rem}.top-1\/2{top:50%}.top-16{top:4rem}.top-3{top:.75rem}.top-6{top:1.5rem}.top-7{top:1.75rem}.z-10{z-index:10}.z-20{z-index:20}.z-30{z-index:30}.z-40{z-index:40}.z-50{z-index:50}.float-right{float:right}.float-left{float:left}.m-4{margin:1rem}.m-auto{margin:auto}.mx-4{margin-left:1rem;margin-right:1rem}.mx-auto{margin-left:auto;margin-right:auto}.my-2{margin-top:.5rem;margin-bottom:.5rem}.my-6{margin-top:1.5rem;margin-bottom:1.5rem}.my-auto{margin-top:auto;margin-bottom:auto}.-ml-6{margin-left:-1.5rem}.mb-12{margin-bottom:3rem}.mb-2{margin-bottom:.5rem}.mb-4{margin-bottom:1rem}.mb-8{margin-bottom:2rem}.ml-6{margin-left:1.5rem}.mr-4{margin-right:1rem}.mt-0{margin-top:0}.mt-0\.5{margin-top:.125rem}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.mt-4{margin-top:1rem}.block{display:block}.inline-block{display:inline-block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-0{height:0}.h-0\.5{height:.125rem}.h-16{height:4rem}.h-2{height:.5rem}.h-32{height:8rem}.h-4{height:1rem}.h-48{height:12rem}.h-7{height:1.75rem}.h-\[100dvh\]{height:100dvh}.h-full{height:100%}.h-screen{height:100vh}.max-h-\[10em\]{max-height:10em}.max-h-\[95\%\]{max-height:95%}.min-h-\[10em\]{min-height:10em}.w-0{width:0}.w-1\/2{width:50%}.w-12{width:3rem}.w-16{width:4rem}.w-24{width:6rem}.w-32{width:8rem}.w-4{width:1rem}.w-40{width:10rem}.w-44{width:11rem}.w-48{width:12rem}.w-5\/6{width:83.333333%}.w-56{width:14rem}.w-7{width:1.75rem}.w-72{width:18rem}.w-\[90\%\]{width:90%}.w-full{width:100%}.w-max{width:-moz-max-content;width:max-content}.w-screen{width:100vw}.min-w-40{min-width:10rem}.min-w-\[12em\]{min-width:12em}.min-w-\[50\%\]{min-width:50%}.min-w-fit{min-width:-moz-fit-content;min-width:fit-content}.min-w-full{min-width:100%}.max-w-\[50dvw\]{max-width:50dvw}.max-w-screen-sm{max-width:640px}.max-w-screen-xl{max-width:1280px}.flex-1{flex:1 1 0%}.flex-none{flex:none}.shrink-0{flex-shrink:0}.grow{flex-grow:1}.origin-top-right{transform-origin:top right}.-translate-x-2\/4{--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.-translate-y-1\/2,.-translate-y-2\/4{--tw-translate-y:-50%}.-translate-y-1\/2,.-translate-y-2\/4,.transform{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.cursor-pointer{cursor:pointer}.resize{resize:both}.snap-x{scroll-snap-type:x var(--tw-scroll-snap-strictness)}.snap-mandatory{--tw-scroll-snap-strictness:mandatory}.snap-center{scroll-snap-align:center}.appearance-none{-webkit-appearance:none;-moz-appearance:none;appearance:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.flex-wrap-reverse{flex-wrap:wrap-reverse}.items-end{align-items:flex-end}.items-center{align-items:center}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.justify-around{justify-content:space-around}.gap-1{gap:.25rem}.gap-10{gap:2.5rem}.gap-2{gap:.5rem}.gap-4{gap:1rem}.gap-7{gap:1.75rem}.gap-8{gap:2rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(.5rem*var(--tw-space-x-reverse));margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(1rem*var(--tw-space-x-reverse));margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)))}.overflow-auto{overflow:auto}.overflow-hidden{overflow:hidden}.overflow-scroll{overflow:scroll}.overflow-x-auto{overflow-x:auto}.overflow-y-scroll{overflow-y:scroll}.text-ellipsis{text-overflow:ellipsis}.hyphens-auto{-webkit-hyphens:auto;hyphens:auto}.whitespace-nowrap{white-space:nowrap}.whitespace-pre{white-space:pre}.rounded{border-radius:.25rem}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.rounded-none{border-radius:0}.rounded-l{border-top-left-radius:.25rem}.rounded-bl,.rounded-l{border-bottom-left-radius:.25rem}.rounded-tr{border-top-right-radius:.25rem}.border{border-width:1px}.border-b{border-bottom-width:1px}.border-l{border-left-width:1px}.border-l-4{border-left-width:4px}.border-t{border-top-width:1px}.border-gray-200{--tw-border-opacity:1;border-color:rgb(229 231 235/var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity))}.border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity))}.border-purple-500{--tw-border-opacity:1;border-color:rgb(168 85 247/var(--tw-border-opacity))}.border-transparent{border-color:#0000}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity))}.bg-\[\#000\]{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-\[\#1f2937\]{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.bg-\[\#232323\]{--tw-bg-opacity:1;background-color:rgb(35 35 35/var(--tw-bg-opacity))}.bg-\[\#d2b48c\]{--tw-bg-opacity:1;background-color:rgb(210 180 140/var(--tw-bg-opacity))}.bg-\[\#fff\]{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-blue-100{--tw-bg-opacity:1;background-color:rgb(219 234 254/var(--tw-bg-opacity))}.bg-blue-700{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity))}.bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity))}.bg-gray-400{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity))}.bg-gray-500{--tw-bg-opacity:1;background-color:rgb(107 114 128/var(--tw-bg-opacity))}.bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.bg-green-200{--tw-bg-opacity:1;background-color:rgb(187 247 208/var(--tw-bg-opacity))}.bg-green-600{--tw-bg-opacity:1;background-color:rgb(22 163 74/var(--tw-bg-opacity))}.bg-red-500{--tw-bg-opacity:1;background-color:rgb(239 68 68/var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.object-cover{-o-object-fit:cover;object-fit:cover}.object-fill{-o-object-fit:fill;object-fit:fill}.p-1{padding:.25rem}.p-2{padding:.5rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-6{padding:1.5rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.px-8{padding-left:2rem;padding-right:2rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.pb-12{padding-bottom:3rem}.pb-2{padding-bottom:.5rem}.pb-4{padding-bottom:1rem}.pl-0{padding-left:0}.pl-14{padding-left:3.5rem}.pl-6{padding-left:1.5rem}.pr-8{padding-right:2rem}.pt-12{padding-top:3rem}.pt-2{padding-top:.5rem}.pt-3{padding-top:.75rem}.pt-4{padding-top:1rem}.pt-8{padding-top:2rem}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-justify{text-align:justify}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-5xl{font-size:3rem;line-height:1}.text-7xl{font-size:4.5rem;line-height:1}.text-base{font-size:1rem;line-height:1.5rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-bold{font-weight:700}.font-extrabold{font-weight:800}.font-light{font-weight:300}.font-medium{font-weight:500}.font-normal{font-weight:400}.font-semibold{font-weight:600}.uppercase{text-transform:uppercase}.leading-6{line-height:1.5rem}.leading-normal{line-height:1.5}.tracking-tight{letter-spacing:-.025em}.text-\[\#000\]{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-\[\#333\]{--tw-text-opacity:1;color:rgb(51 51 51/var(--tw-text-opacity))}.text-\[\#ccc\]{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity))}.text-\[\#fff\]{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-blue-700{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-green-400{--tw-text-opacity:1;color:rgb(74 222 128/var(--tw-text-opacity))}.text-red-400{--tw-text-opacity:1;color:rgb(248 113 113/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.underline{text-decoration-line:underline}.placeholder-gray-400::-moz-placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity))}.placeholder-gray-400::placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity))}.opacity-0{opacity:0}.opacity-30{opacity:.3}.opacity-50{opacity:.5}.shadow{--tw-shadow:0 1px 3px 0 #0000001a,0 1px 2px -1px #0000001a;--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color)}.shadow,.shadow-2xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-2xl{--tw-shadow:0 25px 50px -12px #00000040;--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.shadow-lg{--tw-shadow:0 10px 15px -3px #0000001a,0 4px 6px -4px #0000001a;--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.shadow-lg,.shadow-md{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-md{--tw-shadow:0 4px 6px -1px #0000001a,0 2px 4px -2px #0000001a;--tw-shadow-colored:0 4px 6px -1px var(--tw-shadow-color),0 2px 4px -2px var(--tw-shadow-color)}.shadow-sm{--tw-shadow:0 1px 2px 0 #0000000d;--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-gray-500{--tw-shadow-color:#6b7280;--tw-shadow:var(--tw-shadow-colored)}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-black{--tw-ring-opacity:1;--tw-ring-color:rgb(0 0 0/var(--tw-ring-opacity))}.ring-opacity-5{--tw-ring-opacity:0.05}.invert{--tw-invert:invert(100%)}.filter,.invert{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-all{transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-colors{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.duration-200{transition-duration:.2s}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.hover\:bg-blue-800:hover{--tw-bg-opacity:1;background-color:rgb(30 64 175/var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.hover\:bg-gray-400:hover{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity))}.hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.hover\:text-black:hover{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.hover\:text-gray-800:hover{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.hover\:text-gray-900:hover{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.hover\:opacity-100:hover{opacity:1}.focus\:border-transparent:focus{border-color:#0000}.focus\:outline-none:focus{outline:2px solid #0000;outline-offset:2px}.focus\:ring-2:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.focus\:ring-2:focus,.focus\:ring-4:focus{box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring-4:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.focus\:ring-blue-300:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(147 197 253/var(--tw-ring-opacity))}.focus\:ring-purple-600:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(147 51 234/var(--tw-ring-opacity))}.peer\/All:checked~.peer-checked\/All\:block,.peer\/Month:checked~.peer-checked\/Month\:block,.peer\/Week:checked~.peer-checked\/Week\:block,.peer\/Year:checked~.peer-checked\/Year\:block{display:block}@media (prefers-color-scheme:dark){.dark\:border-black{--tw-border-opacity:1;border-color:rgb(0 0 0/var(--tw-border-opacity))}.dark\:border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity))}.dark\:border-gray-800{--tw-border-opacity:1;border-color:rgb(31 41 55/var(--tw-border-opacity))}.dark\:bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity))}.dark\:bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.dark\:bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity))}.dark\:bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity))}.dark\:bg-gray-600{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity))}.dark\:bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.dark\:bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.dark\:bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity))}.dark\:bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.dark\:text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.dark\:text-gray-100{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity))}.dark\:text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.dark\:text-gray-300{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity))}.dark\:text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity))}.dark\:text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.dark\:text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.dark\:text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.dark\:text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.dark\:shadow-gray-800{--tw-shadow-color:#1f2937;--tw-shadow:var(--tw-shadow-colored)}.dark\:shadow-gray-900{--tw-shadow-color:#111827;--tw-shadow:var(--tw-shadow-colored)}.dark\:hover\:bg-blue-700:hover{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-600:hover{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-700:hover{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.dark\:hover\:text-gray-100:hover{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity))}.dark\:hover\:text-white:hover{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.dark\:focus\:ring-blue-800:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(30 64 175/var(--tw-ring-opacity))}}@media (min-width:640px){.sm\:col-span-2{grid-column:span 2/span 2}.sm\:mt-0{margin-top:0}.sm\:grid{display:grid}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:gap-4{gap:1rem}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}}@media (min-width:768px){.md\:mr-2{margin-right:.5rem}.md\:block{display:block}.md\:table-cell{display:table-cell}.md\:w-1\/2{width:50%}.md\:w-60{width:15rem}.md\:w-fit{width:-moz-fit-content;width:fit-content}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:justify-start{justify-content:flex-start}.md\:px-24{padding-left:6rem;padding-right:6rem}.md\:px-6{padding-left:1.5rem;padding-right:1.5rem}.md\:pt-0{padding-top:0}.md\:pt-8{padding-top:2rem}.md\:text-4xl{font-size:2.25rem;line-height:2.5rem}.md\:text-sm{font-size:.875rem;line-height:1.25rem}}@media (min-width:1024px){.lg\:mx-48{margin-left:12rem;margin-right:12rem}.lg\:ml-44{margin-left:11rem}.lg\:ml-48{margin-left:12rem}.lg\:hidden{display:none}.lg\:w-48{width:12rem}.lg\:w-80{width:20rem}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:justify-around{justify-content:space-around}.lg\:px-32{padding-left:8rem;padding-right:8rem}.lg\:px-6{padding-left:1.5rem;padding-right:1.5rem}.lg\:py-16{padding-top:4rem;padding-bottom:4rem}.lg\:pr-0{padding-right:0}.lg\:text-9xl{font-size:8rem;line-height:1}} \ No newline at end of file +/*! tailwindcss v3.3.5 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:initial;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:initial}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,::backdrop,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:#3b82f680;--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}.visible{visibility:visible}.invisible{visibility:hidden}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.-bottom-28{bottom:-7rem}.-bottom-5{bottom:-1.25rem}.-top-2{top:-.5rem}.bottom-0{bottom:0}.bottom-4{bottom:1rem}.bottom-6{bottom:1.5rem}.bottom-7{bottom:1.75rem}.left-0{left:0}.left-1\/2{left:50%}.left-4{left:1rem}.left-5{left:1.25rem}.right-0{right:0}.right-4{right:1rem}.right-6{right:1.5rem}.top-0{top:0}.top-1{top:.25rem}.top-1\/2{top:50%}.top-16{top:4rem}.top-3{top:.75rem}.top-6{top:1.5rem}.top-7{top:1.75rem}.z-10{z-index:10}.z-20{z-index:20}.z-30{z-index:30}.z-40{z-index:40}.z-50{z-index:50}.float-right{float:right}.float-left{float:left}.m-4{margin:1rem}.m-auto{margin:auto}.mx-4{margin-left:1rem;margin-right:1rem}.mx-auto{margin-left:auto;margin-right:auto}.my-2{margin-top:.5rem;margin-bottom:.5rem}.my-6{margin-top:1.5rem;margin-bottom:1.5rem}.my-auto{margin-top:auto;margin-bottom:auto}.-ml-6{margin-left:-1.5rem}.mb-12{margin-bottom:3rem}.mb-2{margin-bottom:.5rem}.mb-4{margin-bottom:1rem}.mb-8{margin-bottom:2rem}.ml-6{margin-left:1.5rem}.mr-4{margin-right:1rem}.mt-0{margin-top:0}.mt-0\.5{margin-top:.125rem}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.mt-4{margin-top:1rem}.block{display:block}.inline-block{display:inline-block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.table{display:table}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-0{height:0}.h-0\.5{height:.125rem}.h-16{height:4rem}.h-2{height:.5rem}.h-32{height:8rem}.h-4{height:1rem}.h-48{height:12rem}.h-7{height:1.75rem}.h-\[100dvh\]{height:100dvh}.h-full{height:100%}.h-screen{height:100vh}.max-h-\[10em\]{max-height:10em}.max-h-\[95\%\]{max-height:95%}.min-h-\[10em\]{min-height:10em}.w-0{width:0}.w-1\/2{width:50%}.w-12{width:3rem}.w-16{width:4rem}.w-24{width:6rem}.w-32{width:8rem}.w-4{width:1rem}.w-40{width:10rem}.w-44{width:11rem}.w-48{width:12rem}.w-5\/6{width:83.333333%}.w-56{width:14rem}.w-7{width:1.75rem}.w-72{width:18rem}.w-\[90\%\]{width:90%}.w-full{width:100%}.w-max{width:-moz-max-content;width:max-content}.w-screen{width:100vw}.min-w-40{min-width:10rem}.min-w-\[12em\]{min-width:12em}.min-w-\[50\%\]{min-width:50%}.min-w-fit{min-width:-moz-fit-content;min-width:fit-content}.min-w-full{min-width:100%}.max-w-\[50dvw\]{max-width:50dvw}.max-w-screen-sm{max-width:640px}.max-w-screen-xl{max-width:1280px}.flex-1{flex:1 1 0%}.flex-none{flex:none}.shrink-0{flex-shrink:0}.grow{flex-grow:1}.origin-top-right{transform-origin:top right}.-translate-x-2\/4{--tw-translate-x:-50%;transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.-translate-y-1\/2,.-translate-y-2\/4{--tw-translate-y:-50%}.-translate-y-1\/2,.-translate-y-2\/4,.transform{transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.cursor-pointer{cursor:pointer}.resize{resize:both}.snap-x{scroll-snap-type:x var(--tw-scroll-snap-strictness)}.snap-mandatory{--tw-scroll-snap-strictness:mandatory}.snap-center{scroll-snap-align:center}.appearance-none{-webkit-appearance:none;-moz-appearance:none;appearance:none}.grid-cols-1{grid-template-columns:repeat(1,minmax(0,1fr))}.grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.flex-wrap-reverse{flex-wrap:wrap-reverse}.items-end{align-items:flex-end}.items-center{align-items:center}.justify-start{justify-content:flex-start}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.justify-between{justify-content:space-between}.justify-around{justify-content:space-around}.gap-1{gap:.25rem}.gap-10{gap:2.5rem}.gap-2{gap:.5rem}.gap-4{gap:1rem}.gap-7{gap:1.75rem}.gap-8{gap:2rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(.5rem*var(--tw-space-x-reverse));margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-right:calc(1rem*var(--tw-space-x-reverse));margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)))}.overflow-auto{overflow:auto}.overflow-hidden{overflow:hidden}.overflow-scroll{overflow:scroll}.overflow-x-auto{overflow-x:auto}.overflow-y-scroll{overflow-y:scroll}.text-ellipsis{text-overflow:ellipsis}.hyphens-auto{-webkit-hyphens:auto;hyphens:auto}.whitespace-nowrap{white-space:nowrap}.whitespace-pre{white-space:pre}.rounded{border-radius:.25rem}.rounded-full{border-radius:9999px}.rounded-lg{border-radius:.5rem}.rounded-md{border-radius:.375rem}.rounded-none{border-radius:0}.rounded-l{border-top-left-radius:.25rem}.rounded-bl,.rounded-l{border-bottom-left-radius:.25rem}.rounded-tr{border-top-right-radius:.25rem}.border{border-width:1px}.border-b{border-bottom-width:1px}.border-l{border-left-width:1px}.border-l-4{border-left-width:4px}.border-t{border-top-width:1px}.border-gray-200{--tw-border-opacity:1;border-color:rgb(229 231 235/var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity))}.border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity))}.border-purple-500{--tw-border-opacity:1;border-color:rgb(168 85 247/var(--tw-border-opacity))}.border-transparent{border-color:#0000}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity))}.bg-\[\#000\]{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-\[\#1f2937\]{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.bg-\[\#232323\]{--tw-bg-opacity:1;background-color:rgb(35 35 35/var(--tw-bg-opacity))}.bg-\[\#d2b48c\]{--tw-bg-opacity:1;background-color:rgb(210 180 140/var(--tw-bg-opacity))}.bg-\[\#fff\]{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity))}.bg-blue-100{--tw-bg-opacity:1;background-color:rgb(219 234 254/var(--tw-bg-opacity))}.bg-blue-700{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity))}.bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity))}.bg-gray-400{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity))}.bg-gray-500{--tw-bg-opacity:1;background-color:rgb(107 114 128/var(--tw-bg-opacity))}.bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.bg-green-200{--tw-bg-opacity:1;background-color:rgb(187 247 208/var(--tw-bg-opacity))}.bg-green-600{--tw-bg-opacity:1;background-color:rgb(22 163 74/var(--tw-bg-opacity))}.bg-red-500{--tw-bg-opacity:1;background-color:rgb(239 68 68/var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.object-cover{-o-object-fit:cover;object-fit:cover}.object-fill{-o-object-fit:fill;object-fit:fill}.p-1{padding:.25rem}.p-2{padding:.5rem}.p-3{padding:.75rem}.p-4{padding:1rem}.p-6{padding:1.5rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-3{padding-left:.75rem;padding-right:.75rem}.px-4{padding-left:1rem;padding-right:1rem}.px-6{padding-left:1.5rem;padding-right:1.5rem}.px-8{padding-left:2rem;padding-right:2rem}.py-1{padding-top:.25rem;padding-bottom:.25rem}.py-2{padding-top:.5rem;padding-bottom:.5rem}.py-4{padding-top:1rem;padding-bottom:1rem}.py-5{padding-top:1.25rem;padding-bottom:1.25rem}.py-6{padding-top:1.5rem;padding-bottom:1.5rem}.py-8{padding-top:2rem;padding-bottom:2rem}.pb-12{padding-bottom:3rem}.pb-2{padding-bottom:.5rem}.pb-4{padding-bottom:1rem}.pl-0{padding-left:0}.pl-14{padding-left:3.5rem}.pl-6{padding-left:1.5rem}.pr-8{padding-right:2rem}.pt-12{padding-top:3rem}.pt-2{padding-top:.5rem}.pt-3{padding-top:.75rem}.pt-4{padding-top:1rem}.pt-8{padding-top:2rem}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-justify{text-align:justify}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-5xl{font-size:3rem;line-height:1}.text-7xl{font-size:4.5rem;line-height:1}.text-base{font-size:1rem;line-height:1.5rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-bold{font-weight:700}.font-extrabold{font-weight:800}.font-light{font-weight:300}.font-medium{font-weight:500}.font-normal{font-weight:400}.font-semibold{font-weight:600}.uppercase{text-transform:uppercase}.leading-6{line-height:1.5rem}.leading-normal{line-height:1.5}.tracking-tight{letter-spacing:-.025em}.text-\[\#000\]{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-\[\#333\]{--tw-text-opacity:1;color:rgb(51 51 51/var(--tw-text-opacity))}.text-\[\#ccc\]{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity))}.text-\[\#fff\]{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.text-blue-700{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.text-green-400{--tw-text-opacity:1;color:rgb(74 222 128/var(--tw-text-opacity))}.text-red-400{--tw-text-opacity:1;color:rgb(248 113 113/var(--tw-text-opacity))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.underline{text-decoration-line:underline}.placeholder-gray-400::-moz-placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity))}.placeholder-gray-400::placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity))}.opacity-0{opacity:0}.opacity-30{opacity:.3}.opacity-50{opacity:.5}.shadow{--tw-shadow:0 1px 3px 0 #0000001a,0 1px 2px -1px #0000001a;--tw-shadow-colored:0 1px 3px 0 var(--tw-shadow-color),0 1px 2px -1px var(--tw-shadow-color)}.shadow,.shadow-2xl{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-2xl{--tw-shadow:0 25px 50px -12px #00000040;--tw-shadow-colored:0 25px 50px -12px var(--tw-shadow-color)}.shadow-lg{--tw-shadow:0 10px 15px -3px #0000001a,0 4px 6px -4px #0000001a;--tw-shadow-colored:0 10px 15px -3px var(--tw-shadow-color),0 4px 6px -4px var(--tw-shadow-color)}.shadow-lg,.shadow-md{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-md{--tw-shadow:0 4px 6px -1px #0000001a,0 2px 4px -2px #0000001a;--tw-shadow-colored:0 4px 6px -1px var(--tw-shadow-color),0 2px 4px -2px var(--tw-shadow-color)}.shadow-sm{--tw-shadow:0 1px 2px 0 #0000000d;--tw-shadow-colored:0 1px 2px 0 var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-gray-500{--tw-shadow-color:#6b7280;--tw-shadow:var(--tw-shadow-colored)}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-black{--tw-ring-opacity:1;--tw-ring-color:rgb(0 0 0/var(--tw-ring-opacity))}.ring-opacity-5{--tw-ring-opacity:0.05}.invert{--tw-invert:invert(100%)}.filter,.invert{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.transition{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-all{transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.transition-colors{transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1);transition-duration:.15s}.duration-200{transition-duration:.2s}.ease-in{transition-timing-function:cubic-bezier(.4,0,1,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}.hover\:whitespace-pre:hover{white-space:pre}.hover\:bg-blue-800:hover{--tw-bg-opacity:1;background-color:rgb(30 64 175/var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.hover\:bg-gray-400:hover{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity))}.hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.hover\:text-black:hover{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.hover\:text-gray-800:hover{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.hover\:text-gray-900:hover{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity))}.hover\:opacity-100:hover{opacity:1}.focus\:border-transparent:focus{border-color:#0000}.focus\:outline-none:focus{outline:2px solid #0000;outline-offset:2px}.focus\:ring-2:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(2px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.focus\:ring-2:focus,.focus\:ring-4:focus{box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.focus\:ring-4:focus{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color)}.focus\:ring-blue-300:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(147 197 253/var(--tw-ring-opacity))}.focus\:ring-purple-600:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(147 51 234/var(--tw-ring-opacity))}.peer\/All:checked~.peer-checked\/All\:block,.peer\/Month:checked~.peer-checked\/Month\:block,.peer\/Week:checked~.peer-checked\/Week\:block,.peer\/Year:checked~.peer-checked\/Year\:block{display:block}@media (prefers-color-scheme:dark){.dark\:border-black{--tw-border-opacity:1;border-color:rgb(0 0 0/var(--tw-border-opacity))}.dark\:border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity))}.dark\:border-gray-800{--tw-border-opacity:1;border-color:rgb(31 41 55/var(--tw-border-opacity))}.dark\:bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity))}.dark\:bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.dark\:bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity))}.dark\:bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity))}.dark\:bg-gray-600{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity))}.dark\:bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.dark\:bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.dark\:bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity))}.dark\:bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity))}.dark\:text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity))}.dark\:text-gray-100{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity))}.dark\:text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity))}.dark\:text-gray-300{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity))}.dark\:text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity))}.dark\:text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity))}.dark\:text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity))}.dark\:text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity))}.dark\:text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.dark\:shadow-gray-800{--tw-shadow-color:#1f2937;--tw-shadow:var(--tw-shadow-colored)}.dark\:shadow-gray-900{--tw-shadow-color:#111827;--tw-shadow:var(--tw-shadow-colored)}.dark\:hover\:bg-blue-700:hover{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-600:hover{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-700:hover{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity))}.dark\:hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity))}.dark\:hover\:text-gray-100:hover{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity))}.dark\:hover\:text-white:hover{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity))}.dark\:focus\:ring-blue-800:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(30 64 175/var(--tw-ring-opacity))}}@media (min-width:640px){.sm\:col-span-2{grid-column:span 2/span 2}.sm\:mt-0{margin-top:0}.sm\:grid{display:grid}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.sm\:gap-4{gap:1rem}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}}@media (min-width:768px){.md\:mr-2{margin-right:.5rem}.md\:block{display:block}.md\:table-cell{display:table-cell}.md\:w-1\/2{width:50%}.md\:w-60{width:15rem}.md\:w-fit{width:-moz-fit-content;width:fit-content}.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.md\:grid-cols-4{grid-template-columns:repeat(4,minmax(0,1fr))}.md\:flex-row{flex-direction:row}.md\:justify-start{justify-content:flex-start}.md\:px-24{padding-left:6rem;padding-right:6rem}.md\:px-6{padding-left:1.5rem;padding-right:1.5rem}.md\:pt-0{padding-top:0}.md\:pt-8{padding-top:2rem}.md\:text-4xl{font-size:2.25rem;line-height:2.5rem}.md\:text-sm{font-size:.875rem;line-height:1.25rem}}@media (min-width:1024px){.lg\:mx-48{margin-left:12rem;margin-right:12rem}.lg\:ml-44{margin-left:11rem}.lg\:ml-48{margin-left:12rem}.lg\:hidden{display:none}.lg\:w-48{width:12rem}.lg\:w-80{width:20rem}.lg\:grid-cols-3{grid-template-columns:repeat(3,minmax(0,1fr))}.lg\:flex-row{flex-direction:row}.lg\:justify-around{justify-content:space-around}.lg\:px-32{padding-left:8rem;padding-right:8rem}.lg\:px-6{padding-left:1.5rem;padding-right:1.5rem}.lg\:py-16{padding-top:4rem;padding-bottom:4rem}.lg\:pr-0{padding-right:0}.lg\:text-9xl{font-size:8rem;line-height:1}} \ No newline at end of file diff --git a/config/config.go b/config/config.go index c638dee..0c6db75 100644 --- a/config/config.go +++ b/config/config.go @@ -1,12 +1,13 @@ package config import ( + "fmt" "os" "path" + "runtime" "strings" log "github.com/sirupsen/logrus" - "github.com/snowzach/rotatefilehook" ) type Config struct { @@ -29,18 +30,23 @@ type Config struct { LogLevel string // Cookie Settings - CookieSessionKey string - CookieSecure bool - CookieHTTPOnly bool + CookieAuthKey string + CookieEncKey string + CookieSecure bool + CookieHTTPOnly bool } -type UTCFormatter struct { +type customFormatter struct { log.Formatter } -func (u UTCFormatter) Format(e *log.Entry) ([]byte, error) { +// Force UTC & Set Type (app) +func (cf customFormatter) Format(e *log.Entry) ([]byte, error) { + if e.Data["type"] == nil { + e.Data["type"] = "app" + } e.Time = e.Time.UTC() - return u.Formatter.Format(e) + return cf.Formatter.Format(e) } // Set at runtime @@ -49,15 +55,16 @@ var version string = "develop" func Load() *Config { c := &Config{ Version: version, - DBType: trimLowerString(getEnv("DATABASE_TYPE", "SQLite")), - DBName: trimLowerString(getEnv("DATABASE_NAME", "antholume")), ConfigPath: getEnv("CONFIG_PATH", "/config"), DataPath: getEnv("DATA_PATH", "/data"), ListenPort: getEnv("LISTEN_PORT", "8585"), + DBType: trimLowerString(getEnv("DATABASE_TYPE", "SQLite")), + DBName: trimLowerString(getEnv("DATABASE_NAME", "antholume")), RegistrationEnabled: trimLowerString(getEnv("REGISTRATION_ENABLED", "false")) == "true", DemoMode: trimLowerString(getEnv("DEMO_MODE", "false")) == "true", SearchEnabled: trimLowerString(getEnv("SEARCH_ENABLED", "false")) == "true", - CookieSessionKey: trimLowerString(getEnv("COOKIE_SESSION_KEY", "")), + CookieAuthKey: trimLowerString(getEnv("COOKIE_AUTH_KEY", "")), + CookieEncKey: trimLowerString(getEnv("COOKIE_ENC_KEY", "")), LogLevel: trimLowerString(getEnv("LOG_LEVEL", "info")), CookieSecure: trimLowerString(getEnv("COOKIE_SECURE", "true")) == "true", CookieHTTPOnly: trimLowerString(getEnv("COOKIE_HTTP_ONLY", "true")) == "true", @@ -70,24 +77,29 @@ func Load() *Config { } // Log Formatter - ttyLogFormatter := &UTCFormatter{&log.TextFormatter{FullTimestamp: true}} - fileLogFormatter := &UTCFormatter{&log.TextFormatter{FullTimestamp: true, DisableColors: true}} + logFormatter := &customFormatter{&log.JSONFormatter{ + CallerPrettyfier: prettyCaller, + }} // Log Rotater - rotateFileHook, err := rotatefilehook.NewRotateFileHook(rotatefilehook.RotateFileConfig{ + rotateFileHook, err := NewRotateFileHook(RotateFileConfig{ Filename: path.Join(c.ConfigPath, "logs/antholume.log"), MaxSize: 50, MaxBackups: 3, MaxAge: 30, Level: logLevel, - Formatter: fileLogFormatter, + Formatter: logFormatter, }) if err != nil { - log.Fatal("[config.Load] Unable to initialize file rotate hook") + log.Fatal("Unable to initialize file rotate hook") } + // Rotate Now + rotateFileHook.Rotate() + log.SetLevel(logLevel) - log.SetFormatter(ttyLogFormatter) + log.SetFormatter(logFormatter) + log.SetReportCaller(true) log.AddHook(rotateFileHook) return c @@ -103,3 +115,24 @@ func getEnv(key, fallback string) string { func trimLowerString(val string) string { return strings.ToLower(strings.TrimSpace(val)) } + +func prettyCaller(f *runtime.Frame) (function string, file string) { + purgePrefix := "reichard.io/antholume/" + + pathName := strings.Replace(f.Func.Name(), purgePrefix, "", 1) + parts := strings.Split(pathName, ".") + + filepath, line := f.Func.FileLine(f.PC) + splitFilePath := strings.Split(filepath, "/") + + fileName := fmt.Sprintf("%s/%s@%d", parts[0], splitFilePath[len(splitFilePath)-1], line) + functionName := strings.Replace(pathName, parts[0]+".", "", 1) + + // Exclude GIN Logger + if functionName == "NewApi.apiLogger.func1" { + fileName = "" + functionName = "" + } + + return functionName, fileName +} diff --git a/config/logger.go b/config/logger.go new file mode 100644 index 0000000..3ed2e5d --- /dev/null +++ b/config/logger.go @@ -0,0 +1,54 @@ +package config + +import ( + "github.com/sirupsen/logrus" + "gopkg.in/natefinch/lumberjack.v2" +) + +// Modified "snowzach/rotatefilehook" to support manual rotation + +type RotateFileConfig struct { + Filename string + MaxSize int + MaxBackups int + MaxAge int + Compress bool + Level logrus.Level + Formatter logrus.Formatter +} + +type RotateFileHook struct { + Config RotateFileConfig + logWriter *lumberjack.Logger +} + +func NewRotateFileHook(config RotateFileConfig) (*RotateFileHook, error) { + hook := RotateFileHook{ + Config: config, + } + hook.logWriter = &lumberjack.Logger{ + Filename: config.Filename, + MaxSize: config.MaxSize, + MaxBackups: config.MaxBackups, + MaxAge: config.MaxAge, + Compress: config.Compress, + } + return &hook, nil +} + +func (hook *RotateFileHook) Rotate() error { + return hook.logWriter.Rotate() +} + +func (hook *RotateFileHook) Levels() []logrus.Level { + return logrus.AllLevels[:hook.Config.Level+1] +} + +func (hook *RotateFileHook) Fire(entry *logrus.Entry) (err error) { + b, err := hook.Config.Formatter.Format(entry) + if err != nil { + return err + } + hook.logWriter.Write(b) + return nil +} diff --git a/database/manager.go b/database/manager.go index 76b438a..538e40f 100644 --- a/database/manager.go +++ b/database/manager.go @@ -43,7 +43,7 @@ func NewMgr(c *config.Config) *DBManager { var err error dbm.DB, err = sql.Open("sqlite", dbLocation) if err != nil { - log.Fatalf("[NewMgr] Unable to open DB: %v", err) + log.Fatalf("Unable to open DB: %v", err) } // Single Open Connection @@ -51,19 +51,19 @@ func NewMgr(c *config.Config) *DBManager { // Execute DDL if _, err := dbm.DB.Exec(ddl, nil); err != nil { - log.Fatalf("[NewMgr] Error executing schema: %v", err) + log.Fatalf("Error executing schema: %v", err) } // Perform Migrations err = dbm.performMigrations() if err != nil && err != goose.ErrNoMigrationFiles { - log.Fatalf("[NewMgr] Error running DB migrations: %v", err) + log.Fatalf("Error running DB migrations: %v", err) } // Cache Tables dbm.CacheTempTables() } else { - log.Fatal("[NewMgr] Unsupported Database") + log.Fatal("Unsupported Database") } dbm.Queries = New(dbm.DB) @@ -84,7 +84,7 @@ func (dbm *DBManager) CacheTempTables() error { if _, err := dbm.DB.ExecContext(dbm.Ctx, user_streaks_sql); err != nil { return err } - log.Debug("[CacheTempTables] Cached 'user_streaks' in: ", time.Since(start)) + log.Debug("Cached 'user_streaks' in: ", time.Since(start)) start = time.Now() document_statistics_sql := ` @@ -94,7 +94,7 @@ func (dbm *DBManager) CacheTempTables() error { if _, err := dbm.DB.ExecContext(dbm.Ctx, document_statistics_sql); err != nil { return err } - log.Debug("[CacheTempTables] Cached 'document_user_statistics' in: ", time.Since(start)) + log.Debug("Cached 'document_user_statistics' in: ", time.Since(start)) return nil } diff --git a/go.mod b/go.mod index 61dd755..96d4429 100644 --- a/go.mod +++ b/go.mod @@ -12,10 +12,10 @@ require ( github.com/microcosm-cc/bluemonday v1.0.26 github.com/pressly/goose/v3 v3.17.0 github.com/sirupsen/logrus v1.9.3 - github.com/snowzach/rotatefilehook v0.0.0-20220211133110-53752135082d github.com/taylorskalyo/goreader v0.0.0-20230626212555-e7f5644f8115 github.com/urfave/cli/v2 v2.27.1 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a + gopkg.in/natefinch/lumberjack.v2 v2.2.1 modernc.org/sqlite v1.28.0 ) @@ -61,7 +61,6 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.17.0 // indirect google.golang.org/protobuf v1.32.0 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/uint128 v1.3.0 // indirect modernc.org/cc/v3 v3.41.0 // indirect diff --git a/go.sum b/go.sum index 3b68527..332f9a6 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,6 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/snowzach/rotatefilehook v0.0.0-20220211133110-53752135082d h1:4660u5vJtsyrn3QwJNfESwCws+TM1CMhRn123xjVyQ8= -github.com/snowzach/rotatefilehook v0.0.0-20220211133110-53752135082d/go.mod h1:ZLVe3VfhAuMYLYWliGEydMBoRnfib8EFSqkBYu1ck9E= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= diff --git a/metadata/gbooks.go b/metadata/gbooks.go index 18db85a..adbe87d 100644 --- a/metadata/gbooks.go +++ b/metadata/gbooks.go @@ -122,33 +122,33 @@ func saveGBooksCover(gbid string, coverFilePath string, overwrite bool) error { // Validate File Doesn't Exists _, err := os.Stat(coverFilePath) if err == nil && overwrite == false { - log.Warn("[saveGBooksCover] File Alreads Exists") + log.Warn("File Alreads Exists") return nil } // Create File out, err := os.Create(coverFilePath) if err != nil { - log.Error("[saveGBooksCover] File Create Error") + log.Error("File Create Error") return errors.New("File Failure") } defer out.Close() // Download File - log.Info("[saveGBooksCover] Downloading Cover") + log.Info("Downloading Cover") coverURL := fmt.Sprintf(GBOOKS_GBID_COVER_URL, gbid) resp, err := http.Get(coverURL) if err != nil { - log.Error("[saveGBooksCover] Cover URL API Failure") + log.Error("Cover URL API Failure") return errors.New("API Failure") } defer resp.Body.Close() // Copy File to Disk - log.Info("[saveGBooksCover] Saving Cover") + log.Info("Saving Cover") _, err = io.Copy(out, resp.Body) if err != nil { - log.Error("[saveGBooksCover] File Copy Error") + log.Error("File Copy Error") return errors.New("File Failure") } @@ -157,22 +157,22 @@ func saveGBooksCover(gbid string, coverFilePath string, overwrite bool) error { func performSearchRequest(searchQuery string) (*gBooksQueryResponse, error) { apiQuery := fmt.Sprintf(GBOOKS_QUERY_URL, searchQuery) - log.Info("[performSearchRequest] Acquiring Metadata: ", apiQuery) + log.Info("Acquiring Metadata: ", apiQuery) resp, err := http.Get(apiQuery) if err != nil { - log.Error("[performSearchRequest] Google Books Query URL API Failure") + log.Error("Google Books Query URL API Failure") return nil, errors.New("API Failure") } parsedResp := gBooksQueryResponse{} err = json.NewDecoder(resp.Body).Decode(&parsedResp) if err != nil { - log.Error("[performSearchRequest] Google Books Query API Decode Failure") + log.Error("Google Books Query API Decode Failure") return nil, errors.New("API Failure") } if len(parsedResp.Items) == 0 { - log.Warn("[performSearchRequest] No Results") + log.Warn("No Results") return nil, errors.New("No Results") } @@ -182,17 +182,17 @@ func performSearchRequest(searchQuery string) (*gBooksQueryResponse, error) { func performGBIDRequest(id string) (*gBooksQueryItem, error) { apiQuery := fmt.Sprintf(GBOOKS_GBID_INFO_URL, id) - log.Info("[performGBIDRequest] Acquiring CoverID") + log.Info("Acquiring CoverID") resp, err := http.Get(apiQuery) if err != nil { - log.Error("[performGBIDRequest] Cover URL API Failure") + log.Error("Cover URL API Failure") return nil, errors.New("API Failure") } parsedResp := gBooksQueryItem{} err = json.NewDecoder(resp.Body).Decode(&parsedResp) if err != nil { - log.Error("[performGBIDRequest] Google Books ID API Decode Failure") + log.Error("Google Books ID API Decode Failure") return nil, errors.New("API Failure") } diff --git a/metadata/olib.go b/metadata/olib.go index 0ceeaa6..4816b0e 100644 --- a/metadata/olib.go +++ b/metadata/olib.go @@ -32,24 +32,24 @@ const OLIB_ISBN_LINK_URL string = "https://openlibrary.org/isbn/%s" func GetCoverOLIDs(title *string, author *string) ([]string, error) { if title == nil || author == nil { - log.Error("[metadata] Invalid Search Query") + log.Error("Invalid Search Query") return nil, errors.New("Invalid Query") } searchQuery := url.QueryEscape(fmt.Sprintf("%s %s", *title, *author)) apiQuery := fmt.Sprintf(OLIB_QUERY_URL, searchQuery) - log.Info("[metadata] Acquiring CoverID") + log.Info("Acquiring CoverID") resp, err := http.Get(apiQuery) if err != nil { - log.Error("[metadata] Cover URL API Failure") + log.Error("Cover URL API Failure") return nil, errors.New("API Failure") } target := oLibQueryResponse{} err = json.NewDecoder(resp.Body).Decode(&target) if err != nil { - log.Error("[metadata] Cover URL API Decode Failure") + log.Error("Cover URL API Decode Failure") return nil, errors.New("API Failure") } @@ -73,24 +73,24 @@ func DownloadAndSaveCover(coverID string, dirPath string) (*string, error) { // Validate File Doesn't Exists _, err := os.Stat(safePath) if err == nil { - log.Warn("[metadata] File Alreads Exists") + log.Warn("File Alreads Exists") return &safePath, nil } // Create File out, err := os.Create(safePath) if err != nil { - log.Error("[metadata] File Create Error") + log.Error("File Create Error") return nil, errors.New("File Failure") } defer out.Close() // Download File - log.Info("[metadata] Downloading Cover") + log.Info("Downloading Cover") coverURL := fmt.Sprintf(OLIB_OLID_COVER_URL, coverID) resp, err := http.Get(coverURL) if err != nil { - log.Error("[metadata] Cover URL API Failure") + log.Error("Cover URL API Failure") return nil, errors.New("API Failure") } defer resp.Body.Close() @@ -98,7 +98,7 @@ func DownloadAndSaveCover(coverID string, dirPath string) (*string, error) { // Copy File to Disk _, err = io.Copy(out, resp.Body) if err != nil { - log.Error("[metadata] File Copy Error") + log.Error("File Copy Error") return nil, errors.New("File Failure") } diff --git a/search/search.go b/search/search.go index f57e79e..98f1e5c 100644 --- a/search/search.go +++ b/search/search.go @@ -80,7 +80,7 @@ var sourceDefs = map[Source]sourceDef{ func SearchBook(query string, source Source) ([]SearchItem, error) { def := sourceDefs[source] - log.Debug("[SearchBook] Source: ", def) + log.Debug("Source: ", def) url := fmt.Sprintf(def.searchURL, url.QueryEscape(query)) body, err := getPage(url) if err != nil { @@ -91,7 +91,7 @@ func SearchBook(query string, source Source) ([]SearchItem, error) { func SaveBook(id string, source Source) (string, error) { def := sourceDefs[source] - log.Debug("[SaveBook] Source: ", def) + log.Debug("Source: ", def) url := fmt.Sprintf(def.downloadURL, id) body, err := getPage(url) @@ -101,34 +101,34 @@ func SaveBook(id string, source Source) (string, error) { bookURL, err := def.parseDownloadFunc(body) if err != nil { - log.Error("[SaveBook] Parse Download URL Error: ", err) + log.Error("Parse Download URL Error: ", err) return "", errors.New("Download Failure") } // Create File tempFile, err := os.CreateTemp("", "book") if err != nil { - log.Error("[SaveBook] File Create Error: ", err) + log.Error("File Create Error: ", err) return "", errors.New("File Failure") } defer tempFile.Close() // Download File - log.Info("[SaveBook] Downloading Book: ", bookURL) + log.Info("Downloading Book: ", bookURL) resp, err := downloadBook(bookURL) if err != nil { os.Remove(tempFile.Name()) - log.Error("[SaveBook] Book URL API Failure: ", err) + log.Error("Book URL API Failure: ", err) return "", errors.New("API Failure") } defer resp.Body.Close() // Copy File to Disk - log.Info("[SaveBook] Saving Book") + log.Info("Saving Book") _, err = io.Copy(tempFile, resp.Body) if err != nil { os.Remove(tempFile.Name()) - log.Error("[SaveBook] File Copy Error: ", err) + log.Error("File Copy Error: ", err) return "", errors.New("File Failure") } @@ -163,7 +163,7 @@ func GetBookURL(id string, bookType BookType) (string, error) { } func getPage(page string) (io.ReadCloser, error) { - log.Debug("[getPage] ", page) + log.Debug("URL: ", page) // Set 10s Timeout client := http.Client{ diff --git a/server/server.go b/server/server.go index 3107800..f79ab71 100644 --- a/server/server.go +++ b/server/server.go @@ -29,10 +29,16 @@ func NewServer(assets *embed.FS) *Server { api := api.NewApi(db, c, assets) // Create Paths + os.Mkdir(c.ConfigPath, 0755) + os.Mkdir(c.DataPath, 0755) + + // Create Subpaths docDir := filepath.Join(c.DataPath, "documents") coversDir := filepath.Join(c.DataPath, "covers") - os.Mkdir(docDir, os.ModePerm) - os.Mkdir(coversDir, os.ModePerm) + backupDir := filepath.Join(c.DataPath, "backup") + os.Mkdir(docDir, 0755) + os.Mkdir(coversDir, 0755) + os.Mkdir(backupDir, 0755) return &Server{ API: api, @@ -55,7 +61,7 @@ func (s *Server) StartServer(wg *sync.WaitGroup, done <-chan struct{}) { err := s.httpServer.ListenAndServe() if err != nil && err != http.ErrServerClosed { - log.Error("Error Starting Server:", err) + log.Error("Error starting server:", err) } }() @@ -68,7 +74,7 @@ func (s *Server) StartServer(wg *sync.WaitGroup, done <-chan struct{}) { case <-ticker.C: s.RunScheduledTasks() case <-done: - log.Info("Stopping Task Runner...") + log.Info("Stopping task runner...") return } } @@ -78,23 +84,23 @@ func (s *Server) StartServer(wg *sync.WaitGroup, done <-chan struct{}) { func (s *Server) RunScheduledTasks() { start := time.Now() if err := s.API.DB.CacheTempTables(); err != nil { - log.Warn("[RunScheduledTasks] Refreshing Temp Table Cache Failure:", err) + log.Warn("Refreshing temp table cache failure:", err) } - log.Debug("[RunScheduledTasks] Completed in: ", time.Since(start)) + log.Debug("Completed in: ", time.Since(start)) } func (s *Server) StopServer(wg *sync.WaitGroup, done chan<- struct{}) { - log.Info("Stopping HTTP Server...") + log.Info("Stopping HTTP server...") ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) defer cancel() if err := s.httpServer.Shutdown(ctx); err != nil { - log.Info("Shutting Error") + log.Info("HTTP server shutdown error: ", err) } s.API.DB.Shutdown() close(done) wg.Wait() - log.Info("Server Stopped") + log.Info("Server stopped") } diff --git a/templates/pages/admin-logs.tmpl b/templates/pages/admin-logs.tmpl index 4a6ccb6..641a90f 100644 --- a/templates/pages/admin-logs.tmpl +++ b/templates/pages/admin-logs.tmpl @@ -5,7 +5,7 @@
{{ range $log := .Data }} - {{ $log }} + {{ $log }} {{ end }}
{{ end }}