Skip to content

Commit

Permalink
Merge master into FeatureThemes
Browse files Browse the repository at this point in the history
  • Loading branch information
Antonia Heinen committed Jun 20, 2024
2 parents 949555c + dbff1d9 commit dfe7b01
Show file tree
Hide file tree
Showing 236 changed files with 1,521 additions and 263 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
assignees
addAssignee: anSPBAssignee toCard: anSPBCard
addAssignee: aSPBAssignee toCard: aSPBCard

self subclassResponsibility.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cards
fetchCardsIntoColumns: anOrderedCollection

"anOrderedCollection => Collection of SPBColumn"
^ self subclassResponsibility.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
board
queryBoardName

^ self subclassResponsibility.
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@
"class" : {
},
"instance" : {
"addAssignee:toCard:" : "FP 5/23/2024 10:41",
"addAssignee:toCard:" : "FP 6/18/2024 12:10",
"addLabel:toCard:" : "FP 5/28/2024 11:33",
"createCardsFromColumn:" : "FP 5/23/2024 10:12",
"createColumn:" : "FP 5/23/2024 10:37",
"createNewCard:into:" : "FP 5/23/2024 10:21",
"deleteAssignee:fromCard:" : "FP 5/23/2024 10:41",
"deleteLabel:fromCard:" : "FP 5/23/2024 10:32",
"fetchCardsIntoColumns:" : "FP 6/17/2024 17:14",
"listPossibleAssignees" : "FP 5/23/2024 10:35",
"listPossibleLabels" : "FP 5/23/2024 10:35",
"moveCard:after:toColumn:" : "FP 5/23/2024 10:35",
"moveCardToTop:toColumn:" : "FP 5/23/2024 10:35",
"moveColumn:after:" : "FP 5/23/2024 10:36",
"moveColumnToFront:" : "FP 5/23/2024 10:35",
"queryBoardName" : "FP 6/10/2024 14:59",
"queryColumns" : "FP 5/23/2024 10:35",
"renameColumn:to:" : "FP 5/23/2024 10:35",
"repo" : "FP 5/27/2024 17:23",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@ buildButtons: aBuilder
model: self;
label: 'Submit';
action: #actionSubmit;
color: Color green muchDarker;
yourself.
aBuilder pluggableButtonSpec new
model: self;
label: 'Cancel';
action: #actionCancel;
color: Color orange muchDarker;
yourself.
aBuilder pluggableButtonSpec new
model: self;
label: 'Logout';
action: #resetCredentials;
color: Color red muchDarker;
yourself}.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
actions
resetCredentials
"Resets the username and token to nil to log out the user."

SPBGithubAPI
username: nil;
token: nil.
UserDialogBoxMorph inform: 'Credentials have been reset.' title: 'Logged out'.
self changed: #close.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"instance" : {
"actionCancel" : "mcr 7/4/2022 00:36",
"actionSubmit" : "mcr 8/4/2022 00:25",
"buildButtons:" : "mcr 8/4/2022 00:14",
"buildButtons:" : "FP 6/13/2024 11:10",
"buildInputFields:" : "mcr 8/4/2022 00:18",
"buildInputPanel:" : "tk 8/2/2022 23:42",
"buildWith:" : "tk 8/2/2022 23:43",
Expand All @@ -13,6 +13,7 @@
"errorEmptyField" : "mcr 8/4/2022 00:36",
"errorUserNotFound" : "mcr 8/4/2022 00:36",
"labelString" : "lo 7/13/2022 19:29",
"resetCredentials" : "FP 6/10/2024 10:10",
"token" : "mcr 8/4/2022 00:13",
"token:" : "lo 7/13/2022 19:26",
"updateToken:" : "mcr 8/4/2022 00:18",
Expand Down
13 changes: 3 additions & 10 deletions Squello-Core.package/SPBBoard.class/class/newWith..st
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
startup
newWith: aString

| instance authenticator |
| instance |
instance := self new.

[instance parseRepoFromUrl: aString]
on: Error do: [self errorParsingUrl. ^ self].

authenticator := SPBAuthenticator newWith: instance boardProvider.
[authenticator authenticate]
on: Error do: [^ self].

[instance loadProject: aString]
on: Error do: [^ self].
"["instance loadProject: aString."]
on: Error do: [self errorParsingUrl. ^ self]."

instance buildAndOpen.
^ instance.
4 changes: 1 addition & 3 deletions Squello-Core.package/SPBBoard.class/class/open.st
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ open
prompt := self promptUrl.
prompt = '' ifTrue: [^ self].
self lastProject: prompt.
(prompt beginsWith: self localPrefix) ifTrue: [^ self openLocal: prompt].
^ self newWith: prompt.

^ self openFromPrompt: prompt.
7 changes: 7 additions & 0 deletions Squello-Core.package/SPBBoard.class/class/openFromPrompt..st
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
startup
openFromPrompt: prompt

[(prompt beginsWith: self localPrefix)
ifTrue: [self openLocal: prompt]
ifFalse: [self newWith: prompt.]] fork.

4 changes: 0 additions & 4 deletions Squello-Core.package/SPBBoard.class/class/openInBackground.st

This file was deleted.

2 changes: 1 addition & 1 deletion Squello-Core.package/SPBBoard.class/class/openLocal..st
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ openLocal: aString

| localFile |
localFile := SPBBoardSaver defaultSaver load: aString.
localFile ifNotNil: [:file|^ file window openInWorld].
localFile ifNotNil: [:file|^ file buildAndOpen].
^ self newLocalWith: aString.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
initialize-release
applyUserInterfaceTheme

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

boardName ifNil: [boardName := self boardProvider queryBoardName].
^ boardName.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ buildColumnAreaChildren
| children |
children := ((self buildColumnSpecWith: self usedBuilder)
collect: [:spec | self usedBuilder build: spec]) asOrderedCollection.
children
add: ((self usedBuilder build: (self buildAddColumnButtonPanelSpecWith: self usedBuilder)) color: Color lightGray).
addColumnColumn := self usedBuilder build: (self buildAddColumnButtonPanelSpecWith: self usedBuilder).
children add: addColumnColumn.
self applyUserInterfaceTheme.

^ children.
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ buildSidebarDescriptionSpecWith: aBuilder
name: #sidebarDescription;
setText: #updateActiveCardDescription:;
getText: #activeCardDescription;
frame: (0@0.4 corner: 1@1);
frame: (0@0.5 corner: 1@1);
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 @@ -5,7 +5,7 @@ buildWith: aBuilder
self usedBuilder: aBuilder.
spec := aBuilder pluggableWindowSpec new
model: self;
label: 'Squello Project Board';
label: self boardName;
minimumExtent: 1040@400;
children:
{self buildColumnAreaSpecWith: aBuilder.
Expand Down
1 change: 1 addition & 0 deletions Squello-Core.package/SPBBoard.class/instance/initialize.st
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ initialize-release
initialize

super initialize.
self isLocal: false.
self
boardProvider: SPBGithubBoardProvider new;
changeProvider: SPBGithubChangeProvider new.
Expand Down
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBBoard.class/instance/isLocal..st
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
isLocal: aBoolean

isLocal := aBoolean.
5 changes: 5 additions & 0 deletions Squello-Core.package/SPBBoard.class/instance/isLocal.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
accessing
isLocal

isLocal ifNil: [self isLocal: false].
^ isLocal.
4 changes: 2 additions & 2 deletions Squello-Core.package/SPBBoard.class/instance/loadProject..st
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ initialize-release
loadProject: aString

(aString includesSubstring: '/projects')
ifTrue: [[self boardProvider parseInputBoardUrl: aString]
on: Error do: [self errorInvalidUrl.]]
ifTrue: [self parseProjectFromUrl: aString]
"on: Error do: [self errorInvalidUrl.]]"
ifFalse: [[self chooseProjectFromUrl: aString]
on: Error do: [Error signal]].

Expand Down
1 change: 1 addition & 0 deletions Squello-Core.package/SPBBoard.class/instance/makeLocal.st
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
initialize-release
makeLocal

self isLocal: true.
self boardProvider: SPBLocalBoardProvider new.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
initialize-release
parseProjectFromUrl: aString

(aString includesSubstring: '/orgs/')
ifTrue: [self boardProvider: SPBGithubOrgBoardProvider new].
(aString includesSubstring: '/users/')
ifTrue: [self boardProvider: SPBGithubUserBoardProvider new].
self boardProvider parseInputBoardUrl: aString.

This file was deleted.

11 changes: 10 additions & 1 deletion Squello-Core.package/SPBBoard.class/instance/saveBoard.st
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
updating
saveBoard

SPBBoardSaver defaultSaver save: self as: self boardProvider repo.
self isLocal
ifTrue: [
SPBLandingPage changeRecentLocalBoards: self boardProvider repo.
SPBBoardSaver defaultSaver save: self as: self boardProvider repo.]
ifFalse: [
SPBLandingPage changeRecentGitHubBoards: {
#name -> self boardName.
#url -> self url.
#repo -> self boardProvider repo} asDictionary.
].
7 changes: 5 additions & 2 deletions Squello-Core.package/SPBBoard.class/instance/setupColumns.st
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ setupColumns
self columns
do: [:column | column pasteup: (self usedBuilder widgetAt: column id).
column
initializeIndicator;
fetchAndBuildCards;
initializeIndicator].
self boardProvider fetchCardsIntoColumns: self columns.
self columns
do: [:column|
column
board: self;
resizeToFitCards;
initializeBottomDetection].
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBBoard.class/instance/url.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
url

^ self boardProvider url.
31 changes: 18 additions & 13 deletions Squello-Core.package/SPBBoard.class/methodProperties.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,24 @@
"lastProject:" : "tk 7/30/2022 21:54",
"localPrefix" : "FP 5/27/2024 17:40",
"newLocalWith:" : "FP 5/23/2024 09:43",
"newWith:" : "mcr 8/4/2022 01:09",
"open" : "FP 5/27/2024 17:40",
"openInBackground" : "FP 5/27/2024 15:33",
"openLocal:" : "FP 6/3/2024 11:21",
"newWith:" : "FP 6/15/2024 13:20",
"open" : "FP 6/10/2024 16:24",
"openFromPrompt:" : "FP 6/10/2024 16:26",
"openLocal:" : "FP 6/8/2024 11:59",
"promptUrl" : "FP 5/23/2024 11:00",
"registerInAppsMenu" : "lo 6/4/2022 23:19" },
"instance" : {
"activeCard" : "mcr 8/1/2022 02:31",
"addColumn" : "mcr 8/4/2022 00:40",
"addColumnLocal:" : "lo 8/3/2022 12:34",
"applyUserInterfaceTheme" : "AH 6/20/2024 16:20",
"boardName" : "FP 6/10/2024 15:37",
"boardProvider" : "jh 7/29/2022 11:34",
"boardProvider:" : "lo 7/31/2022 16:32",
"buildAddColumnButtonPanelSpecWith:" : "lo 8/1/2022 13:41",
"buildAddColumnButtonSpecWith:" : "lo 8/1/2022 11:01",
"buildAndOpen" : "mcr 8/3/2022 23:25",
"buildColumnAreaChildren" : "lo 8/1/2022 10:56",
"buildColumnAreaChildren" : "AH 6/20/2024 16:19",
"buildColumnAreaSpecWith:" : "tk 7/30/2022 21:40",
"buildColumnAreaSpecWith:width:" : "lo 8/1/2022 11:01",
"buildColumnBodySpecWith:and:" : "lo 8/1/2022 11:00",
Expand All @@ -35,15 +37,15 @@
"buildSidebarAssigneeListSpecWith:" : "lo 8/1/2022 11:06",
"buildSidebarAssigneePanelSpecWith:" : "lo 8/1/2022 11:06",
"buildSidebarCloseButtonSpecWith:" : "AH 5/25/2024 17:32",
"buildSidebarDescriptionSpecWith:" : "lo 8/1/2022 11:07",
"buildSidebarDescriptionSpecWith:" : "L.L. 6/19/2024 16:50",
"buildSidebarLabelListSpecWith:" : "lo 8/1/2022 11:07",
"buildSidebarLabelPanelSpecWith:" : "lo 8/1/2022 11:07",
"buildSidebarPotentialAssigneeListSpecWith:" : "lo 8/1/2022 11:07",
"buildSidebarPotentialLabelListSpecWith:" : "lo 8/1/2022 11:08",
"buildSidebarSpecWith:" : "mcr 8/1/2022 00:48",
"buildSidebarSpecWith:width:" : "AH 5/25/2024 15:26",
"buildSidebarTitleSpecWith:" : "lo 8/1/2022 11:08",
"buildWith:" : "FP 5/27/2024 18:00",
"buildWith:" : "FP 6/10/2024 15:36",
"changeActiveCardTo:" : "AH 6/14/2024 13:18",
"changeProvider" : "lo 7/8/2022 14:00",
"changeProvider:" : "lo 7/8/2022 15:29",
Expand All @@ -58,21 +60,24 @@
"errorInvalidUrl" : "mcr 8/2/2022 22:17",
"errorNoProjects" : "mcr 8/2/2022 22:15",
"indexOfColumn:" : "lo 8/3/2022 12:57",
"initialize" : "jh 7/29/2022 11:36",
"loadProject:" : "mcr 8/4/2022 01:24",
"makeLocal" : "FP 5/23/2024 09:30",
"initialize" : "FP 6/10/2024 14:43",
"isLocal" : "FP 6/10/2024 15:01",
"isLocal:" : "FP 6/10/2024 14:43",
"loadProject:" : "FP 6/15/2024 13:18",
"makeLocal" : "FP 6/10/2024 14:44",
"parseLocalRepoFromUrl:" : "FP 5/27/2024 17:13",
"parseRepoFromUrl:" : "mcr 8/4/2022 01:06",
"parseProjectFromUrl:" : "FP 6/15/2024 14:10",
"removeColumn:" : "lo 8/1/2022 14:09",
"rerenderColumns" : "lo 7/31/2022 16:42",
"resizeColumnArea" : "jh 8/3/2022 01:07",
"saveBoard" : "FP 6/3/2024 11:22",
"saveBoard" : "FP 6/11/2024 13:38",
"setUpChangeProvider" : "Haru 5/13/2024 14:46",
"setupColumns" : "jh 8/3/2022 00:48",
"setupColumns" : "FP 6/17/2024 17:13",
"sidebar" : "mcr 8/1/2022 00:44",
"sidebar:" : "mcr 8/1/2022 00:44",
"update:with:" : "lo 8/3/2022 12:35",
"updateColumns" : "mcr 8/1/2022 01:27",
"url" : "FP 6/10/2024 15:42",
"usedBuilder" : "lo 5/26/2022 15:02",
"usedBuilder:" : "lo 5/26/2022 15:02",
"window" : "lo 7/3/2022 14:09",
Expand Down
5 changes: 4 additions & 1 deletion Squello-Core.package/SPBBoard.class/properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
"usedBuilder",
"columns",
"window",
"sidebar" ],
"sidebar",
"isLocal",
"boardName",
"addColumnColumn" ],
"name" : "SPBBoard",
"pools" : [
],
Expand Down
2 changes: 1 addition & 1 deletion Squello-Core.package/SPBBoardSaver.class/instance/load..st
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
save/load
load: anObject

^ (self boards at: anObject ifAbsent: nil) veryDeepCopy.
^ (self loadReadonly: anObject) veryDeepCopy.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
save/load
loadReadonly: anObject

^ self boards at: anObject ifAbsent: nil.
Loading

0 comments on commit dfe7b01

Please sign in to comment.