diff --git a/.dockerignore b/.dockerignore index 3bdd11108..30c012657 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,8 +1,8 @@ -.git -**/bin -**/obj -**/node_modules +.git* +**/bin* +**/obj* +**/node_modules* Dockerfile docker-compose.yml -deploy/ +deploy* **/package-lock.json diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 000000000..baa40f1c7 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,32 @@ +name: build release docker + +on: + push: + branches: + - 'preview' + pull_request: + branches: + - 'preview' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v4 + with: + push: true + tags: dorthl/blogifier:preview diff --git a/Dockerfile b/Dockerfile index 3e237e2bb..dc6a203ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,18 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine as sdk +FROM mcr.microsoft.com/dotnet/sdk:8.0.100-preview.7-alpine3.18 as sdk # TOTO zh-CH -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories +# RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN apk add --no-cache npm +# VOLUME ["/root/.nuget","/root/.local/share/NuGet","/root/.npm"] +# TOTO zh-CH +# CMD [ "npm config set registry http://mirrors.cloud.tencent.com/npm" ] # Copy everything else and build COPY ./ /opt/blogifier WORKDIR /opt/blogifier RUN ["dotnet","publish", "-c", "Release","/p:RuntimeIdentifier=linux-musl-x64", "./src/Blogifier/Blogifier.csproj","-o","dist" ] -FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine as run +FROM mcr.microsoft.com/dotnet/aspnet:8.0.0-preview.7-alpine3.18-composite as run # TOTO zh-CH -RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories +# RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN apk add --no-cache icu-libs ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false COPY --from=sdk /opt/blogifier/dist /opt/blogifier/ diff --git a/docker.sh b/docker.sh index 17697cc0a..16328b1bf 100644 --- a/docker.sh +++ b/docker.sh @@ -1,3 +1,3 @@ # docker -docker build -t dorthl/blogifier:latest . -docker push dorthl/blogifier:latest +docker build -t dorthl/blogifier:preview . +docker push dorthl/blogifier:preview diff --git a/global.json b/global.json index e383752a1..4ba67068e 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "7.0.304" + "version": "8.0.100-preview.7.23376.3" } } diff --git a/src/Blogifier.Admin/Blogifier.Admin.csproj b/src/Blogifier.Admin/Blogifier.Admin.csproj index 1b365811c..e2496d344 100644 --- a/src/Blogifier.Admin/Blogifier.Admin.csproj +++ b/src/Blogifier.Admin/Blogifier.Admin.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 enable + false - - - - + + + diff --git a/src/Blogifier.Admin/Components/EditorComponent.razor b/src/Blogifier.Admin/Components/EditorComponent.razor deleted file mode 100644 index e9881bf67..000000000 --- a/src/Blogifier.Admin/Components/EditorComponent.razor +++ /dev/null @@ -1,73 +0,0 @@ -@using System.Text.RegularExpressions; -@using System.Text; - -@implements IAsyncDisposable - -@inject IStringLocalizer _localizer -@inject IJSRuntime _jsRuntime -@inject HttpClient _httpClient - -
- -
- - -@code { - - [Parameter] public string Toolbar { get; set; } = default!; - - private ValueTask _taskModule; - private ElementReference? _textareaReference; - private InputFile? _inputFileReference; - - protected override async Task OnAfterRenderAsync(bool firstRender) - { - if (firstRender) - { - _taskModule = _jsRuntime.InvokeAsync("import", "./admin/js/editor.js"); - var module = await _taskModule; - var element = _inputFileReference?.Element; - await module.InvokeVoidAsync("loadEditor", Toolbar, _textareaReference, element); - } - } - - protected async Task LoadImageFiles(InputFileChangeEventArgs args) - { - var module = await _taskModule; - var element = _inputFileReference?.Element; - await module.InvokeVoidAsync("writeFrontFile", element); - } - - public async ValueTask SetValueAsync(string value) - { - var module = await _taskModule; - await module.InvokeVoidAsync("setEditorValue", value); - } - - public async ValueTask GetValueAsync() - { - var module = await _taskModule; - var content = await module.InvokeAsync("getEditorValue"); - var imgsMatches = StringHelper.MatchesMarkdownImgBlob(content); - - if (imgsMatches.Count > 0) - { - var contentStringBuilder = new StringBuilder(content); - foreach (Match match in imgsMatches) - { - var imageUrl = match.Groups[1].Value; - var imageBytes = await _httpClient.GetByteArrayAsync(imageUrl); - var base64String = Convert.ToBase64String(imageBytes); - contentStringBuilder.Replace(imageUrl, "data:image/png;base64," + base64String); - } - content = contentStringBuilder.ToString(); - } - return content; - } - - async ValueTask IAsyncDisposable.DisposeAsync() - { - var module = await _taskModule; - await module.DisposeAsync(); - } -} diff --git a/src/Blogifier.Admin/Components/NavMenuComponent.razor b/src/Blogifier.Admin/Components/NavMenuComponent.razor index dad13a69d..6a7b98856 100644 --- a/src/Blogifier.Admin/Components/NavMenuComponent.razor +++ b/src/Blogifier.Admin/Components/NavMenuComponent.razor @@ -3,6 +3,7 @@ @inject AuthenticationStateProvider _stateProvider @inject IJSRuntime _jsRuntime @inject IStringLocalizer _localizer +@inject CommonJsInterop _commonJsInterop @code { @@ -20,7 +21,7 @@ { if (firstRender) { - await _jsRuntime.InvokeAsync("commonJsFunctions.setTooltip", ""); + await _commonJsInterop.SetTooltipAsync(); } } } @@ -88,7 +89,7 @@ {
  • diff --git a/src/Blogifier.Admin/Components/PageTitleComponent.razor b/src/Blogifier.Admin/Components/PageTitleComponent.razor index fba394574..4ddde8a07 100644 --- a/src/Blogifier.Admin/Components/PageTitleComponent.razor +++ b/src/Blogifier.Admin/Components/PageTitleComponent.razor @@ -1,11 +1,11 @@ @inject IJSRuntime _jsRuntime; +@inject CommonJsInterop _commonJsInterop @code { [Parameter] public string Title { get; set; } = default!; protected override async Task OnInitializedAsync() { - await SetTitleAsync(); + await _commonJsInterop.SetTitleAsync(Title); } - private async Task SetTitleAsync() => await _jsRuntime.InvokeVoidAsync("commonJsFunctions.setTitle", Title); } diff --git a/src/Blogifier.Admin/Components/PostEditorComponent.razor b/src/Blogifier.Admin/Components/PostEditorComponent.razor index 98b7bdcf8..e6a44eec0 100644 --- a/src/Blogifier.Admin/Components/PostEditorComponent.razor +++ b/src/Blogifier.Admin/Components/PostEditorComponent.razor @@ -1,11 +1,17 @@ +@using System.Text.RegularExpressions; +@using System.Text; + @inject IStringLocalizer _localizer -@inject IJSRuntime _jsruntime +@inject IJSRuntime _jsRuntime @inject NavigationManager _navigation @inject IToaster _toaster +@inject HttpClient _httpClient +@inject EditorJsInterop _editorJsInterop +@inject CommonJsInterop _commonJsInterop
    - @_localizer[ + @_localizer[
    @if (string.IsNullOrEmpty(Post.Slug)) @@ -60,11 +66,11 @@
    • - - + +
    • - +
    @@ -73,7 +79,10 @@
    - +
    + + +
    @code { @@ -82,27 +91,74 @@ [Parameter] public EventCallback OnSaveCallback { get; set; } [Parameter] public EventCallback OnRemoveCallback { get; set; } - private EditorComponent _editorComponent = default!; + private ElementReference? _textareaReference; + private InputFile? _inputFileReference; + private InputFile? _inputCovereference; + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + var element = _inputFileReference?.Element; + await _editorJsInterop.LoadEditorAsync(_textareaReference, element); + } + } public async Task SetPostInfoAsync(PostEditorDto post) { var headTitle = _localizer["edit"] + " - " + post.Title; - await _jsruntime.InvokeVoidAsync("commonJsFunctions.setTitle", headTitle); - await _editorComponent.SetValueAsync(post.Content); + await _commonJsInterop.SetTitleAsync(headTitle); + await _editorJsInterop.SetEditorValueAsync(post.Content); + } + + async ValueTask GetValueAsync() + { + var content = await _editorJsInterop.GetEditorValueAsync(); + var imgsMatches = StringHelper.MarkdownImgBlobGeneratedRegex().Matches(content); + + if (imgsMatches.Count > 0) + { + var contentStringBuilder = new StringBuilder(content); + foreach (Match match in imgsMatches) + { + var imageUrl = match.Groups[1].Value; + var imageBytes = await _httpClient.GetByteArrayAsync(imageUrl); + var base64String = Convert.ToBase64String(imageBytes); + contentStringBuilder.Replace(imageUrl, "data:image/png;base64," + base64String); + } + content = contentStringBuilder.ToString(); + } + return content; + } + + protected async Task LoadImageFiles(InputFileChangeEventArgs args) + { + var element = _inputFileReference?.Element; + await _editorJsInterop.WriteFrontFileAsync(element); } protected async Task SaveCoreAsync(PostState postState) { - var content = await _editorComponent.GetValueAsync(); + var content = await GetValueAsync(); if (string.IsNullOrEmpty(Post.Title) || string.IsNullOrEmpty(content)) { _toaster.Error(_localizer["title-content-required"]); return; } Post.Content = content; - Post.Cover = await _jsruntime.InvokeAsync("commonJsFunctions.getSrcValue", "postCover"); - Post.Cover = Post.Cover.Replace(_navigation.BaseUri, ""); - if (string.IsNullOrEmpty(Post.Cover)) Post.Cover = BlogifierSharedConstant.DefaultCover; + if (!string.IsNullOrEmpty(Post.Cover)) + { + var coverMatche = StringHelper.BlobUrlGeneratedRegex().Match(Post.Cover); + if (coverMatche.Success) + { + var imageUrl = coverMatche.Value; + var imageBytes = await _httpClient.GetByteArrayAsync(imageUrl); + var base64String = Convert.ToBase64String(imageBytes); + var dataString = "data:image/png;base64," + base64String; + Console.WriteLine(dataString); + Post.Cover = dataString; + } + } if (string.IsNullOrEmpty(Post.Description)) Post.Description = Post.Title; Post.State = postState; await OnSaveCallback.InvokeAsync(Post); @@ -125,22 +181,28 @@ protected async Task RemoveAsync(int id) { - if (await _jsruntime.InvokeAsync("confirm", _localizer["confirm-delete"])) + if (await _jsRuntime.InvokeAsync("confirm", _localizer["confirm-delete"])) { await OnRemoveCallback.InvokeAsync(id); } } - protected async Task ResetCoverAsync() + protected async Task ChangeCoverAsync() { - Post.Cover = BlogifierSharedConstant.DefaultCover; - await SaveAsync(); + await _commonJsInterop.TriggerClickAsync(_inputCovereference?.Element); } - protected async Task RemoveCoverAsync() + protected async Task LoadCovereFile(InputFileChangeEventArgs args) { - Post.Cover = null; - await SaveAsync(); + var element = _inputCovereference?.Element; + var blobInfo = await _commonJsInterop.GetInputFileBlobInfoAsync(element); + Post.Cover = blobInfo.Url; } + protected Task RemoveCoverAsync() + { + Post.Cover = null; + StateHasChanged(); + return Task.CompletedTask; + } } diff --git a/src/Blogifier.Admin/Dtos/FrontBlobInfo.cs b/src/Blogifier.Admin/Dtos/FrontBlobInfo.cs new file mode 100644 index 000000000..dabd575f9 --- /dev/null +++ b/src/Blogifier.Admin/Dtos/FrontBlobInfo.cs @@ -0,0 +1,7 @@ +namespace Blogifier.Admin; + +public class FrontBlobInfo +{ + public string FileName { get; set; } = default!; + public string Url { get; set; } = default!; +} diff --git a/src/Blogifier.Admin/Interop/CommonJsInterop.cs b/src/Blogifier.Admin/Interop/CommonJsInterop.cs new file mode 100644 index 000000000..76d2dccb6 --- /dev/null +++ b/src/Blogifier.Admin/Interop/CommonJsInterop.cs @@ -0,0 +1,49 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using System; +using System.Threading.Tasks; + +namespace Blogifier.Admin.Interop; + +public class CommonJsInterop : IAsyncDisposable +{ + private readonly Lazy> moduleTask; + + public CommonJsInterop(IJSRuntime jsRuntime) + { + moduleTask = new(() => jsRuntime.InvokeAsync("import", "./admin/js/common.js").AsTask()); + } + + public async ValueTask SetTooltipAsync() + { + var module = await moduleTask.Value; + await module.InvokeVoidAsync("setTooltip"); + } + + public async ValueTask SetTitleAsync(string content) + { + var module = await moduleTask.Value; + await module.InvokeVoidAsync("setTitle", content); + } + + public async ValueTask TriggerClickAsync(ElementReference? element) + { + var module = await moduleTask.Value; + await module.InvokeVoidAsync("triggerClick", element); + } + + public async ValueTask GetInputFileBlobInfoAsync(ElementReference? inputUpload) + { + var module = await moduleTask.Value; + return await module.InvokeAsync("getInputFileBlobInfo", inputUpload); + } + + public async ValueTask DisposeAsync() + { + if (moduleTask.IsValueCreated) + { + var module = await moduleTask.Value; + await module.DisposeAsync(); + } + } +} diff --git a/src/Blogifier.Admin/Interop/EditorJsInterop.cs b/src/Blogifier.Admin/Interop/EditorJsInterop.cs new file mode 100644 index 000000000..2af19b8c7 --- /dev/null +++ b/src/Blogifier.Admin/Interop/EditorJsInterop.cs @@ -0,0 +1,50 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.JSInterop; +using System; +using System.Threading.Tasks; + +namespace Blogifier.Admin.Interop; + +public class EditorJsInterop : IAsyncDisposable +{ + private readonly Lazy> moduleTask; + + public EditorJsInterop(IJSRuntime jsRuntime) + { + moduleTask = new(() => jsRuntime.InvokeAsync("import", "./admin/js/editor.js").AsTask()); + } + + public async ValueTask LoadEditorAsync(ElementReference? textarea, ElementReference? imageUpload, string toolbar = "fullToolbar") + { + var module = await moduleTask.Value; + await module.InvokeVoidAsync("loadEditor", toolbar, textarea, imageUpload); + } + + public async ValueTask SetEditorValueAsync(string content) + { + var module = await moduleTask.Value; + await module.InvokeVoidAsync("setEditorValue", content); + } + + public async ValueTask GetEditorValueAsync() + { + var module = await moduleTask.Value; + var content = await module.InvokeAsync("getEditorValue"); + return content; + } + + public async ValueTask WriteFrontFileAsync(ElementReference? imageUpload) + { + var module = await moduleTask.Value; + await module.InvokeVoidAsync("writeFrontFile", imageUpload); + } + + public async ValueTask DisposeAsync() + { + if (moduleTask.IsValueCreated) + { + var module = await moduleTask.Value; + await module.DisposeAsync(); + } + } +} diff --git a/src/Blogifier.Admin/Pages/Blogs/EditorView.razor b/src/Blogifier.Admin/Pages/Blogs/EditorView.razor index b51c328c4..e9b628a40 100644 --- a/src/Blogifier.Admin/Pages/Blogs/EditorView.razor +++ b/src/Blogifier.Admin/Pages/Blogs/EditorView.razor @@ -22,7 +22,6 @@ Description = string.Empty, Content = string.Empty, PostType = PostType.Post, - Cover = BlogifierSharedConstant.DefaultCover, Categories = new List(), }; @@ -59,22 +58,6 @@ var result = await _httpClient.DeleteAsync($"api/post/{id}"); if (result.IsSuccessStatusCode) _toaster.Success(_localizer["completed"]); else _toaster.Error(_localizer["generic-error"]); - _navigation.NavigateTo($"admin"); + _navigation.NavigateTo("admin"); } - - //protected async Task OnFileUploadAsync(FrontFilePreviewDto file) - //{ - // using var fileContent = new StreamContent(file.BrowserFile.OpenReadStream()); - // fileContent.Headers.ContentType = new MediaTypeHeaderValue(file.BrowserFile.ContentType); - // using var content = new MultipartFormDataContent(); - // content.Add(content: fileContent, name: "\"file\"", fileName: file.BrowserFile.Name); - // var response = await _httpClient.PostAsync("api/storage/upload", content); - // if (response.IsSuccessStatusCode) - // { - // var stream = await response.Content.ReadAsStreamAsync(); - // var storage = JsonSerializer.Deserialize(stream, BlogifierSharedConstant.DefaultJsonSerializerOptions)!; - // await _postEditorComponent.ReplaceSelectionAsync(file, storage); - // } - //} - } diff --git a/src/Blogifier.Admin/Program.cs b/src/Blogifier.Admin/Program.cs index 1f2d30da2..9a91c4fcf 100644 --- a/src/Blogifier.Admin/Program.cs +++ b/src/Blogifier.Admin/Program.cs @@ -1,5 +1,6 @@ using Blogifier; using Blogifier.Admin; +using Blogifier.Admin.Interop; using Blogifier.Admin.Services; using Blogifier.Identity; using Microsoft.AspNetCore.Components.Authorization; @@ -30,4 +31,6 @@ config.NewestOnTop = false; }); builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); await builder.Build().RunAsync(); diff --git a/src/Blogifier.Admin/_Imports.razor b/src/Blogifier.Admin/_Imports.razor index f7552e5f3..8c1f38278 100644 --- a/src/Blogifier.Admin/_Imports.razor +++ b/src/Blogifier.Admin/_Imports.razor @@ -24,3 +24,4 @@ @using Blogifier.Helper; @using Blogifier.Identity @using Blogifier.Models +@using Blogifier.Admin.Interop diff --git a/src/Blogifier.Admin/assets/gulpfile.mjs b/src/Blogifier.Admin/assets/gulpfile.mjs index 47ba6db96..6202f7955 100644 --- a/src/Blogifier.Admin/assets/gulpfile.mjs +++ b/src/Blogifier.Admin/assets/gulpfile.mjs @@ -134,6 +134,50 @@ const editorJs = () => { return stream.pipe(dest('dist/admin/js')); } +const commonJs = () => { + let outputOptions = { + sourcemap: true, + format: 'es' + } + + if (mode !== 'Debug') { + outputOptions.sourcemap = false; + outputOptions.minifyInternalExports = true; + outputOptions.plugins = [terser()]; + } + + let stream = rollupStream({ + input: 'js/common.js', + output: outputOptions, + plugins: [ + babel({ + exclude: 'node_modules/**', + presets: ['@babel/preset-env'], + babelHelpers: 'bundled', + }), + nodeResolve({ + browser: true, + preferBuiltins: false, + }), + commonjs({ + include: ['node_modules/**'], + exclude: [], + sourceMap: mode === 'Debug', + }), + ], + }) + + stream = stream.pipe(source('common.js')); + if (mode !== 'Debug') { + // JS Minify + stream = stream.pipe(buffer()) + stream = stream.pipe(plumber()) + stream = stream.pipe(uglify()) + } + return stream.pipe(dest('dist/admin/js')); +} + + // sass const scss = () => { let stream = src("./scss/**/*.scss") @@ -165,11 +209,11 @@ const watcher = () => { }; export default series( - clean, parallel( scss, blogifierJs, editorJs, + commonJs, watcher ) ); @@ -179,6 +223,7 @@ const build = series( scss, blogifierJs, editorJs, + commonJs, ); export { debug, release, build }; diff --git a/src/Blogifier.Admin/assets/js/blogifier.js b/src/Blogifier.Admin/assets/js/blogifier.js index 9f1685ef1..c54f2d3c5 100644 --- a/src/Blogifier.Admin/assets/js/blogifier.js +++ b/src/Blogifier.Admin/assets/js/blogifier.js @@ -1,93 +1,7 @@ -import { Tooltip } from 'bootstrap' - // Chart.js v2.9.4 import "chart.js" -window.commonJsFunctions = { - setTitle: function (title) { - document.title = title + " - Blogifier"; - }, - setPageTitle: function () { - - }, - showPrompt: function (message) { - return prompt(message, 'Type anything here'); - }, - hideLoader: function (id) { - var el = document.getElementById(id); - el.style.display = 'none'; - }, - getFieldValue: function (field) { - if (field.type === 'checkbox') { - return document.getElementById(field.id).checked; - } - else { - return document.getElementById(field.id).value; - } - }, - getTxtValue: function (txt) { - return document.getElementById(txt).value; - }, - getSrcValue: function (src) { - return document.getElementById(src).src; - }, - focusElement: function (id) { - setTimeout(function () { - const element = document.getElementById(id); - element.focus(); - }, 500); - }, - writeCookie: function (name, value, days) { - - var expires; - if (days) { - var date = new Date(); - date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); - expires = "; expires=" + date.toGMTString(); - } - else { - expires = ""; - } - document.cookie = name + "=" + value + expires + "; path=/"; - }, - setTooltip: function (args) { - setTimeout(function () { - let options = { "trigger": "hover", fallbackPlacements: ['bottom'] }; - let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); - let tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) { - return new Tooltip(tooltipTriggerEl, options) - }); - }, 1000); - }, - showModal: function (id) { - document.getElementById(id).showModal(); - }, - startClock: function () { - var clock = document.getElementById('clock'); - var clockDay = document.getElementById('clock-day'); - var clockMonth = document.getElementById('clock-month'); - - function time() { - var date = new Date(); - var hours = date.getHours(); - var minutes = date.getMinutes(); - hours = hours % 12; - hours = hours ? hours : 12; - minutes = minutes < 10 ? '0' + minutes : minutes; - clock.textContent = hours + ':' + minutes; - - var days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; - var months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; - - clockDay.textContent = days[date.getDay()]; - clockMonth.textContent = months[date.getMonth()] + ' ' + date.getDate(); - } - time(); - setInterval(time, 60 * 1000); - } -}; - window.DataService = function () { let upload = function (url, obj, success, fail) { fetch(url, { diff --git a/src/Blogifier.Admin/assets/js/common.js b/src/Blogifier.Admin/assets/js/common.js new file mode 100644 index 000000000..765469dc3 --- /dev/null +++ b/src/Blogifier.Admin/assets/js/common.js @@ -0,0 +1,87 @@ +import { Tooltip } from 'bootstrap'; + +export function triggerClick(element) { + element.click(); +} + +export function setTitle(title) { + document.title = title + " - Blogifier"; +} + +export function setPageTitle() { + +} + +export function getFieldValue() { + if (field.type === 'checkbox') { + return document.getElementById(field.id).checked; + } + else { + return document.getElementById(field.id).value; + } +} + +export function getTxtValue(txt) { + return document.getElementById(txt).value; +} + +export function focusElement(id) { + setTimeout(function () { + const element = document.getElementById(id); + element.focus(); + }, 500); +} + +export function writeCookie() { + var expires; + if (days) { + var date = new Date(); + date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); + expires = "; expires=" + date.toGMTString(); + } + else { + expires = ""; + } + document.cookie = name + "=" + value + expires + "; path=/"; +} + +export function setTooltip() { + setTimeout(function () { + let options = { "trigger": "hover", fallbackPlacements: ['bottom'] }; + let tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]')); + let tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) { + return new Tooltip(tooltipTriggerEl, options) + }); + }, 1000); +} + +export function startClock() { + var clock = document.getElementById('clock'); + var clockDay = document.getElementById('clock-day'); + var clockMonth = document.getElementById('clock-month'); + function time() { + var date = new Date(); + var hours = date.getHours(); + var minutes = date.getMinutes(); + hours = hours % 12; + hours = hours ? hours : 12; + minutes = minutes < 10 ? '0' + minutes : minutes; + clock.textContent = hours + ':' + minutes; + + var days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; + var months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; + + clockDay.textContent = days[date.getDay()]; + clockMonth.textContent = months[date.getMonth()] + ' ' + date.getDate(); + } + time(); + setInterval(time, 60 * 1000); +} + +export function getInputFileBlobInfo(inputElement) { + const file = inputElement.files[0]; + const fileName = file.name; + const url = URL.createObjectURL(file); + console.log(url); + return { fileName, url }; +} diff --git a/src/Blogifier.Admin/assets/js/editor.js b/src/Blogifier.Admin/assets/js/editor.js index c71cb2eca..64f10d058 100644 --- a/src/Blogifier.Admin/assets/js/editor.js +++ b/src/Blogifier.Admin/assets/js/editor.js @@ -204,7 +204,7 @@ function editorToolbarTooltip() { buttons[i].setAttribute('data-bs-placement', 'bottom'); } // TODO: remove this later: - commonJsFunctions.setTooltip(); + //commonJsFunctions.setTooltip(); } let easymde; diff --git a/src/Blogifier.Admin/wwwroot/admin/favicons/browserconfig.xml b/src/Blogifier.Admin/wwwroot/admin/favicons/browserconfig.xml index f4c19c27a..fa7e4a294 100644 --- a/src/Blogifier.Admin/wwwroot/admin/favicons/browserconfig.xml +++ b/src/Blogifier.Admin/wwwroot/admin/favicons/browserconfig.xml @@ -1,9 +1,9 @@ - - - - #ffffff - - + + + + #ffffff + + diff --git a/src/Blogifier.Admin/wwwroot/admin/favicons/site.webmanifest b/src/Blogifier.Admin/wwwroot/admin/favicons/site.webmanifest index 0d4c82f8b..92f571f0c 100644 --- a/src/Blogifier.Admin/wwwroot/admin/favicons/site.webmanifest +++ b/src/Blogifier.Admin/wwwroot/admin/favicons/site.webmanifest @@ -1,19 +1,19 @@ { - "name": "Blogifier", - "short_name": "Blogifier", - "icons": [ - { - "src": "admin/favicons/android-chrome-192x192.png?v=3", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "admin/favicons/android-chrome-512x512.png?v=3", - "sizes": "512x512", - "type": "image/png" - } - ], - "theme_color": "#ffffff", - "background_color": "#ffffff", - "display": "standalone" + "name": "Blogifier", + "short_name": "Blogifier", + "icons": [ + { + "src": "admin/favicons/android-chrome-192x192.png?v=3", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "admin/favicons/android-chrome-512x512.png?v=3", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" } diff --git a/src/Blogifier.Admin/wwwroot/index.html b/src/Blogifier.Admin/wwwroot/index.html index 628017365..a6e34a242 100644 --- a/src/Blogifier.Admin/wwwroot/index.html +++ b/src/Blogifier.Admin/wwwroot/index.html @@ -10,16 +10,16 @@ TODO: for rtl: --> - - - - - - + + + + + + - + @@ -48,11 +48,6 @@
    -
    - - -
    - diff --git a/src/Blogifier.Shared/Blogifier.Shared.csproj b/src/Blogifier.Shared/Blogifier.Shared.csproj index bc42f863d..0ffd8284e 100644 --- a/src/Blogifier.Shared/Blogifier.Shared.csproj +++ b/src/Blogifier.Shared/Blogifier.Shared.csproj @@ -1,12 +1,12 @@ - net7.0 + net8.0 enable - + diff --git a/src/Blogifier.Shared/BlogifierSharedConstant.cs b/src/Blogifier.Shared/BlogifierSharedConstant.cs index ef8d7a568..e2d10ac82 100644 --- a/src/Blogifier.Shared/BlogifierSharedConstant.cs +++ b/src/Blogifier.Shared/BlogifierSharedConstant.cs @@ -8,7 +8,7 @@ public static class BlogifierSharedConstant public const string PolicyAdminName = "Administrator"; public static readonly string PolicyAdminValue = $"{((int)UserType.Administrator)}"; public static readonly string DefaultAvatar = "/img/avatar.jpg"; - public static readonly string DefaultCover = "img/cover.jpg"; + public static readonly string DefaultCover = "/img/cover.jpg"; public static readonly string DefaultLogo = "img/logo-sm.png"; public static readonly JsonSerializerOptions DefaultJsonSerializerOptions = new(JsonSerializerDefaults.Web); } diff --git a/src/Blogifier.Shared/Helper/UserHelper.cs b/src/Blogifier.Shared/Helper/PageHelper.cs similarity index 50% rename from src/Blogifier.Shared/Helper/UserHelper.cs rename to src/Blogifier.Shared/Helper/PageHelper.cs index 5a83fc028..18902f061 100644 --- a/src/Blogifier.Shared/Helper/UserHelper.cs +++ b/src/Blogifier.Shared/Helper/PageHelper.cs @@ -1,10 +1,16 @@ namespace Blogifier.Shared; -public static class UserHelper +public static class PageHelper { public static string CheckGetAvatarUrl(string? avatar) { if (!string.IsNullOrEmpty(avatar)) return avatar; return BlogifierSharedConstant.DefaultAvatar; } + + public static string CheckGetCoverrUrl(string? avatar) + { + if (!string.IsNullOrEmpty(avatar)) return avatar; + return BlogifierSharedConstant.DefaultCover; + } } diff --git a/src/Blogifier.Shared/Helper/StringHelper.cs b/src/Blogifier.Shared/Helper/StringHelper.cs index 57d6bdf39..1f9c3c34c 100644 --- a/src/Blogifier.Shared/Helper/StringHelper.cs +++ b/src/Blogifier.Shared/Helper/StringHelper.cs @@ -4,36 +4,30 @@ namespace Blogifier.Helper; public static partial class StringHelper { - [GeneratedRegex("]*>[\\s\\S]*?", RegexOptions.Compiled)] - private static partial Regex HtmlScriptGeneratedRegex(); - public static string RemoveHtmlScriptTags(string input) => HtmlScriptGeneratedRegex().Replace(input, string.Empty); - + public static partial Regex HtmlScriptGeneratedRegex(); [GeneratedRegex("]*>[\\s\\S]*?>", RegexOptions.Compiled)] - private static partial Regex HtmlImgGeneratedRegex(); - public static string RemoveHtmlImgTags(string input) => HtmlImgGeneratedRegex().Replace(input, string.Empty); - + public static partial Regex HtmlImgGeneratedRegex(); [GeneratedRegex("", RegexOptions.Compiled)] - private static partial Regex HtmlImgSrcGeneratedRegex(); - public static Match MatchHtmlImgSrc(string input) => HtmlImgSrcGeneratedRegex().Match(input); + public static partial Regex HtmlImgSrcGeneratedRegex(); [GeneratedRegex("]*?src\\s*=\\s*[\"']?([^'\" >]+?)[ '\"][^>]*?>", RegexOptions.Compiled)] - private static partial Regex HtmlImgTagsGeneratedRegex(); - public static MatchCollection MatchesHtmlImgTags(string input) => HtmlImgTagsGeneratedRegex().Matches(input); - + public static partial Regex HtmlImgTagsGeneratedRegex(); [GeneratedRegex("(?i)]*?>(?.*?)", RegexOptions.Compiled)] - private static partial Regex HtmlFileGeneratedRegex(); - public static MatchCollection MatchesHtmlFile(string input) => HtmlFileGeneratedRegex().Matches(input); - + public static partial Regex HtmlFileGeneratedRegex(); [GeneratedRegex("!\\[[^\\]]*\\]\\((blob:[^)]+)\\)", RegexOptions.Compiled)] - private static partial Regex MarkdownImgBlobGeneratedRegex(); - public static MatchCollection MatchesMarkdownImgBlob(string input) => MarkdownImgBlobGeneratedRegex().Matches(input); - + public static partial Regex MarkdownImgBlobGeneratedRegex(); - [GeneratedRegex(@"!\[(?[^\]]+)\]\(data:image\/(?.+);base64,(?.+?)\)", RegexOptions.Compiled)] + [GeneratedRegex(@"!\[(?[^\]]+)\]\(data:image\/(?.+);base64,(?.*)\)", RegexOptions.Compiled)] public static partial Regex MarkdownDataImageBase64BlobGeneratedRegex(); + + [GeneratedRegex(@"blob:(https?://[^/]+/\S+)", RegexOptions.Compiled)] + public static partial Regex BlobUrlGeneratedRegex(); + + [GeneratedRegex(@"data:image\/(?.+);base64,(?.*)", RegexOptions.Compiled)] + public static partial Regex DataImageBase64GeneratedRegex(); } diff --git a/src/Blogifier.Shared/Resources/Resource.resx b/src/Blogifier.Shared/Resources/Resource.resx index a415c3dfb..536d0b30f 100644 --- a/src/Blogifier.Shared/Resources/Resource.resx +++ b/src/Blogifier.Shared/Resources/Resource.resx @@ -786,4 +786,7 @@ View All + + Account Profile + \ No newline at end of file diff --git a/src/Blogifier.Shared/Resources/Resource.zh-CN.resx b/src/Blogifier.Shared/Resources/Resource.zh-CN.resx index f83ff6081..465691f7e 100644 --- a/src/Blogifier.Shared/Resources/Resource.zh-CN.resx +++ b/src/Blogifier.Shared/Resources/Resource.zh-CN.resx @@ -504,4 +504,25 @@ 查看所有 + + 操作 + + + 修改 + + + 重置 + + + 编辑配置 + + + 退出登陆 + + + 注册 + + + 用户信息 + \ No newline at end of file diff --git a/src/Blogifier.Themes.Standard/Blogifier.Themes.Standard.csproj b/src/Blogifier.Themes.Standard/Blogifier.Themes.Standard.csproj index 70a13b88c..fbfc7d793 100644 --- a/src/Blogifier.Themes.Standard/Blogifier.Themes.Standard.csproj +++ b/src/Blogifier.Themes.Standard/Blogifier.Themes.Standard.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable true diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml index ac79f4d21..d48bff059 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/404.cshtml @@ -3,93 +3,7 @@ Layout = "layouts/_base.cshtml"; } -@section HeadMeta{ - +@section HeaderScript{ @_localizer["page-not-found"] } diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml index e3d4f9860..15fedd335 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/components/nav.cshtml @@ -87,7 +87,7 @@
  • @_localizer["newsletter"]
  • @_localizer["settings"]
  • @_localizer["customize"]
    • -
  • @_localizer["edit-profile"]
    • +
  • @_localizer["account-profile"]
    • diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/initialize.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/initialize.cshtml index 9b8b68d9a..3d22500b6 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/initialize.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/initialize.cshtml @@ -4,7 +4,7 @@ Layout = "layouts/_account.cshtml"; } -@section HeadMeta{ +@section HeaderScript{ @_localizer["initialize"] } diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml index 201dbb63d..32d238add 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_account.cshtml @@ -6,9 +6,10 @@ - @await RenderSectionAsync("HeadMeta",false) - + + + @await RenderSectionAsync("HeaderScript", required: false) @@ -27,7 +28,7 @@ @RenderBody() - + diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_base.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_base.cshtml index b9ca833d4..f6350fc9a 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_base.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_base.cshtml @@ -4,7 +4,6 @@ - @await RenderSectionAsync("HeadMeta",false) - + + @await RenderSectionAsync("HeaderScript", required: false) @RenderBody() - diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_main.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_main.cshtml index 61581df89..4607be766 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_main.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_main.cshtml @@ -29,14 +29,16 @@ --bf-radius: .5rem; } - + @Html.Raw(Model.Main.HeaderScript) @RenderBody() - + + + @RenderSection("FooterScript", required: false) @Html.Raw(Model.Main.FooterScript) diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml index 27cbb22da..addc7dc57 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/layouts/_profile.cshtml @@ -7,9 +7,8 @@ - @await RenderSectionAsync("HeadMeta",false) - - + + @await RenderSectionAsync("HeaderScript",false) @@ -53,7 +52,8 @@ - + + @await RenderSectionAsync("FooterScript",false) diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/login.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/login.cshtml index 1c2e746db..33f3c6cff 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/login.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/login.cshtml @@ -4,7 +4,7 @@ } @inject IStringLocalizer _localizer -@section HeadMeta{ +@section HeaderScript{ @_localizer["login"] } @@ -25,4 +25,5 @@ + @_localizer["register"] diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml index 81f970c42..e50ff1a9a 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/page.cshtml @@ -7,10 +7,14 @@ Layout = "layouts/_main.cshtml"; } +@section FooterScript { + +} +
    - @Model.PostSlug.Post.Title + @Model.PostSlug.Post.Title

    @Model.PostSlug.Post.Title

    diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/password.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/password.cshtml index 2703d0e87..8b1333603 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/password.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/password.cshtml @@ -6,7 +6,7 @@ @inject IStringLocalizer _localizer -@section HeadMeta{ +@section HeaderScript{ @_localizer["edit-profile"] } diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml index 4d14f2c84..f5b798103 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post.cshtml @@ -1,20 +1,25 @@ @model PostModel @inject IStringLocalizer _localizer + @{ Layout = "layouts/_main.cshtml"; ; } +@section FooterScript { + +} +
    - +

    @Model.PostSlug.Post.Title

    -
    @_localizer["author"] diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/author.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/author.cshtml index 88f4e4fb3..c9fa54f55 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/author.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/author.cshtml @@ -2,7 +2,7 @@
    - @Model.PostSlug.Post.User.NickName + @Model.PostSlug.Post.User.NickName
    @Model.PostSlug.Post.User.NickName
    diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml index 0b00e4273..f42a85161 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/featured.cshtml @@ -21,7 +21,7 @@
    @@ -32,7 +32,7 @@
    - @item.User.NickName + @item.User.NickName @item.User.NickName
    diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml index 69b0ea7f0..affb8fddc 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/related.cshtml @@ -32,7 +32,7 @@
    @if (post.Categories != null) { @@ -51,7 +51,7 @@

    - + @post.User.NickName
    diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml index 1a4c03326..c17ad76c7 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-grid.cshtml @@ -10,7 +10,7 @@
    - @post.Title + @post.Title
    @if (post.Categories != null) { @@ -27,7 +27,7 @@

    @Html.Raw(post.Description)

    - @post.User.NickName + @post.User.NickName @post.User.NickName
    diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml index 73e2e716a..ed9f89ee0 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/post/view-list.cshtml @@ -7,7 +7,7 @@ {
    - @post.Title + @post.Title

    @@ -15,7 +15,7 @@

    - @post.User.NickName @post.User.NickName
    diff --git a/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml b/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml index 418f99b23..dd1b15afb 100644 --- a/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml +++ b/src/Blogifier.Themes.Standard/Views/Themes/standard/profile.cshtml @@ -4,11 +4,15 @@ } @inject IStringLocalizer _localizer -@section HeadMeta{ - @_localizer["edit-profile"] +@section HeaderScript{ + @_localizer["account-profile"] } -

    @_localizer["edit-profile"]

    +@section FooterScript { + +} + +

    @_localizer["account-profile"]

    @if (!string.IsNullOrEmpty(Model.Error)) { @@ -19,9 +23,9 @@
    - +
    - @Model.NickName + @Model.NickName
    + @_localizer["cancel"] diff --git a/src/Blogifier.Themes.Standard/assets/gulpfile.mjs b/src/Blogifier.Themes.Standard/assets/gulpfile.mjs index 5dcc1d51e..ce4bdea1e 100644 --- a/src/Blogifier.Themes.Standard/assets/gulpfile.mjs +++ b/src/Blogifier.Themes.Standard/assets/gulpfile.mjs @@ -45,8 +45,8 @@ const release = (done) => { done(); }; -// Rollup.js -const rollupJs = () => { +// blogifier.js +const blogifierJs = () => { let outputOptions = { sourcemap: true, format: 'iife' @@ -89,6 +89,140 @@ const rollupJs = () => { return stream.pipe(dest('dist/js')); } +// highlight.js +const highlightJs = () => { + let outputOptions = { + sourcemap: true, + format: 'iife' + } + + if (mode !== 'Debug') { + outputOptions.sourcemap = false; + outputOptions.minifyInternalExports = true; + outputOptions.plugins = [terser()]; + } + + let stream = rollupStream({ + input: 'js/highlight.js', + output: outputOptions, + plugins: [ + babel({ + exclude: 'node_modules/**', + presets: ['@babel/preset-env'], + babelHelpers: 'bundled', + }), + nodeResolve({ + browser: true, + preferBuiltins: false, + }), + commonjs({ + include: ['node_modules/**'], + exclude: [], + sourceMap: mode === 'Debug', + }), + ], + }) + + stream = stream.pipe(source('highlight.js')); + if (mode !== 'Debug') { + // JS Minify + stream = stream.pipe(buffer()) + stream = stream.pipe(plumber()) + stream = stream.pipe(uglify()) + } + return stream.pipe(dest('dist/js')); +} + + +// main.js +const mainJs = () => { + let outputOptions = { + sourcemap: true, + format: 'iife' + } + + if (mode !== 'Debug') { + outputOptions.sourcemap = false; + outputOptions.minifyInternalExports = true; + outputOptions.plugins = [terser()]; + } + + let stream = rollupStream({ + input: 'js/main.js', + output: outputOptions, + plugins: [ + babel({ + exclude: 'node_modules/**', + presets: ['@babel/preset-env'], + babelHelpers: 'bundled', + }), + nodeResolve({ + browser: true, + preferBuiltins: false, + }), + commonjs({ + include: ['node_modules/**'], + exclude: [], + sourceMap: mode === 'Debug', + }), + ], + }) + + stream = stream.pipe(source('main.js')); + if (mode !== 'Debug') { + // JS Minify + stream = stream.pipe(buffer()) + stream = stream.pipe(plumber()) + stream = stream.pipe(uglify()) + } + return stream.pipe(dest('dist/js')); +} + + +// profile.js +const profileJs = () => { + let outputOptions = { + sourcemap: true, + format: 'iife' + } + + if (mode !== 'Debug') { + outputOptions.sourcemap = false; + outputOptions.minifyInternalExports = true; + outputOptions.plugins = [terser()]; + } + + let stream = rollupStream({ + input: 'js/profile.js', + output: outputOptions, + plugins: [ + babel({ + exclude: 'node_modules/**', + presets: ['@babel/preset-env'], + babelHelpers: 'bundled', + }), + nodeResolve({ + browser: true, + preferBuiltins: false, + }), + commonjs({ + include: ['node_modules/**'], + exclude: [], + sourceMap: mode === 'Debug', + }), + ], + }) + + stream = stream.pipe(source('profile.js')); + if (mode !== 'Debug') { + // JS Minify + stream = stream.pipe(buffer()) + stream = stream.pipe(plumber()) + stream = stream.pipe(uglify()) + } + return stream.pipe(dest('dist/js')); +} + // sass const scss = () => { let stream = src("./scss/**/*.scss") @@ -129,15 +263,22 @@ const svgSprite = () => { } const watcher = () => { - watch('./js/**/*.js', series(rollupJs)); + watch('./js/**/*.js', series( + blogifierJs, + highlightJs, + mainJs, + profileJs, + )); watch('./scss/**/*.scss', series(scss)); }; export default series( - clean, parallel( scss, - rollupJs, + blogifierJs, + highlightJs, + mainJs, + profileJs, svgSprite, watcher ) @@ -146,7 +287,10 @@ export default series( const build = series( clean, scss, - rollupJs, + blogifierJs, + highlightJs, + mainJs, + profileJs, svgSprite, ); diff --git a/src/Blogifier.Themes.Standard/assets/js/blogifier.js b/src/Blogifier.Themes.Standard/assets/js/blogifier.js index 7cbde4ed8..aa9524295 100644 --- a/src/Blogifier.Themes.Standard/assets/js/blogifier.js +++ b/src/Blogifier.Themes.Standard/assets/js/blogifier.js @@ -1,87 +1,6 @@ import "bootstrap"; -import hljs from 'highlight.js'; -hljs.initHighlightingOnLoad(); -// get the newsletter form elements -const form = document.getElementById("newsletter"); -const form_email = document.getElementById("newsletter_email"); -const form_status = document.getElementById("newsletter_status"); -const newsletterSucessMsg = form_status.dataset.success, newsletterErrorMsg = form_status.dataset.error; -// Success, Loading and Error functions -function successNewsletter() { - form_status.innerHTML = ``; - setTimeout(resetNewsletter, 2000); -} -function loadingNewsletter() { - form_status.innerHTML = '' -} -function errorNewsletter(msg) { - form_status.innerHTML = ``; -} -function resetNewsletter() { - form.reset(); - form_status.innerHTML = ""; -} -function subscribeNewsletter(url, data) { - var options = { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify(data) - } - fetch(url, options) - .then((response) => { - if (response.status == 200) { - return response.json(); - } else { - throw new Error('The Newsletter is not working!'); - } - }) - .then(() => { - successNewsletter(); - }) - .catch((err) => { - errorNewsletter(err); - }); -} - -form.addEventListener("submit", function (e) { - e.preventDefault(); - loadingNewsletter(); - var subscriber_data = { - Email: form_email.value, - Ip: "unknown", - Country: "unknown", - Region: "unknown" - }; - fetch('https://ipapi.co/json/') - .then((response) => { - if (response.status == 200) { - return response.json(); - } else { - throw new Error('Not sure where you are!'); - } - }) - .then((loc) => { - subscriber_data.Ip = loc.ip; - subscriber_data.Country = loc.country_name; - subscriber_data.Region = loc.region; - subscribeNewsletter(form.action, subscriber_data); - }) - .catch((err) => { - subscribeNewsletter(form.action, subscriber_data); - }); -}); - - -// search modal auto focus -var myModal = document.getElementById('searchModal'); -var myInput = document.getElementById('searchFormInput'); -if (myModal) { - myModal.addEventListener('shown.bs.modal', function () { - myInput.focus() - }) -} // copy input function copyInput(elm) { diff --git a/src/Blogifier.Themes.Standard/assets/js/highlight.js b/src/Blogifier.Themes.Standard/assets/js/highlight.js new file mode 100644 index 000000000..2a5ed565e --- /dev/null +++ b/src/Blogifier.Themes.Standard/assets/js/highlight.js @@ -0,0 +1,2 @@ +import hljs from 'highlight.js'; +hljs.initHighlightingOnLoad(); diff --git a/src/Blogifier.Themes.Standard/assets/js/main.js b/src/Blogifier.Themes.Standard/assets/js/main.js new file mode 100644 index 000000000..b602c41dc --- /dev/null +++ b/src/Blogifier.Themes.Standard/assets/js/main.js @@ -0,0 +1,79 @@ +// get the newsletter form elements +const form = document.getElementById("newsletter"); +const form_email = document.getElementById("newsletter_email"); +const form_status = document.getElementById("newsletter_status"); + +// Success, Loading and Error functions +function successNewsletter() { + const newsletterSucessMsg = form_status.dataset.success, newsletterErrorMsg = form_status.dataset.error; + form_status.innerHTML = ``; + setTimeout(resetNewsletter, 2000); +} +function loadingNewsletter() { + form_status.innerHTML = '' +} +function errorNewsletter(msg) { + form_status.innerHTML = ``; +} +function resetNewsletter() { + form.reset(); + form_status.innerHTML = ""; +} + +function subscribeNewsletter(url, data) { + var options = { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(data) + } + fetch(url, options) + .then((response) => { + if (response.status == 200) { + return response.json(); + } else { + throw new Error('The Newsletter is not working!'); + } + }) + .then(() => { + successNewsletter(); + }) + .catch((err) => { + errorNewsletter(err); + }); +} + +form.addEventListener("submit", function (e) { + e.preventDefault(); + loadingNewsletter(); + var subscriber_data = { + Email: form_email.value, + Ip: "unknown", + Country: "unknown", + Region: "unknown" + }; + fetch('https://ipapi.co/json/') + .then((response) => { + if (response.status == 200) { + return response.json(); + } else { + throw new Error('Not sure where you are!'); + } + }) + .then((loc) => { + subscriber_data.Ip = loc.ip; + subscriber_data.Country = loc.country_name; + subscriber_data.Region = loc.region; + subscribeNewsletter(form.action, subscriber_data); + }) + .catch((err) => { + subscribeNewsletter(form.action, subscriber_data); + }); +}); + +// search modal auto focus +var myModal = document.getElementById('searchModal'); +if (myModal) { + myModal.addEventListener('shown.bs.modal', function () { + document.getElementById('searchFormInput').focus() + }) +} diff --git a/src/Blogifier.Themes.Standard/assets/js/profile.js b/src/Blogifier.Themes.Standard/assets/js/profile.js new file mode 100644 index 000000000..47eec7b47 --- /dev/null +++ b/src/Blogifier.Themes.Standard/assets/js/profile.js @@ -0,0 +1,15 @@ + +// copy input +function test(elm) { + var copyText = document.getElementById(elm); + var copyTextStore = copyText.dataset.link; + copyText.select(); + copyText.setSelectionRange(0, 99999); + document.execCommand("copy"); + copyText.value = "Copied!"; + copyText.classList.add("copied"); + setTimeout(function () { + copyText.value = copyTextStore; + copyText.classList.remove("copied"); + }, 500); +} diff --git a/src/Blogifier.Themes.Standard/assets/scss/account.scss b/src/Blogifier.Themes.Standard/assets/scss/account.scss index 40a2dc70b..7b1f10a37 100644 --- a/src/Blogifier.Themes.Standard/assets/scss/account.scss +++ b/src/Blogifier.Themes.Standard/assets/scss/account.scss @@ -102,7 +102,10 @@ $form-floating-padding-y: .875rem; $form-floating-label-opacity: .65; $form-floating-label-transform: scale(.8) translateY(-.325rem) translateX(.15rem); -@import "helpers/bootstrap"; +@import "../node_modules/bootstrap/scss/functions"; +@import "../node_modules/bootstrap/scss/variables"; +@import "../node_modules/bootstrap/scss/root"; + @import "layout/sidebar"; @import "include/buttons"; @import "include/forms"; @@ -143,11 +146,3 @@ body { display: flex; flex-direction: column; } - -// shared/MainLayout.razor -.content { -} - -// Components/NavMenuComponent.razor -.menu { -} diff --git a/src/Blogifier.Themes.Standard/assets/scss/base.scss b/src/Blogifier.Themes.Standard/assets/scss/base.scss new file mode 100644 index 000000000..7de07fe86 --- /dev/null +++ b/src/Blogifier.Themes.Standard/assets/scss/base.scss @@ -0,0 +1,84 @@ +*, +*::before, +*::after { + box-sizing: border-box; +} + +html { + height: 100%; +} + +body { + margin: 0; + font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-size: 1rem; + font-weight: 400; + line-height: 1.5; + color: #000; + background-color: #f8f9fa; + display: flex; + height: 100%; +} + +p { + margin: 0; +} + +.container { + width: 32rem; + max-width: 100%; + padding: 2rem; + margin: auto; +} + +.title { + margin: 0 0 1rem; + font-weight: 500; + font-size: 2rem; +} + +.message { + margin-bottom: 2rem; + font-size: 1.25rem; + color: #727272; +} + +.button { + padding: 0 1.5rem 0 .75rem; + border-radius: .3rem; + display: inline-block; + background-color: #009e66; + color: #fff; + text-decoration: none; + font-size: .875rem; + font-weight: 500; + line-height: 2.5rem; +} + + .button:hover { + background-color: #009460; + } + + .button .icon { + vertical-align: middle; + } + +@media screen and (min-width:480px) { + .title { + font-size: 2.5rem; + font-weight: 700; + } + + .message { + font-size: 1.5rem; + font-weight: 300; + } + + .message .br { + display: block; + } + + .button { + line-height: 2.75rem; + } +} diff --git a/src/Blogifier.Themes.Standard/assets/scss/blogifier.scss b/src/Blogifier.Themes.Standard/assets/scss/blogifier.scss index f299d05da..af19e22c1 100644 --- a/src/Blogifier.Themes.Standard/assets/scss/blogifier.scss +++ b/src/Blogifier.Themes.Standard/assets/scss/blogifier.scss @@ -6,7 +6,63 @@ // helpers @import "helpers/variables"; -@import "helpers/bootstrap"; + +/* + * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/) + * Copyright 2011-2021 The Bootstrap Authors + * Copyright 2011-2021 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) + */ + +// scss-docs-start import-stack +// Configuration +@import "../node_modules/bootstrap/scss/functions"; +@import "../node_modules/bootstrap/scss/variables"; +@import "../node_modules/bootstrap/scss/mixins"; +@import "helpers/colors"; +@import "../node_modules/bootstrap/scss/utilities"; +@import "../node_modules/bootstrap/scss/root"; + +// Layout & components + +@import "../node_modules/bootstrap/scss/reboot"; +@import "../node_modules/bootstrap/scss/type"; +@import "../node_modules/bootstrap/scss/images"; +@import "../node_modules/bootstrap/scss/containers"; +@import "../node_modules/bootstrap/scss/grid"; +@import "../node_modules/bootstrap/scss/tables"; +@import "../node_modules/bootstrap/scss/forms"; +@import "../node_modules/bootstrap/scss/buttons"; +@import "../node_modules/bootstrap/scss/transitions"; +@import "../node_modules/bootstrap/scss/dropdown"; +@import "../node_modules/bootstrap/scss/button-group"; +// @import "../node_modules/bootstrap/scss/nav"; +// @import "../node_modules/bootstrap/scss/navbar"; +// @import "../node_modules/bootstrap/scss/card"; +@import "../node_modules/bootstrap/scss/accordion"; +// @import "../node_modules/bootstrap/scss/breadcrumb"; +@import "../node_modules/bootstrap/scss/pagination"; +@import "../node_modules/bootstrap/scss/badge"; +@import "../node_modules/bootstrap/scss/alert"; +// @import "../node_modules/bootstrap/scss/progress"; +@import "../node_modules/bootstrap/scss/list-group"; +@import "../node_modules/bootstrap/scss/close"; +// @import "../node_modules/bootstrap/scss/toasts"; +@import "../node_modules/bootstrap/scss/modal"; +@import "../node_modules/bootstrap/scss/tooltip"; +@import "../node_modules/bootstrap/scss/popover"; +@import "../node_modules/bootstrap/scss/carousel"; +@import "../node_modules/bootstrap/scss/spinners"; +// @import "../node_modules/bootstrap/scss/offcanvas"; + +// Helpers +@import "../node_modules/bootstrap/scss/helpers"; + +// Utilities +@import "../node_modules/bootstrap/scss/utilities/api"; +// scss-docs-end import-stack + + @import "helpers/mixins"; @import "helpers/reset"; @import "helpers/base"; diff --git a/src/Blogifier.Themes.Standard/assets/scss/helpers/_bootstrap.scss b/src/Blogifier.Themes.Standard/assets/scss/helpers/_bootstrap.scss deleted file mode 100644 index 759829d45..000000000 --- a/src/Blogifier.Themes.Standard/assets/scss/helpers/_bootstrap.scss +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Bootstrap v5.0.0-beta3 (https://getbootstrap.com/) - * Copyright 2011-2021 The Bootstrap Authors - * Copyright 2011-2021 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) - */ - -// scss-docs-start import-stack -// Configuration -@import "../../node_modules/bootstrap/scss/functions"; -@import "../../node_modules/bootstrap/scss/variables"; -@import "../../node_modules/bootstrap/scss/mixins"; -@import "colors"; -@import "../../node_modules/bootstrap/scss/utilities"; - -// Layout & components -@import "../../node_modules/bootstrap/scss/root"; -@import "../../node_modules/bootstrap/scss/reboot"; -@import "../../node_modules/bootstrap/scss/type"; -@import "../../node_modules/bootstrap/scss/images"; -@import "../../node_modules/bootstrap/scss/containers"; -@import "../../node_modules/bootstrap/scss/grid"; -@import "../../node_modules/bootstrap/scss/tables"; -@import "../../node_modules/bootstrap/scss/forms"; -@import "../../node_modules/bootstrap/scss/buttons"; -@import "../../node_modules/bootstrap/scss/transitions"; -@import "../../node_modules/bootstrap/scss/dropdown"; -@import "../../node_modules/bootstrap/scss/button-group"; -// @import "../../node_modules/bootstrap/scss/nav"; -// @import "../../node_modules/bootstrap/scss/navbar"; -// @import "../../node_modules/bootstrap/scss/card"; -@import "../../node_modules/bootstrap/scss/accordion"; -// @import "../../node_modules/bootstrap/scss/breadcrumb"; -@import "../../node_modules/bootstrap/scss/pagination"; -@import "../../node_modules/bootstrap/scss/badge"; -@import "../../node_modules/bootstrap/scss/alert"; -// @import "../../node_modules/bootstrap/scss/progress"; -@import "../../node_modules/bootstrap/scss/list-group"; -@import "../../node_modules/bootstrap/scss/close"; -// @import "../../node_modules/bootstrap/scss/toasts"; -@import "../../node_modules/bootstrap/scss/modal"; -@import "../../node_modules/bootstrap/scss/tooltip"; -@import "../../node_modules/bootstrap/scss/popover"; -@import "../../node_modules/bootstrap/scss/carousel"; -@import "../../node_modules/bootstrap/scss/spinners"; -// @import "../../node_modules/bootstrap/scss/offcanvas"; - -// Helpers -@import "../../node_modules/bootstrap/scss/helpers"; - -// Utilities -@import "../../node_modules/bootstrap/scss/utilities/api"; -// scss-docs-end import-stack diff --git a/src/Blogifier/Blogifier.csproj b/src/Blogifier/Blogifier.csproj index 7db59c99a..0f8460e96 100644 --- a/src/Blogifier/Blogifier.csproj +++ b/src/Blogifier/Blogifier.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable false true @@ -14,25 +14,25 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + - + - + diff --git a/src/Blogifier/Interfaces/PostController.cs b/src/Blogifier/Interfaces/PostController.cs index 9478b6da5..b70587f3b 100644 --- a/src/Blogifier/Interfaces/PostController.cs +++ b/src/Blogifier/Interfaces/PostController.cs @@ -46,6 +46,11 @@ public async Task AddPostAsync([FromServices] StorageManager storageMana { var userId = User.FirstUserId(); var uploadAt = DateTime.UtcNow; + if (!string.IsNullOrEmpty(post.Cover)) + { + var coverUrl = await storageManager.UploadImagesBase64(uploadAt, userId, post.Cover); + post.Cover = coverUrl; + } var uploadContent = await storageManager.UploadImagesBase64FoHtml(uploadAt, userId, post.Content); post.Content = uploadContent; return await _postProvider.AddAsync(post, userId); @@ -57,6 +62,11 @@ public async Task UpdateAsync([FromServices] StorageManager storageManager, [Fro { var userId = User.FirstUserId(); var uploadAt = DateTime.UtcNow; + if (!string.IsNullOrEmpty(post.Cover)) + { + var coverUrl = await storageManager.UploadImagesBase64(uploadAt, userId, post.Cover); + post.Cover = coverUrl; + } var uploadContent = await storageManager.UploadImagesBase64FoHtml(uploadAt, userId, post.Content); post.Content = uploadContent; await _postProvider.UpdateAsync(post, userId); diff --git a/src/Blogifier/Posts/ImportManager.cs b/src/Blogifier/Posts/ImportManager.cs index 34333766e..4286b2892 100644 --- a/src/Blogifier/Posts/ImportManager.cs +++ b/src/Blogifier/Posts/ImportManager.cs @@ -2,6 +2,7 @@ using Blogifier.Identity; using Blogifier.Shared; using Blogifier.Storages; +using Microsoft.IdentityModel.Tokens; using System; using System.Collections.Generic; using System.Linq; @@ -47,7 +48,7 @@ public async Task> WriteAsync(ImportDto request, int var publishedAt = post.PublishedAt!.Value.ToUniversalTime(); var baseAddress = new Uri(post.Slug!); - if (post.Cover != null && !post.Cover.Equals(BlogifierSharedConstant.DefaultCover, StringComparison.OrdinalIgnoreCase)) + if (!string.IsNullOrEmpty(post.Cover)) await _storageManager.UploadAsync(publishedAt, user.Id, baseAddress, post.Cover); var uploadeContent = await _storageManager.UploadsFoHtmlAsync(publishedAt, user.Id, baseAddress, post.Content); diff --git a/src/Blogifier/Posts/ImportRssProvider.cs b/src/Blogifier/Posts/ImportRssProvider.cs index 3e9288368..9d2a13538 100644 --- a/src/Blogifier/Posts/ImportRssProvider.cs +++ b/src/Blogifier/Posts/ImportRssProvider.cs @@ -29,7 +29,6 @@ public ImportDto Analysis(string feedUrl) Title = item.Title.Text, Description = GetDescription(item.Summary.Text), Content = content, - Cover = BlogifierSharedConstant.DefaultCover, PublishedAt = item.PublishDate.DateTime, PostType = PostType.Post, }; diff --git a/src/Blogifier/Posts/PostProvider.cs b/src/Blogifier/Posts/PostProvider.cs index 586a2583a..47dc587c9 100644 --- a/src/Blogifier/Posts/PostProvider.cs +++ b/src/Blogifier/Posts/PostProvider.cs @@ -256,8 +256,12 @@ private async Task AddInternalAsync(PostEditorDto postInput, int userId) { var slug = await GetSlugFromTitle(postInput.Title); var postCategories = await CheckPostCategories(postInput.Categories); - var contentFiltr = StringHelper.RemoveHtmlImgTags(StringHelper.RemoveHtmlScriptTags(postInput.Content)); - var descriptionFiltr = StringHelper.RemoveHtmlImgTags(StringHelper.RemoveHtmlScriptTags(postInput.Description)); + + var contentScriptFiltr = StringHelper.HtmlScriptGeneratedRegex().Replace(postInput.Content, string.Empty); + var descriptionScriptFiltr = StringHelper.HtmlScriptGeneratedRegex().Replace(postInput.Description, string.Empty); + var contentFiltr = StringHelper.HtmlImgGeneratedRegex().Replace(contentScriptFiltr, string.Empty); + var descriptionFiltr = StringHelper.HtmlImgGeneratedRegex().Replace(descriptionScriptFiltr, string.Empty); + var publishedAt = GetPublishedAt(postInput.PublishedAt, postInput.State); var post = new Post { @@ -316,8 +320,12 @@ public async Task UpdateAsync(PostEditorDto postInput, int userId) post.Slug = postInput.Slug!; post.Title = postInput.Title; - var contentFiltr = StringHelper.RemoveHtmlImgTags(StringHelper.RemoveHtmlScriptTags(postInput.Content)); - var descriptionFiltr = StringHelper.RemoveHtmlImgTags(StringHelper.RemoveHtmlScriptTags(postInput.Description)); + + var contentScriptFiltr = StringHelper.HtmlScriptGeneratedRegex().Replace(postInput.Content, string.Empty); + var descriptionScriptFiltr = StringHelper.HtmlScriptGeneratedRegex().Replace(postInput.Description, string.Empty); + var contentFiltr = StringHelper.HtmlImgGeneratedRegex().Replace(contentScriptFiltr, string.Empty); + var descriptionFiltr = StringHelper.HtmlImgGeneratedRegex().Replace(descriptionScriptFiltr, string.Empty); + post.Description = descriptionFiltr; post.Content = contentFiltr; post.Cover = postInput.Cover; diff --git a/src/Blogifier/Storages/StorageManager.cs b/src/Blogifier/Storages/StorageManager.cs index 6487bdc44..4768ca6bd 100644 --- a/src/Blogifier/Storages/StorageManager.cs +++ b/src/Blogifier/Storages/StorageManager.cs @@ -5,11 +5,7 @@ using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Microsoft.IdentityModel.Tokens; using System; -using System.Collections.Generic; -using System.IO; using System.Linq; using System.Net.Http; using System.Text; @@ -108,14 +104,15 @@ public async Task UploadsFoHtmlAsync(DateTime uploadAt, int userid, Uri public async Task UploadImagesFoHtml(DateTime uploadAt, int userid, Uri baseAddress, string content) { - var matches = StringHelper.MatchesHtmlImgTags(content); + var matches = StringHelper.HtmlImgTagsGeneratedRegex().Matches(content); if (matches.Any()) { var contentBuilder = new StringBuilder(content); + var htmlImgSrcRegex = StringHelper.HtmlImgSrcGeneratedRegex(); foreach (Match match in matches.Cast()) { var tag = match.Value; - var matchUrl = StringHelper.MatchHtmlImgSrc(tag); + var matchUrl = htmlImgSrcRegex.Match(tag); var urlString = matchUrl.Groups[1].Value; var storage = await UploadAsync(uploadAt, userid, baseAddress, urlString); var uploadTag = $"![{storage.Name}]({storage.Slug})"; @@ -128,7 +125,7 @@ public async Task UploadImagesFoHtml(DateTime uploadAt, int userid, Uri public async Task UploadFilesFoHtml(DateTime uploadAt, int userid, Uri baseAddress, string content) { - var matches = StringHelper.MatchesHtmlFile(content); + var matches = StringHelper.HtmlFileGeneratedRegex().Matches(content); if (matches.Any()) { var contentBuilder = new StringBuilder(content); @@ -174,6 +171,24 @@ public async Task UploadImagesBase64FoHtml(DateTime uploadAt, int userid return content; } + public async Task UploadImagesBase64(DateTime uploadAt, int userid, string dataOrUrl) + { + var match = StringHelper.DataImageBase64GeneratedRegex().Match(dataOrUrl); + if (match.Success) + { + var imageType = match.Groups["type"].Value; + var base64Data = match.Groups["data"].Value; + var imageDataBytes = Convert.FromBase64String(base64Data); + var fileName = Guid.NewGuid().ToString() + "." + imageType; + var path = $"{userid}/{uploadAt.Year}{uploadAt.Month}/{fileName}"; + if (!_contentTypeProvider.TryGetContentType(fileName, out var contentType)) + contentType = "text/html"; + var storage = await _storageProvider.AddAsync(uploadAt, userid, path, fileName, imageDataBytes, contentType); + return storage.Slug; + } + return dataOrUrl; + } + private bool InvalidFileName(string fileName) { var fileExtensions = _fileExtensions ?? BlogifierConstant.FileExtensions; diff --git a/tests/Blogifier.Tests/Blogifier.Tests.csproj b/tests/Blogifier.Tests/Blogifier.Tests.csproj index 1a87258bf..df1d2b36b 100644 --- a/tests/Blogifier.Tests/Blogifier.Tests.csproj +++ b/tests/Blogifier.Tests/Blogifier.Tests.csproj @@ -1,14 +1,14 @@ - net7.0 + net8.0 - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all