Skip to content

Commit

Permalink
Merge pull request #4 from mrzhdev/revert-1-feature/upload-files
Browse files Browse the repository at this point in the history
Revert "Feature/upload files"
  • Loading branch information
mrzhdev authored Jun 11, 2024
2 parents aa66170 + a091868 commit fa05a0c
Show file tree
Hide file tree
Showing 14 changed files with 232 additions and 274 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ name: Deploy to GitHub Pages

# Run workflow on every push to the master branch
on:
workflow_dispatch:
push:
branches: [ main ]
branches: [ master ]

jobs:
deploy-to-github-pages:
Expand All @@ -14,20 +13,20 @@ jobs:
# uses GitHub's checkout action to checkout code form the master branch
- uses: actions/checkout@v2

# sets up .NET Core SDK 7.0
# sets up .NET Core SDK 6.0
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v1
with:
dotnet-version: '7.0'
dotnet-version: '6.0.400-preview.22330.6'
include-prerelease: true

# publishes Blazor project to the release-folder
- name: Publish .NET Core Project
run: dotnet publish BlazorVizView/BlazorVizView.csproj -c Release -o release
run: dotnet publish BlazorVizView/BlazorVizView.csproj -c Release -o release --nologo

# changes the base-tag in index.html from '/' to 'BlazorCslyViz' to match GitHub Pages repository subdirectory
- name: Change base-tag in index.html from / to BlazorCslyViz
run: sed -i 's/<base href="\/" \/>/<base href="\/BlazorCslyViz\/" \/>/g' release/wwwroot/index.html
# changes the base-tag in index.html from '/' to 'BlazorViz' to match GitHub Pages repository subdirectory
- name: Change base-tag in index.html from / to BlazorViz
run: sed -i 's/<base href="\/" \/>/<base href="\/BlazorViz\/" \/>/g' release/wwwroot/index.html

# copy index.html to 404.html to serve the same file when a file is not found
- name: copy index.html to 404.html
Expand Down
13 changes: 0 additions & 13 deletions .idea/.idea.BlazorViz/.idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.idea.BlazorViz/.idea/.name

This file was deleted.

34 changes: 5 additions & 29 deletions BlazorViz.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,7 @@ VisualStudioVersion = 17.1.31903.286
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorVizView", "BlazorVizView\BlazorVizView.csproj", "{83DE0D8C-2626-4924-AFA3-9702D7DA1FCE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sly", "..\csly\src\sly\sly.csproj", "{EED7E32F-3E3A-4EA2-9AD7-496024357C18}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csly-cli-model", "..\csly-cli\csly-cli-model\csly-cli-model.csproj", "{6802225E-7CDE-433D-BC70-31F0F65E8DD5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csly-cli-parser", "..\csly-cli\csly-cli-parser\csly-cli-parser.csproj", "{9FFC7758-5631-4872-BA65-DCC1117082FA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csly-cli-builder", "..\csly-cli\csly-cli-builder\csly-cli-builder.csproj", "{42B9CF08-0CFB-4F50-ACA0-4449D3B5D569}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csly-cli-api", "..\csly-cli\csly-cli-api\csly-cli-api.csproj", "{57A71B05-9241-46DC-950C-96E2BACD1671}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DummyClassLibrary", "DummyClassLibrary\DummyClassLibrary.csproj", "{D1C0EECF-1608-4CF8-AADD-751D9D1B32FA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -25,26 +17,10 @@ Global
{83DE0D8C-2626-4924-AFA3-9702D7DA1FCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83DE0D8C-2626-4924-AFA3-9702D7DA1FCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83DE0D8C-2626-4924-AFA3-9702D7DA1FCE}.Release|Any CPU.Build.0 = Release|Any CPU
{EED7E32F-3E3A-4EA2-9AD7-496024357C18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EED7E32F-3E3A-4EA2-9AD7-496024357C18}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EED7E32F-3E3A-4EA2-9AD7-496024357C18}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EED7E32F-3E3A-4EA2-9AD7-496024357C18}.Release|Any CPU.Build.0 = Release|Any CPU
{6802225E-7CDE-433D-BC70-31F0F65E8DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6802225E-7CDE-433D-BC70-31F0F65E8DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6802225E-7CDE-433D-BC70-31F0F65E8DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6802225E-7CDE-433D-BC70-31F0F65E8DD5}.Release|Any CPU.Build.0 = Release|Any CPU
{9FFC7758-5631-4872-BA65-DCC1117082FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9FFC7758-5631-4872-BA65-DCC1117082FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FFC7758-5631-4872-BA65-DCC1117082FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FFC7758-5631-4872-BA65-DCC1117082FA}.Release|Any CPU.Build.0 = Release|Any CPU
{42B9CF08-0CFB-4F50-ACA0-4449D3B5D569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42B9CF08-0CFB-4F50-ACA0-4449D3B5D569}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42B9CF08-0CFB-4F50-ACA0-4449D3B5D569}.Release|Any CPU.ActiveCfg = Release|Any CPU
{42B9CF08-0CFB-4F50-ACA0-4449D3B5D569}.Release|Any CPU.Build.0 = Release|Any CPU
{57A71B05-9241-46DC-950C-96E2BACD1671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{57A71B05-9241-46DC-950C-96E2BACD1671}.Debug|Any CPU.Build.0 = Debug|Any CPU
{57A71B05-9241-46DC-950C-96E2BACD1671}.Release|Any CPU.ActiveCfg = Release|Any CPU
{57A71B05-9241-46DC-950C-96E2BACD1671}.Release|Any CPU.Build.0 = Release|Any CPU
{D1C0EECF-1608-4CF8-AADD-751D9D1B32FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D1C0EECF-1608-4CF8-AADD-751D9D1B32FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D1C0EECF-1608-4CF8-AADD-751D9D1B32FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D1C0EECF-1608-4CF8-AADD-751D9D1B32FA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
30 changes: 7 additions & 23 deletions BlazorVizView/BlazorVizView.csproj
Original file line number Diff line number Diff line change
@@ -1,38 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />

<!-- <ProjectReference Include="..\..\csly-cli\csly-cli-api\csly-cli-api.csproj" />-->
<!-- -->
<!-- <ProjectReference Include="..\..\csly-cli\csly-cli-builder\csly-cli-builder.csproj" />-->
<!-- -->
<!-- <ProjectReference Include="..\..\csly-cli\csly-cli-model\csly-cli-model.csproj" />-->
<!-- -->
<!-- <ProjectReference Include="..\..\csly-cli\csly-cli-parser\csly-cli-parser.csproj" />-->
<!-- <ProjectReference Include="..\..\csly\src\sly\sly.csproj" />-->



<PackageReference Include="Newtonsoft.Json" Version="13.0.2"/>
<PackageReference Include="System.Collections.Immutable" Version="8.0.0"/>
<PackageReference Include="System.Memory" Version="4.5.5"/>
<PackageReference Include="System.ValueTuple" Version="4.5.0"/>

<PackageReference Include="csly-cli-api" Version="1.0.3"/>
<PackageReference Include="sly" Version="3.1.5"/>
<PackageReference Include="BlazorMonaco" Version="3.2.0"/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<Folder Include="wwwroot\js\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\DummyClassLibrary\DummyClassLibrary.csproj" />
</ItemGroup>

</Project>
7 changes: 3 additions & 4 deletions BlazorVizView/Pages/Index.razor
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
@inject IJSRuntime JSRuntime
@inject NavigationManager NavManager

@using Microsoft.JSInterop

@using DummyClassLibrary
@page "/"


Expand All @@ -14,12 +13,12 @@

private Random random = new Random();


private Processing processing = new Processing();

public string JsVersionDebug { get => random.NextInt64().ToString(); }


public async Task VizRender(string ast)
public async Task VizRender(string ast)
{
await JSRuntime.InvokeAsync<bool>("Render",ast);
}
Expand Down
Loading

0 comments on commit fa05a0c

Please sign in to comment.