Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cf2021
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vojtech.pikal
cf2021
Commits
d5aae28b
Commit
d5aae28b
authored
4 years ago
by
xaralis
Browse files
Options
Downloads
Patches
Plain Diff
feat: render speakers alongside proposer in program
parent
29070864
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/actions/program.js
+1
-0
1 addition, 0 deletions
src/actions/program.js
src/pages/Program.jsx
+14
-5
14 additions, 5 deletions
src/pages/Program.jsx
src/ws/handlers/program.js
+3
-0
3 additions, 0 deletions
src/ws/handlers/program.js
typings/cf2021.d.ts
+1
-0
1 addition, 0 deletions
typings/cf2021.d.ts
with
19 additions
and
5 deletions
src/actions/program.js
+
1
−
0
View file @
d5aae28b
...
...
@@ -37,6 +37,7 @@ export const loadProgram = createAsyncAction(
"
title
"
,
"
description
"
,
"
proposer
"
,
"
speakers
"
,
]),
discussionOpened
:
entry
.
discussion_opened
,
expectedStartAt
:
parse
(
...
...
This diff is collapsed.
Click to expand it.
src/pages/Program.jsx
+
14
−
5
View file @
d5aae28b
...
...
@@ -68,10 +68,10 @@ const Schedule = () => {
)
}
</
div
>
<
div
className
=
"w-full md:w-32 flex flex-row md:flex-col items-center md:items-stretch md:text-right md:pr-8"
>
<
p
className
=
"head-
heavy-
xs md:head-heavy-base"
>
<
p
className
=
"head-
allcaps-2
xs md:head-heavy-base"
>
{
format
(
entry
.
expectedStartAt
,
"
H:mm
"
)
}
</
p
>
<
p
className
=
"ml-auto md:ml-0 head-
heavy-
xs md:head-heavy-xs md:text-grey-200 whitespace-no-wrap"
>
<
p
className
=
"ml-auto md:ml-0 head-
allcaps-2
xs md:head-heavy-xs md:text-grey-200 whitespace-no-wrap"
>
{
format
(
entry
.
expectedStartAt
,
"
d. M. Y
"
)
}
</
p
>
</
div
>
...
...
@@ -80,9 +80,17 @@ const Schedule = () => {
{
isCurrent
&&
<
Link
to
=
"/"
>
{
fullTitle
}
</
Link
>
}
{
!
isCurrent
&&
fullTitle
}
</
h2
>
<
div
className
=
"flex space-x-2"
>
<
strong
>
Navrhovatel:
</
strong
>
<
span
>
{
entry
.
proposer
}
</
span
>
<
div
className
=
"leading-normal sm:flex sm:space-x-4"
>
<
div
className
=
"space-x-2"
>
<
strong
>
Navrhovatel:
</
strong
>
<
span
>
{
entry
.
proposer
}
</
span
>
</
div
>
{
entry
.
speakers
&&
(
<
div
className
=
"space-x-2"
>
<
strong
>
Řečníci:
</
strong
>
<
span
>
{
entry
.
speakers
}
</
span
>
</
div
>
)
}
</
div
>
{
htmlContent
&&
(
<
div
...
...
@@ -98,6 +106,7 @@ const Schedule = () => {
onClick
=
{
()
=>
setEntryToActivate
(
entry
)
}
color
=
"grey-125"
className
=
"text-xs"
fullwidth
>
Aktivovat tento bod programu
</
Button
>
...
...
This diff is collapsed.
Click to expand it.
src/ws/handlers/program.js
+
3
−
0
View file @
d5aae28b
...
...
@@ -11,6 +11,9 @@ export const handleProgramEntryChanged = (payload) => {
if
(
has
(
payload
,
"
title
"
))
{
state
.
items
[
payload
.
id
].
title
=
payload
.
title
;
}
if
(
has
(
payload
,
"
description
"
))
{
state
.
items
[
payload
.
id
].
description
=
payload
.
description
;
}
}
});
};
This diff is collapsed.
Click to expand it.
typings/cf2021.d.ts
+
1
−
0
View file @
d5aae28b
...
...
@@ -15,6 +15,7 @@ declare namespace CF2021 {
number
:
string
;
title
:
string
;
proposer
:
string
;
speakers
:
string
;
discussionOpened
:
boolean
;
description
?:
string
;
expectedStartAt
:
Date
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment