Skip to content

Commit 8a4f757

Browse files
authored
Merge pull request #205 from ScalaIO/udpate-orga
update orga
2 parents aab2730 + fdf2820 commit 8a4f757

32 files changed

+98
-78
lines changed

public/images/orgas/vKasas.jpeg

37.4 KB
Loading

src/main/scala/io/scala/Main.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package io.scala
22

33
import com.raquo.laminar.api.L.*
4+
import org.scalajs.dom
5+
46
import io.scala.modules.layout.Footer
57
import io.scala.modules.layout.Header
6-
import org.scalajs.dom
78

89
val profilePlaceholder = "/images/profile.webp"
910

src/main/scala/io/scala/Page.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package io.scala
22

3+
import app.faq.*
4+
import app.schedule.ScheduleView
5+
import app.sessions.SessionList
6+
import app.sessions.SessionView
37
import com.raquo.laminar.api.L.*
48
import com.raquo.waypoint.*
5-
import io.scala.views.*
6-
import io.scala.views.IndexView
79
import org.scalajs.dom.document
810
import org.scalajs.dom.html
911
import upickle.default.*
1012
import urldsl.errors.DummyError
1113
import urldsl.vocabulary.FromString
1214
import urldsl.vocabulary.Printer
1315

14-
import app.faq.*
15-
import app.schedule.ScheduleView
16-
import app.sessions.SessionList
17-
import app.sessions.SessionView
16+
import io.scala.views.*
17+
import io.scala.views.IndexView
1818

1919
sealed trait Draftable:
2020
def withDraft: Option[Boolean]

src/main/scala/io/scala/app/faq/CoCView.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.scala.app.faq
22

33
import com.raquo.laminar.api.L.*
4+
45
import io.scala.modules.elements.Links
56
import io.scala.modules.elements.Lists
67
import io.scala.modules.elements.Paragraphs

src/main/scala/io/scala/app/faq/FAQView.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package io.scala.app.faq
22

33
import com.raquo.laminar.api.L.*
44
import com.raquo.laminar.nodes.ReactiveElement
5+
import org.scalajs.dom.HTMLDivElement
6+
57
import io.scala.CoCPage
68
import io.scala.Page
79
import io.scala.data.OrgaInfo.allOrga
@@ -16,7 +18,6 @@ import io.scala.modules.elements.Paragraphs
1618
import io.scala.modules.elements.Titles
1719
import io.scala.svgs.Icons.github
1820
import io.scala.views.SimpleView
19-
import org.scalajs.dom.HTMLDivElement
2021

2122
object FAQView extends SimpleView {
2223
private def question(question: String, answer: Modifier[ReactiveElement[HTMLDivElement]]*): HtmlElement = {

src/main/scala/io/scala/app/schedule/ScheduleView.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package io.scala.app.schedule
22

33
import com.raquo.laminar.api.L.*
4+
import java.time.DayOfWeek
5+
import java.time.LocalTime
6+
47
import io.scala.Lexicon
58
import io.scala.SchedulePage
69
import io.scala.data.ScheduleInfo
@@ -9,9 +12,6 @@ import io.scala.modules.layout.Tabs
912
import io.scala.modules.syntax.*
1013
import io.scala.views.ReactiveView
1114

12-
import java.time.DayOfWeek
13-
import java.time.LocalTime
14-
1515
case object ScheduleView extends ReactiveView[SchedulePage] {
1616
val selectedDay: Var[DayOfWeek] = Var(DayOfWeek.FRIDAY)
1717

src/main/scala/io/scala/app/sessions/SessionList.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.scala.app.sessions
22

33
import com.raquo.laminar.api.L.*
4+
import scala.collection.immutable.Queue
5+
46
import io.scala.SessionsPage
57
import io.scala.data.SessionsHistory
68
import io.scala.data.SessionsHistory.getConfName
@@ -11,8 +13,6 @@ import io.scala.modules.elements.*
1113
import io.scala.modules.layout.Tabs
1214
import io.scala.views.ReactiveView
1315

14-
import scala.collection.immutable.Queue
15-
1616
case object SessionList extends ReactiveView[SessionsPage] {
1717

1818
given Ordering[(String, List[Session])] =

src/main/scala/io/scala/app/sessions/SessionView.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.scala.app.sessions
22

33
import com.raquo.laminar.api.L.*
4+
45
import io.scala.SessionPage
56
import io.scala.data.SessionsHistory
67
import io.scala.extensions.grayOutIf

src/main/scala/io/scala/app/sessions/SpeakerView.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.scala.app.sessions
22

33
import com.raquo.laminar.api.L.*
4+
45
import io.scala.models.Session.Speaker
56
import io.scala.models.Social
67
import io.scala.modules.elements.Image

src/main/scala/io/scala/data/History.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.scala.data
22

3+
import scala.collection.MapView
4+
35
import io.scala.Draftable
46
import io.scala.Routeable
57
import io.scala.data.parsers.Parsers
68
import io.scala.extensions.filterWhen
79
import io.scala.models.Session
810
import io.scala.models.Sponsor
911

10-
import scala.collection.MapView
11-
1212
// TODO: propagate usage of Event type instead of raw strings
1313
enum Event(val sessions: List[Session], val sponsors: List[Sponsor]):
1414
case `nantes-2024`
@@ -69,6 +69,5 @@ object SponsorsHistory:
6969

7070
def values(rank: Sponsor.Rank): List[Sponsor] = allSponsors(rank)
7171

72-
7372
def sponsorsForConf(confName: Option[String]): List[Sponsor] =
7473
confName.flatMap(Event.withName).getOrElse(Event.Current).sponsors

0 commit comments

Comments
 (0)