From 53dd3bec33ca88f9bd3601e3e8ebcd288ed49d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= Date: Mon, 12 Dec 2022 19:39:25 +0100 Subject: [PATCH] [WIP] Fix styles and js not loading Replace all mud-* styles with non-mud alternatives Add css/js artifacts to ignore list in .gitignore Required steps for successful build were missing critical pieces: - Required the excubo web compiler for js/css compilation (https://github.com/excubo-ag/WebCompiler) - Required .csproj modification to include js/css compilation at build - Required minified files added to the final index.html page as styles/scripts --- .gitignore | 12 + Connected.Components.sln | 8 +- .../Connected.Components.Showcase.csproj | 4 + .../MainLayout.razor | 5 - .../Pages/AlertShowcase.razor | 7 + .../Pages/Index.razor | 3 - .../.config/dotnet-tools.json | 12 + .../Components/Alert/Alert.razor | 2 +- .../Components/Alert/Alert.razor.cs | 45 +- .../Components/Avatar/Avatar.razor | 4 +- .../Components/Avatar/Avatar.razor.cs | 14 +- .../Components/Avatar/AvatarGroup.razor.cs | 8 +- .../Components/Badge/Badge.razor | 2 +- .../Components/Badge/Badge.razor.cs | 24 +- .../Breadcrumbs/BreadcrumbLink.razor.cs | 4 +- .../Breadcrumbs/BreadcrumbSeparator.razor | 2 +- .../Components/Breadcrumbs/Breadcrumbs.razor | 2 +- .../Breadcrumbs/Breadcrumbs.razor.cs | 8 +- .../Components/Button/Button.razor | 2 +- .../Components/Button/Button.razor.cs | 22 +- .../Components/Button/Fab.razor | 2 +- .../Components/Button/Fab.razor.cs | 12 +- .../Components/Button/IconButton.razor | 2 +- .../Components/Button/IconButton.razor.cs | 22 +- .../ButtonGroup/ButtonGroup.razor.cs | 18 +- .../Components/Card/Card.razor.cs | 2 +- .../Components/Card/CardActions.razor.cs | 2 +- .../Components/Card/CardContent.razor.cs | 2 +- .../Components/Card/CardHeader.razor | 6 +- .../Components/Card/CardHeader.razor.cs | 2 +- .../Components/Card/CardMedia.razor.cs | 2 +- .../Components/Carousel/Carousel.razor | 2 +- .../Components/Carousel/Carousel.razor.cs | 6 +- .../Components/Carousel/CarouselItem.razor.cs | 28 +- .../Components/Chart/Chart.razor.cs | 4 +- .../Components/Chart/Charts/Bar.razor | 16 +- .../Components/Chart/Charts/Donut.razor | 8 +- .../Components/Chart/Charts/Line.razor | 16 +- .../Components/Chart/Charts/Pie.razor | 4 +- .../Components/Chart/Parts/Legend.razor | 6 +- .../Components/CheckBox/CheckBox.razor | 2 +- .../Components/CheckBox/CheckBox.razor.cs | 26 +- .../Components/Chip/Chip.razor | 8 +- .../Components/Chip/Chip.razor.cs | 18 +- .../Components/ChipSet/ChipSet.razor.cs | 2 +- .../Components/Collapse/Collapse.razor | 4 +- .../Components/Collapse/Collapse.razor.cs | 8 +- .../Components/ColorPicker/ColorPicker.razor | 62 +- .../ColorPicker/ColorPicker.razor.cs | 2 +- .../Components/DataGrid/Cell.cs | 4 +- .../Components/DataGrid/Column.cs | 12 +- .../Components/DataGrid/DataGrid.razor | 42 +- .../Components/DataGrid/DataGrid.razor.cs | 38 +- .../Components/DataGrid/DataGridPager.razor | 18 +- .../DataGrid/DataGridPager.razor.cs | 2 +- .../Components/DataGrid/HeaderCell.razor | 4 +- .../Components/DataGrid/HeaderCell.razor.cs | 4 +- .../Components/DataGrid/Row.razor.cs | 2 +- .../Components/DatePicker/DatePicker.cs | 8 +- .../DatePicker/DatePickerBase.razor | 64 +- .../DatePicker/DatePickerBase.razor.cs | 10 +- .../DatePicker/DateRangePicker.razor.cs | 44 +- .../Components/Dialog/Dialog.razor.cs | 6 +- .../Components/Dialog/DialogInstance.razor | 6 +- .../Components/Dialog/DialogInstance.razor.cs | 14 +- .../Components/Divider/Divider.razor.cs | 12 +- .../Components/Drawer/Drawer.razor | 2 +- .../Components/Drawer/Drawer.razor.cs | 34 +- .../Drawer/DrawerContainer.razor.cs | 2 +- .../Components/Drawer/DrawerHeader.razor.cs | 4 +- .../DropZone/DropContainer.razor.cs | 2 +- .../Components/DropZone/DropZone.razor | 4 +- .../Components/DropZone/DropZone.razor.cs | 4 +- .../DropZone/DynamicDropItem.razor.cs | 2 +- .../ExpansionPanel/ExpansionPanel.razor | 6 +- .../ExpansionPanel/ExpansionPanel.razor.cs | 18 +- .../ExpansionPanel/ExpansionPanels.razor.cs | 4 +- .../Components/Field/Field.razor | 2 +- .../Components/Field/Field.razor.cs | 38 +- .../Components/FileUpload/FileUpload.razor.cs | 2 +- .../Components/Form/Form.razor.cs | 2 +- .../Components/Icon/Icon.razor.cs | 10 +- .../Components/Image/Image.razor.cs | 4 +- .../Components/Input/Input.razor | 4 +- .../Components/Input/Input.razor.cs | 4 +- .../Components/Input/InputCssHelper.cs | 36 +- .../Components/Input/InputLabel.razor.cs | 12 +- .../Components/Input/RangeInput.razor | 4 +- .../InputControl/InputControl.razor | 4 +- .../InputControl/InputControl.razor.cs | 18 +- .../Components/Layout/Layout.razor.cs | 2 +- .../Components/Link/Link.razor.cs | 10 +- .../Components/List/List.razor.cs | 4 +- .../Components/List/ListItem.razor | 8 +- .../Components/List/ListItem.razor.cs | 14 +- .../Components/List/ListSubheader.razor.cs | 6 +- .../Components/Main/MainContent.razor | 2 +- .../Components/Mask/Mask.razor | 2 +- .../Components/Mask/Mask.razor.cs | 44 +- .../Components/Menu/Menu.razor.cs | 6 +- .../Components/NavMenu/NavGroup.razor | 4 +- .../Components/NavMenu/NavGroup.razor.cs | 20 +- .../Components/NavMenu/NavLink.razor | 4 +- .../Components/NavMenu/NavLink.razor.cs | 12 +- .../Components/NavMenu/NavMenu.razor.cs | 12 +- .../NumericField/NumericField.razor.cs | 6 +- .../Components/Overlay/Overlay.razor | 2 +- .../Components/Overlay/Overlay.razor.cs | 10 +- .../Components/Pagination/Pagination.razor.cs | 16 +- .../Components/Paper/Paper.razor.cs | 8 +- .../Components/Picker/Picker.razor | 2 +- .../Components/Picker/Picker.razor.cs | 42 +- .../Components/Picker/PickerContent.razor | 2 +- .../Components/Picker/PickerToolbar.razor | 6 +- .../Components/Popover/Popover.razor | 2 +- .../Components/Popover/Popover.razor.cs | 20 +- .../Components/Popover/PopoverProvider.razor | 2 +- .../Progress/ProgressCircular.razor | 2 +- .../Progress/ProgressCircular.razor.cs | 16 +- .../Components/Progress/ProgressLinear.razor | 16 +- .../Progress/ProgressLinear.razor.cs | 16 +- .../RTLProvider/RTLProvider.razor.cs | 4 +- .../Components/Radio/Radio.razor | 4 +- .../Components/Radio/Radio.razor.cs | 40 +- .../Components/Radio/RadioGroup.razor.cs | 4 +- .../Components/Rating/Rating.razor.cs | 2 +- .../Components/Rating/RatingItem.razor | 2 +- .../Components/Rating/RatingItem.razor.cs | 12 +- .../ScrollToTop/ScrollToTop.razor.cs | 2 +- .../Components/Select/Select.razor | 4 +- .../Components/Select/Select.razor.cs | 4 +- .../Components/Skeleton/Skeleton.razor.cs | 6 +- .../Components/Slider/Slider.razor | 18 +- .../Components/Slider/Slider.razor.cs | 8 +- .../Components/Snackbar/Defaults.cs | 20 +- .../Snackbar/SnackBarMessageState.cs | 2 +- .../Components/Snackbar/SnackbarElement.razor | 6 +- .../Components/Snackbar/SnackbarOptions.cs | 2 +- .../Snackbar/SnackbarProvider.razor | 2 +- .../Components/Switch/Switch.razor | 8 +- .../Components/Switch/Switch.razor.cs | 32 +- .../Components/Table/TFootRow.razor | 2 +- .../Components/Table/TFootRow.razor.cs | 2 +- .../Components/Table/THeadRow.razor | 2 +- .../Components/Table/THeadRow.razor.cs | 2 +- .../Components/Table/Table.razor | 20 +- .../Components/Table/TableBase.cs | 36 +- .../Components/Table/TableGroupRow.razor | 6 +- .../Components/Table/TableGroupRow.razor.cs | 8 +- .../Components/Table/TablePager.razor | 24 +- .../Components/Table/TablePager.razor.cs | 12 +- .../Components/Table/TableSortLabel.razor | 2 +- .../Components/Table/TableSortLabel.razor.cs | 8 +- .../Components/Table/Td.razor.cs | 4 +- .../Components/Table/Th.razor.cs | 2 +- .../Components/Table/Tr.razor | 4 +- .../Components/Table/Tr.razor.cs | 2 +- .../Components/TableSimple/SimpleTable.razor | 2 +- .../TableSimple/SimpleTable.razor.cs | 18 +- .../Components/Tabs/DynamicTabs.razor.cs | 2 +- .../Components/Tabs/Tabs.razor | 20 +- .../Components/Tabs/Tabs.razor.cs | 58 +- .../Components/TextField/TextField.razor.cs | 2 +- .../ThemeProvider/ThemeProvider.razor | 2 +- .../ThemeProvider/ThemeProvider.razor.cs | 10 +- .../Components/TimePicker/TimePicker.razor | 24 +- .../Components/TimePicker/TimePicker.razor.cs | 52 +- .../Components/Timeline/Timeline.razor.cs | 14 +- .../Components/Timeline/TimelineItem.razor | 6 +- .../Components/Timeline/TimelineItem.razor.cs | 16 +- .../Components/ToolBar/ToolBar.razor | 6 +- .../Components/Tooltip/Tooltip.razor.cs | 16 +- .../Components/TreeView/TreeView.razor.cs | 10 +- .../Components/TreeView/TreeViewItem.razor | 8 +- .../Components/TreeView/TreeViewItem.razor.cs | 8 +- .../TreeView/TreeViewItemToggleButton.razor | 6 +- .../Typography/TextContent.razor.cs | 12 +- .../Connected.Components.csproj | 70 +- .../Enums/HorizontalAlignment.cs | 27 +- .../Services/ServiceCollectionExtensions.cs | 2 +- ...ponents.scss => Connected.Components.scss} | 0 .../TScripts/mudPopover.js | 2 +- src/Connected.Components/compilerconfig.json | 12 +- .../wwwroot/Components.css | 27037 ---------------- src/Connected.Components/wwwroot/Styles.css | 4 - src/Connected.Components/wwwroot/Styles.scss | 7 - 186 files changed, 1064 insertions(+), 28021 deletions(-) delete mode 100644 src/Connected.Components.Showcase/MainLayout.razor create mode 100644 src/Connected.Components.Showcase/Pages/AlertShowcase.razor delete mode 100644 src/Connected.Components.Showcase/Pages/Index.razor create mode 100644 src/Connected.Components/.config/dotnet-tools.json rename src/Connected.Components/Styles/{Components.scss => Connected.Components.scss} (100%) delete mode 100644 src/Connected.Components/wwwroot/Components.css delete mode 100644 src/Connected.Components/wwwroot/Styles.css delete mode 100644 src/Connected.Components/wwwroot/Styles.scss diff --git a/.gitignore b/.gitignore index 9606eee..a9c7d34 100644 --- a/.gitignore +++ b/.gitignore @@ -414,3 +414,15 @@ FodyWeavers.xsd # Minified css files **.min.css + +# css files directly in the wwwroot folder +**/wwwroot/**.css + +# Minified js files +**.min.js + +# js files directly in the wwwroot folder +**/wwwroot/**.js + +# any project with runner in its name +**.Runner/** diff --git a/Connected.Components.sln b/Connected.Components.sln index ce7562c..50640d1 100644 --- a/Connected.Components.sln +++ b/Connected.Components.sln @@ -5,7 +5,9 @@ VisualStudioVersion = 17.4.33020.496 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "src\connected.components\Connected.Components.csproj", "{70BF497D-6519-401B-A0EE-2E9856B13D96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connected.Components.Showcase", "src\Connected.Components.Showcase\Connected.Components.Showcase.csproj", "{EBB24FD8-A554-427C-A93B-B48C047D34CC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components.Showcase", "src\Connected.Components.Showcase\Connected.Components.Showcase.csproj", "{EBB24FD8-A554-427C-A93B-B48C047D34CC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Connected.Components.Showcase.Runner", "Connected.Components.Showcase.Runner\Connected.Components.Showcase.Runner.csproj", "{B8E7BCC3-3F99-4222-B65E-9ABD3B18DAF7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,6 +23,10 @@ Global {EBB24FD8-A554-427C-A93B-B48C047D34CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {EBB24FD8-A554-427C-A93B-B48C047D34CC}.Release|Any CPU.ActiveCfg = Release|Any CPU {EBB24FD8-A554-427C-A93B-B48C047D34CC}.Release|Any CPU.Build.0 = Release|Any CPU + {B8E7BCC3-3F99-4222-B65E-9ABD3B18DAF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B8E7BCC3-3F99-4222-B65E-9ABD3B18DAF7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B8E7BCC3-3F99-4222-B65E-9ABD3B18DAF7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B8E7BCC3-3F99-4222-B65E-9ABD3B18DAF7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Connected.Components.Showcase/Connected.Components.Showcase.csproj b/src/Connected.Components.Showcase/Connected.Components.Showcase.csproj index e9e6072..a0cff86 100644 --- a/src/Connected.Components.Showcase/Connected.Components.Showcase.csproj +++ b/src/Connected.Components.Showcase/Connected.Components.Showcase.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/src/Connected.Components.Showcase/MainLayout.razor b/src/Connected.Components.Showcase/MainLayout.razor deleted file mode 100644 index de2be6c..0000000 --- a/src/Connected.Components.Showcase/MainLayout.razor +++ /dev/null @@ -1,5 +0,0 @@ -@inherits LayoutComponentBase - -
- @Body -
diff --git a/src/Connected.Components.Showcase/Pages/AlertShowcase.razor b/src/Connected.Components.Showcase/Pages/AlertShowcase.razor new file mode 100644 index 0000000..4c0dcc4 --- /dev/null +++ b/src/Connected.Components.Showcase/Pages/AlertShowcase.razor @@ -0,0 +1,7 @@ +@page "/components/alert" + +@using Connected.Components; + + + +This is an alert diff --git a/src/Connected.Components.Showcase/Pages/Index.razor b/src/Connected.Components.Showcase/Pages/Index.razor deleted file mode 100644 index cba3252..0000000 --- a/src/Connected.Components.Showcase/Pages/Index.razor +++ /dev/null @@ -1,3 +0,0 @@ -@page "/" - -

Hello, world!

diff --git a/src/Connected.Components/.config/dotnet-tools.json b/src/Connected.Components/.config/dotnet-tools.json new file mode 100644 index 0000000..0ae7bc6 --- /dev/null +++ b/src/Connected.Components/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "excubo.webcompiler": { + "version": "2.7.12", + "commands": [ + "webcompiler" + ] + } + } +} \ No newline at end of file diff --git a/src/Connected.Components/Components/Alert/Alert.razor b/src/Connected.Components/Components/Alert/Alert.razor index a656343..5d02acf 100644 --- a/src/Connected.Components/Components/Alert/Alert.razor +++ b/src/Connected.Components/Components/Alert/Alert.razor @@ -2,7 +2,7 @@ @inherits UIComponent -