Skip to content

Commit

Permalink
Merge master/master into master
Browse files Browse the repository at this point in the history
  • Loading branch information
LenaMel-99 committed Jul 12, 2024
2 parents c068711 + d832718 commit 6fe5d7c
Show file tree
Hide file tree
Showing 67 changed files with 151 additions and 143 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ Squello needs a *Personal Access Token (classic)* to access the Github api. The
- Columns can not be edited
- Adding cards is not supported yet
- Projects (classic) are supported until Github will sunset them. It is highly recommended to migrate any classic Project.

### Starting it manually

Open the workspace and use `SPBLandingPage open.` to open the LandingPage. Follow the instructions above to obtain an GitHub access token. If you do not want to sync your board to GitHub, you can use a local board. For local boards, no access token is required.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildInputPanel: aBuilder

^ aBuilder pluggablePanelSpec new
model: self;
frame: (0@0 corner: 1@1);
layout: #vertical;
children: (self buildInputFields: aBuilder);
frame: (0@0 corner: 1@1);
yourself.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ buildWith: aBuilder
extent: 600 @ 60;
exclusive: false;
message: 'Insert GitHub authentication data:';
children: {self buildInputPanel: aBuilder};
buttons: (self buildButtons: aBuilder);
children: {self buildInputPanel: aBuilder};
yourself).
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"actionSubmit" : "L.L. 7/12/2024 21:18",
"buildButtons:" : "FP 6/13/2024 11:10",
"buildInputFields:" : "mcr 8/4/2022 00:18",
"buildInputPanel:" : "tk 8/2/2022 23:42",
"buildWith:" : "AH 7/12/2024 15:45",
"buildInputPanel:" : "Haru 7/12/2024 20:08",
"buildWith:" : "Haru 7/12/2024 20:08",
"checkUserValid" : "lo 7/13/2022 19:16",
"close" : "lo 8/1/2022 14:16",
"errorEmptyField" : "mcr 8/4/2022 00:36",
Expand Down
3 changes: 2 additions & 1 deletion Squello-Core.package/SPBBoard.class/instance/addColumn.st
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ addColumn

| column prompt |
prompt := FillInTheBlankMorph request: 'Enter a column name' initialAnswer: ''.
prompt = ''ifTrue: [^ self].
prompt = ''
ifTrue: [^ self].
[column := self boardProvider createColumn: prompt]
on: Error do: [:error | ^ self errorCannotAddColumn: error messageText].

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ applyUserInterfaceTheme

super applyUserInterfaceTheme.
addColumnColumn
ifNotNil: [
addColumnColumn color: ((self userInterfaceTheme get: #color for: SystemWindow)
ifNotNil: [addColumnColumn color: ((self userInterfaceTheme get: #color for: SystemWindow)
ifNil: [Color lightGray]).].
3 changes: 2 additions & 1 deletion Squello-Core.package/SPBBoard.class/instance/boardName.st
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
accessing
boardName

boardName ifNil: [self boardName: self boardProvider queryBoardName].
boardName
ifNil: [self boardName: self boardProvider queryBoardName].
^ boardName.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-colum
buildAddColumnButtonPanelSpecWith: aBuilder

^ aBuilder pluggablePanelSpec new
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
toolbuilder
toolbuilder-colum
buildAddColumnButtonSpecWith: aBuilder

^ aBuilder pluggableActionButtonSpec new
frame: (0@0 corner: 1@0.1);
model: self;
frame: (0@0 corner: 1@0.1);
action: #addColumn;
label: '+ Add column';
help: 'add a new column to the board';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-colum
buildColumnAreaChildren

| children |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-colum
buildColumnAreaSpecWith: aBuilder

^ self buildColumnAreaSpecWith: aBuilder width: 0.75.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
toolbuilder
toolbuilder-colum
buildColumnAreaSpecWith: aBuilder width: aNumber

^ aBuilder resizeScrollPaneSpec new
model: self;
frame: (0@0 corner: aNumber@1);
name: #columnArea;
model: self;
scrollBarThickness: 20;
vScrollBarPolicy: #never;
children: #buildColumnAreaChildren;
layout: #horizontal;
children: #buildColumnAreaChildren;
yourself.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
toolbuilder
toolbuilder-colum
buildColumnBodySpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggableScrollPaneSpec new
model: self;
frame: (0@0.15 corner: 1@1);
name: #columnScrollPane;
model: self;
hScrollBarPolicy: #never;
vScrollBarPolicy: #always;
children: {self buildColumnDropAreaWith: aBuilder and: anSPBColumn};
layout: #vertical;
children: {self buildColumnDropAreaWith: aBuilder and: anSPBColumn};
yourself.


Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-colum
buildColumnDropAreaWith: aBuilder and: anSPBColumn

^ aBuilder pasteUpSpec new
minimumExtent: self class columnMinimumExtent;
model: anSPBColumn;
name: anSPBColumn id;
minimumExtent: self class columnMinimumExtent;
dropped: [:card :event | anSPBColumn cardDropped: card Event: event];
reject: [:morph :event | morph isCard not];
yourself.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
toolbuilder
toolbuilder-colum
buildColumnHeaderAddCardButtonSpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggableActionButtonSpec new
frame: (0@0.6 corner: 0.55@1);
model: anSPBColumn;
frame: (0@0.6 corner: 0.55@1);
action: #addCard;
label: '+ Add card';
help: 'add a new card to the column';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
toolbuilder
toolbuilder-colum
buildColumnHeaderMoveColumnButtonSpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggableActionButtonSpec new
frame: (0.7@0.6 corner: 0.85@1);
model: anSPBColumn;
frame: (0.7@0.6 corner: 0.85@1);
action: #moveColumn;
label: '<->';
help: 'move the column to another place';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
toolbuilder
toolbuilder-colum
buildColumnHeaderMoveColumnLeftButtonSpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggableActionButtonSpec new
frame: (0.55@0.6 corner: 0.7@1);
model: anSPBColumn;
frame: (0.55@0.6 corner: 0.7@1);
action: #swapLeft;
label: '<-';
help: 'move the column left';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
toolbuilder
toolbuilder-colum
buildColumnHeaderMoveColumnRightButtonSpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggableActionButtonSpec new
frame: (0.85@0.6 corner: 1@1);
model: anSPBColumn;
frame: (0.85@0.6 corner: 1@1);
action: #swapRight;
label: '->';
help: 'move the column right';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-colum
buildColumnHeaderSpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggablePanelSpec new
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
toolbuilder
toolbuilder-colum
buildColumnHeaderTitleSpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggableTextSpec new
frame: (0@0 corner: 1@0.6);
model: anSPBColumn;
frame: (0@0 corner: 1@0.6);
getText: #title;
setText: #updateTitle:;
yourself.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-colum
buildColumnSpecWith: aBuilder

^ self columns collect: [:column | self buildColumnSpecWith: aBuilder and: column].
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-colum
buildColumnSpecWith: aBuilder and: anSPBColumn

^ aBuilder pluggablePanelSpec new
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarAssigneeListSpecWith: aBuilder

^ aBuilder pluggableListSpec new
model: self sidebar;
name: #sidebarAssigneeList;
frame: (0@0 corner: 0.5@1);
name: #sidebarAssigneeList;
list: #activeCardAssigneeList;
getSelected: #assigneeSelected;
setSelected: #assigneeSelected:;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarAssigneePanelSpecWith: aBuilder

^ aBuilder pluggablePanelSpec new
model: self sidebar;
name: #sidebarAssigneeList;
frame: (0@0.1 corner: 1@0.25);
name: #sidebarAssigneeList;
minimumHeight: 20;
children: {self buildSidebarAssigneeListSpecWith: aBuilder.
self buildSidebarPotentialAssigneeListSpecWith: aBuilder};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarCloseButtonSpecWith: aBuilder

^ aBuilder pluggableButtonSpec new
model: self sidebar;
name: #sidebarCloseButton;
frame: (0@0.4 corner: 1@0.5);
name: #sidebarCloseButton;
label: #getCloseButtonLabel;
action: #onCloseButton;
yourself.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarDescriptionSpecWith: aBuilder

^ aBuilder pluggableTextSpec new
model: self sidebar;
frame: (0@0.5 corner: 1@1);
name: #sidebarDescription;
setText: #updateActiveCardDescription:;
getText: #activeCardDescription;
frame: (0@0.5 corner: 1@1);
setText: #updateActiveCardDescription:;
yourself.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarLabelListSpecWith: aBuilder

^ aBuilder pluggableListSpec new
model: self sidebar;
name: #sidebarLabelList;
frame: (0@0 corner: 0.5@1);
name: #sidebarLabelList;
list: #activeCardLabelList;
getSelected: #labelSelected;
setSelected: #labelSelected:;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarLabelPanelSpecWith: aBuilder

^ aBuilder pluggablePanelSpec new
model: self sidebar;
name: #sidebarLabelList;
frame: (0@0.25 corner: 1@0.4);
name: #sidebarLabelList;
minimumHeight: 20;
children: {self buildSidebarLabelListSpecWith: aBuilder.
self buildSidebarPotentialLabelListSpecWith: aBuilder};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarPotentialAssigneeListSpecWith: aBuilder

^ aBuilder pluggableListSpec new
model: self sidebar;
name: #sidebarPotentialAssigneeList;
frame: (0.5@0 corner: 1@1);
name: #sidebarPotentialAssigneeList;
list: #potentialAssigneesList;
getSelected: #potentialAssigneeSelected;
setSelected: #potentialAssigneeSelected:;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarPotentialLabelListSpecWith: aBuilder

^ aBuilder pluggableListSpec new
model: self sidebar;
name: #sidebarPotentialLabelList;
frame: (0.5@0 corner: 1@1);
name: #sidebarPotentialLabelList;
list: #potentialLabelsList;
getSelected: #potentialLabelSelected;
setSelected: #potentialLabelSelected:;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-sidebar
buildSidebarSpecWith: aBuilder

^ self buildSidebarSpecWith: aBuilder width: 0.75.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
toolbuilder
toolbuilder-sidebar
buildSidebarSpecWith: aBuilder width: aNumber

^ aBuilder pluggablePanelSpec new
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
toolbuilder
toolbuilder-sidebar
buildSidebarTitleSpecWith: aBuilder

^ aBuilder pluggableTextSpec new
model: self sidebar;
frame: (0@0 corner: 1@0.1);
name: #sidebarTitle;
setText: #updateActiveCardTitle:;
getText: #activeCardTitle;
frame: (0@0 corner: 1@0.1);
setText: #updateActiveCardTitle:;
yourself.
2 changes: 1 addition & 1 deletion Squello-Core.package/SPBBoard.class/instance/buildWith..st
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ buildWith: aBuilder
model: self;
label: self boardName;
minimumExtent: 1040@400;
closeAction: #saveBoard;
children:
{self buildColumnAreaSpecWith: aBuilder.
self buildSidebarSpecWith: aBuilder};
closeAction: #saveBoard;
yourself.

^ self
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ initialize-release
chooseProjectFrom: aCollection

| projectNames chosenProject |
projectNames := aCollection collect: [:project | project at: 'name'].
projectNames := aCollection
collect: [:project | project at: 'name'].
chosenProject := UIManager default
chooseFrom: projectNames
values: aCollection
title: 'Choose your project:'.
^ chosenProject ifNil: [^ self].
^ chosenProject
ifNil: [^ self].
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ chooseProjectFromUrl: aString
projects isEmpty ifTrue: [self errorNoProjects].

chosenProject := self chooseProjectFrom: projects.
chosenProject ifNil: [^ self].
chosenProject
ifNil: [^ self].
self boardProvider boardNr: (chosenProject at: 'number').
self boardProvider projectId: (chosenProject at: 'id').
Loading

0 comments on commit 6fe5d7c

Please sign in to comment.