diff --git a/.gitignore b/.gitignore index 555a816..fde2aa0 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,5 @@ bower_components/ test/isn.tests/bin test/isn.tests/obj/ test/isnd.tests/appsettings.Testing.json +wwwroot/.sass-cache/ +src/isnd/wwwroot/.sass-cache/ diff --git a/src/isnd/Controllers/PackagesController.Views.cs b/src/isnd/Controllers/PackagesController.Views.cs index 8da26e2..e09df3f 100644 --- a/src/isnd/Controllers/PackagesController.Views.cs +++ b/src/isnd/Controllers/PackagesController.Views.cs @@ -15,8 +15,8 @@ namespace isnd.Controllers { var applicationDbContext = _dbContext.Packages.Include(p => p.Versions).Where( p => ( model.Prerelease || p.Versions.Any(v => !v.IsPrerelease)) - && ((model.query == null) || p.Id.StartsWith(model.query))); - model.data = await applicationDbContext.ToArrayAsync(); + && ((model.Query == null) || p.Id.StartsWith(model.Query))); + model.Data = await applicationDbContext.ToArrayAsync(); return View(model); } diff --git a/src/isnd/Services/PackageManager.cs b/src/isnd/Services/PackageManager.cs index 394391c..5ff78c1 100644 --- a/src/isnd/Services/PackageManager.cs +++ b/src/isnd/Services/PackageManager.cs @@ -99,9 +99,9 @@ namespace isnd.Services return new PackageIndexViewModel { - query = query, - totalHits = total, - data = pkgs + Query = query, + TotalHits = total, + Data = pkgs }; } public AutoCompleteResult AutoComplete(string id, diff --git a/src/isnd/ViewModels/PackageIndexViewModel.cs b/src/isnd/ViewModels/PackageIndexViewModel.cs index 7d35697..9af7942 100644 --- a/src/isnd/ViewModels/PackageIndexViewModel.cs +++ b/src/isnd/ViewModels/PackageIndexViewModel.cs @@ -1,12 +1,20 @@ using isnd.Data; +using Newtonsoft.Json; namespace isnd.ViewModels { public class PackageIndexViewModel { + [JsonProperty("prerelease")] public bool Prerelease { get; set; } - public Package[] data {get; set;} - public string query { get; set; } - public int totalHits { get; internal set; } + + [JsonProperty("data")] + public Package[] Data {get; set;} + + [JsonProperty("query")] + public string Query { get; set; } + + [JsonProperty("totalHits")] + public int TotalHits { get; internal set; } } } \ No newline at end of file diff --git a/src/isnd/Views/Home/Features.cshtml b/src/isnd/Views/Home/Features.cshtml new file mode 100644 index 0000000..e38c6a9 --- /dev/null +++ b/src/isnd/Views/Home/Features.cshtml @@ -0,0 +1,17 @@ +@model HomeIndexViewModel +@{ + foreach (string leashed in new string[] { "pkg-push", "pkg-get", + "pkg-autocomplete","pkg-search","pkg-catalog"}) + { + if (Model.UnleashClient.IsEnabled(leashed)) + { + //do some magic +

@leashed

+ } + else + { + //do old boring stuff +

No @leashed (disabled)

+ } + } +} \ No newline at end of file diff --git a/src/isnd/Views/Home/Index.cshtml b/src/isnd/Views/Home/Index.cshtml index 8c17d4b..9c89c66 100644 --- a/src/isnd/Views/Home/Index.cshtml +++ b/src/isnd/Views/Home/Index.cshtml @@ -1,31 +1,12 @@ @model HomeIndexViewModel @{ ViewData["Title"] = "Home Page"; - } -
-

Welcome

+

Bienvenue

- Welcome to isnd + Bienvenue dans isnd

@Model.PkgCount identifiant(s) de paquet dans le SI - - @{ - foreach (string leashed in new string[] { "pkg-push", "pkg-get", - "pkg-autocomplete","pkg-search","pkg-catalog"}) - { - if (Model.UnleashClient.IsEnabled(leashed)) - { - //do some magic -

@leashed

- } - else - { - //do old boring stuff -

No @leashed (disabled)

- } - } - }
diff --git a/src/isnd/Views/Packages/Index.cshtml b/src/isnd/Views/Packages/Index.cshtml index 833f974..8b7d0ee 100644 --- a/src/isnd/Views/Packages/Index.cshtml +++ b/src/isnd/Views/Packages/Index.cshtml @@ -11,9 +11,9 @@
- - - + + +
@@ -25,16 +25,16 @@ - @Html.DisplayNameFor(model => model.data[0].Id) + @Html.DisplayNameFor(model => model.Data[0].Id) - @Html.DisplayNameFor(model => model.data[0].Description) + @Html.DisplayNameFor(model => model.Data[0].Description) -@foreach (var item in Model.data) { +@foreach (var item in Model.Data) { @Html.DisplayFor(modelItem => item.Id) diff --git a/src/isnd/Views/Shared/_Layout.cshtml b/src/isnd/Views/Shared/_Layout.cshtml index 590a4b3..3fe4a69 100644 --- a/src/isnd/Views/Shared/_Layout.cshtml +++ b/src/isnd/Views/Shared/_Layout.cshtml @@ -5,11 +5,11 @@ @ViewData["Title"] - isnd - +
-