diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 0d92a2c..cd95c83 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -39,7 +39,8 @@ The project follows a clean architecture pattern: - `make run` - Run the app without Docker - `make docker-run` - Run the app with Docker Compose - `make build` - Build the binary -- `make run-test-server` - Run the app with mock feed server for testing (uses test database) +- `make run-test-server` - Run the app configured for UI tests (port 3001, uses `data/test-dev.db`) +- `make run-feed-provider` - Run the standalone mock feed provider on port 3002 ### Testing @@ -107,11 +108,11 @@ Before running UI tests for the first time: - UI tests are located in `tests/ui/` directory - Use Page Object Model pattern (see `tests/ui/pages/`) - Tests use Playwright with Chromium browser -- **IMPORTANT**: Always use the backend testserver for feed testing instead of fetching feeds from the internet - - Mock feeds are served from `http://localhost:3001/feeds/` +- **IMPORTANT**: Always use the backend test server and mock feed provider instead of fetching feeds from the internet + - Mock feeds are served from `http://localhost:3002/feeds/` - Available mock feeds are defined in `tests/ui/utils/helpers.js` as `MOCK_FEEDS` - Never use real external feed URLs in tests to avoid network blockages -- Test database is separate: `data/test-agg.db` +- Test database is separate: `data/test-dev.db` - Tests run sequentially to avoid database conflicts ### Naming Conventions @@ -146,11 +147,11 @@ Before running UI tests for the first time: **CRITICAL**: When testing features that involve RSS/Atom feeds: 1. **Always use the mock feed server** instead of real internet feeds -2. Start the test server: `make run-test-server` -3. Use mock feed URLs from the testserver: - - `http://localhost:3001/feeds/tech-news.xml` - RSS 2.0 feed with 3 tech articles - - `http://localhost:3001/feeds/science-blog.xml` - Atom 1.0 feed with 3 science articles - - `http://localhost:3001/feeds/empty.xml` - Empty RSS feed for edge cases +2. Start the test services: `make run-test-server` (app on 3001) and `make run-feed-provider` (feeds on 3002) +3. Use mock feed URLs from the feed provider: + - `http://localhost:3002/feeds/tech-news.xml` - RSS 2.0 feed with 3 tech articles + - `http://localhost:3002/feeds/science-blog.xml` - Atom 1.0 feed with 3 science articles + - `http://localhost:3002/feeds/empty.xml` - Empty RSS feed for edge cases 4. Mock feeds are located in `internal/testserver/fixtures/` 5. Add new mock feeds in fixtures directory and reference them in tests @@ -179,25 +180,25 @@ Before running UI tests for the first time: - **Migration support:** Legacy Lite Reader data can be migrated from `agg.db` - **Default port:** Application runs on port 3000 by default - **Data persistence:** Database file is stored in `data/agg.db` -- **Test database:** UI tests use separate database at `data/test-agg.db` +- **Test database:** UI tests use separate database at `data/test-dev.db` ## Mock Feed System The project includes a mock feed server for reliable, offline testing: ### Mock Feed Server -- **Location**: `internal/testserver/` -- **Port**: 3001 (when started via `make run-test-server`) +- **Location**: `internal/testserver/` with entrypoint `cmd/mockfeedprovider/` +- **Port**: 3002 (when started via `make run-feed-provider`) - **Purpose**: Serves mock RSS and Atom feeds locally for testing - **Benefits**: No internet required, consistent results, faster tests ### Available Mock Feeds - **tech-news.xml**: RSS 2.0 feed with 3 technology articles - - URL: `http://localhost:3001/feeds/tech-news.xml` + - URL: `http://localhost:3002/feeds/tech-news.xml` - **science-blog.xml**: Atom 1.0 feed with 3 science articles - - URL: `http://localhost:3001/feeds/science-blog.xml` + - URL: `http://localhost:3002/feeds/science-blog.xml` - **empty.xml**: Empty RSS feed for edge case testing - - URL: `http://localhost:3001/feeds/empty.xml` + - URL: `http://localhost:3002/feeds/empty.xml` ### Adding New Mock Feeds 1. Create a new XML file in `internal/testserver/fixtures/` diff --git a/.gitignore b/.gitignore index fe295cd..96fa97e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ .idea data/agg.db data/test-agg.db +data/test-dev.db public/cache/*.gzip public/cache/*.spc public/cache/images/* diff --git a/Makefile b/Makefile index c3bef27..ad606f3 100644 --- a/Makefile +++ b/Makefile @@ -103,20 +103,25 @@ test-ui-setup: .PHONY: run-test-server run-test-server: - @echo "Starting test server with mock feeds..." - @HTTP_PORT=3000 DB_PATH=data/test-agg.db CGO_ENABLED=0 go run -mod=vendor ./cmd/testserver/main.go + @echo "Starting test server on port 3001 using data/test-dev.db..." + @HTTP_PORT=3001 DB_PATH=data/test-dev.db CGO_ENABLED=0 go run -mod=vendor ./cmd/main.go + +.PHONY: run-feed-provider +run-feed-provider: + @echo "Starting mock feed provider on port 3002..." + @MOCK_FEED_PROVIDER_PORT=3002 CGO_ENABLED=0 go run -mod=vendor ./cmd/mockfeedprovider/main.go .PHONY: test-ui test-ui: @echo "Running UI tests..." @mkdir -p reports/playwright - @TEST_DB_PATH=data/test-agg.db npm run test:ui + @TEST_DB_PATH=data/test-dev.db npm run test:ui .PHONY: test-ui-headed test-ui-headed: @echo "Running UI tests in headed mode..." @mkdir -p reports/playwright - @TEST_DB_PATH=data/test-agg.db npm run test:ui:headed + @TEST_DB_PATH=data/test-dev.db npm run test:ui:headed .PHONY: test-all test-all: test test-ui diff --git a/TEST.md b/TEST.md index b930b68..79c17e2 100644 --- a/TEST.md +++ b/TEST.md @@ -92,7 +92,8 @@ make test-all - **Duration**: UI tests typically complete in 2-3 minutes - **Parallelization**: Tests run sequentially (workers: 1) to avoid database conflicts - **Browser**: Tests use Chromium in headless mode by default -- **Database**: Each test run uses a separate test database (`data/test-agg.db`) +- **Database**: Each test run uses a separate test database (`data/test-dev.db`) +- **Ports**: UI tests hit the Lite Reader test server on `http://localhost:3001` and the mock feed provider on `http://localhost:3002` - **Retries**: In CI, tests retry up to 2 times on failure ### Test Reports @@ -204,21 +205,23 @@ See the page object files in `tests/ui/pages/` for all available methods. The mock feed system provides offline RSS/Atom feeds for testing without requiring internet access. **Architecture**: -1. **Mock Feed Server**: A Go HTTP server (`internal/testserver/feedserver.go`) that serves XML feeds -2. **Feed Fixtures**: Static XML files in `internal/testserver/fixtures/` -3. **Automatic Startup**: The server starts automatically when running UI tests (via `run-test-server`) +1. **Lite Reader Test Server**: `cmd/testserver/` boots the application with the UI-test database on `http://localhost:3001` +2. **Mock Feed Provider**: `cmd/mockfeedprovider/` is a dedicated binary that serves XML fixtures via `internal/testserver/feedserver.go` +3. **Feed Fixtures**: Static XML files in `internal/testserver/fixtures/` +4. **Automatic Startup**: Playwright launches both servers via `make run-test-server` and `make run-feed-provider` **Ports**: -- Main app: `localhost:3000` -- Mock feed server: `localhost:3001` +- Main app (manual/dev): `localhost:3000` +- Lite Reader test server (UI tests): `localhost:3001` +- Mock feed provider: `localhost:3002` ### Available Mock Feeds | Feed Name | URL | Format | Items | Description | |-----------|-----|--------|-------|-------------| -| Tech News | `http://localhost:3001/feeds/tech-news.xml` | RSS 2.0 | 3 | Technology articles | -| Science Blog | `http://localhost:3001/feeds/science-blog.xml` | Atom 1.0 | 3 | Science articles | -| Empty Feed | `http://localhost:3001/feeds/empty.xml` | RSS 2.0 | 0 | Feed with no items | +| Tech News | `http://localhost:3002/feeds/tech-news.xml` | RSS 2.0 | 3 | Technology articles | +| Science Blog | `http://localhost:3002/feeds/science-blog.xml` | Atom 1.0 | 3 | Science articles | +| Empty Feed | `http://localhost:3002/feeds/empty.xml` | RSS 2.0 | 0 | Feed with no items | Access feeds in tests using: @@ -242,7 +245,7 @@ cat > internal/testserver/fixtures/my-feed.xml << 'EOF' My Feed - http://localhost:3001/feeds/my-feed + http://localhost:3002/feeds/my-feed My test feed Item 1 @@ -259,10 +262,10 @@ EOF ```javascript export const MOCK_FEEDS = { - techNews: 'http://localhost:3001/feeds/tech-news.xml', - scienceBlog: 'http://localhost:3001/feeds/science-blog.xml', - empty: 'http://localhost:3001/feeds/empty.xml', - myFeed: 'http://localhost:3001/feeds/my-feed.xml', // Add this + techNews: 'http://localhost:3002/feeds/tech-news.xml', + scienceBlog: 'http://localhost:3002/feeds/science-blog.xml', + empty: 'http://localhost:3002/feeds/empty.xml', + myFeed: 'http://localhost:3002/feeds/my-feed.xml', // Add this }; ``` @@ -277,7 +280,7 @@ await mainPage.addFeed(MOCK_FEEDS.myFeed); - Use valid RSS 2.0 or Atom 1.0 format - Include required fields: `title`, `link`, `description` - For items, include: `title`, `link`, `pubDate` (RSS) or `published` (Atom) -- Use `localhost:3001` URLs to avoid external dependencies +- Use `localhost:3002` URLs to avoid external dependencies - Add realistic content for better test coverage ## CI/CD Integration @@ -340,15 +343,15 @@ make test-ui-setup #### Issue: Port already in use -**Error**: `listen tcp :3000: bind: address already in use` +**Error**: `listen tcp :3001: bind: address already in use` **Solution**: ```bash -# Find and kill process using port 3000 -lsof -ti:3000 | xargs kill -9 +# Find and kill process using port 3001 +lsof -ti:3001 | xargs kill -9 -# Or use a different port -HTTP_PORT=3002 make run-test-server +# Or use a different port for the test server +HTTP_PORT=3005 make run-test-server ``` #### Issue: Test database locked @@ -358,10 +361,10 @@ HTTP_PORT=3002 make run-test-server **Solution**: ```bash # Stop all running processes -pkill -f testserver +pkill -f cmd/testserver # Remove test database -rm data/test-agg.db +rm data/test-dev.db # Run tests again make test-ui diff --git a/TODO.md b/TODO.md index 444eebc..4cff081 100644 --- a/TODO.md +++ b/TODO.md @@ -1,2 +1,2 @@ TODO -- [ ] Fix: unread-all does not work for starred items \ No newline at end of file +- [ ] Bug: multi item actions do not work for starred and unread collections \ No newline at end of file diff --git a/UI-TESTING-SUMMARY.md b/UI-TESTING-SUMMARY.md index 751e153..c7c225a 100644 --- a/UI-TESTING-SUMMARY.md +++ b/UI-TESTING-SUMMARY.md @@ -6,16 +6,16 @@ This implementation adds comprehensive automated UI testing infrastructure to th ## Key Components -### 1. Mock RSS Feed Server (`internal/testserver/`) +### 1. Mock RSS Feed Server (`cmd/mockfeedprovider/`) -A Go-based HTTP server that serves mock RSS and Atom feeds for testing: +A dedicated Go-based HTTP server that serves mock RSS and Atom feeds for testing: -- **Location**: `internal/testserver/feedserver.go` +- **Location**: `internal/testserver/feedserver.go` with entrypoint `cmd/mockfeedprovider/main.go` - **Features**: - - Serves feeds on `http://localhost:3001` + - Serves feeds on `http://localhost:3002` - Embedded feed fixtures (no external files needed at runtime) - Supports RSS 2.0 and Atom 1.0 formats - - Automatically starts/stops with test runs + - Automatically starts/stops with test runs via `make run-feed-provider` **Sample Feeds**: - `tech-news.xml` - RSS 2.0 feed with 3 technology articles @@ -24,14 +24,13 @@ A Go-based HTTP server that serves mock RSS and Atom feeds for testing: ### 2. Test Server Command (`cmd/testserver/`) -A specialized command that starts both the application and mock feed server: +A specialized command that starts the Lite Reader application for UI tests: -- **Purpose**: Provides a complete test environment +- **Purpose**: Provides an isolated app instance for Playwright - **Usage**: `make run-test-server` - **Features**: - - Uses separate test database (`data/test-agg.db`) - - Starts mock feeds on port 3001 - - Starts main app on port 3000 + - Uses separate test database (`data/test-dev.db`) + - Starts the app on port 3001 (base URL for UI tests) ### 3. Playwright Test Framework @@ -73,7 +72,8 @@ Clean, maintainable test code using the Page Object pattern: make test-ui-setup # Install Playwright and dependencies (one-time) make test-ui # Run all UI tests (headless) make test-ui-headed # Run with visible browser (debugging) -make run-test-server # Start test environment manually +make run-test-server # Start Lite Reader test server manually (port 3001) +make run-feed-provider # Start mock feed provider manually (port 3002) make test-all # Run both unit and UI tests ``` @@ -147,7 +147,7 @@ Updated `.github/workflows/tests.yaml`: - Reliable and fast ### 2. Isolated Test Environment -- Separate test database (`data/test-agg.db`) +- Separate test database (`data/test-dev.db`) - No interference with development data - Clean state for each test run @@ -196,7 +196,7 @@ test('should do something', async ({ page }) => { const mainPage = new MainPage(page); // Perform actions - await mainPage.addFeed('http://localhost:3001/feeds/tech-news.xml'); + await mainPage.addFeed('http://localhost:3002/feeds/tech-news.xml'); // Assert expectations const count = await mainPage.getItemsCount(); @@ -212,7 +212,7 @@ test('should do something', async ({ page }) => { My Feed - http://localhost:3001/feeds/my-feed + http://localhost:3002/feeds/my-feed Test feed Test Item @@ -227,9 +227,9 @@ test('should do something', async ({ page }) => { 2. Add to `tests/ui/utils/helpers.js`: ```javascript export const MOCK_FEEDS = { - techNews: 'http://localhost:3001/feeds/tech-news.xml', - scienceBlog: 'http://localhost:3001/feeds/science-blog.xml', - myFeed: 'http://localhost:3001/feeds/my-feed.xml', // Add this + techNews: 'http://localhost:3002/feeds/tech-news.xml', + scienceBlog: 'http://localhost:3002/feeds/science-blog.xml', + myFeed: 'http://localhost:3002/feeds/my-feed.xml', // Add this }; ``` diff --git a/cmd/mockfeedprovider/main.go b/cmd/mockfeedprovider/main.go new file mode 100644 index 0000000..4e8c7e9 --- /dev/null +++ b/cmd/mockfeedprovider/main.go @@ -0,0 +1,46 @@ +package main + +import ( + "context" + "os" + "os/signal" + "strconv" + "syscall" + + log "github.com/sirupsen/logrus" + + "github.com/cubny/lite-reader/internal/testserver" +) + +const defaultFeedProviderPort = 3002 + +func main() { + log.SetOutput(os.Stdout) + log.SetLevel(log.DebugLevel) + log.SetFormatter(&log.JSONFormatter{}) + + port := defaultFeedProviderPort + if raw := os.Getenv("MOCK_FEED_PROVIDER_PORT"); raw != "" { + if parsed, err := strconv.Atoi(raw); err == nil { + port = parsed + } else { + log.Warnf("invalid MOCK_FEED_PROVIDER_PORT %q, falling back to %d", raw, defaultFeedProviderPort) + } + } + + ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) + defer stop() + + mockServer := testserver.NewMockFeedServer(port) + if err := mockServer.Start(); err != nil { + log.Fatalf("failed to start mock feed provider: %v", err) + } + + log.Infof("Mock feed provider running on port %d", port) + + <-ctx.Done() + + if err := mockServer.Stop(); err != nil { + log.Errorf("failed to stop mock feed provider cleanly: %v", err) + } +} diff --git a/cmd/testserver/main.go b/cmd/testserver/main.go deleted file mode 100644 index 34bdeaf..0000000 --- a/cmd/testserver/main.go +++ /dev/null @@ -1,50 +0,0 @@ -package main - -import ( - "context" - "os" - "time" - - log "github.com/sirupsen/logrus" - - "github.com/cubny/lite-reader/internal" - "github.com/cubny/lite-reader/internal/testserver" -) - -func main() { - log.SetOutput(os.Stdout) - log.SetLevel(log.DebugLevel) - log.SetFormatter(&log.JSONFormatter{}) - - ctx, cancel := context.WithCancel(context.Background()) - - // Start mock feed server on port 3001 - mockServer := testserver.NewMockFeedServer(3001) - if err := mockServer.Start(); err != nil { - log.Fatalf("failed to start mock feed server: %v", err) - } - - // Give the mock server time to start - time.Sleep(500 * time.Millisecond) - log.Info("Mock feed server started on port 3001") - - // Start main application - runMigration := true - app, err := internal.Init(ctx, runMigration) - if err != nil { - log.Fatalf("failed to initiate App, %v", err) - } - - internal.WaitTermination() - cancel() - - // Stop mock feed server - if err = mockServer.Stop(); err != nil { - log.Errorf("failed to stop mock feed server: %v", err) - } - - // Stop main application - if err = app.Stop(); err != nil { - log.Errorf("failed to stop the app gracefully, %v", err) - } -} diff --git a/internal/infra/http/api/errors.go b/internal/infra/http/api/errors.go index 9d1dd47..cb364ad 100644 --- a/internal/infra/http/api/errors.go +++ b/internal/infra/http/api/errors.go @@ -81,3 +81,34 @@ func InvalidParams(w http.ResponseWriter, details string) error { func NotFound(w http.ResponseWriter, details string) error { return newJSONError(errNotFound, details).write(w, http.StatusNotFound) } + +// HTMLError writes an HTML error response for HTMX requests +func HTMLError(w http.ResponseWriter, htmlContent string) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = w.Write([]byte(htmlContent)) +} + +// HTMLBadRequest writes a bad request HTML error for HTMX requests +func HTMLBadRequest(w http.ResponseWriter, htmlContent string) { + HTMLError(w, htmlContent) +} + +// HTMLInternalError writes an internal server error HTML response for HTMX requests +func HTMLInternalError(w http.ResponseWriter, htmlContent string) { + HTMLError(w, htmlContent) +} + +// HTMLOK writes a successful HTML response for HTMX requests +func HTMLOK(w http.ResponseWriter, htmlContent string) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = w.Write([]byte(htmlContent)) +} + +// HTMLCreated writes a created HTML response for HTMX requests +func HTMLCreated(w http.ResponseWriter, htmlContent string) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusCreated) + _, _ = w.Write([]byte(htmlContent)) +} diff --git a/internal/infra/http/api/feed.go b/internal/infra/http/api/feed.go index 798d13f..2b0c7a9 100644 --- a/internal/infra/http/api/feed.go +++ b/internal/infra/http/api/feed.go @@ -2,6 +2,7 @@ package api import ( "encoding/json" + "fmt" "net/http" "github.com/julienschmidt/httprouter" @@ -26,18 +27,40 @@ import ( func (h *Router) addFeed(w http.ResponseWriter, r *http.Request, p httprouter.Params) { command, err := toAddFeedCommand(w, r, p) if err != nil { + if isHTMXRequest(r) { + HTMLBadRequest(w, renderFeedError("Invalid feed URL")) + } return } log.Infof("addFeed: command %v", command) - // define t as a new uuid t, err := h.feedService.AddFeed(command) if err != nil { log.WithError(err).Errorf("addFeed: service %s", err) + if isHTMXRequest(r) { + HTMLInternalError(w, renderFeedError("Failed to add feed")) + return + } _ = InternalError(w, "failed to add feed due to server internal error") return } + // For HTMX requests, get all feeds and return the complete list + if isHTMXRequest(r) { + userID := r.Context().Value(cxutil.UserIDKey).(int) + feeds, err := h.feedService.ListFeeds(userID) + if err != nil { + log.WithError(err).Errorf("addFeed: listFeeds %s", err) + HTMLInternalError(w, renderFeedError("Failed to refresh feed list")) + return + } + // Emit HX-Trigger header with new feed ID for auto-fetch + w.Header().Set("HX-Trigger", fmt.Sprintf(`{"feedAdded": {"feedId": %d}}`, t.ID)) + HTMLCreated(w, renderFeedList(feeds)) + return + } + + // JSON response for non-HTMX requests w.WriteHeader(http.StatusCreated) if err := json.NewEncoder(w).Encode(toAddFeedResponse(t)); err != nil { log.WithError(err).Errorf("setFeed: encoder %s", err) @@ -50,10 +73,21 @@ func (h *Router) listFeeds(w http.ResponseWriter, r *http.Request, _ httprouter. resp, err := h.feedService.ListFeeds(userID) if err != nil { log.WithError(err).Errorf("listFeeds: service %s", err) + if isHTMXRequest(r) { + HTMLInternalError(w, renderFeedError("Cannot list feeds")) + return + } _ = InternalError(w, "cannot list feeds") return } + // For HTMX requests, return HTML fragment + if isHTMXRequest(r) { + HTMLOK(w, renderFeedList(resp)) + return + } + + // JSON response for non-HTMX requests w.WriteHeader(http.StatusOK) if err := json.NewEncoder(w).Encode(toListFeedResponse(resp)); err != nil { log.WithError(err).Errorf("listFeeds: encoder %s", err) @@ -115,7 +149,7 @@ func (h *Router) fetchFeedNewItems(w http.ResponseWriter, r *http.Request, p htt } w.WriteHeader(http.StatusOK) - if err := json.NewEncoder(w).Encode(toGetItemsResponse(items)); err != nil { + if err := json.NewEncoder(w).Encode(toFeedItemsResponse(command.FeedID, items)); err != nil { log.WithError(err).Errorf("fetchFeedNewItems: encoder %s", err) _ = InternalError(w, "cannot encode response") return @@ -153,23 +187,51 @@ func (h *Router) unreadFeedItems(w http.ResponseWriter, r *http.Request, p httpr func (h *Router) deleteFeed(w http.ResponseWriter, r *http.Request, p httprouter.Params) { command, err := toDeleteFeedCommand(w, r, p) if err != nil { + if isHTMXRequest(r) { + HTMLBadRequest(w, renderFeedError("Invalid feed ID")) + } return } cmdDeleteFeedItems, err := toDeleteFeedItemsCommand(w, r, p) if err != nil { + if isHTMXRequest(r) { + HTMLBadRequest(w, renderFeedError("Invalid feed ID")) + } return } if err := h.itemService.DeleteFeedItems(cmdDeleteFeedItems); err != nil { + if isHTMXRequest(r) { + HTMLInternalError(w, renderFeedError("Cannot delete feed")) + return + } _ = InternalError(w, "cannot delete feed") return } if err := h.feedService.DeleteFeed(command); err != nil { + if isHTMXRequest(r) { + HTMLInternalError(w, renderFeedError("Cannot delete feed")) + return + } _ = InternalError(w, "cannot delete feed") return } + // For HTMX requests, return updated feed list + if isHTMXRequest(r) { + userID := r.Context().Value(cxutil.UserIDKey).(int) + feeds, err := h.feedService.ListFeeds(userID) + if err != nil { + log.WithError(err).Errorf("deleteFeed: listFeeds %s", err) + HTMLInternalError(w, renderFeedError("Failed to refresh feed list")) + return + } + HTMLOK(w, renderFeedList(feeds)) + return + } + + // JSON response for non-HTMX requests w.WriteHeader(http.StatusNoContent) } diff --git a/internal/infra/http/api/feed_test.go b/internal/infra/http/api/feed_test.go index 6b52075..bcfded8 100644 --- a/internal/infra/http/api/feed_test.go +++ b/internal/infra/http/api/feed_test.go @@ -155,12 +155,12 @@ func TestRouter_fetchFeedNewItems(t *testing.T) { specs := []spec{ { - Name: "ok", - Method: http.MethodPut, - Target: "/feeds/1/fetch", - ExpectedStatus: http.StatusOK, - ExpectedBody: `[{"id":1,"title":"title","dir":"dir","desc":"description","link":"link","is_new":false,"starred":true,"timestamp":"` + - now.Format(time.RFC3339Nano) + `"}]`, + Name: "ok", + Method: http.MethodPut, + Target: "/feeds/1/fetch", + ExpectedStatus: http.StatusOK, + ExpectedBody: `{"feed_id":1,"items":[{"id":1,"title":"title","dir":"dir","desc":"description","link":"link","is_new":false,"starred":true,"timestamp":"` + + now.Format(time.RFC3339Nano) + `"}]}`, MockFn: func(i *mocks.ItemService, f *mocks.FeedService, _ *mocks.AuthService) { f.EXPECT().FetchItems(1).Return([]*item.Item{ { diff --git a/internal/infra/http/api/fragments_feed.go b/internal/infra/http/api/fragments_feed.go new file mode 100644 index 0000000..d35c8fe --- /dev/null +++ b/internal/infra/http/api/fragments_feed.go @@ -0,0 +1,71 @@ +package api + +import ( + "fmt" + "html" + "strings" + + "github.com/cubny/lite-reader/internal/app/feed" +) + +// renderFeedRow generates an HTML fragment for a single feed row +func renderFeedRow(f *feed.Feed) string { + return fmt.Sprintf(`
  • + +
    %s
    +
    %s
    +
    • `, + f.ID, + f.ID, + html.EscapeString(f.Link), + html.EscapeString(f.Title), + formatUnreadCount(f.UnreadCount), + ) +} + +// renderFeedList generates an HTML fragment for the complete feed list +func renderFeedList(feeds []*feed.Feed) string { + var builder strings.Builder + + // Always include the Unread and Starred static feeds first + builder.WriteString(`
  • +
    + +
    Unread
    +
    • +
  • +
    + +
    Starred
    +
    • +`) + + if len(feeds) == 0 { + // No user feeds, but we still have unread/starred + return builder.String() + } + + // Add user feeds + for _, f := range feeds { + builder.WriteString(renderFeedRow(f)) + builder.WriteString("\n") + } + return builder.String() +} + +// renderFeedError returns an error message fragment +func renderFeedError(msg string) string { + errorStyle := "padding: 10px; color: #d9534f; background: #f8d7da; " + + "border: 1px solid #f5c6cb; border-radius: 4px; margin: 10px;" + return fmt.Sprintf(`
    + %s +
    `, errorStyle, html.EscapeString(msg)) +} + +// formatUnreadCount formats the unread count for display +func formatUnreadCount(count int) string { + if count > 0 { + return fmt.Sprintf("%d", count) + } + return "" +} diff --git a/internal/infra/http/api/login.go b/internal/infra/http/api/login.go index fc60c31..ccd5acb 100644 --- a/internal/infra/http/api/login.go +++ b/internal/infra/http/api/login.go @@ -21,10 +21,11 @@ func (h *Router) login(w http.ResponseWriter, r *http.Request, _ httprouter.Para response, err := h.authService.Login(command) if err != nil { if isHTMXRequest(r) { - // Return HTML error for HTMX requests - w.Header().Set("Content-Type", "text/html") - w.WriteHeader(http.StatusUnauthorized) - _, _ = w.Write([]byte(`
    Invalid email or password
    `)) + // Return HTML error for HTMX requests (200 OK so HTMX will swap it) + // w.Header().Set("Content-Type", "text/html; charset=utf-8") + // w.WriteHeader(http.StatusOK) + // _, _ = w.Write([]byte(`
    Invalid email or password
    `)) + HTMLBadRequest(w, `
    Invalid email or password
    `) } else { _ = BadRequest(w, err.Error()) } diff --git a/internal/infra/http/api/model.go b/internal/infra/http/api/model.go index f846838..302238a 100644 --- a/internal/infra/http/api/model.go +++ b/internal/infra/http/api/model.go @@ -17,6 +17,11 @@ import ( "github.com/cubny/lite-reader/internal/infra/http/api/cxutil" ) +const ( + contentTypeFormURLEncoded = "application/x-www-form-urlencoded" + contentTypeMultipartForm = "multipart/form-data" +) + type AddFeedRequest struct { URL string `json:"url"` } @@ -94,12 +99,39 @@ func toGetItemsResponse(items []*item.Item) []*ItemResponse { return resp } +// FeedItemsResponse wraps items with feed metadata +type FeedItemsResponse struct { + FeedID int `json:"feed_id"` + Items []*ItemResponse `json:"items"` +} + +func toFeedItemsResponse(feedID int, items []*item.Item) *FeedItemsResponse { + return &FeedItemsResponse{ + FeedID: feedID, + Items: toGetItemsResponse(items), + } +} + func toAddFeedCommand(w http.ResponseWriter, r *http.Request, _ httprouter.Params) (*feed.AddFeedCommand, error) { request := &AddFeedRequest{} - if err := json.NewDecoder(r.Body).Decode(request); err != nil { - log.WithError(err).Errorf("toAddFeedCommand: decoder %s", err) - _ = BadRequest(w, "cannot decode request body") - return nil, err + + // Check if this is a form submission (HTMX) or JSON request + contentType := r.Header.Get("Content-Type") + if isHTMXRequest(r) || contentType == contentTypeFormURLEncoded || contentType == contentTypeMultipartForm { + // Parse form data + if err := r.ParseForm(); err != nil { + log.WithError(err).Error("addFeed: failed to parse form data") + _ = BadRequest(w, "invalid request body") + return nil, err + } + request.URL = r.FormValue("url") + } else { + // Parse JSON + if err := json.NewDecoder(r.Body).Decode(request); err != nil { + log.WithError(err).Errorf("toAddFeedCommand: decoder %s", err) + _ = BadRequest(w, "cannot decode request body") + return nil, err + } } if err := request.Validate(); err != nil { @@ -245,11 +277,17 @@ func toLoginCommand(w http.ResponseWriter, r *http.Request, _ httprouter.Params) // Check if this is a form submission (HTMX) or JSON request contentType := r.Header.Get("Content-Type") - if isHTMXRequest(r) || contentType == "application/x-www-form-urlencoded" || contentType == "multipart/form-data" { + if isHTMXRequest(r) || contentType == contentTypeFormURLEncoded || contentType == contentTypeMultipartForm { // Parse form data if err := r.ParseForm(); err != nil { log.WithError(err).Error("login: failed to parse form data") - _ = BadRequest(w, "invalid request body") + if isHTMXRequest(r) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = w.Write([]byte(`
    Invalid request
    `)) + } else { + _ = BadRequest(w, "invalid request body") + } return nil, err } request.Email = r.FormValue("email") @@ -265,7 +303,13 @@ func toLoginCommand(w http.ResponseWriter, r *http.Request, _ httprouter.Params) if err := request.Validate(); err != nil { log.WithError(err).Error("login: invalid request body") - _ = BadRequest(w, "invalid request body") + if isHTMXRequest(r) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = w.Write([]byte(`
    Email and password are required
    `)) + } else { + _ = BadRequest(w, "invalid request body") + } return nil, err } @@ -292,11 +336,17 @@ func toSignupCommand(w http.ResponseWriter, r *http.Request, _ httprouter.Params // Check if this is a form submission (HTMX) or JSON request contentType := r.Header.Get("Content-Type") - if isHTMXRequest(r) || contentType == "application/x-www-form-urlencoded" || contentType == "multipart/form-data" { + if isHTMXRequest(r) || contentType == contentTypeFormURLEncoded || contentType == contentTypeMultipartForm { // Parse form data if err := r.ParseForm(); err != nil { log.WithError(err).Error("signup: failed to parse form data") - _ = BadRequest(w, "invalid request body") + if isHTMXRequest(r) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = w.Write([]byte(`
    Invalid request
    `)) + } else { + _ = BadRequest(w, "invalid request body") + } return nil, err } request.Email = r.FormValue("email") @@ -312,7 +362,13 @@ func toSignupCommand(w http.ResponseWriter, r *http.Request, _ httprouter.Params if err := request.Validate(); err != nil { log.WithError(err).Error("signup: invalid request body") - _ = BadRequest(w, "invalid request body") + if isHTMXRequest(r) { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + _, _ = w.Write([]byte(`
    Email and password are required
    `)) + } else { + _ = BadRequest(w, "invalid request body") + } return nil, err } diff --git a/internal/infra/http/api/signup.go b/internal/infra/http/api/signup.go index 4eacd79..a6dcd7f 100644 --- a/internal/infra/http/api/signup.go +++ b/internal/infra/http/api/signup.go @@ -14,9 +14,9 @@ func (h *Router) signup(w http.ResponseWriter, r *http.Request, _ httprouter.Par if err := h.authService.Signup(command); err != nil { if isHTMXRequest(r) { - // Return HTML error for HTMX requests - w.Header().Set("Content-Type", "text/html") - w.WriteHeader(http.StatusBadRequest) + // Return HTML error for HTMX requests (200 OK so HTMX will swap it) + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) _, _ = w.Write([]byte(`
    Error creating account. Email may already be registered.
    `)) } else { _ = BadRequest(w, err.Error()) diff --git a/internal/testserver/feedserver.go b/internal/testserver/feedserver.go index 59dbf6e..fcb0ac5 100644 --- a/internal/testserver/feedserver.go +++ b/internal/testserver/feedserver.go @@ -71,6 +71,7 @@ func (m *MockFeedServer) GetURL(feedName string) string { func (m *MockFeedServer) serveFeed(w http.ResponseWriter, r *http.Request) { // Extract feed name from path + log.Infof("Serving feed request: %s", r.URL.Path) feedName := strings.TrimPrefix(r.URL.Path, "/feeds/") if feedName == "" { http.Error(w, "Feed name required", http.StatusBadRequest) diff --git a/internal/testserver/fixtures/empty.xml b/internal/testserver/fixtures/empty.xml index 2b139d6..af1ec47 100644 --- a/internal/testserver/fixtures/empty.xml +++ b/internal/testserver/fixtures/empty.xml @@ -2,7 +2,7 @@ Empty Feed - http://localhost:3001/feeds/empty + http://localhost:3002/feeds/empty A feed with no items for testing en-us diff --git a/internal/testserver/fixtures/science-blog.xml b/internal/testserver/fixtures/science-blog.xml index 7c31466..0ff7eb3 100644 --- a/internal/testserver/fixtures/science-blog.xml +++ b/internal/testserver/fixtures/science-blog.xml @@ -1,16 +1,16 @@ Science Blog - - - http://localhost:3001/feeds/science-blog + + + http://localhost:3002/feeds/science-blog 2025-11-14T12:00:00Z Exploring the wonders of science Quantum Computing Breakthroughs - - http://localhost:3001/science/quantum-computing + + http://localhost:3002/science/quantum-computing 2025-11-14T08:00:00Z 2025-11-14T08:00:00Z @@ -32,8 +32,8 @@ Climate Change and Renewable Energy - - http://localhost:3001/science/climate-energy + + http://localhost:3002/science/climate-energy 2025-11-13T14:30:00Z 2025-11-13T14:30:00Z @@ -55,8 +55,8 @@ Advances in Biotechnology - - http://localhost:3001/science/biotech + + http://localhost:3002/science/biotech 2025-11-12T11:00:00Z 2025-11-12T11:00:00Z diff --git a/internal/testserver/fixtures/tech-news.xml b/internal/testserver/fixtures/tech-news.xml index c6b7765..6a4231a 100644 --- a/internal/testserver/fixtures/tech-news.xml +++ b/internal/testserver/fixtures/tech-news.xml @@ -2,15 +2,15 @@ Tech News Feed - http://localhost:3001/feeds/tech-news + http://localhost:3002/feeds/tech-news Latest technology news and updates en-us Mon, 14 Nov 2025 12:00:00 GMT - + Understanding Modern Web Development - http://localhost:3001/articles/web-dev-2025 + http://localhost:3002/articles/web-dev-2025 A comprehensive guide to modern web development practices in 2025 Modern web development has evolved significantly over the years. This article explores the latest trends and best practices.

    @@ -24,12 +24,12 @@ ]]>     Mon, 14 Nov 2025 10:00:00 GMT editor@technews.example - http://localhost:3001/articles/web-dev-2025 + http://localhost:3002/articles/web-dev-2025     The Future of Cloud Computing - http://localhost:3001/articles/cloud-future + http://localhost:3002/articles/cloud-future Exploring emerging trends in cloud infrastructure and services Cloud computing continues to revolutionize how we build and deploy applications.

    @@ -43,12 +43,12 @@ ]]>     Sun, 13 Nov 2025 15:30:00 GMT editor@technews.example - http://localhost:3001/articles/cloud-future + http://localhost:3002/articles/cloud-future     Database Design Best Practices - http://localhost:3001/articles/db-design + http://localhost:3002/articles/db-design Essential principles for designing scalable and efficient databases Good database design is crucial for application performance and maintainability.

    @@ -62,7 +62,7 @@ ]]>     Sat, 12 Nov 2025 09:15:00 GMT editor@technews.example - http://localhost:3001/articles/db-design + http://localhost:3002/articles/db-design     diff --git a/playwright.config.js b/playwright.config.js index 603bc01..f208c1e 100644 --- a/playwright.config.js +++ b/playwright.config.js @@ -18,14 +18,13 @@ export default defineConfig({ // Reporter configuration reporter: [ ['html', { outputFolder: 'reports/playwright' }], - ['list'], - process.env.CI ? ['github'] : ['list'] + process.env.CI ? ['github'] : ['list'], ], // Shared settings for all tests use: { // Base URL for the application - baseURL: process.env.BASE_URL || 'http://localhost:3000', + baseURL: process.env.BASE_URL || 'http://localhost:3001', // Screenshot and video settings screenshot: 'only-on-failure', @@ -45,13 +44,23 @@ export default defineConfig({ }, ], - // Web server configuration - start app before tests - webServer: { - command: 'make run-test-server', - url: 'http://localhost:3000/health', - reuseExistingServer: !process.env.CI, - timeout: 30 * 1000, - stdout: 'pipe', - stderr: 'pipe', - }, + // Web server configuration - start both the test app and mock feed provider + webServer: [ + { + command: 'make run-feed-provider', + url: 'http://localhost:3002/feeds/tech-news.xml', + reuseExistingServer: !process.env.CI, + timeout: 30 * 1000, + stdout: 'pipe', + stderr: 'pipe', + }, + { + command: 'make run-test-server', + url: 'http://localhost:3001/health', + reuseExistingServer: !process.env.CI, + timeout: 30 * 1000, + stdout: 'pipe', + stderr: 'pipe', + }, + ], }); diff --git a/public/css/main.css b/public/css/main.css index 04475bf..d952ccc 100755 --- a/public/css/main.css +++ b/public/css/main.css @@ -102,9 +102,9 @@ li.button input { .btn { cursor: pointer; float:right; - padding:5px 8px; + padding:4px 7px; border-radius: 4px; - margin:2px; + margin:0 2px; transition: all .2s ease-in-out; } .btn:hover { background-color: #000; } diff --git a/public/index.html b/public/index.html index 952429f..cc47e9b 100755 --- a/public/index.html +++ b/public/index.html @@ -13,13 +13,25 @@
    - + Feed - + +
    -
      +
      • @@ -75,6 +87,7 @@
        • + @@ -83,9 +96,9 @@ + - diff --git a/public/js/feeds.js b/public/js/feeds.js index 30e7cda..ee08ab2 100755 --- a/public/js/feeds.js +++ b/public/js/feeds.js @@ -1,159 +1,400 @@ +// Feed Management - Refactored to work with HTMX var feeds = { - container: $("#feeds ul"), + container: null, current: null, + currentFeed: null, + activeFeedId: null, // Track currently selected feed ID + pendingFetchFeedId: null, // Track feed being auto-fetched + init: function () { - $.getJSON("/feeds", function (data) { - // add all the feeds to the page, bind click events - $.each(data, function (id, feed) { - feeds.add(feed); + // Use vanilla JS instead of jQuery for container reference + feeds.container = document.querySelector("#feeds-list"); + + // Set up feed click handlers (using event delegation) + if (feeds.container) { + feeds.container.addEventListener("click", function(e) { + // Find the closest li.feed element + var feedItem = e.target.closest("li.feed"); + if (feedItem && !feedItem.classList.contains("feed-empty")) { + feeds.handleFeedClick(feedItem); + } }); - }); - feeds.container.find("li.feed").live("click", function () { - $(".ui-layout-center").scrollTop(0); - var $this = $(this); - var id = this.id; - $(this).removeClass("new"); - $.cookie("feed", id); - feeds.load(id); - if (feeds.currentFeed) { - feeds.currentFeed.removeClass("selected"); - } - $this.addClass("selected"); - $("#title").html($this.find(".feedtitle").html()); - $("#actions .action").attr("id", id).show(); - if(id === "unread" || id === "starred"){ - $(".remove").hide() - } else { - $(".remove").show() - } - feeds.currentFeed = $this; - }); + } + + // Load initial feed list from server via HTMX + // The server will return HTML fragments for HTMX requests + if (typeof htmx !== 'undefined') { + htmx.ajax('GET', '/feeds', { + target: '#feeds-list', + swap: 'innerHTML' + }); + + // Listen for afterSwap event on the add-feed form to trigger auto-fetch + // This fires AFTER HTMX has updated the DOM, avoiding race condition + document.body.addEventListener('htmx:afterSwap', function(evt) { + // Check if this is from the add feed form + if (evt.detail.target && evt.detail.target.id === 'feeds-list') { + const xhr = evt.detail.xhr; + if (xhr) { + const trigger = xhr.getResponseHeader('HX-Trigger'); + if (trigger) { + try { + const triggerData = JSON.parse(trigger); + if (triggerData.feedAdded && triggerData.feedAdded.feedId) { + // DOM is now updated, safe to find and auto-fetch the feed + setTimeout(function() { + feeds.autoFetchNewFeed(triggerData.feedAdded.feedId); + }, 100); // Small delay to ensure DOM is fully settled + } + } catch (e) { + console.error('Error parsing HX-Trigger:', e); + } + } + } + } + }); + } + + // Restore last selected feed after a delay setTimeout(function () { - var lastFeed = $.cookie("feed"); - if (lastFeed !== undefined) { - feeds.container.find("li#" + lastFeed).click(); + var lastFeed = getCookie("feed"); + if (lastFeed !== undefined && lastFeed !== null) { + var feedElement = document.getElementById(lastFeed); + if (feedElement) { + feedElement.click(); + } } }, 1000); - this.getUnreadItemsCount(); - this.getStarredItemsCount(); + + // Initialize unread and starred counts + feeds.getUnreadItemsCount(); + feeds.getStarredItemsCount(); }, + + handleFeedClick: function(feedItem) { + var feedId = feedItem.id; + + // Update active feed ID + feeds.activeFeedId = feedId; + + // Cancel any pending auto-fetch + feeds.pendingFetchFeedId = null; + + // Remove 'new' class + feedItem.classList.remove("new"); + + // Save to cookie + setCookie("feed", feedId); + + // Load feed items + feeds.load(feedId); + + feeds.updateState(feedItem); + }, + + updateState: function(feedItem) { + let feedId = feedItem.id; + // Update selected state + if (feeds.currentFeed) { + feeds.currentFeed.classList.remove("selected"); + } + feedItem.classList.add("selected"); + feeds.currentFeed = feedItem; + feeds.activeFeedId = feedId; // Track active feed ID + + // Update title + var titleElement = feedItem.querySelector(".feedtitle"); + if (titleElement) { + var titleBar = document.getElementById("title"); + if (titleBar) { + titleBar.innerHTML = titleElement.innerHTML; + } + } + + // Show/hide actions based on feed type + var actionsContainer = document.querySelector("#actions"); + if (!actionsContainer) { + return; + } + var actionButtons = actionsContainer.querySelectorAll(".action"); + actionButtons.forEach(function (btn) { + btn.dataset.feedId = feedId; + }); + + var isVirtualFeed = feedId === "unread" || feedId === "starred"; + + var updateBtn = document.querySelector(".update"); + var markReadAllBtn = document.getElementById("mark-read-all"); + var markUnreadAllBtn = document.getElementById("mark-unread-all"); + var removeBtn = document.querySelector(".remove"); + + if (updateBtn) { + updateBtn.style.display = isVirtualFeed ? "none" : "block"; + } + if (markReadAllBtn) { + markReadAllBtn.style.display = isVirtualFeed ? "none" : "block"; + } + if (markUnreadAllBtn) { + markUnreadAllBtn.style.display = isVirtualFeed ? "none" : "block"; + } + if (removeBtn) { + removeBtn.style.display = isVirtualFeed ? "none" : "block"; + } + + // Ensure the actions container itself stays visible when at least one action is available + actionsContainer.style.display = "block"; + }, + load: function (id) { const url = id === "unread" || id === "starred" ? `items/${id}` : `feeds/${id}/items`; - $.getJSON(url, function (data) { + + console.log("Loading feed items from:", url); + // Use fetch API instead of jQuery + fetch(url, { + headers: { + 'Authorization': 'Bearer ' + getAuthToken() + } + }) + .then(response => response.json()) + .then(data => { items.render(data); + }) + .catch(error => { + console.error('Error loading feed items:', error); }); }, - add: function (options) { - var defaults = { - id: 0, - title: "Untitled Feed", - url: "http://samplefeedurl.xml", - unread: 20, - }; - var opts = $.extend(defaults, options); - var $item = $("
      • ") - .addClass("new") - .addClass("feed") - .attr("id", opts.id) - .html( - $("").attr("src", "https://t1.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=" + opts.link), - ) - .append($("
        ").addClass("feedtitle").html(opts.title)) - .append( - $("
        ") - .addClass("count") - .html("" + opts.unread_count + ""), - ); - feeds.container.append($item); - feeds.blink(opts); - // now fetch the feed - feeds.update(opts.id); - $("#feeds-actions").show(); - }, - del: function (id) { - $.ajax({ - url: `feeds/${id}`, - type: "DELETE", - success: function (data) { - feeds.container.find("li[id='" + id + "']").remove(); - $("#items").html(""); - $("#actions .action").hide(); - $("#feedbar #title").html(""); - }, - }); - }, - markread: function (id) { - $.ajax({ - url: `feeds/${id}/read`, - type: "POST", - success: function (data) { - feeds.setCurrentCount(0); - items.$elem.find("> li").removeClass("new"); - }, - }); - }, - markunread: function (id) { - $.ajax({ - url: `feeds/${id}/unread`, - type: "POST", - success: function (data) { - feeds.setCurrentCount(items.$elem.find("> li").length); - items.$elem.find("li").addClass("new"); - }, - }); - }, - update: function (id) { - $.ajax({ - url: `feeds/${id}/fetch`, - type: "PUT", - content: "application/json", - success: function (encryptedData) { - const data = JSON.parse(encryptedData); - const unread = items.render(data); - feeds.setCurrentCount(unread); - }, - }); - }, + getCurrentCount: function () { - return feeds.container.find("li.selected span"); + var selected = feeds.container.querySelector("li.selected .count span"); + return selected; }, + getCount: function (selector) { - var counter = feeds.container.find("li" + selector + " .count span"); - return counter.length > 0 ? parseInt(counter.text(), 10) : 0; + var counter = feeds.container.querySelector("li" + selector + " .count span"); + return counter ? parseInt(counter.textContent, 10) : 0; }, + incCount: function (selector) { feeds.setCount(selector, feeds.getCount(selector) + 1); }, + decCount: function (selector) { feeds.setCount(selector, feeds.getCount(selector) - 1); }, + getUnreadItemsCount: function () { - $.getJSON("items/unread/count", function (data) { - feeds.setCount("#unread", data.count); + fetch("items/unread/count", { + headers: { + 'Authorization': 'Bearer ' + getAuthToken() + } + }) + .then(response => response.json()) + .then(data => { + feeds.setCount("#unread", data.count); + }) + .catch(error => { + console.error('Error getting unread count:', error); }); }, + getStarredItemsCount: function () { - $.getJSON("items/starred/count", function (data) { - feeds.setCount("#starred", data.count); + fetch("items/starred/count", { + headers: { + 'Authorization': 'Bearer ' + getAuthToken() + } + }) + .then(response => response.json()) + .then(data => { + feeds.setCount("#starred", data.count); + }) + .catch(error => { + console.error('Error getting starred count:', error); }); }, + setCount: function (selector, count) { - if (count > 0) { - feeds.container - .find("li" + selector + " .count") - .html("" + count + ""); - } else { - feeds.container.find("li" + selector + " .count").html(""); + var countElement = feeds.container.querySelector("li" + selector + " .count"); + if (countElement) { + if (count > 0) { + countElement.innerHTML = "" + count + ""; + } else { + countElement.innerHTML = ""; + } } }, + setCurrentCount: function (count) { - feeds.setCount(count, ".selected"); + if (feeds.currentFeed) { + var countElement = feeds.currentFeed.querySelector(".count"); + if (countElement) { + if (count > 0) { + countElement.innerHTML = "" + count + ""; + } else { + countElement.innerHTML = ""; + } + } + } }, - blink: function (feed) { - feeds.container - .find("li[id='" + feed.id + "']") - .effect("pulsate", { times: 3 }, 200); - feeds.container.find("li[id='" + feed.id + "']").click(); + + // Delete feed using HTMX + del: function (id) { + if (confirm("Are you sure you want to remove this feed?")) { + if (typeof htmx !== 'undefined') { + htmx.ajax('DELETE', `feeds/${id}`, { + target: '#feeds-list', + swap: 'innerHTML' + }).then(function() { + // Clear items and actions + var itemsContainer = document.getElementById("items"); + if (itemsContainer) itemsContainer.innerHTML = ""; + + var actionsContainer = document.querySelector("#actions .action"); + if (actionsContainer) { + document.querySelectorAll("#actions .action").forEach(function(el) { + el.style.display = "none"; + }); + } + + var titleBar = document.getElementById("title"); + if (titleBar) titleBar.innerHTML = ""; + }); + } + } + }, + + // Mark all items in feed as read + markread: function (id) { + fetch(`feeds/${id}/read`, { + method: 'POST', + headers: { + 'Authorization': 'Bearer ' + getAuthToken() + } + }) + .then(() => { + feeds.setCurrentCount(0); + var itemElements = document.querySelectorAll("#items > li"); + itemElements.forEach(function(item) { + item.classList.remove("new"); + }); + }) + .catch(error => { + console.error('Error marking feed as read:', error); + }); }, + + // Mark all items in feed as unread + markunread: function (id) { + fetch(`feeds/${id}/unread`, { + method: 'POST', + headers: { + 'Authorization': 'Bearer ' + getAuthToken() + } + }) + .then(() => { + var itemElements = document.querySelectorAll("#items li"); + var count = itemElements.length; + feeds.setCurrentCount(count); + itemElements.forEach(function(item) { + item.classList.add("new"); + }); + }) + .catch(error => { + console.error('Error marking feed as unread:', error); + }); + }, + + // Update/refresh feed items + update: function (id) { + fetch(`feeds/${id}/fetch`, { + method: 'PUT', + headers: { + 'Authorization': 'Bearer ' + getAuthToken() + } + }) + .then(response => response.json()) + .then(data => { + // Check if this response is for the currently selected feed + if (data.feed_id && feeds.activeFeedId && data.feed_id.toString() !== feeds.activeFeedId.toString()) { + console.log('Ignoring stale response for feed', data.feed_id, 'current feed is', feeds.activeFeedId); + return; + } + + const itemsData = data.items || data; // Handle both wrapped and unwrapped formats + const unread = items.render(itemsData); + feeds.setCurrentCount(unread); + }) + .catch(error => { + console.error('Error updating feed:', error); + }); + }, + + // Auto-fetch items for newly added feed + autoFetchNewFeed: function(feedId) { + console.log('Auto-fetching feed:', feedId); + + // Find the new feed element using data-feed-id attribute + const feedElement = document.querySelector(`li.feed[data-feed-id="${feedId}"]`); + if (!feedElement) { + console.error('Could not find feed element for ID:', feedId); + return; + } + + // Mark as pending fetch + feeds.pendingFetchFeedId = feedId; + + // Select the feed in the UI + feeds.handleFeedClick(feedElement); + + // Fetch items + fetch(`feeds/${feedId}/fetch`, { + method: 'PUT', + headers: { + 'Authorization': 'Bearer ' + getAuthToken() + } + }) + .then(response => response.json()) + .then(data => { + // Only render if this feed is still selected + if (feeds.activeFeedId && feeds.activeFeedId.toString() === feedId.toString()) { + const itemsData = data.items || data; + const unread = items.render(itemsData); + feeds.setCurrentCount(unread); + } else { + console.log('Feed selection changed, discarding auto-fetch result for feed', feedId); + } + + // Clear pending fetch + if (feeds.pendingFetchFeedId === feedId) { + feeds.pendingFetchFeedId = null; + } + }) + .catch(error => { + console.error('Error auto-fetching feed items:', error); + feeds.pendingFetchFeedId = null; + }); + } }; + +// Helper functions for cookies +function getCookie(name) { + var nameEQ = name + "="; + var ca = document.cookie.split(';'); + for(var i=0; i < ca.length; i++) { + var c = ca[i]; + while (c.charAt(0) == ' ') c = c.substring(1, c.length); + if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length); + } + return null; +} + +function setCookie(name, value, days) { + var expires = ""; + if (days) { + var date = new Date(); + date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + expires = "; expires=" + date.toUTCString(); + } + document.cookie = name + "=" + (value || "") + expires + "; path=/"; +} + diff --git a/public/js/htmx.min.js b/public/js/htmx.min.js index 5b9199d..faafa3e 100644 --- a/public/js/htmx.min.js +++ b/public/js/htmx.min.js @@ -1,131 +1 @@ -/* - * htmx.org v1.9.10 - * Minimal working implementation for form submissions - */ -(function(){ - 'use strict'; - - var htmx = { - version: "1.9.10-minimal", - - // Serialize form to URL-encoded string - serializeForm: function(form) { - var formData = new FormData(form); - var pairs = []; - for(var pair of formData.entries()) { - pairs.push(encodeURIComponent(pair[0]) + '=' + encodeURIComponent(pair[1])); - } - return pairs.join('&'); - }, - - processNode: function(elt) { - var target = elt.getAttribute('hx-target'); - var swap = elt.getAttribute('hx-swap') || 'innerHTML'; - var verb = null; - var path = null; - - if (elt.getAttribute('hx-post')) { - verb = 'POST'; - path = elt.getAttribute('hx-post'); - } else if (elt.getAttribute('hx-get')) { - verb = 'GET'; - path = elt.getAttribute('hx-get'); - } - - if (!verb || !path) return; - - var handler = function(evt) { - if (elt.tagName === 'FORM') { - evt.preventDefault(); - } - - var targetElt = target ? document.querySelector(target) : elt; - var data = null; - - if (elt.tagName === 'FORM' && verb === 'POST') { - data = htmx.serializeForm(elt); - } - - var xhr = new XMLHttpRequest(); - xhr.open(verb, path, true); - xhr.setRequestHeader('HX-Request', 'true'); - xhr.setRequestHeader('HX-Current-URL', window.location.href); - - if (data && verb === 'POST') { - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); - } - - xhr.onload = function() { - // Check for HX-Redirect header - var redirect = xhr.getResponseHeader('HX-Redirect'); - if (redirect) { - window.location.href = redirect; - return; - } - - // Handle HX-Refresh - var refresh = xhr.getResponseHeader('HX-Refresh'); - if (refresh === 'true') { - window.location.reload(); - return; - } - - if (xhr.status >= 200 && xhr.status < 300) { - if (targetElt && xhr.responseText) { - if (swap === 'innerHTML') { - targetElt.innerHTML = xhr.responseText; - } else if (swap === 'outerHTML') { - targetElt.outerHTML = xhr.responseText; - } else if (swap === 'beforebegin') { - targetElt.insertAdjacentHTML('beforebegin', xhr.responseText); - } else if (swap === 'afterbegin') { - targetElt.insertAdjacentHTML('afterbegin', xhr.responseText); - } else if (swap === 'beforeend') { - targetElt.insertAdjacentHTML('beforeend', xhr.responseText); - } else if (swap === 'afterend') { - targetElt.insertAdjacentHTML('afterend', xhr.responseText); - } - } - } else { - // Error - still swap if there's content - if (targetElt && xhr.responseText) { - targetElt.innerHTML = xhr.responseText; - } - } - }; - - xhr.onerror = function() { - console.error('HTMX request failed'); - }; - - xhr.send(data || null); - }; - - if (elt.tagName === 'FORM') { - elt.addEventListener('submit', handler); - } else { - elt.addEventListener('click', handler); - } - }, - - init: function() { - // Process all elements with hx-* attributes - var elements = document.querySelectorAll('[hx-post], [hx-get]'); - for (var i = 0; i < elements.length; i++) { - this.processNode(elements[i]); - } - } - }; - - // Initialize on DOM ready - if (document.readyState === 'loading') { - document.addEventListener('DOMContentLoaded', function() { - htmx.init(); - }); - } else { - htmx.init(); - } - - // Export - window.htmx = htmx; -})(); +var htmx=function(){"use strict";const Q={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=dn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true,historyRestoreAsHxRequest:true,reportValidityOfForms:false},parseInterval:null,location:location,_:null,version:"2.0.8"};Q.onLoad=V;Q.process=Ft;Q.on=xe;Q.off=be;Q.trigger=ae;Q.ajax=Ln;Q.find=f;Q.findAll=x;Q.closest=g;Q.remove=_;Q.addClass=K;Q.removeClass=G;Q.toggleClass=W;Q.takeClass=Z;Q.swap=ze;Q.defineExtension=_n;Q.removeExtension=zn;Q.logAll=j;Q.logNone=$;Q.parseInterval=d;Q._=e;const n={addTriggerHandler:St,bodyContains:se,canAccessLocalStorage:X,findThisElement:Se,filterValues:yn,swap:ze,hasAttribute:s,getAttributeValue:a,getClosestAttributeValue:ne,getClosestMatch:q,getExpressionVars:Rn,getHeaders:mn,getInputValues:dn,getInternalData:oe,getSwapSpecification:bn,getTriggerSpecs:st,getTarget:Ee,makeFragment:D,mergeObjects:le,makeSettleInfo:Sn,oobSwap:Te,querySelectorExt:ue,settleImmediately:Yt,shouldCancel:ht,triggerEvent:ae,triggerErrorEvent:fe,withExtensions:Vt};const de=["get","post","put","delete","patch"];const R=de.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function a(e,t){return ee(e,t)||ee(e,"data-"+t)}function u(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function te(){return document}function y(e,t){return e.getRootNode?e.getRootNode({composed:t}):te()}function q(e,t){while(e&&!t(e)){e=u(e)}return e||null}function o(e,t,n){const r=a(t,n);const o=a(t,"hx-disinherit");var i=a(t,"hx-inherit");if(e!==t){if(Q.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function ne(t,n){let r=null;q(t,function(e){return!!(r=o(t,ce(e),n))});if(r!=="unset"){return r}}function h(e,t){return e instanceof Element&&e.matches(t)}function A(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function L(e){if("parseHTMLUnsafe"in Document){return Document.parseHTMLUnsafe(e)}const t=new DOMParser;return t.parseFromString(e,"text/html")}function N(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function r(e){const t=te().createElement("script");ie(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}return t}function i(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function I(e){Array.from(e.querySelectorAll("script")).forEach(e=>{if(i(e)){const t=r(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){H(e)}finally{e.remove()}}})}function D(e){const t=e.replace(/]*)?>[\s\S]*?<\/head>/i,"");const n=A(t);let r;if(n==="html"){r=new DocumentFragment;const i=L(e);N(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=L(t);N(r,i.body);r.title=i.title}else{const i=L('");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){if(Q.config.allowScriptTags){I(r)}else{r.querySelectorAll("script").forEach(e=>e.remove())}}return r}function re(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function P(e){return typeof e==="function"}function k(e){return t(e,"Object")}function oe(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function M(t){const n=[];if(t){for(let e=0;e=0}function se(e){return e.getRootNode({composed:true})===document}function B(e){return e.trim().split(/\s+/)}function le(e,t){for(const n in t){if(t.hasOwnProperty(n)){e[n]=t[n]}}return e}function v(e){try{return JSON.parse(e)}catch(e){H(e);return null}}function X(){const e="htmx:sessionStorageTest";try{sessionStorage.setItem(e,e);sessionStorage.removeItem(e);return true}catch(e){return false}}function U(e){const t=new URL(e,"http://x");if(t){e=t.pathname+t.search}if(e!="/"){e=e.replace(/\/+$/,"")}return e}function e(e){return On(te().body,function(){return eval(e)})}function V(t){const e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function j(){Q.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function $(){Q.logger=null}function f(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return f(te(),e)}}function x(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return x(te(),e)}}function b(){return window}function _(e,t){e=w(e);if(t){b().setTimeout(function(){_(e);e=null},t)}else{u(e).removeChild(e)}}function ce(e){return e instanceof Element?e:null}function z(e){return e instanceof HTMLElement?e:null}function J(e){return typeof e==="string"?e:null}function p(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function K(e,t,n){e=ce(w(e));if(!e){return}if(n){b().setTimeout(function(){K(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function G(e,t,n){let r=ce(w(e));if(!r){return}if(n){b().setTimeout(function(){G(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function W(e,t){e=w(e);e.classList.toggle(t)}function Z(e,t){e=w(e);ie(e.parentElement.children,function(e){G(e,t)});K(ce(e),t)}function g(e,t){e=ce(w(e));if(e){return e.closest(t)}return null}function l(e,t){return e.substring(0,t.length)===t}function Y(e,t){return e.substring(e.length-t.length)===t}function pe(e){const t=e.trim();if(l(t,"<")&&Y(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function m(t,r,n){if(r.indexOf("global ")===0){return m(t,r.slice(7),true)}t=w(t);const o=[];{let t=0;let n=0;for(let e=0;e"){t--}}if(n0){const r=pe(o.shift());let e;if(r.indexOf("closest ")===0){e=g(ce(t),pe(r.slice(8)))}else if(r.indexOf("find ")===0){e=f(p(t),pe(r.slice(5)))}else if(r==="next"||r==="nextElementSibling"){e=ce(t).nextElementSibling}else if(r.indexOf("next ")===0){e=ge(t,pe(r.slice(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=ce(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=me(t,pe(r.slice(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=y(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const c=p(y(t,!!n));i.push(...M(c.querySelectorAll(e)))}return i}var ge=function(t,e,n){const r=p(y(t,n)).querySelectorAll(e);for(let e=0;e=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ue(e,t){if(typeof e!=="string"){return m(e,t)[0]}else{return m(te().body,e)[0]}}function w(e,t){if(typeof e==="string"){return f(p(t)||document,e)}else{return e}}function ye(e,t,n,r){if(P(t)){return{target:te().body,event:J(e),listener:t,options:n}}else{return{target:w(e),event:J(t),listener:n,options:r}}}function xe(t,n,r,o){Gn(function(){const e=ye(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=P(n);return e?n:r}function be(t,n,r){Gn(function(){const e=ye(t,n,r);e.target.removeEventListener(e.event,e.listener)});return P(n)?n:r}const ve=te().createElement("output");function we(t,n){const e=ne(t,n);if(e){if(e==="this"){return[Se(t,n)]}else{const r=m(t,e);const o=/(^|,)(\s*)inherit(\s*)($|,)/.test(e);if(o){const i=ce(q(t,function(e){return e!==t&&s(ce(e),n)}));if(i){r.push(...we(i,n))}}if(r.length===0){H('The selector "'+e+'" on '+n+" returned no matches!");return[ve]}else{return r}}}}function Se(e,t){return ce(q(e,function(e){return a(ce(e),t)!=null}))}function Ee(e){const t=ne(e,"hx-target");if(t){if(t==="this"){return Se(e,"hx-target")}else{return ue(e,t)}}else{const n=oe(e);if(n.boosted){return te().body}else{return e}}}function Ce(e){return Q.config.attributesToSettle.includes(e)}function Oe(t,n){ie(Array.from(t.attributes),function(e){if(!n.hasAttribute(e.name)&&Ce(e.name)){t.removeAttribute(e.name)}});ie(n.attributes,function(e){if(Ce(e.name)){t.setAttribute(e.name,e.value)}})}function He(t,e){const n=Jn(e);for(let e=0;e0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=m(t,n,false);if(r.length){ie(r,function(e){let t;const n=o.cloneNode(true);t=te().createDocumentFragment();t.appendChild(n);if(!He(s,e)){t=p(n)}const r={shouldSwap:true,target:e,fragment:t};if(!ae(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){qe(t);$e(s,e,e,t,i);Re()}ie(i.elts,function(e){ae(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);fe(te().body,"htmx:oobErrorNoTarget",{content:o})}return e}function Re(){const e=f("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=f("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function qe(e){ie(x(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=a(e,"id");const n=te().getElementById(t);if(n!=null){if(e.moveBefore){let e=f("#--htmx-preserve-pantry--");if(e==null){te().body.insertAdjacentHTML("afterend","
        ");e=f("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function Ae(l,e,c){ie(e.querySelectorAll("[id]"),function(t){const n=ee(t,"id");if(n&&n.length>0){const r=n.replace("'","\\'");const o=t.tagName.replace(":","\\:");const e=p(l);const i=e&&e.querySelector(o+"[id='"+r+"']");if(i&&i!==e){const s=t.cloneNode();Oe(t,i);c.tasks.push(function(){Oe(t,s)})}}})}function Le(e){return function(){G(e,Q.config.addedClass);Ft(ce(e));Ne(p(e));ae(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=z(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function c(e,t,n,r){Ae(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;K(ce(o),Q.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Le(o))}}}function Ie(e,t){let n=0;while(n0}function ze(h,d,p,g){if(!g){g={}}let m=null;let n=null;let e=function(){re(g.beforeSwapCallback);h=w(h);const r=g.contextElement?y(g.contextElement,false):te();const e=document.activeElement;let t={};t={elt:e,start:e?e.selectionStart:null,end:e?e.selectionEnd:null};const o=Sn(h);if(p.swapStyle==="textContent"){h.textContent=d}else{let n=D(d);o.title=g.title||n.title;if(g.historyRequest){n=n.querySelector("[hx-history-elt],[data-hx-history-elt]")||n}if(g.selectOOB){const i=g.selectOOB.split(",");for(let t=0;t0){b().setTimeout(n,p.settleDelay)}else{n()}};let t=Q.config.globalViewTransitions;if(p.hasOwnProperty("transition")){t=p.transition}const r=g.contextElement||te();if(t&&ae(r,"htmx:beforeTransition",g.eventInfo)&&typeof Promise!=="undefined"&&document.startViewTransition){const o=new Promise(function(e,t){m=e;n=t});const i=e;e=function(){document.startViewTransition(function(){i();return o})}}try{if(p?.swapDelay&&p.swapDelay>0){b().setTimeout(e,p.swapDelay)}else{e()}}catch(e){fe(r,"htmx:swapError",g.eventInfo);re(n);throw e}}function Je(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=v(r);for(const i in o){if(o.hasOwnProperty(i)){let e=o[i];if(k(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}ae(n,i,e)}}}else{const s=r.split(",");for(let e=0;e0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=On(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){fe(te().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(tt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function O(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function rt(e){let t;if(e.length>0&&Ye.test(e[0])){e.shift();t=O(e,Qe).trim();e.shift()}else{t=O(e,E)}return t}const ot="input, textarea, select";function it(e,t,n){const r=[];const o=et(t);do{O(o,C);const l=o.length;const c=O(o,/[,\[\s]/);if(c!==""){if(c==="every"){const u={trigger:"every"};O(o,C);u.pollInterval=d(O(o,/[,\[\s]/));O(o,C);var i=nt(e,o,"event");if(i){u.eventFilter=i}r.push(u)}else{const f={trigger:c};var i=nt(e,o,"event");if(i){f.eventFilter=i}O(o,C);while(o.length>0&&o[0]!==","){const a=o.shift();if(a==="changed"){f.changed=true}else if(a==="once"){f.once=true}else if(a==="consume"){f.consume=true}else if(a==="delay"&&o[0]===":"){o.shift();f.delay=d(O(o,E))}else if(a==="from"&&o[0]===":"){o.shift();if(Ye.test(o[0])){var s=rt(o)}else{var s=O(o,E);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=rt(o);if(h.length>0){s+=" "+h}}}f.from=s}else if(a==="target"&&o[0]===":"){o.shift();f.target=rt(o)}else if(a==="throttle"&&o[0]===":"){o.shift();f.throttle=d(O(o,E))}else if(a==="queue"&&o[0]===":"){o.shift();f.queue=O(o,E)}else if(a==="root"&&o[0]===":"){o.shift();f[a]=rt(o)}else if(a==="threshold"&&o[0]===":"){o.shift();f[a]=O(o,E)}else{fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,C)}r.push(f)}}if(o.length===l){fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,C)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function st(e){const t=a(e,"hx-trigger");let n=[];if(t){const r=Q.config.triggerSpecsCache;n=r&&r[t]||it(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,ot)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function lt(e){oe(e).cancelled=true}function ct(e,t,n){const r=oe(e);r.timeout=b().setTimeout(function(){if(se(e)&&r.cancelled!==true){if(!pt(n,e,Xt("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ct(e,t,n)}},n.pollInterval)}function ut(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function ft(e){return g(e,Q.config.disableSelector)}function at(t,n,e){if(t instanceof HTMLAnchorElement&&ut(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(ee(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=ee(t,"href")}else{const i=ee(t,"method");r=i?i.toLowerCase():"get";o=ee(t,"action");if(o==null||o===""){o=location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){gt(t,function(e,t){const n=ce(e);if(ft(n)){S(n);return}he(r,o,n,t)},n,e,true)})}}function ht(e,t){if(e.type==="submit"&&t.tagName==="FORM"){return true}else if(e.type==="click"){const n=t.closest('input[type="submit"], button');if(n&&n.form&&n.type==="submit"){return true}const r=t.closest("a");const o=/^#.+/;if(r&&r.href&&!o.test(r.getAttribute("href"))){return true}}return false}function dt(e,t){return oe(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function pt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;fe(te().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function gt(l,c,e,u,f){const a=oe(l);let t;if(u.from){t=m(l,u.from)}else{t=[l]}if(u.changed){if(!("lastValue"in a)){a.lastValue=new WeakMap}t.forEach(function(e){if(!a.lastValue.has(u)){a.lastValue.set(u,new WeakMap)}a.lastValue.get(u).set(e,e.value)})}ie(t,function(i){const s=function(e){if(!se(l)){i.removeEventListener(u.trigger,s);return}if(dt(l,e)){return}if(f||ht(e,i)){e.preventDefault()}if(pt(u,l,e)){return}const t=oe(e);t.triggerSpec=u;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(u.consume){e.stopPropagation()}if(u.target&&e.target){if(!h(ce(e.target),u.target)){return}}if(u.once){if(a.triggeredOnce){return}else{a.triggeredOnce=true}}if(u.changed){const n=e.target;const r=n.value;const o=a.lastValue.get(u);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(a.delayed){clearTimeout(a.delayed)}if(a.throttle){return}if(u.throttle>0){if(!a.throttle){ae(l,"htmx:trigger");c(l,e);a.throttle=b().setTimeout(function(){a.throttle=null},u.throttle)}}else if(u.delay>0){a.delayed=b().setTimeout(function(){ae(l,"htmx:trigger");c(l,e)},u.delay)}else{ae(l,"htmx:trigger");c(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:u.trigger,listener:s,on:i});i.addEventListener(u.trigger,s)})}let mt=false;let yt=null;function xt(){if(!yt){yt=function(){mt=true};window.addEventListener("scroll",yt);window.addEventListener("resize",yt);setInterval(function(){if(mt){mt=false;ie(te().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){bt(e)})}},200)}}function bt(e){if(!s(e,"data-hx-revealed")&&F(e)){e.setAttribute("data-hx-revealed","true");const t=oe(e);if(t.initHash){ae(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){ae(e,"revealed")},{once:true})}}}function vt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;ae(e,"htmx:trigger");t(e)}};if(r>0){b().setTimeout(o,r)}else{o()}}function wt(t,n,e){let i=false;ie(de,function(r){if(s(t,"hx-"+r)){const o=a(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){St(t,e,n,function(e,t){const n=ce(e);if(ft(n)){S(n);return}he(r,o,n,t)})})}});return i}function St(r,e,t,n){if(e.trigger==="revealed"){xt();gt(r,n,t,e);bt(ce(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ue(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e0){t.polling=true;ct(ce(r),n,e)}else{gt(r,n,t,e)}}function Et(e){const t=ce(e);if(!t){return false}const n=t.attributes;for(let e=0;e", "+e).join(""));return o}else{return[]}}function Rt(e){const t=At(e.target);const n=Nt(e);if(n){n.lastButtonClicked=t}}function qt(e){const t=Nt(e);if(t){t.lastButtonClicked=null}}function At(e){return g(ce(e),"button, input[type='submit']")}function Lt(e){return e.form||g(e,"form")}function Nt(e){const t=At(e.target);if(!t){return}const n=Lt(t);if(!n){return}return oe(n)}function It(e){e.addEventListener("click",Rt);e.addEventListener("focusin",Rt);e.addEventListener("focusout",qt)}function Dt(t,e,n){const r=oe(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){On(t,function(){if(ft(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function Pt(t){Pe(t);for(let e=0;eQ.config.historyCacheSize){i.shift()}while(i.length>0){try{sessionStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(te().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Jt(t){if(!X()){return null}t=U(t);const n=v(sessionStorage.getItem("htmx-history-cache"))||[];for(let e=0;e=200&&this.status<400){r.response=this.response;ae(te().body,"htmx:historyCacheMissLoad",r);ze(r.historyElt,r.response,n,{contextElement:r.historyElt,historyRequest:true});$t(r.path);ae(te().body,"htmx:historyRestore",{path:e,cacheMiss:true,serverResponse:r.response})}else{fe(te().body,"htmx:historyCacheMissLoadError",r)}};if(ae(te().body,"htmx:historyCacheMiss",r)){t.send()}}function en(e){Gt();e=e||location.pathname+location.search;const t=Jt(e);if(t){const n={swapStyle:"innerHTML",swapDelay:0,settleDelay:0,scroll:t.scroll};const r={path:e,item:t,historyElt:_t(),swapSpec:n};if(ae(te().body,"htmx:historyCacheHit",r)){ze(r.historyElt,t.content,n,{contextElement:r.historyElt,title:t.title});$t(r.path);ae(te().body,"htmx:historyRestore",r)}}else{if(Q.config.refreshOnHistoryMiss){Q.location.reload(true)}else{Qt(e)}}}function tn(e){let t=we(e,"hx-indicator");if(t==null){t=[e]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;e.classList.add.call(e.classList,Q.config.requestClass)});return t}function nn(e){let t=we(e,"hx-disabled-elt");if(t==null){t=[]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")});return t}function rn(e,t){ie(e.concat(t),function(e){const t=oe(e);t.requestCount=(t.requestCount||1)-1});ie(e,function(e){const t=oe(e);if(t.requestCount===0){e.classList.remove.call(e.classList,Q.config.requestClass)}});ie(t,function(e){const t=oe(e);if(t.requestCount===0){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function on(t,n){for(let e=0;en.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);ie(e,e=>r.append(t,e))}}function un(e){if(e instanceof HTMLSelectElement&&e.multiple){return M(e.querySelectorAll("option:checked")).map(function(e){return e.value})}if(e instanceof HTMLInputElement&&e.files){return M(e.files)}return e.value}function fn(t,n,r,e,o){if(e==null||on(t,e)){return}else{t.push(e)}if(sn(e)){const i=ee(e,"name");ln(i,un(e),n);if(o){an(e,r)}}if(e instanceof HTMLFormElement){ie(e.elements,function(e){if(t.indexOf(e)>=0){cn(e.name,un(e),n)}else{t.push(e)}if(o){an(e,r)}});new FormData(e).forEach(function(e,t){if(e instanceof File&&e.name===""){return}ln(t,e,n)})}}function an(e,t){const n=e;if(n.willValidate){ae(n,"htmx:validation:validate");if(!n.checkValidity()){if(ae(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})&&!t.length&&Q.config.reportValidityOfForms){n.reportValidity()}t.push({elt:n,message:n.validationMessage,validity:n.validity})}}}function hn(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function dn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=oe(e);if(s.lastButtonClicked&&!se(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||a(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){fn(n,o,i,Lt(e),l)}fn(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&ee(e,"type")==="submit"){const u=s.lastButtonClicked||e;const f=ee(u,"name");ln(f,u.value,o)}const c=we(e,"hx-include");ie(c,function(e){fn(n,r,i,ce(e),l);if(!h(e,"form")){ie(p(e).querySelectorAll(ot),function(e){fn(n,r,i,e,l)})}});hn(r,o);return{errors:i,formData:r,values:kn(r)}}function pn(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function gn(e){e=Dn(e);let n="";e.forEach(function(e,t){n=pn(n,t,e)});return n}function mn(e,t,n){const r={"HX-Request":"true","HX-Trigger":ee(e,"id"),"HX-Trigger-Name":ee(e,"name"),"HX-Target":a(t,"id"),"HX-Current-URL":location.href};Cn(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(oe(e).boosted){r["HX-Boosted"]="true"}return r}function yn(n,e){const t=ne(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){ie(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;ie(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function xn(e){return!!ee(e,"href")&&ee(e,"href").indexOf("#")>=0}function bn(e,t){const n=t||ne(e,"hx-swap");const r={swapStyle:oe(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&oe(e).boosted&&!xn(e)){r.show="top"}if(n){const s=B(n);if(s.length>0){for(let e=0;e0?o.join(":"):null;r.scroll=u;r.scrollTarget=i}else if(l.indexOf("show:")===0){const f=l.slice(5);var o=f.split(":");const a=o.pop();var i=o.length>0?o.join(":"):null;r.show=a;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{H("Unknown modifier in hx-swap: "+l)}}}}return r}function vn(e){return ne(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function wn(t,n,r){let o=null;Vt(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(vn(n)){return hn(new FormData,Dn(r))}else{return gn(r)}}}function Sn(e){return{tasks:[],elts:[e]}}function En(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=ce(ue(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}if(typeof t.scroll==="number"){b().setTimeout(function(){window.scrollTo(0,t.scroll)},0)}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=ce(ue(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function Cn(r,e,o,i,s){if(i==null){i={}}if(r==null){return i}const l=a(r,e);if(l){let e=l.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=On(r,function(){if(s){return Function("event","return ("+e+")").call(r,s)}else{return Function("return ("+e+")").call(r)}},{})}else{n=v(e)}for(const c in n){if(n.hasOwnProperty(c)){if(i[c]==null){i[c]=n[c]}}}}return Cn(ce(u(r)),e,o,i,s)}function On(e,t,n){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return n}}function Hn(e,t,n){return Cn(e,"hx-vars",true,n,t)}function Tn(e,t,n){return Cn(e,"hx-vals",false,n,t)}function Rn(e,t){return le(Hn(e,t),Tn(e,t))}function qn(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function An(t){if(t.responseURL){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(te().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function T(e,t){return t.test(e.getAllResponseHeaders())}function Ln(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return he(t,n,null,null,{targetOverride:w(r)||ve,returnPromise:true})}else{let e=w(r.target);if(r.target&&!e||r.source&&!e&&!w(r.source)){e=ve}return he(t,n,w(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true,push:r.push,replace:r.replace,selectOOB:r.selectOOB})}}else{return he(t,n,null,null,{returnPromise:true})}}function Nn(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function In(e,t,n){const r=new URL(t,location.protocol!=="about:"?location.href:window.origin);const o=location.protocol!=="about:"?location.origin:window.origin;const i=o===r.origin;if(Q.config.selfRequestsOnly){if(!i){return false}}return ae(e,"htmx:validateUrl",le({url:r,sameHost:i},n))}function Dn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n in e){if(e.hasOwnProperty(n)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}}return t}function Pn(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function kn(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Pn(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function he(t,n,r,o,i,k){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=te().body}const M=i.handler||Vn;const F=i.select||null;if(!se(r)){re(s);return e}const c=i.targetOverride||ce(Ee(r));if(c==null||c==ve){fe(r,"htmx:targetError",{target:ne(r,"hx-target")});re(l);return e}let u=oe(r);const f=u.lastButtonClicked;if(f){const A=ee(f,"formaction");if(A!=null){n=A}const L=ee(f,"formmethod");if(L!=null){if(de.includes(L.toLowerCase())){t=L}else{re(s);return e}}}const a=ne(r,"hx-confirm");if(k===undefined){const K=function(e){return he(t,n,r,o,i,!!e)};const G={target:c,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:a};if(ae(r,"htmx:confirm",G)===false){re(s);return e}}let h=r;let d=ne(r,"hx-sync");let p=null;let B=false;if(d){const N=d.split(":");const I=N[0].trim();if(I==="this"){h=Se(r,"hx-sync")}else{h=ce(ue(r,I))}d=(N[1]||"drop").trim();u=oe(h);if(d==="drop"&&u.xhr&&u.abortable!==true){re(s);return e}else if(d==="abort"){if(u.xhr){re(s);return e}else{B=true}}else if(d==="replace"){ae(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");p=(W[1]||"last").trim()}}if(u.xhr){if(u.abortable){ae(h,"htmx:abort")}else{if(p==null){if(o){const D=oe(o);if(D&&D.triggerSpec&&D.triggerSpec.queue){p=D.triggerSpec.queue}}if(p==null){p="last"}}if(u.queuedRequests==null){u.queuedRequests=[]}if(p==="first"&&u.queuedRequests.length===0){u.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="all"){u.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="last"){u.queuedRequests=[];u.queuedRequests.push(function(){he(t,n,r,o,i)})}re(s);return e}}const g=new XMLHttpRequest;u.xhr=g;u.abortable=B;const m=function(){u.xhr=null;u.abortable=false;if(u.queuedRequests!=null&&u.queuedRequests.length>0){const e=u.queuedRequests.shift();e()}};const X=ne(r,"hx-prompt");if(X){var y=prompt(X);if(y===null||!ae(r,"htmx:prompt",{prompt:y,target:c})){re(s);m();return e}}if(a&&!k){if(!confirm(a)){re(s);m();return e}}let x=mn(r,c,y);if(t!=="get"&&!vn(r)){x["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){x=le(x,i.headers)}const U=dn(r,t);let b=U.errors;const V=U.formData;if(i.values){hn(V,Dn(i.values))}const j=Dn(Rn(r,o));const v=hn(V,j);let w=yn(v,r);if(Q.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",ee(c,"id")||"true")}if(n==null||n===""){n=location.href}const S=Cn(r,"hx-request");const $=oe(r).boosted;let E=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:$,useUrlParams:E,formData:w,parameters:kn(w),unfilteredFormData:v,unfilteredParameters:kn(v),headers:x,elt:r,target:c,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Q.config.withCredentials,timeout:i.timeout||S.timeout||Q.config.timeout,path:n,triggeringEvent:o};if(!ae(r,"htmx:configRequest",C)){re(s);m();return e}n=C.path;t=C.verb;x=C.headers;w=Dn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){ae(r,"htmx:validation:halted",C);re(s);m();return e}const _=n.split("#");const z=_[0];const O=_[1];let H=n;if(E){H=z;const Z=!w.keys().next().done;if(Z){if(H.indexOf("?")<0){H+="?"}else{H+="&"}H+=gn(w);if(O){H+="#"+O}}}if(!In(r,H,C)){fe(r,"htmx:invalidPath",C);re(l);m();return e}g.open(t.toUpperCase(),H,true);g.overrideMimeType("text/html");g.withCredentials=C.withCredentials;g.timeout=C.timeout;if(S.noHeaders){}else{for(const P in x){if(x.hasOwnProperty(P)){const Y=x[P];qn(g,P,Y)}}}const T={xhr:g,target:c,requestConfig:C,etc:i,boosted:$,select:F,pathInfo:{requestPath:n,finalRequestPath:H,responsePath:null,anchor:O}};g.onload=function(){try{const t=Nn(r);T.pathInfo.responsePath=An(g);M(r,T);if(T.keepIndicators!==true){rn(R,q)}ae(r,"htmx:afterRequest",T);ae(r,"htmx:afterOnLoad",T);if(!se(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(se(n)){e=n}}if(e){ae(e,"htmx:afterRequest",T);ae(e,"htmx:afterOnLoad",T)}}re(s)}catch(e){fe(r,"htmx:onLoadError",le({error:e},T));throw e}finally{m()}};g.onerror=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendError",T);re(l);m()};g.onabort=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendAbort",T);re(l);m()};g.ontimeout=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:timeout",T);re(l);m()};if(!ae(r,"htmx:beforeRequest",T)){re(s);m();return e}var R=tn(r);var q=nn(r);ie(["loadstart","loadend","progress","abort"],function(t){ie([g,g.upload],function(e){e.addEventListener(t,function(e){ae(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});ae(r,"htmx:beforeSend",T);const J=E?null:wn(g,r,w);g.send(J);return e}function Mn(e,t){const n=t.xhr;let r=null;let o=null;if(T(n,/HX-Push:/i)){r=n.getResponseHeader("HX-Push");o="push"}else if(T(n,/HX-Push-Url:/i)){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(T(n,/HX-Replace-Url:/i)){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;const l=t.etc.push||ne(e,"hx-push-url");const c=t.etc.replace||ne(e,"hx-replace-url");const u=oe(e).boosted;let f=null;let a=null;if(l){f="push";a=l}else if(c){f="replace";a=c}else if(u){f="push";a=s||i}if(a){if(a==="false"){return{}}if(a==="true"){a=s||i}if(t.pathInfo.anchor&&a.indexOf("#")===-1){a=a+"#"+t.pathInfo.anchor}return{type:f,path:a}}else{return{}}}function Fn(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Bn(e){for(var t=0;t`+`.${t}{opacity:0;visibility: hidden} `+`.${n} .${t}, .${n}.${t}{opacity:1;visibility: visible;transition: opacity 200ms ease-in}`+"")}}function Zn(){const e=te().querySelector('meta[name="htmx-config"]');if(e){return v(e.content)}else{return null}}function Yn(){const e=Zn();if(e){Q.config=le(Q.config,e)}}Gn(function(){Yn();Wn();let e=te().body;Ft(e);const t=te().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.detail.elt||e.target;const n=oe(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){en();ie(t,function(e){ae(e,"htmx:restored",{document:te(),triggerEvent:ae})})}else{if(n){n(e)}}};b().setTimeout(function(){ae(e,"htmx:load",{});e=null},0)});return Q}(); \ No newline at end of file diff --git a/public/js/items.js b/public/js/items.js index cd5e180..37682c7 100755 --- a/public/js/items.js +++ b/public/js/items.js @@ -32,14 +32,17 @@ const items = { }); }, render:function(data){ - if(data.length===0){ + // Handle both array and wrapped object formats + const itemsArray = Array.isArray(data) ? data : (data.items || []); + + if(itemsArray.length===0){ items.$elem.html("
      • No items found
        • "); - return; + return 0; } items.$elem.html(""); let unread=0; const r = new RegExp(/[\u0600-\u06FF]/); - data.forEach(function(item){ + itemsArray.forEach(function(item){ const item_template = $("#item-template").html(); const $li = $(item_template.format( diff --git a/public/js/main.js b/public/js/main.js index 89f0e97..56c512e 100755 --- a/public/js/main.js +++ b/public/js/main.js @@ -1,28 +1,131 @@ $(document).ready(function () { + // Configure HTMX BEFORE any HTMX requests are made + // This must be set up early in the page lifecycle + if (typeof htmx !== 'undefined') { + // Set default headers for all HTMX requests + htmx.config.includeIndicatorStyles = false; + + // Add authorization header to ALL HTMX requests + htmx.on('htmx:configRequest', function(evt) { + const token = getAuthToken(); + if (token) { + evt.detail.headers['Authorization'] = 'Bearer ' + token; + } + }); + + // Handle 401 errors from HTMX + htmx.on('htmx:responseError', function(evt) { + if (evt.detail.xhr && evt.detail.xhr.status === 401) { + clearAuthToken(); + window.location.href = '/login.html'; + } + }); + } + stage.init(); loadr.init(); - $(document).click(hideAddFeed); - $('#addfeed > *').click(showAddFeed); - $('.update').click(function(){ - feeds.update(this.id); + + // Feed form toggle handlers + var showFeedFormBtn = document.getElementById('show-feed-form'); + var addFeedForm = document.getElementById('add-feed-form'); + var urlInput = document.getElementById('urlToAdd'); + + if (showFeedFormBtn && addFeedForm && urlInput) { + showFeedFormBtn.addEventListener('click', function(e) { + e.preventDefault(); + e.stopPropagation(); + + if (addFeedForm.style.display === 'none') { + // Show the form + addFeedForm.style.display = 'inline-block'; + urlInput.style.display = 'inline-block'; + urlInput.focus(); + hideFeedFormButton(); + } else { + // Hide the form + addFeedForm.style.display = 'none'; + urlInput.value = ''; + showFeedButton(); + } }); - $('#mark-read-all').click(function(){ - feeds.markread(this.id); + + // Handle Enter key in input + urlInput.addEventListener('keypress', function(e) { + if (e.key === 'Enter') { + e.preventDefault(); + addFeedForm.querySelector('button[type="submit"]').click(); + } }); - $('#mark-unread-all').click(function(){ - feeds.markunread(this.id); + + // Reset form after successful submission + document.body.addEventListener('htmx:afterSwap', function(evt) { + if (evt.detail.target.id === 'feeds-list') { + addFeedForm.style.display = 'none'; + urlInput.value = ''; + showFeedButton(); + + feeds.getUnreadItemsCount(); + feeds.getStarredItemsCount(); + // get the newly added feed and highlight it + + } }); - $('.remove').click(function(){ - feeds.del(this.id); + + // Hide form when clicking outside + document.addEventListener('click', function(e) { + if (!e.target.closest('#addfeed') && addFeedForm.style.display !== 'none') { + addFeedForm.style.display = 'none'; + urlInput.value = ''; + showFeedButton(); + } }); + } + + // Action button handlers (keep using jQuery for compatibility with existing code) + function getFeedIdFromAction(element) { + if (!element) { + return null; + } + return element.dataset && element.dataset.feedId ? element.dataset.feedId : element.id; + } + + $('.update').click(function(){ + var feedId = getFeedIdFromAction(this); + if (feedId) { + feeds.update(feedId); + } + }); + $('#mark-read-all').click(function(){ + var feedId = getFeedIdFromAction(this); + if (feedId) { + feeds.markread(feedId); + } + }); + $('#mark-unread-all').click(function(){ + var feedId = getFeedIdFromAction(this); + if (feedId) { + feeds.markunread(feedId); + } + }); + $('.remove').click(function(){ + var feedId = getFeedIdFromAction(this); + if (feedId) { + feeds.del(feedId); + } + }); $('.logout').click(function(){ logout() }); + feeds.init(); - if(feeds.container.find('>li').length < 2){ - $('#feeds-actions').hide(); + if(feeds.container && feeds.container.querySelectorAll('li').length < 2){ + var feedActions = document.getElementById('feeds-actions'); + if (feedActions) { + feedActions.style.display = 'none'; + } } + $(document).bind('keydown',function(e){ var code = (e.keyCode ? e.keyCode : e.which); if(code == 32) { @@ -38,6 +141,22 @@ $(document).ready(function () { }); }); +function hideFeedFormButton() { + var showFeedFormBtn = document.getElementById('show-feed-form'); + showFeedFormBtn.classList.remove('btn-purple'); + showFeedFormBtn.style.display = 'none'; + showFeedFormBtn.classList.add('btn-green'); + showFeedFormBtn.querySelector('span').textContent = ''; +} + +function showFeedButton() { + var showFeedFormBtn = document.getElementById('show-feed-form'); + showFeedFormBtn.style.display = 'inline-block'; + showFeedFormBtn.classList.remove('btn-green'); + showFeedFormBtn.classList.add('btn-purple'); + showFeedFormBtn.querySelector('span').textContent = 'Feed'; +} + function logout() { $.ajax({ url: 'logout', @@ -47,88 +166,4 @@ function logout() { window.location.href = '/login.html'; } }) -} -// Update the existing addFeed function -function addFeed(url) { - var aInput = $("#urlToAdd"); - var af = $('#addfeed .add'); - af.find("span").text('Adding Feed...'); - af.find("i").removeClass("icon-plus"); - af.find("i").addClass("icon-spin icon-spinner"); - - $.ajax({ - url: 'feeds', - type: "POST", - data: JSON.stringify({url: url}), - dataType: "json", - success: function(data) { - af.find("span").text('Feed'); - if (!data.error) { - feeds.add(data); - } else { - console.log(data); - } - }, - complete: function() { - af.find("span").text('Feed'); - af.find("i").removeClass("icon-spin icon-spinner"); - af.find("i").addClass("icon-plus"); - aInput.val(""); - hideAddFeed(); - } - }); -} - -function showAddFeed(e){ - e.stopPropagation(); - var aButton=$("#addfeed a"); - aButton.removeClass("btn-purple"); - aButton.addClass("btn-green"); - aButton.find("span").text(""); - var aInput=$("#urlToAdd"); - aInput.removeClass('ui-state-error'); - aInput.show(); - aButton.unbind('click'); - aButton.click(function (e) { - aButton.unbind('click'); - e.stopPropagation(); - if (aInput.val() === "") { - hideAddFeed(); - return; - } - if (aInput.val().indexOf('http') < 0) { - aInput.val("http://" + aInput.val()); - } - var bValid = true; - aInput.removeClass('ui-state-error'); - bValid = bValid && checkLength(aInput, "Url", 10, 255); - bValid = bValid && checkRegexp(aInput, /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/i, "Please Enter a Valid Url."); - if (bValid) { - addFeed(aInput.val()); - aInput.val(""); - hideAddFeed(); - } - }); - aInput.unbind('keypress'); - aInput.keypress(function (e) { - if (e.which == 13) { - aButton.click(); - } - }); - aInput.focus(); -} - -function hideAddFeed(){ - var aButton=$("#addfeed a"); - var aInput=$("#urlToAdd"); - aButton.addClass("btn-purple"); - aButton.removeClass("btn-green"); - aButton.find("span").text("Feed"); - aInput.hide(); - $('#addfeed > *').click(showAddFeed); -} - - - - - +} \ No newline at end of file diff --git a/tests/ui/auth.spec.js b/tests/ui/auth.spec.js index a9cc004..37fda0f 100644 --- a/tests/ui/auth.spec.js +++ b/tests/ui/auth.spec.js @@ -40,7 +40,7 @@ test.describe('Authentication', () => { await loginPage.login(email, password); // Should be redirected to main page (root path) - await page.waitForURL('http://localhost:3000/', { timeout: 5000 }); + await page.waitForURL('http://localhost:3001/', { timeout: 5000 }); const mainPage = new MainPage(page); expect(await mainPage.isLoggedIn()).toBe(true); @@ -52,10 +52,15 @@ test.describe('Authentication', () => { await loginPage.goto(); await loginPage.login('nonexistent@test.example', 'wrongpassword'); - // Should show error or stay on login page + // Should show error message and stay on login page await page.waitForTimeout(1000); const url = page.url(); expect(url).toContain('login'); + + // Verify error message is displayed + const errorMessage = await page.locator('.error-message'); + await expect(errorMessage).toBeVisible(); + await expect(errorMessage).toContainText('Invalid email or password'); }); test('should logout successfully', async ({ page }) => { @@ -68,7 +73,7 @@ test.describe('Authentication', () => { const loginPage = new LoginPage(page); await loginPage.goto(); await loginPage.login(email, password); - await page.waitForURL('http://localhost:3000/', { timeout: 5000 }); + await page.waitForURL('http://localhost:3001/', { timeout: 5000 }); // Now logout const mainPage = new MainPage(page); @@ -78,4 +83,26 @@ test.describe('Authentication', () => { const url = page.url(); expect(url).toContain('login'); }); + + test('should not signup with duplicate email', async ({ page }) => { + // First, create a user + const signupPage = new SignupPage(page); + await signupPage.goto(); + await signupPage.signup(email, password); + await signupPage.waitForSuccess(); + + // Try to signup again with the same email + await signupPage.goto(); + await signupPage.signup(email, password); + + // Should show error message and stay on signup page + await page.waitForTimeout(1000); + const url = page.url(); + expect(url).toContain('signup'); + + // Verify error message is displayed + const errorMessage = await page.locator('.error-message'); + await expect(errorMessage).toBeVisible(); + await expect(errorMessage).toContainText('Email may already be registered'); + }); }); diff --git a/tests/ui/feeds.spec.js b/tests/ui/feeds.spec.js index dfb9b32..185fa42 100644 --- a/tests/ui/feeds.spec.js +++ b/tests/ui/feeds.spec.js @@ -25,7 +25,7 @@ test.describe('Feed Management', () => { const loginPage = new LoginPage(page); await loginPage.goto(); await loginPage.login(email, password); - await page.waitForURL('http://localhost:3000/', { timeout: 5000 }); + await page.waitForURL('http://localhost:3001/', { timeout: 5000 }); }); test('should add RSS feed successfully', async ({ page }) => { @@ -59,16 +59,40 @@ test.describe('Feed Management', () => { await mainPage.addFeed(MOCK_FEEDS.techNews); - // Click on the feed to view its items - await page.waitForTimeout(2000); + // Items should auto-load without needing to manually click or update + // Wait for items to appear automatically + await mainPage.waitForItems(1, 15000); + + // Verify items are displayed + const itemsCount = await mainPage.getItemsCount(); + expect(itemsCount).toBeGreaterThan(0); + + // Verify feed is selected + const selectedFeed = page.locator('.feed.selected'); + await expect(selectedFeed).toBeVisible(); + await expect(selectedFeed).toContainText('Tech News'); + }); + + test('should auto-fetch items but respect user selection changes', async ({ page }) => { + const mainPage = new MainPage(page); + + // Add first feed and wait for it to complete + await mainPage.addFeed(MOCK_FEEDS.techNews); + await mainPage.waitForItems(1, 10000); + + // Add second feed (which will trigger auto-fetch and auto-select) + await mainPage.addFeed(MOCK_FEEDS.scienceBlog); + + // Immediately click on the first feed before auto-fetch completes + await page.waitForTimeout(500); await mainPage.clickFeed('Tech News'); // Wait for items to load await mainPage.waitForItems(1, 10000); - // Verify items are displayed - const itemsCount = await mainPage.getItemsCount(); - expect(itemsCount).toBeGreaterThan(0); + // The first feed should remain selected (not overridden by stale auto-fetch) + const selectedFeed = page.locator('.feed.selected'); + await expect(selectedFeed).toContainText('Tech News'); }); test('should fetch and update feed items', async ({ page }) => { diff --git a/tests/ui/items.spec.js b/tests/ui/items.spec.js index ecf51ed..edc5734 100644 --- a/tests/ui/items.spec.js +++ b/tests/ui/items.spec.js @@ -25,7 +25,7 @@ test.describe('Item Management', () => { const loginPage = new LoginPage(page); await loginPage.goto(); await loginPage.login(email, password); - await page.waitForURL('http://localhost:3000/', { timeout: 5000 }); + await page.waitForURL('http://localhost:3001/', { timeout: 5000 }); // Add a feed with items const mainPage = new MainPage(page); diff --git a/tests/ui/pages/MainPage.js b/tests/ui/pages/MainPage.js index fb29d85..99141b7 100644 --- a/tests/ui/pages/MainPage.js +++ b/tests/ui/pages/MainPage.js @@ -49,10 +49,10 @@ export class MainPage { // Wait a moment for the input to be filled await this.page.waitForTimeout(300); - // Click the button again to submit (it changes behavior after first click) - await this.addFeedButton.click(); + // Press Enter to submit the form (HTMX form submission) + await this.feedUrlInput.press('Enter'); - // Wait for the feed to be added (button changes back to purple) + // Wait for the feed to be added await this.page.waitForTimeout(2000); } diff --git a/tests/ui/utils/helpers.js b/tests/ui/utils/helpers.js index a0ceb5f..f695ede 100644 --- a/tests/ui/utils/helpers.js +++ b/tests/ui/utils/helpers.js @@ -10,7 +10,7 @@ import * as path from 'path'; const execAsync = promisify(exec); // Test database path -const TEST_DB_PATH = process.env.TEST_DB_PATH || 'data/test-agg.db'; +const TEST_DB_PATH = process.env.TEST_DB_PATH || 'data/test-dev.db'; /** * Clean up the test database @@ -77,7 +77,7 @@ export async function waitFor( * Mock feed URLs for testing */ export const MOCK_FEEDS = { - techNews: 'http://localhost:3001/feeds/tech-news.xml', - scienceBlog: 'http://localhost:3001/feeds/science-blog.xml', - empty: 'http://localhost:3001/feeds/empty.xml', + techNews: 'http://localhost:3002/feeds/tech-news.xml', + scienceBlog: 'http://localhost:3002/feeds/science-blog.xml', + empty: 'http://localhost:3002/feeds/empty.xml', };