Skip to content

Commit c4481ca

Browse files
authored
Merge pull request #289 from blogifierdotnet/dev
Dev
2 parents 6a55b46 + d7686f6 commit c4481ca

File tree

26 files changed

+595
-100
lines changed

26 files changed

+595
-100
lines changed

.github/workflows/demo.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Deploy to demo branch
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
deploy-demo:
10+
runs-on: ubuntu-latest
11+
steps:
12+
13+
- name: Checkout
14+
uses: actions/checkout@v2.3.1
15+
16+
- uses: actions/cache@v2
17+
with:
18+
path: ~/.nuget/packages
19+
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
20+
restore-keys: |
21+
${{ runner.os }}-nuget-
22+
- name: Setup .NET
23+
uses: actions/setup-dotnet@v1
24+
with:
25+
dotnet-version: '5.0.x'
26+
27+
- name: Publish Blogifier
28+
run: dotnet publish -c Release -o release --nologo
29+
30+
- name: Add .nojekyll file
31+
run: touch release/.nojekyll
32+
33+
- name: Deploy
34+
uses: JamesIves/github-pages-deploy-action@4.1.4
35+
with:
36+
branch: demo
37+
folder: release

src/Blogifier.Admin/Components/Blog/CategoriesComponent.razor

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@inject HttpClient _http
22
@inject IStringLocalizer<Resource> _localizer
3-
3+
<style>
4+
.bf-test { color: red !important }
5+
</style>
46
<div class="d-flex">
57
@if (PostCategories != null)
68
{
@@ -14,7 +16,7 @@
1416
</div>
1517
}
1618
}
17-
<input type="text" id="add_category_control" @bind="Tag" @onkeyup="KeyPressed" name="tagItem" placeholder="@_localizer["add-category"]" />
19+
<input type="text" id="add_category_control" class="bf-test" @bind="Tag" @onkeyup="KeyPressed" name="tagItem" placeholder="@_localizer["add-category"]" />
1820
</div>
1921

2022
@code {

src/Blogifier.Admin/Pages/Account/Register.razor

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
<PageTitle Title="@_localizer["register"]" />
88

9+
<div class="account-header">
10+
<h2 class="account-title text-lg-center">@_localizer["welcome-blogifier"]</h2>
11+
</div>
12+
913
@if (showError)
1014
{
1115
<div class="account-message -error">@_localizer["register-failed"].</div>
@@ -35,6 +39,6 @@
3539
<label for="registerConfirmPassword">@_localizer["confirm-password"]</label>
3640
<ValidationMessage For="@(() => model.PasswordConfirm)"></ValidationMessage>
3741
</div>
38-
<button type="submit" class="btn btn-blogifier btn-block btn-floating">Create admin account</button>
42+
<button type="submit" class="btn btn-blogifier btn-block btn-floating">@_localizer["create-admin-account"]</button>
3943
</EditForm>
4044
}

src/Blogifier.Admin/Pages/Blog/Editor.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
Post.PostType = _stateprovider.PostType;
137137

138138
Post.Cover = await _jsruntime.InvokeAsync<string>("commonJsFunctions.getSrcValue", "postCover");
139+
Post.Cover = Post.Cover.Replace(_navigation.BaseUri, "");
139140

140141
if(string.IsNullOrEmpty(Post.Cover))
141142
Post.Cover = Constants.DefaultCover;

src/Blogifier.Admin/Shared/AccountLayout.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@inject IStringLocalizer<Resource> _localizer
33

44
<div class="account">
5-
<a class="account-logo link-blogifier" href="http://blogifier.net/" target="_blank" rel="nofollow external" data-bs-toggle="tooltip" title="Powered by Blogifier">
5+
<a class="account-logo link-blogifier" href="http://blogifier.net/" target="_blank" rel="nofollow external" data-bs-toggle="tooltip" title="@_localizer["powered-by-blogifier"]">
66
<svg width="40" height="40" fill="currentColor" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
77
<path d="M179.2 0H102.4L81.92 51.2H166.4C180.538 51.2 192 62.6615 192 76.8C192 90.9385 180.538 102.4 166.4 102.4H61.44L40.96 153.6L166.4 153.6C180.538 153.6 192 165.062 192 179.2C192 193.338 180.538 204.8 166.4 204.8H20.48L0 256H179.2C221.615 256 256 221.615 256 179.2C256 159.53 248.605 141.587 236.444 128C248.605 114.413 256 96.4699 256 76.8C256 34.3845 221.615 0 179.2 0Z" />
88
</svg>

src/Blogifier.Admin/wwwroot/admin/css/app.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Blogifier.Admin/wwwroot/admin/css/app.min.css

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/Blogifier.Admin/wwwroot/admin/css/app.css renamed to src/Blogifier.Admin/wwwroot/admin/css/blogifier.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Blogifier.Admin/wwwroot/admin/css/blogifier.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Blogifier.Admin/wwwroot/admin/css/blogifier.rtl.css

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)