-
Notifications
You must be signed in to change notification settings - Fork 73
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
- Loading branch information
1 parent
50b5d3e
commit ccc9a0c
Showing
4 changed files
with
169 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
name: Code formatting | ||
on: | ||
push: | ||
paths: | ||
- src/**.cs | ||
- src/**.js | ||
- src/**.css | ||
permissions: | ||
contents: write | ||
|
||
jobs: | ||
code-formatting: | ||
if: github.ref != 'refs/heads/main' && github.repository != 'FritzAndFriends/TagzApp' | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Get git diff | ||
id: diff | ||
run: | | ||
git remote add upstream https://github.com/FritzAndFriends/TagzApp.git | ||
git fetch upstream main | ||
{ | ||
echo 'files<<EOF' | ||
git diff upstream/main --name-only --diff-filter=d -- "*.css" "*.js" "*.cs" | ||
echo EOF | ||
} >> "$GITHUB_OUTPUT" | ||
- name: Get changed C# files | ||
id: changed_cs | ||
run: | | ||
{ | ||
echo 'files<<EOF' | ||
echo "${{ steps.diff.outputs.files }}" | grep -E "\.cs$" | paste -sd " " | ||
echo EOF | ||
} >> "$GITHUB_OUTPUT" | ||
- name: Add formatting rules to .editorconfig | ||
if: steps.changed_cs.outputs.files != '' | ||
run: | | ||
echo "" >> src/.editorconfig | ||
echo "[*.cs]" >> src/.editorconfig | ||
echo "dotnet_diagnostic.IDE0005.severity = error" >> src/.editorconfig # Remove unnecessary using directives | ||
echo "dotnet_diagnostic.IDE0090.severity = error" >> src/.editorconfig # Simplify new expression | ||
echo "dotnet_diagnostic.IDE0003.severity = error" >> src/.editorconfig # this and Me preferences | ||
echo "dotnet_diagnostic.IDE0009.severity = error" >> src/.editorconfig # this and Me preferences | ||
- name: Setup .NET | ||
if: steps.changed_cs.outputs.files != '' | ||
uses: actions/setup-dotnet@v3 | ||
with: | ||
dotnet-version: 7.0.x | ||
- name: Run dotnet format | ||
if: steps.changed_cs.outputs.files != '' | ||
id: dotnet-format | ||
run: | | ||
echo -e "\033[36mRunning dotnet format on:\033[0m ${{ steps.changed_cs.outputs.files }}" | ||
result=$(dotnet format src/TagzApp.sln --verbosity normal --exclude src/**/Migrations/ --include ${{ steps.changed_cs.outputs.files }}) | ||
echo -e "\033[36mdotnet-format result:\033[0m" | ||
echo "$result" | ||
count=$(echo "$result" | grep -c "Formatted code file" || true) | ||
echo -e "\033[36mNumber of files formatted: $count\033[0m" | ||
- name: Get changed JS/CSS files | ||
id: changed_js_css | ||
run: | | ||
{ | ||
echo 'files<<EOF' | ||
echo "${{ steps.diff.outputs.files }}" | grep -E "\.(js|css)$" | paste -sd " " | ||
echo EOF | ||
} >> "$GITHUB_OUTPUT" | ||
- name: Setup Node | ||
if: steps.changed_js_css.outputs.files != '' | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: lts/* | ||
- name: Run prettier | ||
if: steps.changed_js_css.outputs.files != '' | ||
id: prettier | ||
run: | | ||
echo -e "\033[36mRunning prettier on:\033[0m ${{ steps.changed_js_css.outputs.files }}" | ||
npm install prettier | ||
result=$(npx prettier --write --list-different ${{ steps.changed_js_css.outputs.files }}) | ||
echo -e "\033[36mprettier result:\033[0m" | ||
echo "$result" | ||
count=$(echo "$result" | grep -cE "\.(js|css)$" || true) | ||
echo -e "\033[36mNumber of files formatted: $count\033[0m" | ||
- name: Commit | ||
continue-on-error: true | ||
run: | | ||
echo -e "\033[33mNote: This step will fail if there are no formatted files, but that's ok.\033[0m" | ||
git config --global user.name "github-actions[bot]" | ||
git config --global user.email "github-actions[bot]@users.noreply.github.com" | ||
git add *.cs *.js *.css | ||
git commit -m "Applying formatting changes through GitHub Actions" | ||
git push |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,41 @@ | ||
using Microsoft.Extensions.Configuration; | ||
using Microsoft.Extensions.DependencyInjection; | ||
using TagzApp.Common.Exceptions; | ||
|
||
namespace TagzApp.Providers.TwitchChat; | ||
|
||
public class StartTwitchChat : IConfigureProvider | ||
{ | ||
|
||
private const string ConfigurationKey = "providers:twitchchat"; | ||
|
||
public IServiceCollection RegisterServices(IServiceCollection services, IConfiguration configuration) | ||
{ | ||
|
||
IConfiguration config = null; | ||
try | ||
{ | ||
config = configuration.GetSection(ConfigurationKey); | ||
services.Configure<TwitchChatConfiguration>(config); | ||
} | ||
catch (Exception ex) | ||
{ | ||
|
||
// Was not able to configure the provider | ||
throw new InvalidConfigurationException(ex.Message, ConfigurationKey); | ||
|
||
} | ||
|
||
if (config is null || string.IsNullOrEmpty(config.GetValue<string>("ClientId"))) | ||
{ | ||
// No configuration provided, no registration to be added | ||
return services; | ||
} | ||
|
||
services.AddSingleton<ISocialMediaProvider, TwitchChatProvider>(); | ||
|
||
|
||
return services; | ||
|
||
} | ||
} | ||
using Microsoft.Extensions.Configuration; | ||
using Microsoft.Extensions.DependencyInjection; | ||
using TagzApp.Common.Exceptions; | ||
|
||
namespace TagzApp.Providers.TwitchChat; | ||
|
||
public class StartTwitchChat : IConfigureProvider | ||
{ | ||
|
||
private const string _ConfigurationKey = "providers:twitchchat"; | ||
|
||
public IServiceCollection RegisterServices(IServiceCollection services, IConfiguration configuration) | ||
{ | ||
|
||
IConfiguration config = null; | ||
try | ||
{ | ||
config = configuration.GetSection(_ConfigurationKey); | ||
services.Configure<TwitchChatConfiguration>(config); | ||
} | ||
catch (Exception ex) | ||
{ | ||
|
||
// Was not able to configure the provider | ||
throw new InvalidConfigurationException(ex.Message, _ConfigurationKey); | ||
|
||
} | ||
|
||
if (config is null || string.IsNullOrEmpty(config.GetValue<string>("ClientId"))) | ||
{ | ||
// No configuration provided, no registration to be added | ||
return services; | ||
} | ||
|
||
services.AddSingleton<ISocialMediaProvider, TwitchChatProvider>(); | ||
|
||
|
||
return services; | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,33 @@ | ||
(function () { | ||
|
||
const m = { | ||
|
||
resizeGridItem: function (item) { | ||
grid = document.getElementById("taggedContent"); | ||
rowHeight = parseInt(window.getComputedStyle(grid).getPropertyValue('grid-auto-rows')); | ||
rowGap = parseInt(window.getComputedStyle(grid).getPropertyValue('grid-row-gap')); | ||
var imageSize = (item.querySelector('.contentcard')?.getBoundingClientRect().height ?? 0) + (item.querySelector('.contentcard') ? 6 : 0); | ||
rowSpan = Math.ceil((item.querySelector('.content').getBoundingClientRect().height + imageSize + 100 + rowGap) / (rowHeight + rowGap)); | ||
item.style.gridRowEnd = "span " + rowSpan; | ||
}, | ||
|
||
resizeAllGridItems: function () { | ||
allItems = document.querySelectorAll("article"); | ||
for (x = 0; x < allItems.length; x++) { | ||
m.resizeGridItem(allItems[x]); | ||
} | ||
} | ||
|
||
}; | ||
|
||
window.Masonry = m; | ||
|
||
})(); | ||
(function () { | ||
const m = { | ||
resizeGridItem: function (item) { | ||
grid = document.getElementById('taggedContent'); | ||
rowHeight = parseInt( | ||
window.getComputedStyle(grid).getPropertyValue('grid-auto-rows'), | ||
); | ||
rowGap = parseInt( | ||
window.getComputedStyle(grid).getPropertyValue('grid-row-gap'), | ||
); | ||
var imageSize = | ||
(item.querySelector('.contentcard')?.getBoundingClientRect().height ?? | ||
0) + (item.querySelector('.contentcard') ? 6 : 0); | ||
rowSpan = Math.ceil( | ||
(item.querySelector('.content').getBoundingClientRect().height + | ||
imageSize + | ||
100 + | ||
rowGap) / | ||
(rowHeight + rowGap), | ||
); | ||
item.style.gridRowEnd = 'span ' + rowSpan; | ||
}, | ||
|
||
resizeAllGridItems: function () { | ||
allItems = document.querySelectorAll('article'); | ||
for (x = 0; x < allItems.length; x++) { | ||
m.resizeGridItem(allItems[x]); | ||
} | ||
}, | ||
}; | ||
|
||
window.Masonry = m; | ||
})(); |