From b49b5ee0be651a2f28e1d59b380e4d4bb3a3443d Mon Sep 17 00:00:00 2001 From: kpenfound Date: Tue, 26 Aug 2025 23:02:43 -0300 Subject: [PATCH 1/3] vibed up a sweet halifax theme Signed-off-by: kpenfound --- .dagger/debugger.go | 6 +- .dagger/develop.go | 2 + .dagger/review.go | 1 + .dagger/workspace/main.go | 14 ++-- dagger.json | 2 +- website/cypress/e2e/greeting_test.cy.ts | 6 +- website/index.html | 87 ++++++++++++++++++------- 7 files changed, 82 insertions(+), 36 deletions(-) diff --git a/.dagger/debugger.go b/.dagger/debugger.go index bd15ef2..17c8e9e 100644 --- a/.dagger/debugger.go +++ b/.dagger/debugger.go @@ -21,8 +21,9 @@ func (g *Greetings) DebugTests( // Check if backend is broken if _, berr := g.Backend.CheckDirectory(ctx, g.Backend.Source()); berr != nil { ws := dag.Workspace( - g.Backend.Source(), + g.Source, g.Backend.AsWorkspaceCheckable(), + ".", ) env := dag.Env(). WithWorkspaceInput("workspace", ws, "workspace to read, write, and test code"). @@ -39,8 +40,9 @@ func (g *Greetings) DebugTests( // Check if frontend is broken if _, ferr := g.Frontend.CheckDirectory(ctx, g.Frontend.Source()); ferr != nil { ws := dag.Workspace( - g.Frontend.Source(), + g.Source, g.Frontend.AsWorkspaceCheckable(), + "website", ) env := dag.Env(). WithWorkspaceInput("workspace", ws, "workspace to read, write, and test code"). diff --git a/.dagger/develop.go b/.dagger/develop.go index 729158e..3948e56 100644 --- a/.dagger/develop.go +++ b/.dagger/develop.go @@ -24,6 +24,7 @@ func (g *Greetings) Develop( g.Source, // FIXME: no great way to determine which checker without submodule or self calls g.Backend.AsWorkspaceCheckable(), + ".", ) env := dag.Env(). @@ -117,6 +118,7 @@ func (g *Greetings) DevelopFeedback( source, // FIXME: no great way to determine which checker without submodule or self calls g.Backend.AsWorkspaceCheckable(), + ".", ) env := dag.Env(). diff --git a/.dagger/review.go b/.dagger/review.go index a9c73a6..8f572c6 100644 --- a/.dagger/review.go +++ b/.dagger/review.go @@ -28,6 +28,7 @@ func (g *Greetings) DevelopReview( source, // FIXME: no great way to determine which checker without submodule or self calls g.Backend.AsWorkspaceCheckable(), + ".", ) env := dag.Env(). diff --git a/.dagger/workspace/main.go b/.dagger/workspace/main.go index 7f90664..5300e76 100644 --- a/.dagger/workspace/main.go +++ b/.dagger/workspace/main.go @@ -16,7 +16,8 @@ type Checkable interface { // Place to do work and check it type Workspace struct { - Work *dagger.Directory + Work *dagger.Directory + CheckDirectory string // +private Start *dagger.Directory // +private @@ -28,11 +29,14 @@ func New( source *dagger.Directory, // Checker to use for testing checker Checkable, + // Path to execute checker on + checkDirectory string, ) *Workspace { return &Workspace{ - Start: source, - Work: source, - Checker: checker, + Start: source, + Work: source, + Checker: checker, + CheckDirectory: checkDirectory, } } @@ -76,7 +80,7 @@ func (w *Workspace) Tree(ctx context.Context) (string, error) { // Run the tests in the workspace func (w *Workspace) Check(ctx context.Context) (string, error) { - return w.Checker.CheckDirectory(ctx, w.Work) + return w.Checker.CheckDirectory(ctx, w.Work.Directory(w.CheckDirectory)) } // Show the changes made to the workspace so far in unified diff format diff --git a/dagger.json b/dagger.json index b19d6e3..12f093e 100644 --- a/dagger.json +++ b/dagger.json @@ -1,6 +1,6 @@ { "name": "greetings", - "engineVersion": "v0.18.12", + "engineVersion": "v0.18.16", "sdk": { "source": "go" }, diff --git a/website/cypress/e2e/greeting_test.cy.ts b/website/cypress/e2e/greeting_test.cy.ts index cb69949..75c462d 100644 --- a/website/cypress/e2e/greeting_test.cy.ts +++ b/website/cypress/e2e/greeting_test.cy.ts @@ -3,19 +3,19 @@ describe("Greetings API", () => { it("should display a greeting", () => { cy.visit("/"); - cy.get("h1").should("contain", "Greetings Daggernauts"); + cy.get("h1").should("contain", "Greetings Halifax!"); }); it("should change the greeting when the button is clicked", () => { cy.visit("/"); cy.get("#greetingDisplay").should( "contain", - "Click the button to see a greeting!", + "Click the button to see a Maritime greeting!", ); cy.get("#randomGreetingButton").click(); cy.get("#greetingDisplay").should( "not.contain", - "Click the button to see a greeting!", + "Click the button to see a Maritime greeting!", ); }); }); diff --git a/website/index.html b/website/index.html index 7e6f858..e815d6e 100644 --- a/website/index.html +++ b/website/index.html @@ -1,32 +1,69 @@ - + - - - - Greetings App - - - + + + + Halifax Harbour Greetings + + + +
-

Greetings Daggernauts

-
- Click the button to see a greeting! -
- +

🌊 Halifax Harbour Greetings ⚓

+

+ Welcome to the Atlantic's finest port city! +

+
+ Click the button to receive a Maritime welcome! +
+
- - \ No newline at end of file + + From 542e8bf5bfd6a9622c3deb27e3533f5cf1a4a711 Mon Sep 17 00:00:00 2001 From: Kyle Penfound Date: Wed, 27 Aug 2025 09:34:04 -0400 Subject: [PATCH 2/3] Update website/index.html Co-authored-by: agent-kal[bot] <211748117+agent-kal[bot]@users.noreply.github.com> --- website/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/index.html b/website/index.html index e815d6e..cb0685e 100644 --- a/website/index.html +++ b/website/index.html @@ -37,7 +37,7 @@

🌊 Halifax Harbour Greetings ⚓

id="greetingDisplay" class="greeting harbor-blue rounded-lg shadow-lg p-6 min-h-20 flex items-center justify-center border-2 border-blue-300" > - Click the button to receive a Maritime welcome! + Click the button to see a Maritime greeting!