Skip to content

Commit b272394

Browse files
Packages +
Material.Carousel add fullscreen
1 parent 518667f commit b272394

File tree

12 files changed

+61
-35
lines changed

12 files changed

+61
-35
lines changed

Client/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sunengine-client",
3-
"version": "2.13.1",
3+
"version": "2.13.2",
44
"description": "SunEngine - web engine with support of blog, forum and articles functionality",
55
"productName": "SunEngine",
66
"author": "Dmitrij Polianin",
@@ -9,14 +9,14 @@
99
"dev run": "quasar dev"
1010
},
1111
"dependencies": {
12-
"@quasar/extras": "^1.9.12",
12+
"@quasar/extras": "^1.10.6",
1313
"axios": "^0.21.1",
1414
"js-lock": "^0.1.1",
15-
"quasar": "^1.15.0",
15+
"quasar": "^1.15.20",
1616
"vue-i18n": "^8.22.2"
1717
},
1818
"devDependencies": {
19-
"@quasar/app": "^2.1.14",
19+
"@quasar/app": "^2.2.9",
2020
"babel-preset-proposals": "^0.3.0",
2121
"glob": "^7.1.6",
2222
"minimist": "^1.2.5",

Client/src/icons/fontawesomeV5.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ const global = {
2020
envelope: "fas fa-envelope",
2121
wrench: "fas fa-wrench",
2222
tooltip: "far fa-question-circle",
23+
fullscreen: 'fas la-compress',
24+
fullscreenExit: 'fas la-arrows-alt'
2325
};
2426

2527
export default {
@@ -247,7 +249,9 @@ export default {
247249
delete: global.delete,
248250
publishDate: global.clock,
249251
restore: "fas fa-trash-restore",
250-
visits: global.eye
252+
visits: global.eye,
253+
fullscreen: global.fullscreen,
254+
fullscreenExit: global.fullscreenExit
251255
},
252256
MaterialForm: {
253257
category: global.category,

Client/src/icons/lineAwesome.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ const global = {
1919
envelope: "la la-envelope",
2020
wrench: "la la-wrench",
2121
tooltip: "la la-question-circle",
22+
fullscreen: 'las la-compress',
23+
fullscreenExit: 'las la-arrows-alt'
2224
};
2325

2426
export default {
@@ -247,7 +249,9 @@ export default {
247249
delete: global.delete,
248250
publishDate: global.clock,
249251
restore: "la la-trash-restore",
250-
visits: global.eye
252+
visits: global.eye,
253+
fullscreen: global.fullscreen,
254+
fullscreenExit: global.fullscreenExit
251255
},
252256
MaterialForm: {
253257
category: "la la-stream",

Client/src/modules/material/Material.vue

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,29 @@
88
:subTitle="material.subTitle"
99
/>
1010

11-
<q-carousel transition-prev="jump-right"
11+
<q-carousel class="material__carousel" transition-prev="jump-right"
1212
transition-next="jump-left"
1313
swipeable
1414
animated
1515
control-color="carousel"
1616
navigation
1717
infinite
18+
:fullscreen.sync="isFullscreenCarousel"
1819
padding
1920
arrows
2021
v-model="carouselCurrent" v-if="carouselImages" >
22+
<template v-slot:control>
23+
<q-carousel-control
24+
position="bottom-right"
25+
:offset="[12, 75]"
26+
>
27+
<q-btn
28+
push round dense color="white" text-color="primary"
29+
:icon="isFullscreenCarousel ? $iconsSet.Material.fullscreen : $iconsSet.Material.fullscreenExit"
30+
@click="isFullscreenCarousel = !isFullscreenCarousel"
31+
/>
32+
</q-carousel-control>
33+
</template>
2134
<q-carousel-slide :name="img" v-for="img in carouselImages" :key="img" class="column no-wrap flex-center">
2235
<img :src="img" class="material__carousel--img" />
2336
</q-carousel-slide>
@@ -172,7 +185,8 @@ export default {
172185
page: null,
173186
headersPrepared: false,
174187
carouselImages: null,
175-
carouselCurrent: null
188+
carouselCurrent: null,
189+
isFullscreenCarousel: false
176190
};
177191
},
178192
watch: {
@@ -389,4 +403,8 @@ export default {
389403
.material__carousel--img {
390404
height: 100%;
391405
}
406+
407+
.material__carousel {
408+
height: 500px;
409+
}
392410
</style>

README.RU.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
# SunEngine
1111

12-
<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.13.1&color=green"></a>
12+
<a href="#"><img src="https://img.shields.io/static/v1?label=%D0%92%D0%B5%D1%80%D1%81%D0%B8%D1%8F&message=v2.13.2&color=green"></a>
1313
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
1414
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
1515
<br/>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Build on AspNet Core, VueJS, Quasar.</h3>
88

99
# SunEngine
1010

11-
<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.13.1&color=green"></a>
11+
<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.13.2&color=green"></a>
1212
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
1313
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
1414
<br/>

Server/SunEngine.Admin/SunEngine.Admin.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="NJsonSchema" Version="10.3.3" />
9+
<PackageReference Include="NJsonSchema" Version="10.4.4" />
1010
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
1111
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
1212
</ItemGroup>

Server/SunEngine.Cli/SunEngine.Cli.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFramework>net5.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
6-
<Version>2.13.1</Version>
6+
<Version>2.13.2</Version>
77
<Title>SunEngine</Title>
88
<Authors>Dmitrij Polianin</Authors>
99
<Description>Site engine with blog, forum and articles functionalities on Asp.Net Core and Vue.Js.</Description>
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Flurl" Version="3.0.1" />
18+
<PackageReference Include="Flurl" Version="3.0.2" />
1919
<PackageReference Include="System.Linq" Version="4.3.0" />
2020
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
2121
</ItemGroup>

Server/SunEngine.Core/SunEngine.Core.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22

33
<PropertyGroup>
44
<TargetFramework>net5.0</TargetFramework>
5-
<Version>2.13.1</Version>
5+
<Version>2.13.2</Version>
66
<LangVersion>default</LangVersion>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Flurl" Version="3.0.1" />
11-
<PackageReference Include="HtmlSanitizer" Version="5.0.376" />
12-
<PackageReference Include="linq2db" Version="3.2.3" />
13-
<PackageReference Include="linq2db.Identity" Version="3.2.0" />
10+
<PackageReference Include="Flurl" Version="3.0.2" />
11+
<PackageReference Include="HtmlSanitizer" Version="5.0.404" />
12+
<PackageReference Include="linq2db" Version="3.4.0" />
13+
<PackageReference Include="linq2db.Identity" Version="3.3.0" />
1414
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
1515
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
1616
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.2" />
18+
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.7" />
1919
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
20-
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.8.0" />
21-
<PackageReference Include="NJsonSchema" Version="10.3.3" />
22-
<PackageReference Include="Npgsql" Version="5.0.3" />
20+
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.11.1" />
21+
<PackageReference Include="NJsonSchema" Version="10.4.4" />
22+
<PackageReference Include="Npgsql" Version="5.0.5" />
2323
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0013" />
24-
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />
24+
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.3" />
2525
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0010" />
26-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.8.0" />
26+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.11.1" />
2727
<PackageReference Include="System.Runtime.Caching" Version="5.0.0" />
28-
<PackageReference Include="UAParser" Version="3.1.44" />
28+
<PackageReference Include="UAParser" Version="3.1.47" />
2929
</ItemGroup>
3030

3131
</Project>

Server/SunEngine.DataSeed/SunEngine.DataSeed.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="linq2db" Version="3.2.3" />
10-
<PackageReference Include="linq2db.Identity" Version="3.2.0" />
9+
<PackageReference Include="linq2db" Version="3.4.0" />
10+
<PackageReference Include="linq2db.Identity" Version="3.3.0" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
12-
<PackageReference Include="NJsonSchema" Version="10.3.3" />
13-
<PackageReference Include="Npgsql" Version="5.0.3" />
12+
<PackageReference Include="NJsonSchema" Version="10.4.4" />
13+
<PackageReference Include="Npgsql" Version="5.0.5" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

0 commit comments

Comments
 (0)