chore(deps): update dependency eslint-plugin-svelte to v3.4.1

admin/api/exercice.go

@@ -20,6 +20,7 @@ import (
 func declareGlobalExercicesRoutes(router *gin.RouterGroup) {
 	router.GET("/resolutions.json", exportResolutionMovies)
 	router.GET("/exercices_stats.json", getExercicesStats)
+	router.GET("/exercices_forge_bindings.json", getExercicesForgeLinks)
 	router.GET("/tags", listTags)
 }
 
@@ -487,6 +488,71 @@ func getExercicesStats(c *gin.Context) {
 	c.JSON(http.StatusOK, ret)
 }
 
+type themeForgeBinding struct {
+	ThemeName string                 `json:"name"`
+	ThemePath string                 `json:"path"`
+	ForgeLink string                 `json:"forge_link"`
+	Exercices []exerciceForgeBinding `json:"exercices"`
+}
+
+type exerciceForgeBinding struct {
+	ExerciceName string `json:"name"`
+	ExercicePath string `json:"path"`
+	ForgeLink    string `json:"forge_link"`
+}
+
+func getExercicesForgeLinks(c *gin.Context) {
+	themes, err := fic.GetThemesExtended()
+	if err != nil {
+		log.Println("Unable to listThemes:", err.Error())
+		c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during themes listing."})
+		return
+	}
+
+	fli, ok := sync.GlobalImporter.(sync.ForgeLinkedImporter)
+	if !ok {
+		c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": "Current importer is not compatible with ForgeLinkedImporter"})
+		return
+	}
+
+	ret := []themeForgeBinding{}
+	for _, theme := range themes {
+		exercices, err := theme.GetExercices()
+		if err != nil {
+			log.Println("Unable to listExercices:", err.Error())
+			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during exercice listing."})
+			return
+		}
+
+		var exlinks []exerciceForgeBinding
+		for _, exercice := range exercices {
+			var forgelink string
+			if u, _ := fli.GetExerciceLink(exercice); u != nil {
+				forgelink = u.String()
+			}
+
+			exlinks = append(exlinks, exerciceForgeBinding{
+				ExerciceName: exercice.Title,
+				ExercicePath: exercice.Path,
+				ForgeLink:    forgelink,
+			})
+		}
+
+		var forgelink string
+		if u, _ := fli.GetThemeLink(theme); u != nil {
+			forgelink = u.String()
+		}
+		ret = append(ret, themeForgeBinding{
+			ThemeName: theme.Name,
+			ThemePath: theme.Path,
+			ForgeLink: forgelink,
+			Exercices: exlinks,
+		})
+	}
+
+	c.JSON(http.StatusOK, ret)
+}
+
 func AssigneeCookieHandler(c *gin.Context) {
 	myassignee, err := c.Cookie("myassignee")
 	if err != nil {

admin/static.go

@@ -80,6 +80,9 @@ func declareStaticRoutes(router *gin.RouterGroup, cfg *settings.Settings, baseUR
 	router.GET("/files", func(c *gin.Context) {
 		serveIndex(c)
 	})
+	router.GET("/forge-links", func(c *gin.Context) {
+		serveIndex(c)
+	})
 	router.GET("/public/*_", func(c *gin.Context) {
 		serveIndex(c)
 	})

admin/static/js/app.js

@@ -49,6 +49,10 @@ angular.module("FICApp", ["ngRoute", "ngResource", "ngSanitize"])
 				controller: "ExerciceController",
 				templateUrl: "views/exercice-resolution.html"
 			})
+			.when("/forge-links", {
+				controller: "ForgeLinksController",
+				templateUrl: "views/exercices-forgelink.html"
+			})
 			.when("/tags", {
 				controller: "TagsListController",
 				templateUrl: "views/tags.html"
@@ -2189,6 +2193,16 @@ angular.module("FICApp")
 		};
 	})
 
+	.controller("ForgeLinksController", function ($scope, $http) {
+	  $http({
+	    url: "api/exercices_forge_bindings.json",
+	  }).then(function (response) {
+	    $scope.forge_links = response.data;
+	  }, function (response) {
+	    $scope.addToast('danger', 'An error occurs when generating exercice forge links: ', response.data.errmsg);
+	  });
+	})
+
 	.controller("ExerciceTagsController", function ($scope, ExerciceTags, $routeParams, $rootScope) {
 		$scope.tags = ExerciceTags.query({ exerciceId: $routeParams.exerciceId });
 

admin/static/views/exercices-forgelink.html

@@ -0,0 +1,12 @@
+<h1>Accès rapide aux exercices</h1>
+
+<div ng-repeat="theme in forge_links">
+  <h2>
+    <a ng-href="{{ theme.forge_link }}" target="_blank">{{ theme.name }}</a>&nbsp;: <span class="text-monospace">{{ theme.path }}</span>
+  </h2>
+  <ul>
+    <li ng-repeat="exercice in theme.exercices">
+      <a ng-href="{{ exercice.forge_link }}" target="_blank">{{ exercice.name }}</a>&nbsp;: <span class="text-monospace">{{ exercice.path }}</span>
+    </li>
+  </ul>
+</div>

admin/static/views/team-stats.html

@@ -37,7 +37,7 @@
       <dt ng-bind="theme.name"></dt>
       <dd>
 	<ul class="list-unstyled">
-	  <li ng-repeat="(eid,exercice) in theme.exercices" ng-if="my.exercices[eid] && my.exercices[eid].solved_rank"><a href="/{{ my.exercices[eid].theme_id }}/{{ eid }}" target="_blank"><abbr title="{{ my.exercices[eid].statement }}">{{ exercice.title }}</abbr></a> (<abbr title="{{ my.exercices[eid].solved_time | date:'mediumDate' }} à {{ my.exercices[eid].solved_time | date:'mediumTime' }}">{{ my.exercices[eid].solved_rank }}<sup>e</sup></abbr>)</li>
+	  <li ng-repeat="exercice in theme.exercices" ng-if="my.exercices[exercice.id] && my.exercices[exercice.id].solved_rank"><a href="/{{ my.exercices[exercice.id].theme_id }}/{{ exercice.id }}" target="_blank"><abbr title="{{ my.exercices[exercice.id].statement }}">{{ exercice.title }}</abbr></a> (<abbr title="{{ my.exercices[exercice.id].solved_time | date:'mediumDate' }} à {{ my.exercices[exercice.id].solved_time | date:'mediumTime' }}">{{ my.exercices[exercice.id].solved_rank }}<sup>e</sup></abbr>)</li>
 	</ul>
       </dd>
     </div>

admin/static/views/theme-list.html

@@ -2,6 +2,7 @@
   Thèmes
   <button type="button" ng-click="show('new')" class="float-right btn btn-sm btn-primary ml-2"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Ajouter un thème</button>
   <button type="button" ng-click="sync()" ng-class="{'disabled': inSync}" class="float-right btn btn-sm btn-secondary ml-2"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> Synchroniser</button>
+  <a href="forge-links" class="float-right btn btn-sm btn-dark ml-2"><span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span> Liens d'accès à la forge</a>
 </h2>
 
 <p><input type="search" class="form-control" placeholder="Search" ng-model="query" ng-keypress="validateSearch($event)" autofocus></p>

admin/sync/importer_gitbin.go

@@ -205,7 +205,7 @@ func (i GitImporter) GetThemeLink(th *fic.Theme) (u *url.URL, err error) {
 		return
 	}
 
-	u.Path = path.Join(u.Path, "-", "tree", i.Branch, strings.TrimPrefix(th.Path, prefix))
+	u.Path = path.Join(u.Path, "-", "tree", i.Branch, strings.TrimPrefix("/"+th.Path, prefix))
 
 	return
 }
@@ -241,7 +241,7 @@ func (i GitImporter) GetExerciceLink(e *fic.Exercice) (u *url.URL, err error) {
 		return
 	}
 
-	u.Path = path.Join(u.Path, "-", "tree", i.Branch, strings.TrimPrefix(e.Path, prefix))
+	u.Path = path.Join(u.Path, "-", "tree", i.Branch, strings.TrimPrefix("/"+e.Path, prefix))
 
 	return
 }