Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Catch up with SAP 2.1 #89

Merged
merged 1 commit into from
Oct 1, 2024
Merged

⬆️ Catch up with SAP 2.1 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ First of all, don't panic. You can do the following things:
These bindings are barely "facades" types for the official UI5 library. They _won't_ work if you don't handle that npm dependency on your own project. You will need the following imports in your `package.json` (or equivalent tool such as scala-js-bundler):

```
"@ui5/webcomponents": "2.0.1",
"@ui5/webcomponents-fiori": "2.0.1",
"@ui5/webcomponents-icons": "2.0.1"
"@ui5/webcomponents": "2.1.0",
"@ui5/webcomponents-fiori": "2.1.0",
"@ui5/webcomponents-icons": "2.1.0"
```

(and thus `npm install` it). Then, you can use any of the components as defined in the `be.doeraene.webcomponents.ui5` package.
Expand Down
128 changes: 64 additions & 64 deletions demo/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"vite-plugin-html": "3.2.0"
},
"dependencies": {
"@ui5/webcomponents": "2.0.1",
"@ui5/webcomponents-fiori": "2.0.1",
"@ui5/webcomponents-icons": "2.0.1",
"@ui5/webcomponents-compat": "2.0.1",
"@ui5/webcomponents": "2.1.0",
"@ui5/webcomponents-fiori": "2.1.0",
"@ui5/webcomponents-icons": "2.1.0",
"@ui5/webcomponents-compat": "2.1.0",
"highlight.js": "^11.6.0"
}
}
}
96 changes: 80 additions & 16 deletions demo/src/main/scala/demo/TimelineExample.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ object TimelineExample extends Example("Timeline") {
//-- Begin: Basic Timeline
Timeline(
_.item(
_.titleText := "called",
_.subtitleText := "20.02.2022 11:30",
_.icon := IconName.phone,
_.name := "John Smith",
_.titleText := "called",
_.subtitleText := "20.02.2022 11:30",
_.icon := IconName.phone,
_.name := "John Smith",
_.nameClickable := true,
_.events.onNameClick.mapTo(()) --> Observer[Any](_ => println("Clicked on John Smith!"))
),
_.item(
_.titleText := "Weekly Sync - CP Design",
_.titleText := "Weekly Sync - CP Design",
_.subtitleText := "27.07.2022 (11:00 - 12:30)",
_.icon := IconName.calendar,
_.icon := IconName.calendar,
div("MR SOF02 2.43")
),
_.item(
_.titleText := "Video Converence Call - UI5",
_.titleText := "Video Converence Call - UI5",
_.subtitleText := "31.01.2023 (12:00 - 13:00)",
_.icon := IconName.calendar,
_.icon := IconName.calendar,
div("Online meeting")
)
)
Expand All @@ -41,26 +41,90 @@ object TimelineExample extends Example("Timeline") {
Timeline(
_.layout := TimelineLayout.Horizontal,
_.item(
_.titleText := "called",
_.subtitleText := "20.02.2022 11:30",
_.icon := IconName.phone,
_.name := "John Smith",
_.titleText := "called",
_.subtitleText := "20.02.2022 11:30",
_.icon := IconName.phone,
_.name := "John Smith",
_.nameClickable := true
),
_.item(
_.titleText := "Weekly Sync - CP Design",
_.titleText := "Weekly Sync - CP Design",
_.subtitleText := "27.07.2022 (11:00 - 12:30)",
_.icon := IconName.calendar,
_.icon := IconName.calendar,
div("MR SOF02 2.43")
),
_.item(
_.titleText := "Video Converence Call - UI5",
_.titleText := "Video Converence Call - UI5",
_.subtitleText := "31.01.2023 (12:00 - 13:00)",
_.icon := IconName.calendar,
_.icon := IconName.calendar,
div("Online meeting")
)
)
//-- End
),
DemoPanel("Timeline with group")(
//-- Begin: Timeline with group
Timeline(
_.layout := TimelineLayout.Vertical,
_.group(
_.groupName := "Events",
_.item(
_.titleText := "Event",
_.subtitleText := "18.06.2024 11:30",
_.name := "SAP D-com"
),
_.item(
_.titleText := "Event",
_.subtitleText := "19.06.2024 12:30",
_.name := "SAP Talk",
_.icon := IconName.calendar
),
_.item(
_.titleText := "Event",
_.subtitleText := "21.06.2024 18:30",
_.name := "SAP iXP Summer Party"
)
),
_.group(
_.groupName := "Meetings",
_.item(
_.titleText := "coming-up",
_.subtitleText := "10.07.2024 11:30",
_.name := "Team Belgium Meeting",
_.icon := IconName.calendar
),
_.item(
_.titleText := "coming-up",
_.subtitleText := "20.08.2024 12:30",
_.name := "Team Belgium Planning",
_.icon := IconName.calendar
),
_.item(
_.titleText := "coming-up",
_.subtitleText := "22.08.2024 14:30",
_.name := "Team Belgium Retrospective",
_.icon := IconName.calendar
)
),
_.group(
_.groupName := "Calls",
_.item(
_.titleText := "made group call",
_.subtitleText := "20.09.2024 11:30",
_.name := "John Doe",
_.icon := IconName.calendar,
_.nameClickable := true
),
_.item(
_.subtitleText := "20.09.2024 12:30",
_.name := "John Doe",
_.nameClickable := true,
Avatar(_.initials := ('J', 'D')),
Label("has ended the call")
)
)
)
//-- End
)
)

Expand Down
6 changes: 3 additions & 3 deletions demo/src/main/scala/demo/TitleExample.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ object TitleExample extends Example("Title") {
def component(using
demoPanelInfoMap: FetchDemoPanelFromGithub.CompleteDemoPanelInfo
): HtmlElement = div(
DemoPanel("Title in All Available Levels")(
//-- Begin: Title in All Available Levels
div(TitleLevel.allValues.map(level => Title(_.level := level, s"Title level ${level.value.tail}")))
DemoPanel("Title in All Available Sizes")(
//-- Begin: Title in All Available Sizes
div(TitleLevel.allValues.map(level => Title(_.size := level, s"Title level ${level.value.tail}")))
//-- End
)
)
Expand Down
2 changes: 1 addition & 1 deletion demo/src/main/scala/demo/helpers/Example.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ trait Example(val name: String) {

def completeComponent: HtmlElement = div(
padding := "5px",
Title(_.level := TitleLevel.H1, name),
Title.h1(name),
div(
"You can see the source code ",
Link(
Expand Down
Loading
Loading