Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert changes #197

Merged
merged 2 commits into from
Aug 2, 2023
Merged

revert changes #197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd3dddf
revert changes
MaxymGorn Aug 2, 2023
d3f6e0d
Fix empty tag : [ meta ] must be self closed. (tag-self-close)
MaxymGorn Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ jobs:
echo -n "$jsFile" > service-worker-assets.js

# copy index.html to 404.html to serve the same file when a file is not found
#- name: copy index.html to 404.html
# run: cp release/wwwroot/index.html release/wwwroot/404.html
- name: copy index.html to 404.html
run: cp release/wwwroot/index.html release/wwwroot/404.html

# add .nojekyll file to tell GitHub pages to not treat this as a Jekyll project. (Allow files and folders starting with an underscore)
- name: Add .nojekyll file
Expand Down
4 changes: 4 additions & 0 deletions src/Cropper.Blazor/Client/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
using Cropper.Blazor.Client;
using Cropper.Blazor.Client.Extensions;
using Cropper.Blazor.Extensions;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;

var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.RootComponents.Add<App>("#app");
builder.RootComponents.Add<HeadOutlet>("head::after");

builder.Services
.AddScoped(sp => new HttpClient
Expand Down
9 changes: 1 addition & 8 deletions src/Cropper.Blazor/Server/Pages/_Host.cshtml → src/Cropper.Blazor/Client/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
@page
@using Cropper.Blazor.Client;
@using Cropper.Blazor.Client.Shared;
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

<!DOCTYPE html>
<!DOCTYPE html>
<html>

<head>
Expand Down Expand Up @@ -44,8 +39,6 @@
</head>

<body>
<component type="typeof(SeoHeader)" render-mode="WebAssemblyPrerendered"/>
<component type="typeof(App)" render-mode="WebAssembly"/>
<div id="app">
<div style="height:100%;width:100%;margin:0;position:fixed;">
<div style="display: flex;justify-content: center;align-items:center;height:100%;width:100%;">
Expand Down
11 changes: 0 additions & 11 deletions src/Cropper.Blazor/Server/Pages/_Host.cshtml.cs
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions src/Cropper.Blazor/Server/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
using Cropper.Blazor.Client.Extensions;

var builder = WebApplication.CreateBuilder(args);

// Add services to the container.

builder.Services.AddControllersWithViews();
builder.Services.AddRazorPages();
builder.Services.TryAddDocsViewServices();

var app = builder.Build();

Expand All @@ -31,6 +28,6 @@

app.MapRazorPages();
app.MapControllers();
app.MapFallbackToPage("/_Host");
app.MapFallbackToFile("index.html");

app.Run();