~jan0sch/smederee
Showing details for patch f6721fac1062780206681d96d6924e2f279673d9.
diff -rN -u old-smederee/modules/hub/src/main/scala/de/smederee/hub/VcsRepositoryRoutes.scala new-smederee/modules/hub/src/main/scala/de/smederee/hub/VcsRepositoryRoutes.scala --- old-smederee/modules/hub/src/main/scala/de/smederee/hub/VcsRepositoryRoutes.scala 2025-02-02 19:55:51.425582998 +0000 +++ new-smederee/modules/hub/src/main/scala/de/smederee/hub/VcsRepositoryRoutes.scala 2025-02-02 19:55:51.425582998 +0000 @@ -165,7 +165,7 @@ .attrs(directory, skip = (path, _) => path.baseName === "_darcs", maxDepth = 1) .map((path, attrs) => (path.relativeTo(directory), attrs)) ) - actionBaseUri <- Sync[F].delay( + repositoryBaseUri <- Sync[F].delay( Uri(path = Uri.Path.Root |+| Uri.Path( Vector(Uri.Path.Segment(s"~$repositoryOwner"), Uri.Path.Segment(repositoryName.toString)) @@ -174,12 +174,12 @@ ) resp <- Ok( views.html.showRepository()( - actionBaseUri, + repositoryBaseUri, csrf, None, s"Smederee/~$repositoryOwner/$repositoryName".some, user - )(listing, repositoryName) + )(listing, repositoryBaseUri, repositoryName) ) } yield resp } @@ -210,28 +210,19 @@ IndexedSeq.empty } viewFile <- Sync[F].delay(os.isFile(directory)) - actionBaseUriAppendix <- Sync[F].delay { - filePathParts.map(part => Uri.Path.Segment(part)).toVector - } - actionBaseUri <- Sync[F].delay( + repositoryBaseUri <- Sync[F].delay( Uri(path = Uri.Path.Root |+| Uri.Path( - Vector( - Uri.Path.Segment(s"~$repositoryOwner"), - Uri.Path.Segment(repositoryName.toString) - ) ++ actionBaseUriAppendix + Vector(Uri.Path.Segment(s"~$repositoryOwner"), Uri.Path.Segment(repositoryName.toString)) ) ) ) + actionBaseUriAppendix <- Sync[F].delay { + filePathParts.map(part => Uri.Path.Segment(part)).toVector + } + actionBaseUri <- Sync[F].delay(Uri(path = repositoryBaseUri.path |+| Uri.Path(actionBaseUriAppendix))) goBackUri <- Sync[F].delay( - Uri(path = - Uri.Path.Root |+| Uri.Path( - Vector( - Uri.Path.Segment(s"~$repositoryOwner"), - Uri.Path.Segment(repositoryName.toString) - ) ++ actionBaseUriAppendix.reverse.drop(1).reverse - ) - ) + Uri(path = repositoryBaseUri.path |+| Uri.Path(actionBaseUriAppendix.reverse.drop(1).reverse)) ) resp <- viewFile match { case false => @@ -242,7 +233,7 @@ Option(goBackUri), s"Smederee/~$repositoryOwner/$repositoryName".some, user - )(listing, repositoryName) + )(listing, repositoryBaseUri, repositoryName) ) case true => SeeOther.apply(Location(Uri(path = actionBaseUri.path.addSegment("raw")))) diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepositoryHistory.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepositoryHistory.scala.html --- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepositoryHistory.scala.html 2025-02-02 19:55:51.425582998 +0000 +++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepositoryHistory.scala.html 2025-02-02 19:55:51.425582998 +0000 @@ -4,6 +4,13 @@ <div class="content"> <div class="pure-g"> <div class="l-box pure-u-1-1 pure-u-md-1-1"> + <a class="" href="@createFullPath(pathPrefix)(actionBaseUri)">Files</a> + </div> + </div> + </div> + <div class="content"> + <div class="pure-g"> + <div class="l-box pure-u-1-1 pure-u-md-1-1"> <pre><code>@history</code></pre> </div> </div> diff -rN -u old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepository.scala.html new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepository.scala.html --- old-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepository.scala.html 2025-02-02 19:55:51.425582998 +0000 +++ new-smederee/modules/hub/src/main/twirl/de/smederee/hub/views/showRepository.scala.html 2025-02-02 19:55:51.425582998 +0000 @@ -1,9 +1,16 @@ -@(lang: LanguageCode = LanguageCode("en"), pathPrefix: Option[Uri] = None)(actionBaseUri: Uri, csrf: Option[CsrfToken] = None, goBackUri: Option[Uri] = None, title: Option[String] = None, user: Account)(listing: IndexedSeq[(os.RelPath, os.StatInfo)], repositoryName: VcsRepositoryName) +@(lang: LanguageCode = LanguageCode("en"), pathPrefix: Option[Uri] = None)(actionBaseUri: Uri, csrf: Option[CsrfToken] = None, goBackUri: Option[Uri] = None, title: Option[String] = None, user: Account)(listing: IndexedSeq[(os.RelPath, os.StatInfo)], repositoryBaseUri: Uri, repositoryName: VcsRepositoryName) @main(lang, pathPrefix)()(csrf, title, user.some) { @defining(lang.toLocale) { implicit locale => <div class="content"> <div class="pure-g"> <div class="l-box pure-u-1-1 pure-u-md-1-1"> + <a class="" href="@createFullPath(pathPrefix)(repositoryBaseUri.addSegment("history"))">History</a> + </div> + </div> + </div> + <div class="content"> + <div class="pure-g"> + <div class="l-box pure-u-1-1 pure-u-md-1-1"> <table class="pure-table pure-table-horizontal"> <thead> <tr>