Skip to content

Commit

Permalink
Merge pull request #1099 from TomaszKandula/dev
Browse files Browse the repository at this point in the history 
merge: dev to master
  • Loading branch information
@TomaszKandula
TomaszKandula authored May 23, 2024
2 parents a9d01aa + 20e8fe4 commit c9e92e7
Show file tree
Hide file tree
Showing 19 changed files with 253 additions and 210 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: actions/checkout@v4

- name: Log to Azure Cloud
uses: Azure/login@v1.6.1
uses: Azure/login@v2.1.0
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

Expand Down
162 changes: 79 additions & 83 deletions ...rc/Components/Articles/ArticleFeature/View/__snapshots__/articleFeatureView.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`test articles group component: ArticleFeatureView should render correct
class="makeStyles-section-1"
>
<div
class="MuiContainer-root MuiContainer-maxWidthXl"
class="MuiContainer-root MuiContainer-maxWidthLg"
>
<div
class="MuiBox-root MuiBox-root-12"
Expand All @@ -21,134 +21,130 @@ exports[`test articles group component: ArticleFeatureView should render correct
</p>
</div>
<div
class="MuiContainer-root MuiContainer-maxWidthLg"
data-aos="fade-up"
>
<div
data-aos="fade-up"
class="MuiGrid-root MuiGrid-container"
>
<div
class="MuiGrid-root MuiGrid-container"
class="MuiGrid-root makeStyles-content-9 MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-lg-6"
>
<div
class="MuiGrid-root makeStyles-content-9 MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-lg-6"
class="MuiPaper-root MuiCard-root makeStyles-card-2 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiPaper-root MuiCard-root makeStyles-card-2 MuiPaper-elevation0 MuiPaper-rounded"
class="MuiCardContent-root makeStyles-card_content-3"
>
<div
class="MuiCardContent-root makeStyles-card_content-3"
class="MuiBox-root MuiBox-root-14"
>
<p
class="MuiTypography-root makeStyles-text1-6 MuiTypography-body1"
>
.NET Core, Azure, databases and others.
</p>
<div
class="MuiBox-root MuiBox-root-14"
class="MuiBox-root MuiBox-root-15"
>
<p
class="MuiTypography-root makeStyles-text1-6 MuiTypography-body1"
class="MuiTypography-root makeStyles-text2-7 MuiTypography-body1"
>
.NET Core, Azure, databases and others.
Let's dive into Microsoft technology...
</p>
<div
class="MuiBox-root MuiBox-root-15"
>
<p
class="MuiTypography-root makeStyles-text2-7 MuiTypography-body1"
>
Let's dive into Microsoft technology...
</p>
</div>
<div
class="MuiBox-root MuiBox-root-16"
</div>
<div
class="MuiBox-root MuiBox-root-16"
>
<a
class="makeStyles-link-26"
href="/action-link"
>
<a
class="makeStyles-link-26"
href="/action-link"
<button
class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-button-27"
tabindex="0"
type="button"
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-text makeStyles-button-27"
tabindex="0"
type="button"
<span
class="MuiButton-label"
>
View list of articles
<span
class="MuiButton-label"
class="MuiButton-endIcon MuiButton-iconSizeMedium"
>
View list of articles
<span
class="MuiButton-endIcon MuiButton-iconSizeMedium"
<svg
aria-hidden="true"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M16.01 11H4v2h12.01v3L20 12l-3.99-4z"
/>
</svg>
</span>
<path
d="M16.01 11H4v2h12.01v3L20 12l-3.99-4z"
/>
</svg>
</span>
<span
class="MuiTouchRipple-root"
/>
</button>
</a>
</div>
</span>
<span
class="MuiTouchRipple-root"
/>
</button>
</a>
</div>
</div>
</div>
</div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-lg-6"
>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-lg-6"
class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
>
<div
class="MuiGrid-root MuiGrid-container MuiGrid-spacing-xs-2"
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-8"
>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-8"
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image1.jpg\\")"
/>
</div>
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image1.jpg\\")"
/>
</div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4"
>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4"
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image2.jpg\\")"
/>
</div>
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image2.jpg\\")"
/>
</div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4"
>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-4"
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image3.jpg\\")"
/>
</div>
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image3.jpg\\")"
/>
</div>
</div>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-8"
>
<div
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-12 MuiGrid-grid-md-8"
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiPaper-root MuiCard-root makeStyles-card_image-4 MuiPaper-elevation0 MuiPaper-rounded"
>
<div
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image4.jpg\\")"
/>
</div>
class="MuiCardMedia-root makeStyles-media-8"
style="background-image:url(\\"http://localhost:5000/api/v1/content/assets/getNonVideoAsset?blobName=images/sections/articles/image4.jpg\\")"
/>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TokanPages.ClientApp/src/Components/Articles/ArticleFeature/View/articleFeatureStyle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const ArticleFeatureStyle = makeStyles(theme => ({
title: {
textAlign: "center",
fontSize: "2.0rem",
color: Colours.colours.darkViolet1,
color: Colours.colours.violet,
},
text1: {
fontSize: "1.5rem",
Expand Down
Loading

0 comments on commit c9e92e7

Please sign in to comment.