From cc743934875a678c1df89aa6ffe429a5101e82ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Prei=C3=9Fner?= Date: Tue, 11 Jun 2024 12:14:38 +0200 Subject: [PATCH] added chaning content panel for landing page --- .../instance/buildContentPanelSpecWith..st | 9 +++++++++ .../instance/buildMainLayoutPanelSpecWith..st | 2 +- .../instance/buildRecentBoardsSpecWith..st | 15 --------------- .../instance/contentPanelChildren.st | 7 +++++++ .../instance/contentSpecDict.st | 7 +++++++ ...forlaterbuildRecentLocalBoardsSpecWith..st | 19 ------------------- .../instance/lastSidebarPart..st | 16 ++-------------- .../methodProperties.json | 9 +++++---- .../instance/queryBoardName.st | 4 ++++ .../methodProperties.json | 1 + 10 files changed, 36 insertions(+), 53 deletions(-) create mode 100644 Squello-Core.package/SPBLandingPage.class/instance/buildContentPanelSpecWith..st delete mode 100644 Squello-Core.package/SPBLandingPage.class/instance/buildRecentBoardsSpecWith..st create mode 100644 Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st create mode 100644 Squello-Core.package/SPBLandingPage.class/instance/contentSpecDict.st delete mode 100644 Squello-Core.package/SPBLandingPage.class/instance/forlaterbuildRecentLocalBoardsSpecWith..st create mode 100644 Squello-Tests.package/SPBMockGithubBoardProvider.class/instance/queryBoardName.st diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildContentPanelSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildContentPanelSpecWith..st new file mode 100644 index 00000000..ca8fa9bc --- /dev/null +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildContentPanelSpecWith..st @@ -0,0 +1,9 @@ +toolbuilder +buildContentPanelSpecWith: aBuilder + + self usedBuilder: aBuilder. + ^ aBuilder pluggablePanelSpec new + model: self; + layout: #vertical; + children: #contentPanelChildren; + yourself. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st index 1bf51c4b..5af82be2 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/buildMainLayoutPanelSpecWith..st @@ -6,7 +6,7 @@ buildMainLayoutPanelSpecWith: aBuilder frame: (0@0 corner: 1@1); children: {self buildSidebarSpecWith: aBuilder. - self buildRecentBoardsSpecWith: aBuilder. + self buildContentPanelSpecWith: aBuilder. }; layout: #horizontal; yourself. diff --git a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentBoardsSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/buildRecentBoardsSpecWith..st deleted file mode 100644 index b0426c23..00000000 --- a/Squello-Core.package/SPBLandingPage.class/instance/buildRecentBoardsSpecWith..st +++ /dev/null @@ -1,15 +0,0 @@ -toolbuilder -buildRecentBoardsSpecWith: aBuilder - - | spec | - self usedBuilder: aBuilder. - spec := aBuilder pluggablePanelSpec new - model: self; - "label: 'Recent Boards';" - layout: #vertical; - children: - {self buildRecentLocalBoardsSpecWith: aBuilder. - self buildRecentGitHubBoardsSpecWith: aBuilder. - }; - yourself. - ^ spec. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st b/Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st new file mode 100644 index 00000000..32a81f9e --- /dev/null +++ b/Squello-Core.package/SPBLandingPage.class/instance/contentPanelChildren.st @@ -0,0 +1,7 @@ +toolbuilder +contentPanelChildren + + self lastSidebarPart ifNil: [^ {}]. + (self contentSpecDict includesKey: self lastSidebarPart) ifTrue: + [^ (self contentSpecDict at: self lastSidebarPart) collect: [:each| each buildWith: self usedBuilder]]. + ^ {}. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/contentSpecDict.st b/Squello-Core.package/SPBLandingPage.class/instance/contentSpecDict.st new file mode 100644 index 00000000..d6cf9870 --- /dev/null +++ b/Squello-Core.package/SPBLandingPage.class/instance/contentSpecDict.st @@ -0,0 +1,7 @@ +toolbuilder +contentSpecDict + + ^ {'Recent Boards' -> { + self buildRecentLocalBoardsSpecWith: self usedBuilder. + self buildRecentGitHubBoardsSpecWith: self usedBuilder.}. + } asDictionary. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/forlaterbuildRecentLocalBoardsSpecWith..st b/Squello-Core.package/SPBLandingPage.class/instance/forlaterbuildRecentLocalBoardsSpecWith..st deleted file mode 100644 index cc84bd25..00000000 --- a/Squello-Core.package/SPBLandingPage.class/instance/forlaterbuildRecentLocalBoardsSpecWith..st +++ /dev/null @@ -1,19 +0,0 @@ -currently not in use -forlaterbuildRecentLocalBoardsSpecWith: aBuilder - - ^ aBuilder pluggablePanelSpec new - model: self; - "label: 'Recent Local Boards';" - - "frame: (0@0.2 corner: 1@1);" - children: - {"self class RecentLocalBoards: [:NameOfRecentLocalBoard | self buildRecentLocalBoardsButtonSpecWith: aBuilder withName: NameOfRecentLocalBoard] - " - self buildRecentLocalBoardsButtonSpecWith: aBuilder withName: 'hi'. - self buildRecentLocalBoardsButtonSpecWith: aBuilder withName: 'test' - - }; - layout: #horizontal; - yourself. - - \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/instance/lastSidebarPart..st b/Squello-Core.package/SPBLandingPage.class/instance/lastSidebarPart..st index 66027886..31554564 100644 --- a/Squello-Core.package/SPBLandingPage.class/instance/lastSidebarPart..st +++ b/Squello-Core.package/SPBLandingPage.class/instance/lastSidebarPart..st @@ -2,17 +2,5 @@ accessing lastSidebarPart: anObject lastSidebarPart := anObject. - self changed: #lastSidebarPart - - "self updateMainPanel - - self projectDescription: .. - - self changed: #projectDescription. - - - buildWIth: .... pluggableTextSpec new .... model: self ... getText: #projectDescription. - - - - " \ No newline at end of file + self changed: #lastSidebarPart. + self changed: #contentPanelChildren. \ No newline at end of file diff --git a/Squello-Core.package/SPBLandingPage.class/methodProperties.json b/Squello-Core.package/SPBLandingPage.class/methodProperties.json index 35604b38..50b590b7 100644 --- a/Squello-Core.package/SPBLandingPage.class/methodProperties.json +++ b/Squello-Core.package/SPBLandingPage.class/methodProperties.json @@ -11,11 +11,11 @@ "open" : "Haru 6/1/2024 12:28" }, "instance" : { "buildAthentificationSpecWith:" : "Haru 6/7/2024 12:15", - "buildMainLayoutPanelSpecWith:" : "FP 6/10/2024 14:23", + "buildContentPanelSpecWith:" : "FP 6/11/2024 11:54", + "buildMainLayoutPanelSpecWith:" : "FP 6/11/2024 11:53", "buildManageLocalBoardsSpecWith:" : "Haru 6/7/2024 12:15", "buildNewLocalBoardSpecWith:" : "Haru 6/7/2024 12:14", "buildOpenBoardSpecWith:" : "Haru 6/7/2024 12:14", - "buildRecentBoardsSpecWith:" : "FP 6/10/2024 15:28", "buildRecentGitHubBoardsButtonSpecWith:withBoardInfo:" : "FP 6/10/2024 16:27", "buildRecentGitHubBoardsChildren" : "FP 6/10/2024 16:00", "buildRecentGitHubBoardsSpecWith:" : "FP 6/10/2024 15:55", @@ -25,10 +25,11 @@ "buildResetUserAccountSpecWith:" : "Haru 6/7/2024 12:15", "buildSidebarSpecWith:" : "FP 6/10/2024 14:36", "buildWith:" : "FP 6/10/2024 14:22", - "forlaterbuildRecentLocalBoardsSpecWith:" : "Haru 6/9/2024 20:09", + "contentPanelChildren" : "FP 6/11/2024 12:13", + "contentSpecDict" : "FP 6/11/2024 12:07", "initialize" : "Haru 6/7/2024 11:58", "lastSidebarPart" : "Haru 6/7/2024 11:57", - "lastSidebarPart:" : "Haru 6/7/2024 11:57", + "lastSidebarPart:" : "FP 6/11/2024 12:05", "list" : "Haru 6/9/2024 14:12", "open" : "Haru 6/1/2024 12:22", "usedBuilder" : "Haru 6/1/2024 12:39", diff --git a/Squello-Tests.package/SPBMockGithubBoardProvider.class/instance/queryBoardName.st b/Squello-Tests.package/SPBMockGithubBoardProvider.class/instance/queryBoardName.st new file mode 100644 index 00000000..1eed5de2 --- /dev/null +++ b/Squello-Tests.package/SPBMockGithubBoardProvider.class/instance/queryBoardName.st @@ -0,0 +1,4 @@ +as yet unclassified +queryBoardName + + ^ 'TestBoard'. \ No newline at end of file diff --git a/Squello-Tests.package/SPBMockGithubBoardProvider.class/methodProperties.json b/Squello-Tests.package/SPBMockGithubBoardProvider.class/methodProperties.json index 7d80b971..780dee3a 100644 --- a/Squello-Tests.package/SPBMockGithubBoardProvider.class/methodProperties.json +++ b/Squello-Tests.package/SPBMockGithubBoardProvider.class/methodProperties.json @@ -19,6 +19,7 @@ "moveCard:after:toColumn:" : "mcr 6/3/2022 13:16", "moveCardToTop:toColumn:" : "mcr 6/3/2022 13:17", "moveColumn:after:" : "tk 7/30/2022 22:00", + "queryBoardName" : "FP 6/11/2024 11:04", "queryCardContent:" : "FP 5/11/2024 14:57", "queryColumns" : "tk 7/30/2022 23:31", "renameColumn:to:" : "FP 5/11/2024 15:01",