Skip to content

Commit

Permalink
update ref's
Browse files Browse the repository at this point in the history
  • Loading branch information
brunobritodev committed Mar 6, 2020
1 parent 33b0785 commit a921957
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 61 deletions.
22 changes: 11 additions & 11 deletions src/Backend/JPProject.Admin.Api/JPProject.Admin.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@

<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="4.0.0" />
<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="4.2.0" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
<PackageReference Include="JPProject.Admin.Application" Version="3.2.0-prerelease1.03-01-070149" />
<PackageReference Include="JPProject.Admin.EntityFramework.Repository" Version="3.2.0-prerelease1.03-01-070149" />
<PackageReference Include="JPProject.AspNet.Core" Version="3.2.0-prerelease1.03-01-070149" />
<PackageReference Include="JPProject.Admin.Application" Version="3.2.1" />
<PackageReference Include="JPProject.Admin.EntityFramework.Repository" Version="3.2.1" />
<PackageReference Include="JPProject.AspNet.Core" Version="3.2.1" />
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.12.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.1">
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.2" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.4" />
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="3.1.2" />
<PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0" />
Expand Down
14 changes: 7 additions & 7 deletions src/Backend/Jp.Database/Jp.Database.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.1.1" />
<PackageReference Include="JPProject.Domain.Core" Version="3.2.0-prerelease1.03-01-070149" />
<PackageReference Include="JPProject.Admin.EntityFramework.Repository" Version="3.2.0-prerelease1.03-01-070149" />
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.1.2" />
<PackageReference Include="JPProject.Domain.Core" Version="3.2.1" />
<PackageReference Include="JPProject.Admin.EntityFramework.Repository" Version="3.2.1" />
</ItemGroup>

<ItemGroup Label="Databases">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.2" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
pre {
overflow: auto
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ export class UserEventsComponent implements OnInit {
flatMap(p => this.userService.getDetails(p["username"])),
tap(user => this.user = user),
)
.subscribe(s => this.loadResources(),
err => {
this.router.navigate(['/users']);
});
.subscribe(s => this.loadResources(),
err => {
this.router.navigate(['/users']);
});

this.eventSearch
.pipe(debounceTime(500))
Expand All @@ -53,6 +53,7 @@ export class UserEventsComponent implements OnInit {
public loadResources() {
this.userService.showEvents(this.user.userName, this.quantity, this.page)
.subscribe((response: ListOf<EventHistoryData>) => {
this.setEveryoneToNotShow();
this.model = response.collection;
this.total = response.total;
});
Expand All @@ -79,7 +80,7 @@ export class UserEventsComponent implements OnInit {
return;
}

let htmlContent = `<pre>${JSON.stringify(JSON.parse(item.details), null, 4)}</pre>`;
let htmlContent = `<pre class="pre-scrollable-width">${JSON.stringify(JSON.parse(item.details), null, 4)}</pre>`;

// Create an empty <tr> element and add it to the 1st position of the table:
var row = table.insertRow(index + 2);
Expand All @@ -96,6 +97,8 @@ export class UserEventsComponent implements OnInit {
}

private setEveryoneToNotShow() {
if (this.model == null)
return;
// set all others items as show = false
this.model.forEach(e => {
e.show = false;
Expand Down
69 changes: 36 additions & 33 deletions src/Frontend/Jp.AdminUI/src/app/shared/styles/bootstrap/_code.scss
Original file line number Diff line number Diff line change
@@ -1,48 +1,51 @@
// Inline code
code {
font-size: $code-font-size;
color: $code-color;
word-break: break-word;

// Streamline the style when inside anchors to avoid broken underline and more
a > & {
color: inherit;
}
font-size: $code-font-size;
color: $code-color;
word-break: break-word;
// Streamline the style when inside anchors to avoid broken underline and more
a>& {
color: inherit;
}
}

// User input typically entered via keyboard
kbd {
padding: $kbd-padding-y $kbd-padding-x;
font-size: $kbd-font-size;
color: $kbd-color;
background-color: $kbd-bg;
@include border-radius($border-radius-sm);
@include box-shadow($kbd-box-shadow);

kbd {
padding: 0;
font-size: 100%;
font-weight: $nested-kbd-font-weight;
@include box-shadow(none);
}
padding: $kbd-padding-y $kbd-padding-x;
font-size: $kbd-font-size;
color: $kbd-color;
background-color: $kbd-bg;
@include border-radius($border-radius-sm);
@include box-shadow($kbd-box-shadow);
kbd {
padding: 0;
font-size: 100%;
font-weight: $nested-kbd-font-weight;
@include box-shadow(none);
}
}

// Blocks of code
pre {
display: block;
font-size: $code-font-size;
color: $pre-color;

// Account for some code outputs that place code tags in pre tags
code {
font-size: inherit;
color: inherit;
word-break: normal;
}
display: block;
font-size: $code-font-size;
color: $pre-color;
// Account for some code outputs that place code tags in pre tags
code {
font-size: inherit;
color: inherit;
word-break: normal;
}
}

// Enable scrollable blocks of code
.pre-scrollable {
max-height: $pre-scrollable-max-height;
overflow-y: scroll;
max-height: $pre-scrollable-max-height;
overflow-y: scroll;
}

// Enable scrollable blocks of code
.pre-scrollable-width {
max-width: $pre-scrollable-max-width;
overflow-x: scroll;
}
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,7 @@ $kbd-bg: $gray-900 !default;

$pre-color: $gray-900 !default;
$pre-scrollable-max-height: 340px !default;
$pre-scrollable-max-width : 865px !default;


// Printing
Expand Down
5 changes: 3 additions & 2 deletions src/Frontend/Jp.AdminUI/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@
"key": "Key",
"picture": "Picture",
"scopes": "Scopes",
"type": "Type"
"type": "Type",
"details": "Details"
},
"remove": {
"cancelButtonText": "No, cancel plx!",
Expand Down Expand Up @@ -515,4 +516,4 @@
"eventType": "Event Type",
"eventType-tooltip": "Category of an Event (Optional)"
}
}
}

0 comments on commit a921957

Please sign in to comment.