From a0918680ec1ee2675a4efa3b5a3091dc36246ca9 Mon Sep 17 00:00:00 2001 From: Hernic Mirza <47992551+mrzhdev@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:10:32 +0200 Subject: [PATCH] Revert "Feature/upload files" --- .github/workflows/main.yml | 15 +- .idea/.idea.BlazorViz/.idea/.gitignore | 13 -- .idea/.idea.BlazorViz/.idea/.name | 1 - BlazorViz.sln | 34 +--- BlazorVizView/BlazorVizView.csproj | 30 +--- BlazorVizView/Pages/Index.razor | 7 +- BlazorVizView/Shared/VizGraph.razor | 191 ++------------------- BlazorVizView/_Imports.razor | 5 +- BlazorVizView/wwwroot/css/app.css | 7 - BlazorVizView/wwwroot/index.html | 9 +- DummyClassLibrary/DummyClassLibrary.csproj | 13 ++ DummyClassLibrary/ExpressionWalker.cs | 121 +++++++++++++ DummyClassLibrary/Processing.cs | 34 ++++ README.md | 26 ++- 14 files changed, 232 insertions(+), 274 deletions(-) delete mode 100644 .idea/.idea.BlazorViz/.idea/.gitignore delete mode 100644 .idea/.idea.BlazorViz/.idea/.name create mode 100644 DummyClassLibrary/DummyClassLibrary.csproj create mode 100644 DummyClassLibrary/ExpressionWalker.cs create mode 100644 DummyClassLibrary/Processing.cs diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d983aa4..be9701b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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: @@ -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///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///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 diff --git a/.idea/.idea.BlazorViz/.idea/.gitignore b/.idea/.idea.BlazorViz/.idea/.gitignore deleted file mode 100644 index d2c9c40..0000000 --- a/.idea/.idea.BlazorViz/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/modules.xml -/contentModel.xml -/.idea.BlazorViz.iml -/projectSettingsUpdater.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.idea.BlazorViz/.idea/.name b/.idea/.idea.BlazorViz/.idea/.name deleted file mode 100644 index a347b4c..0000000 --- a/.idea/.idea.BlazorViz/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -BlazorCslyViz \ No newline at end of file diff --git a/BlazorViz.sln b/BlazorViz.sln index 2660813..8f9dc5e 100644 --- a/BlazorViz.sln +++ b/BlazorViz.sln @@ -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 @@ -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 diff --git a/BlazorVizView/BlazorVizView.csproj b/BlazorVizView/BlazorVizView.csproj index 6d785a0..ad4eaae 100644 --- a/BlazorVizView/BlazorVizView.csproj +++ b/BlazorVizView/BlazorVizView.csproj @@ -1,38 +1,22 @@ - net7.0 + net6.0 enable enable - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/BlazorVizView/Pages/Index.razor b/BlazorVizView/Pages/Index.razor index 5069c01..341f88a 100644 --- a/BlazorVizView/Pages/Index.razor +++ b/BlazorVizView/Pages/Index.razor @@ -1,8 +1,7 @@ @inject IJSRuntime JSRuntime @inject NavigationManager NavManager - @using Microsoft.JSInterop - +@using DummyClassLibrary @page "/" @@ -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("Render",ast); } diff --git a/BlazorVizView/Shared/VizGraph.razor b/BlazorVizView/Shared/VizGraph.razor index 6399ed7..08c07ab 100644 --- a/BlazorVizView/Shared/VizGraph.razor +++ b/BlazorVizView/Shared/VizGraph.razor @@ -1,41 +1,30 @@ @inject IJSRuntime JSRuntime @inject NavigationManager NavManager @using Microsoft.JSInterop +@using DummyClassLibrary
@Title -

Visualization for CSLY with Viz.js

- - -
- - - - - -
- -
-