diff --git a/.golangci.toml b/.golangci.toml new file mode 100644 index 0000000..bc546a4 --- /dev/null +++ b/.golangci.toml @@ -0,0 +1,6 @@ +#:schema https://golangci-lint.run/jsonschema/golangci.jsonschema.json +version = "2" + +[[linters.exclusions.rules]] +linters = [ "errcheck" ] +source = "^\\s*defer\\s+" diff --git a/Makefile b/Makefile index c55de40..4626132 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ docker_build_release_latest: build_tailwind --push . build_tailwind: - tailwindcss build -o ./assets/style.css --minify + tailwindcss build -o ./assets/tailwind.css --minify dev: build_tailwind GIN_MODE=release \ diff --git a/api/api.go b/api/api.go index 49f3697..19e127a 100644 --- a/api/api.go +++ b/api/api.go @@ -136,35 +136,43 @@ func (api *API) registerWebAppRoutes(router *gin.Engine) { router.GET("/favicon.ico", api.appFaviconIcon) router.GET("/sw.js", api.appServiceWorker) - // Local / offline static pages (no template, no auth) + // Web App - Offline router.GET("/local", api.appLocalDocuments) - // Reader (reader page, document progress, devices) + // Web App - Reader router.GET("/reader", api.appDocumentReader) router.GET("/reader/devices", api.authWebAppMiddleware, api.appGetDevices) router.GET("/reader/progress/:document", api.authWebAppMiddleware, api.appGetDocumentProgress) - // Web app - router.GET("/", api.authWebAppMiddleware, api.appGetHome) - router.GET("/activity", api.authWebAppMiddleware, api.appGetActivity) - router.GET("/progress", api.authWebAppMiddleware, api.appGetProgress) - router.GET("/documents", api.authWebAppMiddleware, api.appGetDocuments) - router.GET("/documents/:document", api.authWebAppMiddleware, api.appGetDocument) - router.GET("/documents/:document/cover", api.authWebAppMiddleware, api.createGetCoverHandler(appErrorPage)) - router.GET("/documents/:document/file", api.authWebAppMiddleware, api.createDownloadDocumentHandler(appErrorPage)) + // Web App - Templates + router.GET("/", api.authWebAppMiddleware, api.appGetHome) // DONE + router.GET("/activity", api.authWebAppMiddleware, api.appGetActivity) // DONE + router.GET("/progress", api.authWebAppMiddleware, api.appGetProgress) // DONE + router.GET("/documents", api.authWebAppMiddleware, api.appGetDocuments) // DONE + router.GET("/documents/:document", api.authWebAppMiddleware, api.appGetDocument) // DONE + + // Web App - Other Routes + router.GET("/documents/:document/cover", api.authWebAppMiddleware, api.createGetCoverHandler(appErrorPage)) // DONE + router.GET("/documents/:document/file", api.authWebAppMiddleware, api.createDownloadDocumentHandler(appErrorPage)) // DONE + router.GET("/logout", api.authWebAppMiddleware, api.appAuthLogout) // DONE + router.POST("/login", api.appAuthLogin) // DONE + router.POST("/register", api.appAuthRegister) // DONE + router.GET("/settings", api.authWebAppMiddleware, api.appGetSettings) // DONE + + // TODO router.GET("/login", api.appGetLogin) - router.GET("/logout", api.authWebAppMiddleware, api.appAuthLogout) router.GET("/register", api.appGetRegister) - router.GET("/settings", api.authWebAppMiddleware, api.appGetSettings) + + // DONE + router.GET("/admin", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appGetAdmin) + router.POST("/admin", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appPerformAdminAction) + + // TODO - WIP router.GET("/admin/logs", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appGetAdminLogs) router.GET("/admin/import", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appGetAdminImport) router.POST("/admin/import", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appPerformAdminImport) router.GET("/admin/users", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appGetAdminUsers) router.POST("/admin/users", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appUpdateAdminUsers) - router.GET("/admin", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appGetAdmin) - router.POST("/admin", api.authWebAppMiddleware, api.authAdminWebAppMiddleware, api.appPerformAdminAction) - router.POST("/login", api.appAuthLogin) - router.POST("/register", api.appAuthRegister) // Demo mode enabled configuration if api.cfg.DemoMode { @@ -174,17 +182,18 @@ func (api *API) registerWebAppRoutes(router *gin.Engine) { router.POST("/documents/:document/identify", api.authWebAppMiddleware, api.appDemoModeError) router.POST("/settings", api.authWebAppMiddleware, api.appDemoModeError) } else { - router.POST("/documents", api.authWebAppMiddleware, api.appUploadNewDocument) - router.POST("/documents/:document/delete", api.authWebAppMiddleware, api.appDeleteDocument) - router.POST("/documents/:document/edit", api.authWebAppMiddleware, api.appEditDocument) - router.POST("/documents/:document/identify", api.authWebAppMiddleware, api.appIdentifyDocument) - router.POST("/settings", api.authWebAppMiddleware, api.appEditSettings) + router.POST("/documents", api.authWebAppMiddleware, api.appUploadNewDocument) // DONE + router.POST("/documents/:document/delete", api.authWebAppMiddleware, api.appDeleteDocument) // DONE + router.POST("/documents/:document/edit", api.authWebAppMiddleware, api.appEditDocument) // DONE + router.POST("/documents/:document/identify", api.authWebAppMiddleware, api.appIdentifyDocumentNew) // DONE + router.POST("/settings", api.authWebAppMiddleware, api.appEditSettings) // DONE + } // Search enabled configuration if api.cfg.SearchEnabled { - router.GET("/search", api.authWebAppMiddleware, api.appGetSearch) - router.POST("/search", api.authWebAppMiddleware, api.appSaveNewDocument) + router.GET("/search", api.authWebAppMiddleware, api.appGetSearch) // DONE + router.POST("/search", api.authWebAppMiddleware, api.appSaveNewDocument) // TODO } } @@ -354,13 +363,13 @@ func loggingMiddleware(c *gin.Context) { } // Get username - var auth authData + var auth *authData if data, _ := c.Get("Authorization"); data != nil { - auth = data.(authData) + auth = data.(*authData) } // Log user - if auth.UserName != "" { + if auth != nil && auth.UserName != "" { logData["user"] = auth.UserName } diff --git a/api/app-admin-routes.go b/api/app-admin-routes.go index d43645f..4ee6930 100644 --- a/api/app-admin-routes.go +++ b/api/app-admin-routes.go @@ -27,6 +27,8 @@ import ( "reichard.io/antholume/database" "reichard.io/antholume/metadata" "reichard.io/antholume/utils" + "reichard.io/antholume/web/models" + "reichard.io/antholume/web/pages" ) type adminAction string @@ -96,21 +98,31 @@ type importResult struct { Error error } -func (api *API) appPerformAdminAction(c *gin.Context) { - templateVars, _ := api.getBaseTemplateVars("admin", c) +func (api *API) appGetAdmin(c *gin.Context) { + api.renderPage(c, &pages.AdminGeneral{}) +} +func (api *API) appPerformAdminAction(c *gin.Context) { var rAdminAction requestAdminAction if err := c.ShouldBind(&rAdminAction); err != nil { - log.Error("Invalid Form Bind: ", err) + log.Error("invalid or missing form values") appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") return } + var allNotifications []*models.Notification switch rAdminAction.Action { + case adminRestore: + api.processRestoreFile(rAdminAction, c) + return + case adminBackup: + api.processBackup(c, rAdminAction.BackupTypes) + return case adminMetadataMatch: - // TODO - // 1. Documents xref most recent metadata table? - // 2. Select all / deselect? + allNotifications = append(allNotifications, &models.Notification{ + Type: models.NotificationTypeError, + Content: "Metadata match not implemented", + }) case adminCacheTables: go func() { err := api.db.CacheTempTables(c) @@ -118,49 +130,14 @@ func (api *API) appPerformAdminAction(c *gin.Context) { log.Error("Unable to cache temp tables: ", err) } }() - case adminRestore: - api.processRestoreFile(rAdminAction, c) - return - case adminBackup: - // Vacuum - _, err := api.db.DB.ExecContext(c, "VACUUM;") - if err != nil { - log.Error("Unable to vacuum DB: ", err) - appErrorPage(c, http.StatusInternalServerError, "Unable to vacuum database") - return - } - // Set Headers - c.Header("Content-type", "application/octet-stream") - c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"AnthoLumeBackup_%s.zip\"", time.Now().Format("20060102150405"))) - - // Stream Backup ZIP Archive - c.Stream(func(w io.Writer) bool { - var directories []string - for _, item := range rAdminAction.BackupTypes { - if item == backupCovers { - directories = append(directories, "covers") - } else if item == backupDocuments { - directories = append(directories, "documents") - } - } - - err := api.createBackup(c, w, directories) - if err != nil { - log.Error("Backup Error: ", err) - } - return false + allNotifications = append(allNotifications, &models.Notification{ + Type: models.NotificationTypeSuccess, + Content: "Initiated table cache", }) - - return } - c.HTML(http.StatusOK, "page/admin", templateVars) -} - -func (api *API) appGetAdmin(c *gin.Context) { - templateVars, _ := api.getBaseTemplateVars("admin", c) - c.HTML(http.StatusOK, "page/admin", templateVars) + api.renderPage(c, &pages.AdminGeneral{}, allNotifications...) } func (api *API) appGetAdminLogs(c *gin.Context) { @@ -533,6 +510,40 @@ func (api *API) appPerformAdminImport(c *gin.Context) { c.HTML(http.StatusOK, "page/admin-import-results", templateVars) } +func (api *API) processBackup(c *gin.Context, backupTypes []backupType) { + // Vacuum + _, err := api.db.DB.ExecContext(c, "VACUUM;") + if err != nil { + log.Error("Unable to vacuum DB: ", err) + appErrorPage(c, http.StatusInternalServerError, "Unable to vacuum database") + return + } + + // Set Headers + c.Header("Content-type", "application/octet-stream") + c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=\"AnthoLumeBackup_%s.zip\"", time.Now().Format("20060102150405"))) + + // Stream Backup ZIP Archive + c.Stream(func(w io.Writer) bool { + var directories []string + for _, item := range backupTypes { + switch item { + case backupCovers: + directories = append(directories, "covers") + case backupDocuments: + directories = append(directories, "documents") + } + } + + err := api.createBackup(c, w, directories) + if err != nil { + log.Error("Backup Error: ", err) + } + return false + }) + +} + func (api *API) processRestoreFile(rAdminAction requestAdminAction, c *gin.Context) { // Validate Type & Derive Extension on MIME uploadedFile, err := rAdminAction.RestoreFile.Open() @@ -789,7 +800,7 @@ func (api *API) createBackup(ctx context.Context, w io.Writer, directories []str } } - ar.Close() + _ = ar.Close() return nil } diff --git a/api/app-routes-new.go b/api/app-routes-new.go new file mode 100644 index 0000000..7bb85b3 --- /dev/null +++ b/api/app-routes-new.go @@ -0,0 +1,513 @@ +package api + +import ( + "cmp" + "crypto/md5" + "fmt" + "math" + "net/http" + "sort" + "strings" + "time" + + argon2 "github.com/alexedwards/argon2id" + "github.com/gin-gonic/gin" + log "github.com/sirupsen/logrus" + "reichard.io/antholume/database" + "reichard.io/antholume/metadata" + "reichard.io/antholume/pkg/formatters" + "reichard.io/antholume/pkg/ptr" + "reichard.io/antholume/pkg/sliceutils" + "reichard.io/antholume/pkg/utils" + "reichard.io/antholume/search" + "reichard.io/antholume/web/components/stats" + "reichard.io/antholume/web/models" + "reichard.io/antholume/web/pages" +) + +func (api *API) appGetHome(c *gin.Context) { + _, auth := api.getBaseTemplateVars("home", c) + + start := time.Now() + dailyStats, err := api.db.Queries.GetDailyReadStats(c, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get daily read stats") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get daily read stats: %s", err)) + return + } + log.Debug("GetDailyReadStats DB Performance: ", time.Since(start)) + + start = time.Now() + databaseInfo, err := api.db.Queries.GetDatabaseInfo(c, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get database info") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get database info: %s", err)) + return + } + log.Debug("GetDatabaseInfo DB Performance: ", time.Since(start)) + + start = time.Now() + streaks, err := api.db.Queries.GetUserStreaks(c, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get user streaks") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get user streaks: %s", err)) + return + } + log.Debug("GetUserStreaks DB Performance: ", time.Since(start)) + + start = time.Now() + userStatistics, err := api.db.Queries.GetUserStatistics(c) + if err != nil { + log.WithError(err).Error("failed to get user statistics") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get user statistics: %s", err)) + return + } + log.Debug("GetUserStatistics DB Performance: ", time.Since(start)) + + api.renderPage(c, &pages.Home{ + Leaderboard: arrangeUserStatistic(userStatistics), + Streaks: streaks, + DailyStats: dailyStats, + RecordInfo: &databaseInfo, + }) +} + +func (api *API) appGetDocuments(c *gin.Context) { + qParams, err := bindQueryParams(c, 9) + if err != nil { + log.WithError(err).Error("failed to bind query params") + appErrorPage(c, http.StatusBadRequest, fmt.Sprintf("failed to bind query params: %s", err)) + return + } + + var query *string + if qParams.Search != nil && *qParams.Search != "" { + search := "%" + *qParams.Search + "%" + query = &search + } + + _, auth := api.getBaseTemplateVars("documents", c) + documents, err := api.db.Queries.GetDocumentsWithStats(c, database.GetDocumentsWithStatsParams{ + UserID: auth.UserName, + Query: query, + Deleted: ptr.Of(false), + Offset: (*qParams.Page - 1) * *qParams.Limit, + Limit: *qParams.Limit, + }) + if err != nil { + log.WithError(err).Error("failed to get documents with stats") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get documents with stats: %s", err)) + return + } + + length, err := api.db.Queries.GetDocumentsSize(c, query) + if err != nil { + log.WithError(err).Error("failed to get document sizes") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get document sizes: %s", err)) + return + } + + if err = api.getDocumentsWordCount(c, documents); err != nil { + log.WithError(err).Error("failed to get word counts") + } + + totalPages := int64(math.Ceil(float64(length) / float64(*qParams.Limit))) + nextPage := *qParams.Page + 1 + previousPage := *qParams.Page - 1 + + api.renderPage(c, pages.Documents{ + Data: sliceutils.Map(documents, convertDBDocToUI), + Previous: utils.Ternary(previousPage >= 0, int(previousPage), 0), + Next: utils.Ternary(nextPage <= totalPages, int(nextPage), 0), + Limit: int(ptr.Deref(qParams.Limit)), + }) +} + +func (api *API) appGetDocument(c *gin.Context) { + var rDocID requestDocumentID + if err := c.ShouldBindUri(&rDocID); err != nil { + log.WithError(err).Error("failed to bind URI") + appErrorPage(c, http.StatusNotFound, "Invalid document") + return + } + + _, auth := api.getBaseTemplateVars("document", c) + document, err := api.db.GetDocument(c, rDocID.DocumentID, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get document") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get document: %s", err)) + return + } + + api.renderPage(c, &pages.Document{Data: convertDBDocToUI(*document)}) +} + +func (api *API) appGetActivity(c *gin.Context) { + qParams, err := bindQueryParams(c, 15) + if err != nil { + log.WithError(err).Error("failed to bind query params") + appErrorPage(c, http.StatusBadRequest, fmt.Sprintf("failed to bind query params: %s", err)) + return + } + + _, auth := api.getBaseTemplateVars("activity", c) + activity, err := api.db.Queries.GetActivity(c, database.GetActivityParams{ + UserID: auth.UserName, + Offset: (*qParams.Page - 1) * *qParams.Limit, + Limit: *qParams.Limit, + DocFilter: qParams.Document != nil, + DocumentID: ptr.Deref(qParams.Document), + }) + if err != nil { + log.WithError(err).Error("failed to get activity") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get activity: %s", err)) + return + } + + api.renderPage(c, &pages.Activity{Data: sliceutils.Map(activity, convertDBActivityToUI)}) +} + +func (api *API) appGetProgress(c *gin.Context) { + qParams, err := bindQueryParams(c, 15) + if err != nil { + log.WithError(err).Error("failed to bind query params") + appErrorPage(c, http.StatusBadRequest, fmt.Sprintf("failed to bind query params: %s", err)) + return + } + + _, auth := api.getBaseTemplateVars("progress", c) + progress, err := api.db.Queries.GetProgress(c, database.GetProgressParams{ + UserID: auth.UserName, + Offset: (*qParams.Page - 1) * *qParams.Limit, + Limit: *qParams.Limit, + DocFilter: qParams.Document != nil, + DocumentID: ptr.Deref(qParams.Document), + }) + if err != nil { + log.WithError(err).Error("failed to get progress") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get progress: %s", err)) + return + } + + api.renderPage(c, &pages.Progress{Data: sliceutils.Map(progress, convertDBProgressToUI)}) +} + +func (api *API) appIdentifyDocumentNew(c *gin.Context) { + var rDocID requestDocumentID + if err := c.ShouldBindUri(&rDocID); err != nil { + log.WithError(err).Error("failed to bind URI") + appErrorPage(c, http.StatusNotFound, "Invalid document") + return + } + + var rDocIdentify requestDocumentIdentify + if err := c.ShouldBind(&rDocIdentify); err != nil { + log.WithError(err).Error("failed to bind form") + appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") + return + } + + // Disallow Empty Strings + if rDocIdentify.Title != nil && strings.TrimSpace(*rDocIdentify.Title) == "" { + rDocIdentify.Title = nil + } + if rDocIdentify.Author != nil && strings.TrimSpace(*rDocIdentify.Author) == "" { + rDocIdentify.Author = nil + } + if rDocIdentify.ISBN != nil && strings.TrimSpace(*rDocIdentify.ISBN) == "" { + rDocIdentify.ISBN = nil + } + + // Validate Values + if rDocIdentify.ISBN == nil && rDocIdentify.Title == nil && rDocIdentify.Author == nil { + log.Error("invalid or missing form values") + appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") + return + } + + // Get Metadata + var searchResult *models.DocumentMetadata + var allNotifications []*models.Notification + metadataResults, err := metadata.SearchMetadata(metadata.SourceGoogleBooks, metadata.MetadataInfo{ + Title: rDocIdentify.Title, + Author: rDocIdentify.Author, + ISBN10: rDocIdentify.ISBN, + ISBN13: rDocIdentify.ISBN, + }) + if err != nil { + log.WithError(err).Error("failed to search metadata") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to search metadata: %s", err)) + return + } else if firstResult, found := sliceutils.First(metadataResults); found { + searchResult = convertMetaToUI(firstResult) + + // Store First Metadata Result + if _, err = api.db.Queries.AddMetadata(c, database.AddMetadataParams{ + DocumentID: rDocID.DocumentID, + Title: firstResult.Title, + Author: firstResult.Author, + Description: firstResult.Description, + Gbid: firstResult.SourceID, + Isbn10: firstResult.ISBN10, + Isbn13: firstResult.ISBN13, + }); err != nil { + log.WithError(err).Error("failed to add metadata") + } + } else { + allNotifications = append(allNotifications, &models.Notification{ + Type: models.NotificationTypeError, + Content: "No Metadata Found", + }) + } + + // Get Auth + _, auth := api.getBaseTemplateVars("document", c) + document, err := api.db.GetDocument(c, rDocID.DocumentID, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get document") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get document: %s", err)) + return + } + + api.renderPage(c, &pages.Document{ + Data: convertDBDocToUI(*document), + Search: searchResult, + }, allNotifications...) +} + +// Tabs: +// - General (Import, Backup & Restore, Version (githash?), Stats?) +// - Users +// - Metadata +func (api *API) appGetSearch(c *gin.Context) { + var sParams searchParams + if err := c.BindQuery(&sParams); err != nil { + log.WithError(err).Error("failed to bind form") + appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") + return + } + + // Only Handle Query + var searchResults []models.SearchResult + var searchError string + if sParams.Query != nil && sParams.Source != nil { + results, err := search.SearchBook(*sParams.Query, *sParams.Source) + if err != nil { + log.WithError(err).Error("failed to search book") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("Search Error: %v", err)) + return + } + searchResults = sliceutils.Map(results, convertSearchToUI) + } else if sParams.Query != nil || sParams.Source != nil { + searchError = "Invailid Query" + } + + api.renderPage(c, &pages.Search{ + Results: searchResults, + Source: ptr.Deref(sParams.Source), + Query: ptr.Deref(sParams.Query), + Error: searchError, + }) +} + +func (api *API) appGetSettings(c *gin.Context) { + _, auth := api.getBaseTemplateVars("settings", c) + + user, err := api.db.Queries.GetUser(c, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get user") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get user: %s", err)) + return + } + + devices, err := api.db.Queries.GetDevices(c, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get devices") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get devices: %s", err)) + return + } + + api.renderPage(c, &pages.Settings{ + Timezone: ptr.Deref(user.Timezone), + Devices: sliceutils.Map(devices, convertDBDeviceToUI), + }) +} + +func (api *API) appEditSettings(c *gin.Context) { + var rUserSettings requestSettingsEdit + if err := c.ShouldBind(&rUserSettings); err != nil { + log.WithError(err).Error("failed to bind form") + appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") + return + } + + // Validate Something Exists + if rUserSettings.Password == nil && rUserSettings.NewPassword == nil && rUserSettings.Timezone == nil { + log.Error("invalid or missing form values") + appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") + return + } + + _, auth := api.getBaseTemplateVars("settings", c) + + newUserSettings := database.UpdateUserParams{ + UserID: auth.UserName, + Admin: auth.IsAdmin, + } + + // Set New Password + var allNotifications []*models.Notification + if rUserSettings.Password != nil && rUserSettings.NewPassword != nil { + password := fmt.Sprintf("%x", md5.Sum([]byte(*rUserSettings.Password))) + if _, err := api.authorizeCredentials(c, auth.UserName, password); err != nil { + allNotifications = append(allNotifications, &models.Notification{ + Type: models.NotificationTypeError, + Content: "Invalid Password", + }) + } else { + password := fmt.Sprintf("%x", md5.Sum([]byte(*rUserSettings.NewPassword))) + hashedPassword, err := argon2.CreateHash(password, argon2.DefaultParams) + if err != nil { + allNotifications = append(allNotifications, &models.Notification{ + Type: models.NotificationTypeError, + Content: "Unknown Error", + }) + } else { + allNotifications = append(allNotifications, &models.Notification{ + Type: models.NotificationTypeSuccess, + Content: "Password Updated", + }) + newUserSettings.Password = &hashedPassword + } + } + } + + // Set Time Offset + if rUserSettings.Timezone != nil { + allNotifications = append(allNotifications, &models.Notification{ + Type: models.NotificationTypeSuccess, + Content: "Time Offset Updated", + }) + newUserSettings.Timezone = rUserSettings.Timezone + } + + // Update User + _, err := api.db.Queries.UpdateUser(c, newUserSettings) + if err != nil { + log.WithError(err).Error("failed to update user") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to update user: %s", err)) + return + } + + // Get User + user, err := api.db.Queries.GetUser(c, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get user") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get user: %s", err)) + return + } + + // Get Devices + devices, err := api.db.Queries.GetDevices(c, auth.UserName) + if err != nil { + log.WithError(err).Error("failed to get devices") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to get devices: %s", err)) + return + } + + api.renderPage(c, &pages.Settings{ + Devices: sliceutils.Map(devices, convertDBDeviceToUI), + Timezone: ptr.Deref(user.Timezone), + }, allNotifications...) +} + +func (api *API) renderPage(c *gin.Context, page pages.Page, notifications ...*models.Notification) { + // Get Authentication Data + auth, err := getAuthData(c) + if err != nil { + log.WithError(err).Error("failed to acquire auth data") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to acquire auth data: %s", err)) + return + } + + // Generate Page + pageNode, err := page.Generate(models.PageContext{ + UserInfo: &models.UserInfo{ + Username: auth.UserName, + IsAdmin: auth.IsAdmin, + }, + ServerInfo: &models.ServerInfo{ + RegistrationEnabled: api.cfg.RegistrationEnabled, + SearchEnabled: api.cfg.SearchEnabled, + Version: api.cfg.Version, + }, + Notifications: notifications, + }) + if err != nil { + log.WithError(err).Error("failed to generate page") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to generate page: %s", err)) + return + } + + // Render Page + err = pageNode.Render(c.Writer) + if err != nil { + log.WithError(err).Error("failed to render page") + appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("failed to render page: %s", err)) + return + } +} + +func sortItem[T cmp.Ordered]( + data []database.GetUserStatisticsRow, + accessor func(s database.GetUserStatisticsRow) T, + formatter func(s T) string, +) []stats.LeaderboardItem { + sort.SliceStable(data, func(i, j int) bool { + return accessor(data[i]) > accessor(data[j]) + }) + + var items []stats.LeaderboardItem + for _, s := range data { + items = append(items, stats.LeaderboardItem{ + UserID: s.UserID, + Value: formatter(accessor(s)), + }) + } + return items +} + +func arrangeUserStatistic(data []database.GetUserStatisticsRow) []stats.LeaderboardData { + wpmFormatter := func(v float64) string { return fmt.Sprintf("%.2f WPM", v) } + return []stats.LeaderboardData{ + { + Name: "WPM", + All: sortItem(data, func(r database.GetUserStatisticsRow) float64 { return r.TotalWpm }, wpmFormatter), + Year: sortItem(data, func(r database.GetUserStatisticsRow) float64 { return r.YearlyWpm }, wpmFormatter), + Month: sortItem(data, func(r database.GetUserStatisticsRow) float64 { return r.MonthlyWpm }, wpmFormatter), + Week: sortItem(data, func(r database.GetUserStatisticsRow) float64 { return r.WeeklyWpm }, wpmFormatter), + }, + { + Name: "Words", + All: sortItem(data, func(r database.GetUserStatisticsRow) int64 { return r.TotalWordsRead }, formatters.FormatNumber), + Year: sortItem(data, func(r database.GetUserStatisticsRow) int64 { return r.YearlyWordsRead }, formatters.FormatNumber), + Month: sortItem(data, func(r database.GetUserStatisticsRow) int64 { return r.MonthlyWordsRead }, formatters.FormatNumber), + Week: sortItem(data, func(r database.GetUserStatisticsRow) int64 { return r.WeeklyWordsRead }, formatters.FormatNumber), + }, + { + Name: "Duration", + All: sortItem(data, func(r database.GetUserStatisticsRow) time.Duration { + return time.Duration(r.TotalSeconds) * time.Second + }, formatters.FormatDuration), + Year: sortItem(data, func(r database.GetUserStatisticsRow) time.Duration { + return time.Duration(r.YearlySeconds) * time.Second + }, formatters.FormatDuration), + Month: sortItem(data, func(r database.GetUserStatisticsRow) time.Duration { + return time.Duration(r.MonthlySeconds) * time.Second + }, formatters.FormatDuration), + Week: sortItem(data, func(r database.GetUserStatisticsRow) time.Duration { + return time.Duration(r.WeeklySeconds) * time.Second + }, formatters.FormatDuration), + }, + } +} diff --git a/api/app-routes.go b/api/app-routes.go index 26ba7fe..48cb8e7 100644 --- a/api/app-routes.go +++ b/api/app-routes.go @@ -2,28 +2,22 @@ package api import ( "context" - "crypto/md5" "database/sql" "fmt" "io" - "math" "mime/multipart" "net/http" "os" "path/filepath" - "reflect" - "sort" "strings" "time" - argon2 "github.com/alexedwards/argon2id" "github.com/gabriel-vasile/mimetype" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" "golang.org/x/exp/slices" "reichard.io/antholume/database" "reichard.io/antholume/metadata" - "reichard.io/antholume/pkg/ptr" "reichard.io/antholume/search" ) @@ -101,242 +95,6 @@ func (api *API) appDocumentReader(c *gin.Context) { c.FileFromFS("assets/reader/index.htm", http.FS(api.assets)) } -func (api *API) appGetDocuments(c *gin.Context) { - templateVars, auth := api.getBaseTemplateVars("documents", c) - qParams := bindQueryParams(c, 9) - - var query *string - if qParams.Search != nil && *qParams.Search != "" { - search := "%" + *qParams.Search + "%" - query = &search - } - - documents, err := api.db.Queries.GetDocumentsWithStats(c, database.GetDocumentsWithStatsParams{ - UserID: auth.UserName, - Query: query, - Deleted: ptr.Of(false), - Offset: (*qParams.Page - 1) * *qParams.Limit, - Limit: *qParams.Limit, - }) - if err != nil { - log.Error("GetDocumentsWithStats DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsWithStats DB Error: %v", err)) - return - } - - length, err := api.db.Queries.GetDocumentsSize(c, query) - if err != nil { - log.Error("GetDocumentsSize DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocumentsSize DB Error: %v", err)) - return - } - - if err = api.getDocumentsWordCount(c, documents); err != nil { - log.Error("Unable to Get Word Counts: ", err) - } - - totalPages := int64(math.Ceil(float64(length) / float64(*qParams.Limit))) - nextPage := *qParams.Page + 1 - previousPage := *qParams.Page - 1 - - if nextPage <= totalPages { - templateVars["NextPage"] = nextPage - } - - if previousPage >= 0 { - templateVars["PreviousPage"] = previousPage - } - - templateVars["PageLimit"] = *qParams.Limit - templateVars["Data"] = documents - - c.HTML(http.StatusOK, "page/documents", templateVars) -} - -func (api *API) appGetDocument(c *gin.Context) { - templateVars, auth := api.getBaseTemplateVars("document", c) - - var rDocID requestDocumentID - if err := c.ShouldBindUri(&rDocID); err != nil { - log.Error("Invalid URI Bind") - appErrorPage(c, http.StatusNotFound, "Invalid document") - return - } - - document, err := api.db.GetDocument(c, rDocID.DocumentID, auth.UserName) - if err != nil { - log.Error("GetDocument DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocument DB Error: %v", err)) - return - } - - templateVars["Data"] = document - templateVars["TotalTimeLeftSeconds"] = int64((100.0 - document.Percentage) * float64(document.SecondsPerPercent)) - - c.HTML(http.StatusOK, "page/document", templateVars) -} - -func (api *API) appGetProgress(c *gin.Context) { - templateVars, auth := api.getBaseTemplateVars("progress", c) - - qParams := bindQueryParams(c, 15) - - progressFilter := database.GetProgressParams{ - UserID: auth.UserName, - Offset: (*qParams.Page - 1) * *qParams.Limit, - Limit: *qParams.Limit, - } - - if qParams.Document != nil { - progressFilter.DocFilter = true - progressFilter.DocumentID = *qParams.Document - } - - progress, err := api.db.Queries.GetProgress(c, progressFilter) - if err != nil { - log.Error("GetProgress DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err)) - return - } - - templateVars["Data"] = progress - - c.HTML(http.StatusOK, "page/progress", templateVars) -} - -func (api *API) appGetActivity(c *gin.Context) { - templateVars, auth := api.getBaseTemplateVars("activity", c) - qParams := bindQueryParams(c, 15) - - activityFilter := database.GetActivityParams{ - UserID: auth.UserName, - Offset: (*qParams.Page - 1) * *qParams.Limit, - Limit: *qParams.Limit, - } - - if qParams.Document != nil { - activityFilter.DocFilter = true - activityFilter.DocumentID = *qParams.Document - } - - activity, err := api.db.Queries.GetActivity(c, activityFilter) - if err != nil { - log.Error("GetActivity DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetActivity DB Error: %v", err)) - return - } - - templateVars["Data"] = activity - - c.HTML(http.StatusOK, "page/activity", templateVars) -} - -func (api *API) appGetHome(c *gin.Context) { - templateVars, auth := api.getBaseTemplateVars("home", c) - - start := time.Now() - graphData, err := api.db.Queries.GetDailyReadStats(c, auth.UserName) - if err != nil { - log.Error("GetDailyReadStats DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDailyReadStats DB Error: %v", err)) - return - } - log.Debug("GetDailyReadStats DB Performance: ", time.Since(start)) - - start = time.Now() - databaseInfo, err := api.db.Queries.GetDatabaseInfo(c, auth.UserName) - if err != nil { - log.Error("GetDatabaseInfo DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDatabaseInfo DB Error: %v", err)) - return - } - log.Debug("GetDatabaseInfo DB Performance: ", time.Since(start)) - - start = time.Now() - streaks, err := api.db.Queries.GetUserStreaks(c, auth.UserName) - if err != nil { - log.Error("GetUserStreaks DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUserStreaks DB Error: %v", err)) - return - } - log.Debug("GetUserStreaks DB Performance: ", time.Since(start)) - - start = time.Now() - userStatistics, err := api.db.Queries.GetUserStatistics(c) - if err != nil { - log.Error("GetUserStatistics DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUserStatistics DB Error: %v", err)) - return - } - log.Debug("GetUserStatistics DB Performance: ", time.Since(start)) - - templateVars["Data"] = gin.H{ - "Streaks": streaks, - "GraphData": graphData, - "DatabaseInfo": databaseInfo, - "UserStatistics": arrangeUserStatistics(userStatistics), - } - - c.HTML(http.StatusOK, "page/home", templateVars) -} - -func (api *API) appGetSettings(c *gin.Context) { - templateVars, auth := api.getBaseTemplateVars("settings", c) - - user, err := api.db.Queries.GetUser(c, auth.UserName) - if err != nil { - log.Error("GetUser DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err)) - return - } - - devices, err := api.db.Queries.GetDevices(c, auth.UserName) - if err != nil { - log.Error("GetDevices DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) - return - } - - templateVars["Data"] = gin.H{ - "Timezone": *user.Timezone, - "Devices": devices, - } - - c.HTML(http.StatusOK, "page/settings", templateVars) -} - -// Tabs: -// - General (Import, Backup & Restore, Version (githash?), Stats?) -// - Users -// - Metadata -func (api *API) appGetSearch(c *gin.Context) { - templateVars, _ := api.getBaseTemplateVars("search", c) - - var sParams searchParams - err := c.BindQuery(&sParams) - if err != nil { - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("Invalid Form Bind: %v", err)) - return - } - - // Only Handle Query - if sParams.Query != nil && sParams.Source != nil { - // Search - searchResults, err := search.SearchBook(*sParams.Query, *sParams.Source) - if err != nil { - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("Search Error: %v", err)) - return - } - - templateVars["Data"] = searchResults - templateVars["Source"] = *sParams.Source - } else if sParams.Query != nil || sParams.Source != nil { - templateVars["SearchErrorMessage"] = "Invalid Query" - } - - c.HTML(http.StatusOK, "page/search", templateVars) -} - func (api *API) appGetLogin(c *gin.Context) { templateVars, _ := api.getBaseTemplateVars("login", c) templateVars["RegistrationEnabled"] = api.cfg.RegistrationEnabled @@ -617,85 +375,6 @@ func (api *API) appDeleteDocument(c *gin.Context) { c.Redirect(http.StatusFound, "../") } -func (api *API) appIdentifyDocument(c *gin.Context) { - var rDocID requestDocumentID - if err := c.ShouldBindUri(&rDocID); err != nil { - log.Error("Invalid URI Bind") - appErrorPage(c, http.StatusNotFound, "Invalid document") - return - } - - var rDocIdentify requestDocumentIdentify - if err := c.ShouldBind(&rDocIdentify); err != nil { - log.Error("Invalid Form Bind") - appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") - return - } - - // Disallow Empty Strings - if rDocIdentify.Title != nil && strings.TrimSpace(*rDocIdentify.Title) == "" { - rDocIdentify.Title = nil - } - if rDocIdentify.Author != nil && strings.TrimSpace(*rDocIdentify.Author) == "" { - rDocIdentify.Author = nil - } - if rDocIdentify.ISBN != nil && strings.TrimSpace(*rDocIdentify.ISBN) == "" { - rDocIdentify.ISBN = nil - } - - // Validate Values - if rDocIdentify.ISBN == nil && rDocIdentify.Title == nil && rDocIdentify.Author == nil { - log.Error("Invalid Form") - appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") - return - } - - // Get Template Variables - templateVars, auth := api.getBaseTemplateVars("document", c) - - // Get Metadata - metadataResults, err := metadata.SearchMetadata(metadata.SOURCE_GBOOK, metadata.MetadataInfo{ - Title: rDocIdentify.Title, - Author: rDocIdentify.Author, - ISBN10: rDocIdentify.ISBN, - ISBN13: rDocIdentify.ISBN, - }) - if err == nil && len(metadataResults) > 0 { - firstResult := metadataResults[0] - - // Store First Metadata Result - if _, err = api.db.Queries.AddMetadata(c, database.AddMetadataParams{ - DocumentID: rDocID.DocumentID, - Title: firstResult.Title, - Author: firstResult.Author, - Description: firstResult.Description, - Gbid: firstResult.ID, - Olid: nil, - Isbn10: firstResult.ISBN10, - Isbn13: firstResult.ISBN13, - }); err != nil { - log.Error("AddMetadata DB Error: ", err) - } - - templateVars["Metadata"] = firstResult - } else { - log.Warn("Metadata Error") - templateVars["MetadataError"] = "No Metadata Found" - } - - document, err := api.db.GetDocument(c, rDocID.DocumentID, auth.UserName) - if err != nil { - log.Error("GetDocument DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDocument DB Error: %v", err)) - return - } - - templateVars["Data"] = document - templateVars["TotalTimeLeftSeconds"] = int64((100.0 - document.Percentage) * float64(document.SecondsPerPercent)) - - c.HTML(http.StatusOK, "page/document", templateVars) -} - func (api *API) appSaveNewDocument(c *gin.Context) { var rDocAdd requestDocumentAdd if err := c.ShouldBind(&rDocAdd); err != nil { @@ -833,84 +512,6 @@ 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("Invalid Form Bind") - appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") - return - } - - // Validate Something Exists - if rUserSettings.Password == nil && rUserSettings.NewPassword == nil && rUserSettings.Timezone == nil { - log.Error("Missing Form Values") - appErrorPage(c, http.StatusBadRequest, "Invalid or missing form values") - return - } - - templateVars, auth := api.getBaseTemplateVars("settings", c) - - newUserSettings := database.UpdateUserParams{ - UserID: auth.UserName, - Admin: auth.IsAdmin, - } - - // Set New Password - if rUserSettings.Password != nil && rUserSettings.NewPassword != nil { - password := fmt.Sprintf("%x", md5.Sum([]byte(*rUserSettings.Password))) - data := api.authorizeCredentials(c, auth.UserName, password) - if data == nil { - templateVars["PasswordErrorMessage"] = "Invalid Password" - } else { - password := fmt.Sprintf("%x", md5.Sum([]byte(*rUserSettings.NewPassword))) - hashedPassword, err := argon2.CreateHash(password, argon2.DefaultParams) - if err != nil { - templateVars["PasswordErrorMessage"] = "Unknown Error" - } else { - templateVars["PasswordMessage"] = "Password Updated" - newUserSettings.Password = &hashedPassword - } - } - } - - // Set Time Offset - if rUserSettings.Timezone != nil { - templateVars["TimeOffsetMessage"] = "Time Offset Updated" - newUserSettings.Timezone = rUserSettings.Timezone - } - - // Update User - _, err := api.db.Queries.UpdateUser(c, newUserSettings) - if err != nil { - log.Error("UpdateUser DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("UpdateUser DB Error: %v", err)) - return - } - - // Get User - user, err := api.db.Queries.GetUser(c, auth.UserName) - if err != nil { - log.Error("GetUser DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetUser DB Error: %v", err)) - return - } - - // Get Devices - devices, err := api.db.Queries.GetDevices(c, auth.UserName) - if err != nil { - log.Error("GetDevices DB Error: ", err) - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("GetDevices DB Error: %v", err)) - return - } - - templateVars["Data"] = gin.H{ - "Timezone": *user.Timezone, - "Devices": devices, - } - - c.HTML(http.StatusOK, "page/settings", templateVars) -} - func (api *API) appDemoModeError(c *gin.Context) { appErrorPage(c, http.StatusUnauthorized, "Not Allowed in Demo Mode") } @@ -958,10 +559,10 @@ func (api *API) getDocumentsWordCount(ctx context.Context, documents []database. return nil } -func (api *API) getBaseTemplateVars(routeName string, c *gin.Context) (gin.H, authData) { - var auth authData +func (api *API) getBaseTemplateVars(routeName string, c *gin.Context) (gin.H, *authData) { + var auth *authData if data, _ := c.Get("Authorization"); data != nil { - auth = data.(authData) + auth = data.(*authData) } return gin.H{ @@ -975,12 +576,11 @@ func (api *API) getBaseTemplateVars(routeName string, c *gin.Context) (gin.H, au }, auth } -func bindQueryParams(c *gin.Context, defaultLimit int64) queryParams { +func bindQueryParams(c *gin.Context, defaultLimit int64) (*queryParams, error) { var qParams queryParams err := c.BindQuery(&qParams) if err != nil { - appErrorPage(c, http.StatusInternalServerError, fmt.Sprintf("Invalid Form Bind: %v", err)) - return qParams + return nil, err } if qParams.Limit == nil { @@ -995,7 +595,7 @@ func bindQueryParams(c *gin.Context, defaultLimit int64) queryParams { qParams.Page = &oneValue } - return qParams + return &qParams, nil } func appErrorPage(c *gin.Context, errorCode int, errorMessage string) { @@ -1018,80 +618,3 @@ func appErrorPage(c *gin.Context, errorCode int, errorMessage string) { "Message": errorMessage, }) } - -func arrangeUserStatistics(userStatistics []database.GetUserStatisticsRow) gin.H { - // Item Sorter - sortItem := func(userStatistics []database.GetUserStatisticsRow, key string, less func(i int, j int) bool) []map[string]any { - sortedData := append([]database.GetUserStatisticsRow(nil), userStatistics...) - sort.SliceStable(sortedData, less) - - newData := make([]map[string]any, 0) - for _, item := range sortedData { - v := reflect.Indirect(reflect.ValueOf(item)) - - var value string - if strings.Contains(key, "Wpm") { - rawVal := v.FieldByName(key).Float() - value = fmt.Sprintf("%.2f WPM", rawVal) - } else if strings.Contains(key, "Seconds") { - rawVal := v.FieldByName(key).Int() - value = niceSeconds(rawVal) - } else if strings.Contains(key, "Words") { - rawVal := v.FieldByName(key).Int() - value = niceNumbers(rawVal) - } - - newData = append(newData, map[string]any{ - "UserID": item.UserID, - "Value": value, - }) - } - - return newData - } - - return gin.H{ - "WPM": gin.H{ - "All": sortItem(userStatistics, "TotalWpm", func(i, j int) bool { - return userStatistics[i].TotalWpm > userStatistics[j].TotalWpm - }), - "Year": sortItem(userStatistics, "YearlyWpm", func(i, j int) bool { - return userStatistics[i].YearlyWpm > userStatistics[j].YearlyWpm - }), - "Month": sortItem(userStatistics, "MonthlyWpm", func(i, j int) bool { - return userStatistics[i].MonthlyWpm > userStatistics[j].MonthlyWpm - }), - "Week": sortItem(userStatistics, "WeeklyWpm", func(i, j int) bool { - return userStatistics[i].WeeklyWpm > userStatistics[j].WeeklyWpm - }), - }, - "Duration": gin.H{ - "All": sortItem(userStatistics, "TotalSeconds", func(i, j int) bool { - return userStatistics[i].TotalSeconds > userStatistics[j].TotalSeconds - }), - "Year": sortItem(userStatistics, "YearlySeconds", func(i, j int) bool { - return userStatistics[i].YearlySeconds > userStatistics[j].YearlySeconds - }), - "Month": sortItem(userStatistics, "MonthlySeconds", func(i, j int) bool { - return userStatistics[i].MonthlySeconds > userStatistics[j].MonthlySeconds - }), - "Week": sortItem(userStatistics, "WeeklySeconds", func(i, j int) bool { - return userStatistics[i].WeeklySeconds > userStatistics[j].WeeklySeconds - }), - }, - "Words": gin.H{ - "All": sortItem(userStatistics, "TotalWordsRead", func(i, j int) bool { - return userStatistics[i].TotalWordsRead > userStatistics[j].TotalWordsRead - }), - "Year": sortItem(userStatistics, "YearlyWordsRead", func(i, j int) bool { - return userStatistics[i].YearlyWordsRead > userStatistics[j].YearlyWordsRead - }), - "Month": sortItem(userStatistics, "MonthlyWordsRead", func(i, j int) bool { - return userStatistics[i].MonthlyWordsRead > userStatistics[j].MonthlyWordsRead - }), - "Week": sortItem(userStatistics, "WeeklyWordsRead", func(i, j int) bool { - return userStatistics[i].WeeklyWordsRead > userStatistics[j].WeeklyWordsRead - }), - }, - } -} diff --git a/api/auth.go b/api/auth.go index e3fa854..f7e8e8d 100644 --- a/api/auth.go +++ b/api/auth.go @@ -4,6 +4,7 @@ import ( "context" "crypto/md5" "fmt" + "maps" "net/http" "strings" "time" @@ -29,31 +30,31 @@ type authKOHeader struct { AuthKey string `header:"x-auth-key"` } -func (api *API) authorizeCredentials(ctx context.Context, username string, password string) (auth *authData) { +func (api *API) authorizeCredentials(ctx context.Context, username string, password string) (*authData, error) { user, err := api.db.Queries.GetUser(ctx, username) if err != nil { - return + return nil, err } if match, err := argon2.ComparePasswordAndHash(password, *user.Pass); err != nil || !match { - return + return nil, err } - // Update auth cache + // Update Auth Cache api.userAuthCache[user.ID] = *user.AuthHash return &authData{ UserName: user.ID, IsAdmin: user.Admin, AuthHash: *user.AuthHash, - } + }, nil } func (api *API) authKOMiddleware(c *gin.Context) { session := sessions.Default(c) // Check Session First - if auth, ok := api.getSession(c, session); ok { + if auth, ok := api.authorizeSession(c, session); ok { c.Set("Authorization", auth) c.Header("Cache-Control", "private") c.Next() @@ -64,21 +65,25 @@ func (api *API) authKOMiddleware(c *gin.Context) { var rHeader authKOHeader if err := c.ShouldBindHeader(&rHeader); err != nil { + log.WithError(err).Error("failed to bind auth headers") c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "Incorrect Headers"}) return } if rHeader.AuthUser == "" || rHeader.AuthKey == "" { + log.Error("invalid authentication headers") c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Invalid Authorization Headers"}) return } - authData := api.authorizeCredentials(c, rHeader.AuthUser, rHeader.AuthKey) - if authData == nil { + authData, err := api.authorizeCredentials(c, rHeader.AuthUser, rHeader.AuthKey) + if err != nil { + log.WithField("user", rHeader.AuthUser).WithError(err).Error("failed to authorize credentials") c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"}) return } - if err := api.setSession(session, *authData); err != nil { + if err := api.setSession(session, authData); err != nil { + log.WithField("user", rHeader.AuthUser).WithError(err).Error("failed to set session") c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"}) return } @@ -95,14 +100,16 @@ func (api *API) authOPDSMiddleware(c *gin.Context) { // Validate Auth Fields if !hasAuth || user == "" || rawPassword == "" { + log.Error("invalid authorization headers") c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Invalid Authorization Headers"}) return } // Validate Auth password := fmt.Sprintf("%x", md5.Sum([]byte(rawPassword))) - authData := api.authorizeCredentials(c, user, password) - if authData == nil { + authData, err := api.authorizeCredentials(c, user, password) + if err != nil { + log.WithField("user", user).WithError(err).Error("failed to authorize credentials") c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"}) return } @@ -116,7 +123,7 @@ func (api *API) authWebAppMiddleware(c *gin.Context) { session := sessions.Default(c) // Check Session - if auth, ok := api.getSession(c, session); ok { + if auth, ok := api.authorizeSession(c, session); ok { c.Set("Authorization", auth) c.Header("Cache-Control", "private") c.Next() @@ -129,7 +136,7 @@ func (api *API) authWebAppMiddleware(c *gin.Context) { func (api *API) authAdminWebAppMiddleware(c *gin.Context) { if data, _ := c.Get("Authorization"); data != nil { - auth := data.(authData) + auth := data.(*authData) if auth.IsAdmin { c.Next() return @@ -154,8 +161,9 @@ func (api *API) appAuthLogin(c *gin.Context) { // MD5 - KOSync Compatiblity password := fmt.Sprintf("%x", md5.Sum([]byte(rawPassword))) - authData := api.authorizeCredentials(c, username, password) - if authData == nil { + authData, err := api.authorizeCredentials(c, username, password) + if err != nil { + log.WithField("user", username).WithError(err).Error("failed to authorize credentials") templateVars["Error"] = "Invalid Credentials" c.HTML(http.StatusUnauthorized, "page/login", templateVars) return @@ -163,7 +171,7 @@ func (api *API) appAuthLogin(c *gin.Context) { // Set Session session := sessions.Default(c) - if err := api.setSession(session, *authData); err != nil { + if err := api.setSession(session, authData); err != nil { templateVars["Error"] = "Invalid Credentials" c.HTML(http.StatusUnauthorized, "page/login", templateVars) return @@ -252,7 +260,7 @@ func (api *API) appAuthRegister(c *gin.Context) { } // Set session - auth := authData{ + auth := &authData{ UserName: user.ID, IsAdmin: user.Admin, AuthHash: *user.AuthHash, @@ -348,35 +356,40 @@ func (api *API) koAuthRegister(c *gin.Context) { }) } -func (api *API) getSession(ctx context.Context, session sessions.Session) (auth authData, ok bool) { +func (api *API) authorizeSession(ctx context.Context, session sessions.Session) (*authData, bool) { // Get Session authorizedUser := session.Get("authorizedUser") isAdmin := session.Get("isAdmin") expiresAt := session.Get("expiresAt") authHash := session.Get("authHash") if authorizedUser == nil || isAdmin == nil || expiresAt == nil || authHash == nil { - return + return nil, false } // Create Auth Object - auth = authData{ + auth := &authData{ UserName: authorizedUser.(string), IsAdmin: isAdmin.(bool), AuthHash: authHash.(string), } + logger := log.WithField("user", auth.UserName) // Validate Auth Hash correctAuthHash, err := api.getUserAuthHash(ctx, auth.UserName) - if err != nil || correctAuthHash != auth.AuthHash { - return + if err != nil { + logger.WithError(err).Error("failed to get auth hash") + return nil, false + } else if correctAuthHash != auth.AuthHash { + logger.Warn("user auth hash mismatch") + return nil, false } // Refresh if expiresAt.(int64)-time.Now().Unix() < 60*60*24 { - log.Info("Refreshing Session") + logger.Info("refreshing session") if err := api.setSession(session, auth); err != nil { - log.Error("unable to get session") - return + logger.WithError(err).Error("failed to refresh session") + return nil, false } } @@ -384,7 +397,7 @@ func (api *API) getSession(ctx context.Context, session sessions.Session) (auth return auth, true } -func (api *API) setSession(session sessions.Session, auth authData) error { +func (api *API) setSession(session sessions.Session, auth *authData) error { // Set Session Cookie session.Set("authorizedUser", auth.UserName) session.Set("isAdmin", auth.IsAdmin) @@ -464,9 +477,7 @@ func (api *API) rotateAllAuthHashes(ctx context.Context) error { } // Transaction Succeeded -> Update Cache - for user, hash := range newAuthHashCache { - api.userAuthCache[user] = hash - } + maps.Copy(api.userAuthCache, newAuthHashCache) return nil } diff --git a/api/common.go b/api/common.go index 0888ed4..a95680f 100644 --- a/api/common.go +++ b/api/common.go @@ -98,20 +98,20 @@ func (api *API) createGetCoverHandler(errorFunc func(*gin.Context, int, string)) } // Attempt Metadata - var coverDir string = filepath.Join(api.cfg.DataPath, "covers") - var coverFile string = "UNKNOWN" + coverDir := filepath.Join(api.cfg.DataPath, "covers") + coverFile := "UNKNOWN" // Identify Documents & Save Covers - metadataResults, err := metadata.SearchMetadata(metadata.SOURCE_GBOOK, metadata.MetadataInfo{ + metadataResults, err := metadata.SearchMetadata(metadata.SourceGoogleBooks, metadata.MetadataInfo{ Title: document.Title, Author: document.Author, }) - if err == nil && len(metadataResults) > 0 && metadataResults[0].ID != nil { + if err == nil && len(metadataResults) > 0 && metadataResults[0].SourceID != nil { firstResult := metadataResults[0] // Save Cover - fileName, err := metadata.CacheCover(*firstResult.ID, coverDir, document.ID, false) + fileName, err := metadata.CacheCover(*firstResult.SourceID, coverDir, document.ID, false) if err == nil { coverFile = *fileName } @@ -122,7 +122,7 @@ func (api *API) createGetCoverHandler(errorFunc func(*gin.Context, int, string)) Title: firstResult.Title, Author: firstResult.Author, Description: firstResult.Description, - Gbid: firstResult.ID, + Gbid: firstResult.SourceID, Olid: nil, Isbn10: firstResult.ISBN10, Isbn13: firstResult.ISBN13, diff --git a/api/convert.go b/api/convert.go new file mode 100644 index 0000000..af98b46 --- /dev/null +++ b/api/convert.go @@ -0,0 +1,83 @@ +package api + +import ( + "time" + + "reichard.io/antholume/database" + "reichard.io/antholume/metadata" + "reichard.io/antholume/pkg/ptr" + "reichard.io/antholume/pkg/utils" + "reichard.io/antholume/search" + "reichard.io/antholume/web/models" +) + +func convertDBDocToUI(r database.GetDocumentsWithStatsRow) models.Document { + return models.Document{ + ID: r.ID, + Title: ptr.Deref(r.Title), + Author: ptr.Deref(r.Author), + ISBN10: ptr.Deref(r.Isbn10), + ISBN13: ptr.Deref(r.Isbn13), + Description: ptr.Deref(r.Description), + Percentage: r.Percentage, + WPM: r.Wpm, + Words: r.Words, + TotalTimeRead: time.Duration(r.TotalTimeSeconds) * time.Second, + TimePerPercent: time.Duration(r.SecondsPerPercent) * time.Second, + HasFile: ptr.Deref(r.Filepath) != "", + } +} + +func convertMetaToUI(m metadata.MetadataInfo) *models.DocumentMetadata { + return &models.DocumentMetadata{ + SourceID: ptr.Deref(m.SourceID), + ISBN10: ptr.Deref(m.ISBN10), + ISBN13: ptr.Deref(m.ISBN13), + Title: ptr.Deref(m.Title), + Author: ptr.Deref(m.Author), + Description: ptr.Deref(m.Description), + Source: m.Source, + } +} + +func convertDBActivityToUI(r database.GetActivityRow) models.Activity { + return models.Activity{ + ID: r.DocumentID, + Author: utils.FirstNonZero(ptr.Deref(r.Author), "N/A"), + Title: utils.FirstNonZero(ptr.Deref(r.Title), "N/A"), + StartTime: r.StartTime, + Duration: time.Duration(r.Duration) * time.Second, + Percentage: r.EndPercentage, + } +} + +func convertDBProgressToUI(r database.GetProgressRow) models.Progress { + return models.Progress{ + ID: r.DocumentID, + Author: utils.FirstNonZero(ptr.Deref(r.Author), "N/A"), + Title: utils.FirstNonZero(ptr.Deref(r.Title), "N/A"), + DeviceName: r.DeviceName, + Percentage: r.Percentage, + CreatedAt: r.CreatedAt, + } +} + +func convertDBDeviceToUI(r database.GetDevicesRow) models.Device { + return models.Device{ + DeviceName: r.DeviceName, + LastSynced: r.LastSynced, + CreatedAt: r.CreatedAt, + } +} + +func convertSearchToUI(r search.SearchItem) models.SearchResult { + return models.SearchResult{ + ID: r.ID, + Title: r.Title, + Author: r.Author, + Series: r.Series, + FileType: r.FileType, + FileSize: r.FileSize, + UploadDate: r.UploadDate, + } +} diff --git a/api/opds-routes.go b/api/opds-routes.go index 17cceea..2644587 100644 --- a/api/opds-routes.go +++ b/api/opds-routes.go @@ -62,13 +62,19 @@ func (api *API) opdsEntry(c *gin.Context) { } func (api *API) opdsDocuments(c *gin.Context) { - var auth authData - if data, _ := c.Get("Authorization"); data != nil { - auth = data.(authData) + auth, err := getAuthData(c) + if err != nil { + log.WithError(err).Error("failed to acquire auth data") + c.AbortWithStatus(http.StatusInternalServerError) } // Potential URL Parameters (Default Pagination - 100) - qParams := bindQueryParams(c, 100) + qParams, err := bindQueryParams(c, 100) + if err != nil { + log.WithError(err).Error("failed to bind query params") + c.AbortWithStatus(http.StatusBadRequest) + return + } // Possible Query var query *string @@ -86,7 +92,7 @@ func (api *API) opdsDocuments(c *gin.Context) { Limit: *qParams.Limit, }) if err != nil { - log.Error("GetDocumentsWithStats DB Error:", err) + log.WithError(err).Error("failed to get documents with stats") c.AbortWithStatus(http.StatusBadRequest) return } diff --git a/api/utils.go b/api/utils.go index 3fb3e4a..72a8e92 100644 --- a/api/utils.go +++ b/api/utils.go @@ -8,11 +8,22 @@ import ( "reflect" "strings" + "github.com/gin-gonic/gin" "reichard.io/antholume/database" "reichard.io/antholume/graph" "reichard.io/antholume/metadata" ) +func getAuthData(ctx *gin.Context) (*authData, error) { + if data, ok := ctx.Get("Authorization"); ok { + var auth *authData + if auth, ok = data.(*authData); ok { + return auth, nil + } + } + return nil, errors.New("could not acquire auth data") +} + // getTimeZones returns a string slice of IANA timezones. func getTimeZones() []string { return []string{ diff --git a/assets/index.css b/assets/index.css new file mode 100644 index 0000000..8f0cc5c --- /dev/null +++ b/assets/index.css @@ -0,0 +1,116 @@ +/* ----------------------------- */ +/* -------- PWA Styling -------- */ +/* ----------------------------- */ +html, +body { + overscroll-behavior-y: none; + margin: 0px; +} + +html { + height: calc(100% + env(safe-area-inset-bottom)); + padding: env(safe-area-inset-top) env(safe-area-inset-right) 0 + env(safe-area-inset-left); +} + +main { + height: calc(100dvh - 4rem - env(safe-area-inset-top)); +} + +#container { + padding-bottom: calc(5em + env(safe-area-inset-bottom) * 2); +} + +/* No Scrollbar - IE, Edge, Firefox */ +* { + -ms-overflow-style: none; + scrollbar-width: none; +} + +/* No Scrollbar - WebKit */ +*::-webkit-scrollbar { + display: none; +} + +/* ----------------------------- */ +/* -------- CSS Button -------- */ +/* ----------------------------- */ +.css-button:checked + div { + visibility: visible; + opacity: 1; +} + +.css-button + div { + visibility: hidden; + opacity: 0; +} + +/* ----------------------------- */ +/* ------- User Dropdown ------- */ +/* ----------------------------- */ +#user-dropdown-button:checked + #user-dropdown { + visibility: visible; + opacity: 1; +} + +#user-dropdown { + visibility: hidden; + opacity: 0; +} + +/* ----------------------------- */ +/* ----- Mobile Navigation ----- */ +/* ----------------------------- */ +#mobile-nav-button span { + transform-origin: 5px 0px; + transition: + transform 0.5s cubic-bezier(0.77, 0.2, 0.05, 1), + background 0.5s cubic-bezier(0.77, 0.2, 0.05, 1), + opacity 0.55s ease; +} + +#mobile-nav-button span:first-child { + transform-origin: 0% 0%; +} + +#mobile-nav-button span:nth-last-child(2) { + transform-origin: 0% 100%; +} + +#mobile-nav-button input:checked ~ span { + opacity: 1; + transform: rotate(45deg) translate(2px, -2px); +} + +#mobile-nav-button input:checked ~ span:nth-last-child(3) { + opacity: 0; + transform: rotate(0deg) scale(0.2, 0.2); +} + +#mobile-nav-button input:checked ~ span:nth-last-child(2) { + transform: rotate(-45deg) translate(0, 6px); +} + +#mobile-nav-button input:checked ~ div { + transform: none; +} + +@media (min-width: 1024px) { + #mobile-nav-button input ~ div { + transform: none; + } +} + +#menu { + top: 0; + padding-top: env(safe-area-inset-top); + transform-origin: 0% 0%; + transform: translate(-100%, 0); + transition: transform 0.5s cubic-bezier(0.77, 0.2, 0.05, 1); +} + +@media (orientation: landscape) { + #menu { + transform: translate(calc(-1 * (env(safe-area-inset-left) + 100%)), 0); + } +} diff --git a/assets/local/index.htm b/assets/local/index.htm index 10192c2..85f85aa 100644 --- a/assets/local/index.htm +++ b/assets/local/index.htm @@ -25,7 +25,7 @@ AnthoLume - Local - + diff --git a/assets/reader/index.htm b/assets/reader/index.htm index 4b8427e..1329968 100644 --- a/assets/reader/index.htm +++ b/assets/reader/index.htm @@ -17,7 +17,7 @@ AnthoLume - Reader - + @@ -82,9 +82,13 @@ id="top-bar" class="transition-all duration-200 absolute z-10 bg-gray-100 dark:bg-gray-800 w-full px-2" > -
-
-
+
+
+
-
-
+
+
diff --git a/assets/style.css b/assets/style.css index e64a372..1d7107e 100644 --- a/assets/style.css +++ b/assets/style.css @@ -1 +1 @@ -*,::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: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-tap-highlight-color:transparent}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}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-feature-settings:normal;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-feature-settings:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-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{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]:where(:not([hidden=until-found])){display:none}.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}}.pointer-events-none{pointer-events:none}.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-10{left:2.5rem}.left-16{left:4rem}.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\.5{top:.375rem}.top-1\/2{top:50%}.top-10{top:2.5rem}.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-bottom:.5rem;margin-top:.5rem}.my-6{margin-bottom:1.5rem;margin-top:1.5rem}.my-auto{margin-bottom:auto;margin-top: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-2{margin-left:.5rem}.ml-6{margin-left:1.5rem}.mr-4{margin-right:1rem}.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}.table-cell{display:table-cell}.grid{display:grid}.contents{display:contents}.hidden{display:none}.h-0\.5{height:.125rem}.h-10{height:2.5rem}.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-\[50\%\]{max-height:50%}.max-h-\[75vh\]{max-height:75vh}.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-default{cursor:default}.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-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*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}.break-all{word-break:break-all}.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-xl{border-radius:.75rem}.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,1))}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity,1))}.border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity,1))}.border-purple-500{--tw-border-opacity:1;border-color:rgb(168 85 247/var(--tw-border-opacity,1))}.border-transparent{border-color:#0000}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity,1))}.bg-\[\#000\]{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity,1))}.bg-\[\#1f2937\]{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.bg-\[\#232323\]{--tw-bg-opacity:1;background-color:rgb(35 35 35/var(--tw-bg-opacity,1))}.bg-\[\#d2b48c\]{--tw-bg-opacity:1;background-color:rgb(210 180 140/var(--tw-bg-opacity,1))}.bg-\[\#fff\]{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity,1))}.bg-blue-100{--tw-bg-opacity:1;background-color:rgb(219 234 254/var(--tw-bg-opacity,1))}.bg-blue-700{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity,1))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity,1))}.bg-gray-400{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity,1))}.bg-gray-500{--tw-bg-opacity:1;background-color:rgb(107 114 128/var(--tw-bg-opacity,1))}.bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity,1))}.bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.bg-green-200{--tw-bg-opacity:1;background-color:rgb(187 247 208/var(--tw-bg-opacity,1))}.bg-green-600{--tw-bg-opacity:1;background-color:rgb(22 163 74/var(--tw-bg-opacity,1))}.bg-red-500{--tw-bg-opacity:1;background-color:rgb(239 68 68/var(--tw-bg-opacity,1))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.object-cover{-o-object-fit:cover;object-fit:cover}.object-fill{-o-object-fit:fill;object-fit:fill}.p-1{padding:.25rem}.p-1\.5{padding:.375rem}.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-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-4{padding-bottom:1rem;padding-top:1rem}.py-5{padding-bottom:1.25rem;padding-top:1.25rem}.py-6{padding-bottom:1.5rem;padding-top:1.5rem}.py-8{padding-bottom:2rem;padding-top: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,1))}.text-\[\#333\]{--tw-text-opacity:1;color:rgb(51 51 51/var(--tw-text-opacity,1))}.text-\[\#ccc\]{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity,1))}.text-\[\#fff\]{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity,1))}.text-blue-700{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity,1))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity,1))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity,1))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity,1))}.text-green-400{--tw-text-opacity:1;color:rgb(74 222 128/var(--tw-text-opacity,1))}.text-red-400{--tw-text-opacity:1;color:rgb(248 113 113/var(--tw-text-opacity,1))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.underline{text-decoration-line:underline}.placeholder-gray-400::-moz-placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity,1))}.placeholder-gray-400::placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity,1))}.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,1))}.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-duration:.15s;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-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-colors{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-100{transition-duration:.1s}.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,1))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.hover\:bg-gray-400:hover{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity,1))}.hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.hover\:text-black:hover{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity,1))}.hover\:text-gray-800:hover{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.hover\:text-gray-900:hover{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity,1))}.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,1))}.focus\:ring-purple-600:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(147 51 234/var(--tw-ring-opacity,1))}.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,.peer\/add:checked~.peer-checked\/add\:block{display:block}@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-60{width:15rem}.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-bottom:4rem;padding-top:4rem}.lg\:pr-0{padding-right:0}.lg\:text-9xl{font-size:8rem;line-height:1}}@media (prefers-color-scheme:dark){.dark\:border-black{--tw-border-opacity:1;border-color:rgb(0 0 0/var(--tw-border-opacity,1))}.dark\:border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity,1))}.dark\:border-gray-800{--tw-border-opacity:1;border-color:rgb(31 41 55/var(--tw-border-opacity,1))}.dark\:bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity,1))}.dark\:bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.dark\:bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.dark\:bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity,1))}.dark\:bg-gray-600{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity,1))}.dark\:bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity,1))}.dark\:bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.dark\:bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity,1))}.dark\:bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.dark\:text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity,1))}.dark\:text-gray-100{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity,1))}.dark\:text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity,1))}.dark\:text-gray-300{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity,1))}.dark\:text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.dark\:text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.dark\:text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.dark\:text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.dark\:text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.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,1))}.dark\:hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.dark\:hover\:bg-gray-600:hover{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity,1))}.dark\:hover\:bg-gray-700:hover{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity,1))}.dark\:hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.dark\:hover\:text-gray-100:hover{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity,1))}.dark\:hover\:text-white:hover{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.dark\:focus\:ring-blue-800:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(30 64 175/var(--tw-ring-opacity,1))}} \ No newline at end of file +*,::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: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.12 | MIT License | https://tailwindcss.com*/*,:after,:before{box-sizing:border-box;border:0 solid #e5e7eb}:after,:before{--tw-content:""}:host,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,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-webkit-tap-highlight-color:transparent}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-feature-settings:normal;font-variation-settings:normal;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;letter-spacing:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-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}.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}}.pointer-events-none{pointer-events:none}.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-10{left:2.5rem}.left-16{left:4rem}.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\.5{top:.375rem}.top-1\/2{top:50%}.top-10{top:2.5rem}.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-0{margin-bottom:0}.mb-12{margin-bottom:3rem}.mb-2{margin-bottom:.5rem}.mb-4{margin-bottom:1rem}.mb-8{margin-bottom:2rem}.ml-2{margin-left:.5rem}.ml-6{margin-left:1.5rem}.mr-4{margin-right:1rem}.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}.table-cell{display:table-cell}.grid{display:grid}.contents{display:contents}.hidden{display:none}.size-4{width:1rem;height:1rem}.size-5{width:1.25rem;height:1.25rem}.size-6{width:1.5rem;height:1.5rem}.size-7{width:1.75rem;height:1.75rem}.size-8{width:2rem;height:2rem}.h-0\.5{height:.125rem}.h-10{height:2.5rem}.h-16{height:4rem}.h-2{height:.5rem}.h-32{height:8rem}.h-4{height:1rem}.h-48{height:12rem}.h-5{height:1.25rem}.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-default{cursor:default}.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}.break-all{word-break:break-all}.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-xl{border-radius:.75rem}.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-1\.5{padding:.375rem}.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-100{transition-duration:.1s}.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,.peer\/\%s:checked~.peer-checked\/\%s\:block,.peer\/add:checked~.peer-checked\/add\:block{display:block}@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-60{width:15rem}.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}}@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))}} \ No newline at end of file diff --git a/assets/sw.js b/assets/sw.js index 8eba6c1..9a5851a 100644 --- a/assets/sw.js +++ b/assets/sw.js @@ -72,7 +72,8 @@ const PRECACHE_ASSETS = [ // Main App Assets "/manifest.json", "/assets/index.js", - "/assets/style.css", + "/assets/index.css", + "/assets/tailwind.css", "/assets/common.js", // Library Assets diff --git a/assets/tailwind.css b/assets/tailwind.css new file mode 100644 index 0000000..1d4190a --- /dev/null +++ b/assets/tailwind.css @@ -0,0 +1 @@ +*,::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: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-tap-highlight-color:transparent}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}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-feature-settings:normal;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:initial}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-feature-settings:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-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{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]:where(:not([hidden=until-found])){display:none}.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}}.pointer-events-none{pointer-events:none}.visible{visibility:visible}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.-bottom-1{bottom:-.25rem}.-bottom-28{bottom:-7rem}.-bottom-5{bottom:-1.25rem}.-top-1{top:-.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-10{left:2.5rem}.left-16{left:4rem}.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\.5{top:.375rem}.top-1\/2{top:50%}.top-10{top:2.5rem}.top-16{top:4rem}.top-3{top:.75rem}.top-6{top:1.5rem}.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-bottom:.5rem;margin-top:.5rem}.my-6{margin-bottom:1.5rem;margin-top:1.5rem}.my-auto{margin-bottom:auto;margin-top: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-2{margin-left:.5rem}.ml-6{margin-left:1.5rem}.mr-4{margin-right:1rem}.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\.5{height:.125rem}.h-10{height:2.5rem}.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-\[50\%\]{max-height:50%}.max-h-\[75vh\]{max-height:75vh}.max-h-\[95\%\]{max-height:95%}.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-64{width:16rem}.w-7{width:1.75rem}.w-72{width:18rem}.w-\[19rem\]{width:19rem}.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-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-bottom{transform-origin:bottom}.origin-bottom-left{transform-origin:bottom left}.origin-bottom-right{transform-origin:bottom right}.origin-center{transform-origin:center}.origin-left{transform-origin:left}.origin-right{transform-origin:right}.origin-top{transform-origin:top}.origin-top-left{transform-origin:top left}.origin-top-right{transform-origin:top right}.-translate-x-1\/2,.-translate-x-2\/4{--tw-translate-x:-50%}.-translate-x-1\/2,.-translate-x-2\/4,.-translate-x-full{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-x-full{--tw-translate-x:-100%}.-translate-y-1\/2,.-translate-y-2\/4{--tw-translate-y:-50%}.-translate-y-1\/2,.-translate-y-2\/4,.-translate-y-full{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-full{--tw-translate-y:-100%}.translate-x-full{--tw-translate-x:100%}.translate-x-full,.translate-y-full{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-full{--tw-translate-y:100%}.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))}@keyframes slideIn{0%{transform:translateX(100%)}to{transform:translateX(0)}}@keyframes slideOut{0%{transform:translateX(0)}to{transform:translateX(100%)}}.animate-notification{animation:slideIn .25s ease-out forwards,slideOut .25s ease-out 4.5s forwards}.cursor-default{cursor:default}.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))}.grid-cols-\[1fr_auto\]{grid-template-columns:1fr auto}.flex-col{flex-direction:column}.flex-col-reverse{flex-direction:column-reverse}.flex-wrap{flex-wrap:wrap}.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-3{gap:.75rem}.gap-4{gap:1rem}.gap-7{gap:1.75rem}.gap-8{gap:2rem}.gap-x-4{-moz-column-gap:1rem;column-gap:1rem}.gap-y-3{row-gap:.75rem}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(.5rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(.5rem*var(--tw-space-x-reverse))}.space-x-4>:not([hidden])~:not([hidden]){--tw-space-x-reverse:0;margin-left:calc(1rem*(1 - var(--tw-space-x-reverse)));margin-right:calc(1rem*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}.whitespace-nowrap{white-space:nowrap}.whitespace-pre{white-space:pre}.text-nowrap{text-wrap:nowrap}.break-all{word-break:break-all}.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-xl{border-radius:.75rem}.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,1))}.border-gray-300{--tw-border-opacity:1;border-color:rgb(209 213 219/var(--tw-border-opacity,1))}.border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity,1))}.border-purple-500{--tw-border-opacity:1;border-color:rgb(168 85 247/var(--tw-border-opacity,1))}.border-transparent{border-color:#0000}.border-white{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity,1))}.bg-\[\#000\]{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity,1))}.bg-\[\#1f2937\]{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.bg-\[\#232323\]{--tw-bg-opacity:1;background-color:rgb(35 35 35/var(--tw-bg-opacity,1))}.bg-\[\#d2b48c\]{--tw-bg-opacity:1;background-color:rgb(210 180 140/var(--tw-bg-opacity,1))}.bg-\[\#fff\]{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.bg-black{--tw-bg-opacity:1;background-color:rgb(0 0 0/var(--tw-bg-opacity,1))}.bg-blue-100{--tw-bg-opacity:1;background-color:rgb(219 234 254/var(--tw-bg-opacity,1))}.bg-blue-700{--tw-bg-opacity:1;background-color:rgb(29 78 216/var(--tw-bg-opacity,1))}.bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity,1))}.bg-gray-400{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity,1))}.bg-gray-500{--tw-bg-opacity:1;background-color:rgb(107 114 128/var(--tw-bg-opacity,1))}.bg-gray-600{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity,1))}.bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity,1))}.bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.bg-green-200{--tw-bg-opacity:1;background-color:rgb(187 247 208/var(--tw-bg-opacity,1))}.bg-green-600{--tw-bg-opacity:1;background-color:rgb(22 163 74/var(--tw-bg-opacity,1))}.bg-red-500{--tw-bg-opacity:1;background-color:rgb(239 68 68/var(--tw-bg-opacity,1))}.bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.object-cover{-o-object-fit:cover;object-fit:cover}.object-fill{-o-object-fit:fill;object-fit:fill}.p-1{padding:.25rem}.p-1\.5{padding:.375rem}.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-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.py-4{padding-bottom:1rem;padding-top:1rem}.py-6{padding-bottom:1.5rem;padding-top:1.5rem}.py-8{padding-bottom:2rem;padding-top:2rem}.pb-12{padding-bottom:3rem}.pb-2{padding-bottom:.5rem}.pb-3{padding-bottom:.75rem}.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-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,1))}.text-\[\#333\]{--tw-text-opacity:1;color:rgb(51 51 51/var(--tw-text-opacity,1))}.text-\[\#ccc\]{--tw-text-opacity:1;color:rgb(204 204 204/var(--tw-text-opacity,1))}.text-\[\#fff\]{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity,1))}.text-blue-700{--tw-text-opacity:1;color:rgb(29 78 216/var(--tw-text-opacity,1))}.text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity,1))}.text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.text-gray-700{--tw-text-opacity:1;color:rgb(55 65 81/var(--tw-text-opacity,1))}.text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.text-gray-900{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity,1))}.text-green-400{--tw-text-opacity:1;color:rgb(74 222 128/var(--tw-text-opacity,1))}.text-red-400{--tw-text-opacity:1;color:rgb(248 113 113/var(--tw-text-opacity,1))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.underline{text-decoration-line:underline}.placeholder-gray-400::-moz-placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity,1))}.placeholder-gray-400::placeholder{--tw-placeholder-opacity:1;color:rgb(156 163 175/var(--tw-placeholder-opacity,1))}.opacity-0{opacity:0}.opacity-30{opacity:.3}.opacity-40{opacity:.4}.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,1))}.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-duration:.15s;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-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-colors{transition-duration:.15s;transition-property:color,background-color,border-color,text-decoration-color,fill,stroke;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-100{transition-duration:.1s}.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,1))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.hover\:bg-gray-400:hover{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity,1))}.hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.hover\:bg-white:hover{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.hover\:text-black:hover{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity,1))}.hover\:text-gray-800:hover{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.hover\:text-gray-900:hover{--tw-text-opacity:1;color:rgb(17 24 39/var(--tw-text-opacity,1))}.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,1))}.focus\:ring-purple-600:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(147 51 234/var(--tw-ring-opacity,1))}.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,.peer\/\"\+key\+\":checked~.peer-checked\/\"\+key\+\"\:block,.peer\/add:checked~.peer-checked\/add\:block{display:block}@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\:p-4{padding:1rem}.sm\:px-6{padding-left:1.5rem;padding-right:1.5rem}}@media (min-width:768px){.md\:block{display:block}.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}}@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-60{width:15rem}.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-bottom:4rem;padding-top:4rem}.lg\:pr-0{padding-right:0}.lg\:text-9xl{font-size:8rem;line-height:1}}@media (prefers-color-scheme:dark){.dark\:border-black{--tw-border-opacity:1;border-color:rgb(0 0 0/var(--tw-border-opacity,1))}.dark\:border-gray-500{--tw-border-opacity:1;border-color:rgb(107 114 128/var(--tw-border-opacity,1))}.dark\:border-gray-800{--tw-border-opacity:1;border-color:rgb(31 41 55/var(--tw-border-opacity,1))}.dark\:bg-blue-600{--tw-bg-opacity:1;background-color:rgb(37 99 235/var(--tw-bg-opacity,1))}.dark\:bg-gray-100{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.dark\:bg-gray-200{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity,1))}.dark\:bg-gray-300{--tw-bg-opacity:1;background-color:rgb(209 213 219/var(--tw-bg-opacity,1))}.dark\:bg-gray-400{--tw-bg-opacity:1;background-color:rgb(156 163 175/var(--tw-bg-opacity,1))}.dark\:bg-gray-600{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity,1))}.dark\:bg-gray-700{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity,1))}.dark\:bg-gray-800{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.dark\:bg-gray-900{--tw-bg-opacity:1;background-color:rgb(17 24 39/var(--tw-bg-opacity,1))}.dark\:bg-white{--tw-bg-opacity:1;background-color:rgb(255 255 255/var(--tw-bg-opacity,1))}.dark\:text-black{--tw-text-opacity:1;color:rgb(0 0 0/var(--tw-text-opacity,1))}.dark\:text-gray-100{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity,1))}.dark\:text-gray-200{--tw-text-opacity:1;color:rgb(229 231 235/var(--tw-text-opacity,1))}.dark\:text-gray-300{--tw-text-opacity:1;color:rgb(209 213 219/var(--tw-text-opacity,1))}.dark\:text-gray-400{--tw-text-opacity:1;color:rgb(156 163 175/var(--tw-text-opacity,1))}.dark\:text-gray-500{--tw-text-opacity:1;color:rgb(107 114 128/var(--tw-text-opacity,1))}.dark\:text-gray-600{--tw-text-opacity:1;color:rgb(75 85 99/var(--tw-text-opacity,1))}.dark\:text-gray-800{--tw-text-opacity:1;color:rgb(31 41 55/var(--tw-text-opacity,1))}.dark\:text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.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,1))}.dark\:hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity,1))}.dark\:hover\:bg-gray-600:hover{--tw-bg-opacity:1;background-color:rgb(75 85 99/var(--tw-bg-opacity,1))}.dark\:hover\:bg-gray-700:hover{--tw-bg-opacity:1;background-color:rgb(55 65 81/var(--tw-bg-opacity,1))}.dark\:hover\:bg-gray-800:hover{--tw-bg-opacity:1;background-color:rgb(31 41 55/var(--tw-bg-opacity,1))}.dark\:hover\:text-gray-100:hover{--tw-text-opacity:1;color:rgb(243 244 246/var(--tw-text-opacity,1))}.dark\:hover\:text-white:hover{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.dark\:focus\:ring-blue-800:focus{--tw-ring-opacity:1;--tw-ring-color:rgb(30 64 175/var(--tw-ring-opacity,1))}} \ No newline at end of file diff --git a/database/query.sql b/database/query.sql index 1929773..ff9ce88 100644 --- a/database/query.sql +++ b/database/query.sql @@ -67,7 +67,7 @@ WITH filtered_activity AS ( SELECT document_id, device_id, - LOCAL_TIME(activity.start_time, users.timezone) AS start_time, + CAST(LOCAL_TIME(activity.start_time, users.timezone) AS TEXT) AS start_time, title, author, duration, @@ -138,8 +138,8 @@ WHERE id = $device_id LIMIT 1; SELECT devices.id, devices.device_name, - LOCAL_TIME(devices.created_at, users.timezone) AS created_at, - LOCAL_TIME(devices.last_synced, users.timezone) AS last_synced + CAST(LOCAL_TIME(devices.created_at, users.timezone) AS TEXT) AS created_at, + CAST(LOCAL_TIME(devices.last_synced, users.timezone) AS TEXT) AS last_synced FROM devices JOIN users ON users.id = devices.user_id WHERE users.id = $user_id @@ -246,7 +246,7 @@ SELECT ROUND(CAST(progress.percentage AS REAL) * 100, 2) AS percentage, progress.document_id, progress.user_id, - LOCAL_TIME(progress.created_at, users.timezone) AS created_at + CAST(LOCAL_TIME(progress.created_at, users.timezone) AS TEXT) AS created_at FROM document_progress AS progress LEFT JOIN users ON progress.user_id = users.id LEFT JOIN devices ON progress.device_id = devices.id diff --git a/database/query.sql.go b/database/query.sql.go index 1f5acb3..fc3d971 100644 --- a/database/query.sql.go +++ b/database/query.sql.go @@ -193,7 +193,7 @@ WITH filtered_activity AS ( SELECT document_id, device_id, - LOCAL_TIME(activity.start_time, users.timezone) AS start_time, + CAST(LOCAL_TIME(activity.start_time, users.timezone) AS TEXT) AS start_time, title, author, duration, @@ -214,15 +214,15 @@ type GetActivityParams struct { } type GetActivityRow struct { - DocumentID string `json:"document_id"` - DeviceID string `json:"device_id"` - StartTime interface{} `json:"start_time"` - Title *string `json:"title"` - Author *string `json:"author"` - Duration int64 `json:"duration"` - StartPercentage float64 `json:"start_percentage"` - EndPercentage float64 `json:"end_percentage"` - ReadPercentage float64 `json:"read_percentage"` + DocumentID string `json:"document_id"` + DeviceID string `json:"device_id"` + StartTime string `json:"start_time"` + Title *string `json:"title"` + Author *string `json:"author"` + Duration int64 `json:"duration"` + StartPercentage float64 `json:"start_percentage"` + EndPercentage float64 `json:"end_percentage"` + ReadPercentage float64 `json:"read_percentage"` } func (q *Queries) GetActivity(ctx context.Context, arg GetActivityParams) ([]GetActivityRow, error) { @@ -422,8 +422,8 @@ const getDevices = `-- name: GetDevices :many SELECT devices.id, devices.device_name, - LOCAL_TIME(devices.created_at, users.timezone) AS created_at, - LOCAL_TIME(devices.last_synced, users.timezone) AS last_synced + CAST(LOCAL_TIME(devices.created_at, users.timezone) AS TEXT) AS created_at, + CAST(LOCAL_TIME(devices.last_synced, users.timezone) AS TEXT) AS last_synced FROM devices JOIN users ON users.id = devices.user_id WHERE users.id = ?1 @@ -431,10 +431,10 @@ ORDER BY devices.last_synced DESC ` type GetDevicesRow struct { - ID string `json:"id"` - DeviceName string `json:"device_name"` - CreatedAt interface{} `json:"created_at"` - LastSynced interface{} `json:"last_synced"` + ID string `json:"id"` + DeviceName string `json:"device_name"` + CreatedAt string `json:"created_at"` + LastSynced string `json:"last_synced"` } func (q *Queries) GetDevices(ctx context.Context, userID string) ([]GetDevicesRow, error) { @@ -824,7 +824,7 @@ SELECT ROUND(CAST(progress.percentage AS REAL) * 100, 2) AS percentage, progress.document_id, progress.user_id, - LOCAL_TIME(progress.created_at, users.timezone) AS created_at + CAST(LOCAL_TIME(progress.created_at, users.timezone) AS TEXT) AS created_at FROM document_progress AS progress LEFT JOIN users ON progress.user_id = users.id LEFT JOIN devices ON progress.device_id = devices.id @@ -851,13 +851,13 @@ type GetProgressParams struct { } type GetProgressRow struct { - Title *string `json:"title"` - Author *string `json:"author"` - DeviceName string `json:"device_name"` - Percentage float64 `json:"percentage"` - DocumentID string `json:"document_id"` - UserID string `json:"user_id"` - CreatedAt interface{} `json:"created_at"` + Title *string `json:"title"` + Author *string `json:"author"` + DeviceName string `json:"device_name"` + Percentage float64 `json:"percentage"` + DocumentID string `json:"document_id"` + UserID string `json:"user_id"` + CreatedAt string `json:"created_at"` } func (q *Queries) GetProgress(ctx context.Context, arg GetProgressParams) ([]GetProgressRow, error) { diff --git a/go.mod b/go.mod index b0b8fc5..93f779b 100644 --- a/go.mod +++ b/go.mod @@ -74,6 +74,7 @@ require ( google.golang.org/protobuf v1.36.7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/uint128 v1.3.0 // indirect + maragu.dev/gomponents v1.1.0 // indirect modernc.org/cc/v3 v3.41.0 // indirect modernc.org/ccgo/v3 v3.17.0 // indirect modernc.org/libc v1.66.6 // indirect diff --git a/go.sum b/go.sum index c583c09..95ab5c5 100644 --- a/go.sum +++ b/go.sum @@ -485,6 +485,8 @@ howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g= howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM= lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo= lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= +maragu.dev/gomponents v1.1.0 h1:iCybZZChHr1eSlvkWp/JP3CrZGzctLudQ/JI3sBcO4U= +maragu.dev/gomponents v1.1.0/go.mod h1:oEDahza2gZoXDoDHhw8jBNgH+3UR5ni7Ur648HORydM= modernc.org/cc/v3 v3.41.0 h1:QoR1Sn3YWlmA1T4vLaKZfawdVtSiGx8H+cEojbC7v1Q= modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y= modernc.org/ccgo/v3 v3.16.15 h1:KbDR3ZAVU+wiLyMESPtbtE/Add4elztFyfsWoNTgxS0= diff --git a/graph/graph.go b/graph/graph.go index d53af7d..cfa6cac 100644 --- a/graph/graph.go +++ b/graph/graph.go @@ -28,7 +28,7 @@ type SVGBezierOpposedLine struct { func GetSVGGraphData(inputData []int64, svgWidth int, svgHeight int) SVGGraphData { // Derive Height - var maxHeight int = 0 + var maxHeight int for _, item := range inputData { if int(item) > maxHeight { maxHeight = int(item) @@ -39,19 +39,19 @@ func GetSVGGraphData(inputData []int64, svgWidth int, svgHeight int) SVGGraphDat var sizePercentage float32 = 0.5 // Scale Ratio -> Desired Height - var sizeRatio float32 = float32(svgHeight) * sizePercentage / float32(maxHeight) + sizeRatio := float32(svgHeight) * sizePercentage / float32(maxHeight) // Point Block Offset - var blockOffset int = int(math.Floor(float64(svgWidth) / float64(len(inputData)))) + blockOffset := int(math.Floor(float64(svgWidth) / float64(len(inputData)))) // Line & Bar Points linePoints := []SVGGraphPoint{} barPoints := []SVGGraphPoint{} // Bezier Fill Coordinates (Max X, Min X, Max Y) - var maxBX int = 0 - var maxBY int = 0 - var minBX int = 0 + var maxBX int + var maxBY int + var minBX int for idx, item := range inputData { itemSize := int(float32(item) * sizeRatio) itemY := svgHeight - itemSize @@ -98,7 +98,7 @@ func getSVGBezierOpposedLine(pointA SVGGraphPoint, pointB SVGGraphPoint) SVGBezi lengthY := float64(pointB.Y - pointA.Y) return SVGBezierOpposedLine{ - Length: int(math.Sqrt(math.Pow(lengthX, 2) + math.Pow(lengthY, 2))), + Length: int(math.Sqrt(lengthX*lengthX + lengthY*lengthY)), Angle: int(math.Atan2(lengthY, lengthX)), } } @@ -113,15 +113,15 @@ func getSVGBezierControlPoint(currentPoint *SVGGraphPoint, prevPoint *SVGGraphPo } // Modifiers - var smoothingRatio float64 = 0.2 + smoothingRatio := 0.2 var directionModifier float64 = 0 if isReverse { directionModifier = math.Pi } opposingLine := getSVGBezierOpposedLine(*prevPoint, *nextPoint) - var lineAngle float64 = float64(opposingLine.Angle) + directionModifier - var lineLength float64 = float64(opposingLine.Length) * smoothingRatio + lineAngle := float64(opposingLine.Angle) + directionModifier + lineLength := float64(opposingLine.Length) * smoothingRatio // Calculate Control Point return SVGGraphPoint{ @@ -156,7 +156,7 @@ func getSVGBezierCurve(point SVGGraphPoint, index int, allPoints []SVGGraphPoint } func getSVGBezierPath(allPoints []SVGGraphPoint) string { - var bezierSVGPath string = "" + var bezierSVGPath string for index, point := range allPoints { if index == 0 { diff --git a/metadata/gbooks.go b/metadata/gbooks.go index 92f9153..2d7250a 100644 --- a/metadata/gbooks.go +++ b/metadata/gbooks.go @@ -41,9 +41,9 @@ const GBOOKS_GBID_COVER_URL string = "https://books.google.com/books/content/ima func getGBooksMetadata(metadataSearch MetadataInfo) ([]MetadataInfo, error) { var queryResults []gBooksQueryItem - if metadataSearch.ID != nil { + if metadataSearch.SourceID != nil { // Use GBID - resp, err := performGBIDRequest(*metadataSearch.ID) + resp, err := performGBIDRequest(*metadataSearch.SourceID) if err != nil { return nil, err } @@ -83,15 +83,16 @@ func getGBooksMetadata(metadataSearch MetadataInfo) ([]MetadataInfo, error) { queryResults = resp.Items } else { - return nil, errors.New("Invalid Data") + return nil, errors.New("invalid data") } // Normalize Data - allMetadata := []MetadataInfo{} + var allMetadata []MetadataInfo for i := range queryResults { item := queryResults[i] // Range Value Pointer Issue itemResult := MetadataInfo{ - ID: &item.ID, + SourceID: &item.ID, + Source: SourceGoogleBooks, Title: &item.Info.Title, Description: &item.Info.Description, } @@ -130,7 +131,7 @@ func saveGBooksCover(gbid string, coverFilePath string, overwrite bool) error { out, err := os.Create(coverFilePath) if err != nil { log.Error("File Create Error") - return errors.New("File Failure") + return errors.New("file failure") } defer out.Close() @@ -149,7 +150,7 @@ func saveGBooksCover(gbid string, coverFilePath string, overwrite bool) error { _, err = io.Copy(out, resp.Body) if err != nil { log.Error("File Copy Error") - return errors.New("File Failure") + return errors.New("file failure") } return nil @@ -164,18 +165,13 @@ func performSearchRequest(searchQuery string) (*gBooksQueryResponse, error) { return nil, errors.New("API Failure") } - parsedResp := gBooksQueryResponse{} + var parsedResp gBooksQueryResponse err = json.NewDecoder(resp.Body).Decode(&parsedResp) if err != nil { log.Error("Google Books Query API Decode Failure") return nil, errors.New("API Failure") } - if len(parsedResp.Items) == 0 { - log.Warn("No Results") - return nil, errors.New("No Results") - } - return &parsedResp, nil } diff --git a/metadata/gbooks_test.go b/metadata/gbooks_test.go index 183e781..bc623cb 100644 --- a/metadata/gbooks_test.go +++ b/metadata/gbooks_test.go @@ -65,7 +65,7 @@ func TestGBooksGBIDMetadata(t *testing.T) { GBID := "ZxwpakTv_MIC" expectedURL := fmt.Sprintf(GBOOKS_GBID_INFO_URL, GBID) - metadataResp, err := getGBooksMetadata(MetadataInfo{ID: &GBID}) + metadataResp, err := getGBooksMetadata(MetadataInfo{SourceID: &GBID}) assert.Nil(t, err, "should not have error") assert.Contains(t, hookDetails.URLs, expectedURL, "should have intercepted URL") diff --git a/metadata/metadata.go b/metadata/metadata.go index 5ed7d1a..4d714e5 100644 --- a/metadata/metadata.go +++ b/metadata/metadata.go @@ -25,12 +25,12 @@ var extensionHandlerMap = map[DocumentType]MetadataHandler{ type Source int const ( - SOURCE_GBOOK Source = iota - SOURCE_OLIB + SourceGoogleBooks Source = iota + SourceOpenLibrary ) type MetadataInfo struct { - ID *string + SourceID *string MD5 *string PartialMD5 *string WordCount *int64 @@ -41,6 +41,7 @@ type MetadataInfo struct { ISBN10 *string ISBN13 *string Type DocumentType + Source Source } // Downloads the Google Books cover file and saves it to the provided directory. @@ -62,9 +63,9 @@ func CacheCover(gbid string, coverDir string, documentID string, overwrite bool) // Searches source for metadata based on the provided information. func SearchMetadata(s Source, metadataSearch MetadataInfo) ([]MetadataInfo, error) { switch s { - case SOURCE_GBOOK: + case SourceGoogleBooks: return getGBooksMetadata(metadataSearch) - case SOURCE_OLIB: + case SourceOpenLibrary: return nil, errors.New("not implemented") default: return nil, errors.New("not implemented") diff --git a/search/downloaders.go b/search/downloaders.go index e69f10d..985811d 100644 --- a/search/downloaders.go +++ b/search/downloaders.go @@ -37,7 +37,7 @@ func getLibraryDownloadURL(md5 string, source Source) ([]string, error) { // Derive Info URL var infoURL string switch source { - case SOURCE_LIBGEN, SOURCE_ANNAS_ARCHIVE: + case SourceLibGen, SourceAnnasArchive: infoURL = "http://library.lol/fiction/" + md5 // case SOURCE_LIBGEN_NON_FICTION: // infoURL = "http://library.lol/main/" + md5 diff --git a/search/search.go b/search/search.go index 0ac0de5..b522cf9 100644 --- a/search/search.go +++ b/search/search.go @@ -25,8 +25,8 @@ const ( type Source string const ( - SOURCE_ANNAS_ARCHIVE Source = "Annas Archive" - SOURCE_LIBGEN Source = "LibGen" + SourceAnnasArchive Source = "Annas Archive" + SourceLibGen Source = "LibGen" ) type SearchItem struct { @@ -44,8 +44,8 @@ type searchFunc func(query string) (searchResults []SearchItem, err error) type downloadFunc func(md5 string, source Source) (downloadURL []string, err error) var searchDefs = map[Source]searchFunc{ - SOURCE_ANNAS_ARCHIVE: searchAnnasArchive, - SOURCE_LIBGEN: searchLibGen, + SourceAnnasArchive: searchAnnasArchive, + SourceLibGen: searchLibGen, } var downloadFuncs = []downloadFunc{ @@ -58,7 +58,6 @@ func SearchBook(query string, source Source) ([]SearchItem, error) { if !found { return nil, fmt.Errorf("invalid source: %s", source) } - log.Debug("Source: ", source) return searchFunc(query) } diff --git a/tailwind.config.js b/tailwind.config.js index 06eb819..b1b2ef6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -2,6 +2,7 @@ module.exports = { content: [ "./templates/**/*.{tmpl,html,htm,svg}", + "./web/**/*.go", "./assets/local/*.{html,htm,svg,js}", "./assets/reader/*.{html,htm,svg,js}", ], @@ -16,6 +17,20 @@ module.exports = { minWidth: { 40: "10rem", }, + animation: { + notification: + "slideIn 0.25s ease-out forwards, slideOut 0.25s ease-out 4.5s forwards", + }, + keyframes: { + slideIn: { + "0%": { transform: "translateX(100%)" }, + "100%": { transform: "translateX(0)" }, + }, + slideOut: { + "0%": { transform: "translateX(0)" }, + "100%": { transform: "translateX(100%)" }, + }, + }, }, }, plugins: [], diff --git a/templates/components/activity.tmpl b/templates/components/activity.tmpl deleted file mode 100644 index df67aeb..0000000 --- a/templates/components/activity.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{ template "base" . }} -{{ define "title" }}Activity{{ end }} -{{ define "header" }}Activity{{ end }} -{{ define "content" }} -
-
- - {{ template "component/table" (dict - "Columns" (slice "Document" "Time" "Duration" "Percent") - "Keys" (slice "Document" "StartTime" "Duration" "EndPercentage") - "Rows" .Data - ) - }} -
-
-{{ end }} - -{{ define "table-cell" }} - {{ if eq .Name "Document" }} - {{ .Data.Author }} - {{ .Data.Title }} - {{ else if eq .Name "EndPercentage" }} - {{ index (fields .Data) .Name }}% - {{ else }} - {{ index (fields .Data) .Name }} - {{ end }} -{{ end }} diff --git a/templates/components/document-card.tmpl b/templates/components/document-card.tmpl deleted file mode 100644 index 576a7ac..0000000 --- a/templates/components/document-card.tmpl +++ /dev/null @@ -1,50 +0,0 @@ -
-
-
- - - -
-
-
-
-

Title

-

{{ or .Title "Unknown" }}

-
-
-
-
-

Author

-

{{ or .Author "Unknown" }}

-
-
-
-
-

Progress

-

{{ .Percentage }}%

-
-
-
-
-

Time Read

-

{{ niceSeconds .TotalTimeSeconds }}

-
-
-
-
- {{ template "svg/activity" }} - {{ if .Filepath }} - {{ template "svg/download" }} - {{ else }} - {{ template "svg/download" (dict "Disabled" true) }} - {{ end }} -
-
-
diff --git a/templates/components/info-card.tmpl b/templates/components/info-card.tmpl deleted file mode 100644 index a36d11d..0000000 --- a/templates/components/info-card.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -{{ if .Link }} -
-
-

{{ .Size }}

-

{{ .Title }}

-
-
-{{ if .Link }} - -{{ else }} - -{{ end }} diff --git a/templates/components/key-val-edit.tmpl b/templates/components/key-val-edit.tmpl deleted file mode 100644 index 337257b..0000000 --- a/templates/components/key-val-edit.tmpl +++ /dev/null @@ -1,32 +0,0 @@ -
-
-

{{ .Title }}

- - -
-
- - {{ template "component/button" (dict "Title" "Save") }} -
-
-
-

{{ or .Value "N/A" }}

-
diff --git a/templates/components/leaderboard-card.tmpl b/templates/components/leaderboard-card.tmpl deleted file mode 100644 index 5b43185..0000000 --- a/templates/components/leaderboard-card.tmpl +++ /dev/null @@ -1,64 +0,0 @@ -
-
-
-
-

- {{ .Name }} Leaderboard -

-
- - - - -
-
-
- - - - - {{ range $key, $data := .Data }} - - -
diff --git a/templates/components/metadata.tmpl b/templates/components/metadata.tmpl deleted file mode 100644 index 2dfa7a0..0000000 --- a/templates/components/metadata.tmpl +++ /dev/null @@ -1,147 +0,0 @@ -{{ if .Error }} -
-
-
-
-

- No Metadata Results Found -

-
- {{ template "component/button" (dict - "Title" "Back to Document" - "Type" "Link" - "URL" (printf "/documents/%s" .ID) - ) - }} -
-
-{{ end }} -{{ if .Metadata }} -
-
-
-
-

- Metadata Results -

-
-
-
-
-
Cover
-
- -
-
-
-
Title
-
- {{ or .Metadata.Title "N/A" }} -
-
-
-
Author
-
- {{ or .Metadata.Author "N/A" }} -
-
-
-
ISBN 10
-
- {{ or .Metadata.ISBN10 "N/A" }} -
-
-
-
ISBN 13
-
- {{ or .Metadata.ISBN13 "N/A" }} -
-
-
-
Description
-
- {{ or .Metadata.Description "N/A" }} -
-
-
- -
-
-
- {{ template "component/button" (dict - "Title" "Cancel" - "Type" "Link" - "URL" (printf "/documents/%s" .ID) - ) - }} - {{ template "component/button" (dict - "Title" "Save" - "FormName" "metadata-save" - ) - }} -
-
-
-
-{{ end }} diff --git a/templates/components/streak-card.tmpl b/templates/components/streak-card.tmpl deleted file mode 100644 index a48bdda..0000000 --- a/templates/components/streak-card.tmpl +++ /dev/null @@ -1,54 +0,0 @@ -
-
-

- {{ if eq .Window "WEEK" }} - Weekly Read Streak - {{ else }} - Daily Read Streak - {{ end }} -

-
-

- {{ .CurrentStreak }} -

-
-
-
-
-

- {{ if eq .Window "WEEK" }} - Current Weekly Streak - {{ else }} - Current Daily Streak - {{ end }} -

-
- {{ .CurrentStreakStartDate }} ➞ {{ .CurrentStreakEndDate }} -
-
-
{{ .CurrentStreak }}
-
-
-
-

- {{ if eq .Window "WEEK" }} - Best Weekly Streak - {{ else }} - Best Daily Streak - {{ end }} -

-
- {{ .MaxStreakStartDate }} ➞ {{ .MaxStreakEndDate }} -
-
-
{{ .MaxStreak }}
-
-
-
-
diff --git a/templates/components/table.tmpl b/templates/components/table.tmpl deleted file mode 100644 index 66c1df6..0000000 --- a/templates/components/table.tmpl +++ /dev/null @@ -1,32 +0,0 @@ -{{ $rows := .Rows }} -{{ $cols := .Columns }} -{{ $keys := .Keys }} - - - - {{ range $col := $cols }} - - {{ end }} - - - - {{ if not $rows }} - - - - {{ end }} - {{ range $row := $rows }} - - {{ range $key := $keys }} - - {{ end }} - - {{ end }} - -
- {{ $col }} -
No Results
- {{ template "table-cell" (dict "Data" $row "Name" $key ) }} -
diff --git a/templates/pages/activity.tmpl b/templates/pages/activity.tmpl deleted file mode 100644 index df67aeb..0000000 --- a/templates/pages/activity.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{ template "base" . }} -{{ define "title" }}Activity{{ end }} -{{ define "header" }}Activity{{ end }} -{{ define "content" }} -
-
- - {{ template "component/table" (dict - "Columns" (slice "Document" "Time" "Duration" "Percent") - "Keys" (slice "Document" "StartTime" "Duration" "EndPercentage") - "Rows" .Data - ) - }} -
-
-{{ end }} - -{{ define "table-cell" }} - {{ if eq .Name "Document" }} - {{ .Data.Author }} - {{ .Data.Title }} - {{ else if eq .Name "EndPercentage" }} - {{ index (fields .Data) .Name }}% - {{ else }} - {{ index (fields .Data) .Name }} - {{ end }} -{{ end }} diff --git a/templates/pages/document.tmpl b/templates/pages/document.tmpl deleted file mode 100644 index 1a6043f..0000000 --- a/templates/pages/document.tmpl +++ /dev/null @@ -1,254 +0,0 @@ -{{ template "base" . }} -{{ define "title" }}Documents{{ end }} -{{ define "header" }}Documents{{ end }} -{{ define "content" }} -
- -
-
- - {{ if .Data.Filepath }} - Read - {{ end }} -
-
-
-

ISBN-10:

-

{{ or .Data.Isbn10 "N/A" }}

-
-
-

ISBN-13:

-

{{ or .Data.Isbn13 "N/A" }}

-
-
-
- -
-
- - {{ template "component/button" (dict "Title" "Upload Cover") }} -
-
- - {{ template "component/button" (dict "Title" "Remove Cover") }} -
-
-
- - -
-
- {{ template "component/button" (dict "Title" "Delete") }} -
-
-
- {{ template "svg/activity" (dict "Size" 28) }} -
- - -
-
- - - - {{ template "component/button" (dict "Title" "Identify") }} -
-
-
- {{ if .Data.Filepath }} - {{ template "svg/download" (dict "Size" 28) }} - {{ else }} - {{ template "svg/download" (dict "Size" 28 "Disabled" true) }} - {{ end }} -
-
-
-
- {{ template "component/key-val-edit" (dict - "Title" "Title" - "Value" .Data.Title - "URL" (printf "./%s/edit" .Data.ID) - "FormValue" "title" - ) - }} - {{ template "component/key-val-edit" (dict - "Title" "Author" - "Value" .Data.Author - "URL" (printf "./%s/edit" .Data.ID) - "FormValue" "author" - ) - }} -
-
-

Time Read

- - -
-
-

Seconds / Percent

-

- {{ .Data.SecondsPerPercent }} -

-
-
-

Words / Minute

-

{{ .Data.Wpm }}

-
-
-

Est. Time Left

-

- {{ niceSeconds .TotalTimeLeftSeconds }} -

-
-
-
-

- {{ niceSeconds .Data.TotalTimeSeconds }} -

-
-
-

Progress

-

{{ .Data.Percentage }}%

-
-
-
-
-

Description

- -
-
-
- -
- -
- - {{ template "component/button" (dict "Title" "Save") }} -
-
-

{{ or .Data.Description "N/A" }}

-
-
- {{ template "component/metadata" (dict - "ID" .Data.ID - "Metadata" .Metadata - "Error" .MetadataError - ) - }} -
-{{ end }} diff --git a/templates/pages/documents.tmpl b/templates/pages/documents.tmpl deleted file mode 100644 index 0f97971..0000000 --- a/templates/pages/documents.tmpl +++ /dev/null @@ -1,99 +0,0 @@ -{{ template "base" . }} -{{ define "title" }}Documents{{ end }} -{{ define "header" }}Documents{{ end }} -{{ define "content" }} -
-
-
-
- - {{ template "svg/search2" (dict "Size" 15) }} - - -
-
-
- {{ template "component/button" (dict - "Title" "Search" - "Variant" "Secondary" - ) - }} -
-
-
-
- {{ range $doc := .Data }} - {{ template "component/document-card" $doc }} - {{ end }} -
-
- {{ if .PreviousPage }} - ◄ - {{ end }} - {{ if .NextPage }} - ► - {{ end }} -
-
- -
-
- - -
- -
- -
-{{ end }} diff --git a/templates/pages/home.tmpl b/templates/pages/home.tmpl deleted file mode 100644 index 9528371..0000000 --- a/templates/pages/home.tmpl +++ /dev/null @@ -1,109 +0,0 @@ -{{ template "base" . }} -{{ define "title" }}Home{{ end }} -{{ define "header" }}Home{{ end }} -{{ define "content" }} -
-
-
-

- Daily Read Totals -

- {{ $data := (getSVGGraphData .Data.GraphData 800 70 ) }} -
- - - - - -
- {{ range $index, $item := $data.LinePoints }} - -
-
- {{ (index $.Data.GraphData $index).Date }} - {{ (index $.Data.GraphData $index).MinutesRead }} - minutes -
-
- {{ end }} -
-
-
-
-
- {{ template "component/info-card" (dict - "Title" "Documents" - "Size" .Data.DatabaseInfo.DocumentsSize - "Link" "./documents" - ) - }} - {{ template "component/info-card" (dict - "Title" "Activity Records" - "Size" .Data.DatabaseInfo.ActivitySize - "Link" "./activity" - ) - }} - {{ template "component/info-card" (dict - "Title" "Progress Records" - "Size" .Data.DatabaseInfo.ProgressSize - "Link" "./progress" - ) - }} - {{ template "component/info-card" (dict - "Title" "Devices" - "Size" .Data.DatabaseInfo.DevicesSize - ) - }} -
-
- {{ range $item := .Data.Streaks }} - {{ template "component/streak-card" $item }} - {{ end }} -
-
- {{ template "component/leaderboard-card" (dict - "Name" "WPM" - "Data" .Data.UserStatistics.WPM - ) - }} - {{ template "component/leaderboard-card" (dict - "Name" "Duration" - "Data" .Data.UserStatistics.Duration - ) - }} - {{ template "component/leaderboard-card" (dict - "Name" "Words" - "Data" .Data.UserStatistics.Words - ) - }} -
-
-{{ end }} diff --git a/templates/pages/progress.tmpl b/templates/pages/progress.tmpl deleted file mode 100644 index 0abd694..0000000 --- a/templates/pages/progress.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{ template "base" . }} -{{ define "title" }}Progress{{ end }} -{{ define "header" }}Progress{{ end }} -{{ define "content" }} -
-
- - {{ template "component/table" (dict - "Columns" (slice "Document" "Device Name" "Percentage" "Created At") - "Keys" (slice "Document" "DeviceName" "Percentage" "CreatedAt") - "Rows" .Data - ) - }} -
-
-{{ end }} - -{{ define "table-cell" }} - {{ if eq .Name "Document" }} - {{ .Data.Author }} - {{ .Data.Title }} - {{ else if eq .Name "Percentage" }} - {{ index (fields .Data) .Name }}% - {{ else }} - {{ index (fields .Data) .Name }} - {{ end }} -{{ end }} diff --git a/templates/pages/search.tmpl b/templates/pages/search.tmpl deleted file mode 100644 index e70913b..0000000 --- a/templates/pages/search.tmpl +++ /dev/null @@ -1,157 +0,0 @@ -{{ template "base" . }} -{{ define "title" }}Search{{ end }} -{{ define "header" }}Search{{ end }} -{{ define "content" }} -
-
-
-
-
-
- - {{ template "svg/search2" (dict "Size" 15) }} - - -
-
-
- - {{ template "svg/documents" (dict "Size" 15) }} - - -
-
- {{ template "component/button" (dict - "Title" "Search" - "Variant" "Secondary" - ) - }} -
-
- {{ if .SearchErrorMessage }} - {{ .SearchErrorMessage }} - {{ end }} -
-
- - - - - - - - - - - - - {{ if not .Data }} - - - - {{ end }} - {{ range $item := .Data }} - - - - - - - - - {{ end }} - -
- Document - - Series - - Type - - Size -
No Results
-
- - - - -
- 		- {{ $item.Author }} - - {{ $item.Title }} - -

{{ or $item.Series "N/A" }}

- 		-

{{ or $item.FileType "N/A" }}

- 		-

{{ or $item.FileSize "N/A" }}

-
-
-
-
-{{ end }} diff --git a/web/assets/embed.go b/web/assets/embed.go new file mode 100644 index 0000000..3410d9e --- /dev/null +++ b/web/assets/embed.go @@ -0,0 +1,20 @@ +package assets + +import ( + "embed" + "fmt" + "io/fs" + + g "maragu.dev/gomponents" +) + +//go:embed svgs/* +var assets embed.FS + +func Asset(name string) g.Node { + b, err := fs.ReadFile(assets, name) + if err != nil { + fmt.Println(err) + } + return g.Raw(string(b)) +} diff --git a/web/assets/icons.go b/web/assets/icons.go new file mode 100644 index 0000000..a86cb1d --- /dev/null +++ b/web/assets/icons.go @@ -0,0 +1,18 @@ +package assets + +import ( + "strconv" + + g "maragu.dev/gomponents" + h "maragu.dev/gomponents/html" +) + +func Icon(name string, size int) g.Node { + return h.SVG( + g.Attr("width", strconv.Itoa(size)), + g.Attr("height", strconv.Itoa(size)), + g.Attr("viewBox", "0 0 24 24"), + g.Attr("fill", "currentColor"), + Asset("svgs/"+name+".svg"), + ) +} diff --git a/web/assets/svgs/activity.svg b/web/assets/svgs/activity.svg new file mode 100644 index 0000000..05ba8f3 --- /dev/null +++ b/web/assets/svgs/activity.svg @@ -0,0 +1,2 @@ + + diff --git a/web/assets/svgs/add.svg b/web/assets/svgs/add.svg new file mode 100644 index 0000000..b658e6b --- /dev/null +++ b/web/assets/svgs/add.svg @@ -0,0 +1,5 @@ + diff --git a/web/assets/svgs/clock.svg b/web/assets/svgs/clock.svg new file mode 100644 index 0000000..9203c7b --- /dev/null +++ b/web/assets/svgs/clock.svg @@ -0,0 +1,9 @@ + + diff --git a/web/assets/svgs/delete.svg b/web/assets/svgs/delete.svg new file mode 100644 index 0000000..4bcaf5d --- /dev/null +++ b/web/assets/svgs/delete.svg @@ -0,0 +1,6 @@ + + diff --git a/web/assets/svgs/documents.svg b/web/assets/svgs/documents.svg new file mode 100644 index 0000000..e85b53b --- /dev/null +++ b/web/assets/svgs/documents.svg @@ -0,0 +1,2 @@ + + diff --git a/web/assets/svgs/download.svg b/web/assets/svgs/download.svg new file mode 100644 index 0000000..aa43bbd --- /dev/null +++ b/web/assets/svgs/download.svg @@ -0,0 +1,5 @@ + diff --git a/web/assets/svgs/dropdown.svg b/web/assets/svgs/dropdown.svg new file mode 100644 index 0000000..e0abffc --- /dev/null +++ b/web/assets/svgs/dropdown.svg @@ -0,0 +1 @@ + diff --git a/web/assets/svgs/edit.svg b/web/assets/svgs/edit.svg new file mode 100644 index 0000000..ac85aca --- /dev/null +++ b/web/assets/svgs/edit.svg @@ -0,0 +1,9 @@ + + + diff --git a/web/assets/svgs/gitea.svg b/web/assets/svgs/gitea.svg new file mode 100644 index 0000000..1567322 --- /dev/null +++ b/web/assets/svgs/gitea.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/web/assets/svgs/home.svg b/web/assets/svgs/home.svg new file mode 100644 index 0000000..5c78b85 --- /dev/null +++ b/web/assets/svgs/home.svg @@ -0,0 +1 @@ + diff --git a/web/assets/svgs/import.svg b/web/assets/svgs/import.svg new file mode 100644 index 0000000..d218174 --- /dev/null +++ b/web/assets/svgs/import.svg @@ -0,0 +1,5 @@ + diff --git a/web/assets/svgs/info.svg b/web/assets/svgs/info.svg new file mode 100644 index 0000000..ce7ad16 --- /dev/null +++ b/web/assets/svgs/info.svg @@ -0,0 +1,5 @@ + diff --git a/web/assets/svgs/loading.svg b/web/assets/svgs/loading.svg new file mode 100644 index 0000000..a4b37da --- /dev/null +++ b/web/assets/svgs/loading.svg @@ -0,0 +1,36 @@ + +