Skip to content

Commit

Permalink
Fixed small bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
Okeanij committed Mar 19, 2020
1 parent 3d20937 commit 7d579f1
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sunengine-client",
"version": "2.9.8",
"version": "2.9.9",
"description": "SunEngine - web engine with support of blog, forum and articles functionality",
"productName": "SunEngine",
"author": "Dmitrij Polianin",
Expand Down
3 changes: 3 additions & 0 deletions Client/src/modules/auth/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ export default {
nameOrEmail: this.nameOrEmail,
password: this.password
})
.then(_ => {
this.$router.replace(this.ret);
})
.catch(error => {
this.submitting = false;
this.$errorNotify(error);
Expand Down
3 changes: 1 addition & 2 deletions Client/src/store/auth/actions/login.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { routeHasAccess } from "utils";
import { router } from "router";

export default function(context, userData) {
return request(Api.Auth.Login, {
Expand All @@ -18,7 +19,5 @@ export default function(context, userData) {
if (resolved && routeHasAccess(resolved.route))
router.replace(resolved.route);
}

router.replace({ name: "Home" });
});
}
1 change: 1 addition & 0 deletions Client/src/store/auth/mutations/clearAllUserRelatedData.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { store } from "storeInd";

export default function clearAllUserRelatedData(state) {
state.user = null;
Expand Down
9 changes: 5 additions & 4 deletions Client/src/store/sections/actions/makeRoutesFromSections.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
export default function(context) {
let routes = [];

for (const section of Object.values(context.state.allSections)) {
const sectionType = context.getters.getSectionType(section.type);
routes.push(...sectionType.getRoutes(section));
}
if (context.state.allSections)
for (const section of Object.values(context.state.allSections)) {
const sectionType = context.getters.getSectionType(section.type);
routes.push(...sectionType.getRoutes(section));
}

return routes;
}
7 changes: 4 additions & 3 deletions Client/src/utils/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
consoleRequestUrl
} from "utils";
import { store } from "storeInd";
import { router } from "router";

const lock = new Lock("request-lock");

Expand Down Expand Up @@ -166,14 +167,14 @@ async function checkTokens(rez) {
store.commit("clearAllUserRelatedData");
await store.dispatch("loadAllCategories", { skipLock: true });
await store.dispatch("registerAllLayouts");
await store.dispatch("loadAllsections", { skipLock: true });
await store.dispatch("loadAllSections");
await store.dispatch("setAllRoutes");
await store.dispatch("loadAllMenuItems", { skipLock: true });
if (routeCheckAccess(router.currentRoute)) {
/*if (routeCheckAccess(router.currentRoute)) {
router.push(router.currentRoute);
app.rerender();
return rez;
}
}*/
} else {
const newTokens = JSON.parse(tokensHeader);

Expand Down
2 changes: 1 addition & 1 deletion README.RU.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# SunEngine

<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.9.8&color=green"></a>
<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.9.9&color=green"></a>
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
<br/>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Build on: AspNet Core, VueJS, Quasar.</h3>

# SunEngine

<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.9.8&color=green"></a>
<a href="#"><img src="https://img.shields.io/static/v1?label=Version&message=v2.9.9&color=green"></a>
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/.NET%20Core/badge.svg" ></a>
<a href="#"><img src="https://github.com/sunengine/SunEngine/workflows/Quasar/badge.svg" ></a>
<br/>
Expand Down
2 changes: 1 addition & 1 deletion Server/SunEngine.Cli/SunEngine.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>2.9.8</Version>
<Version>2.9.9</Version>
<Title>SunEngine</Title>
<Authors>Dmitrij Polianin</Authors>
<Description>Site engine with blog, forum and articles functionalities on Asp.Net Core and Vue.Js.</Description>
Expand Down
2 changes: 1 addition & 1 deletion Server/SunEngine.Core/SunEngine.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<Version>2.9.8</Version>
<Version>2.9.9</Version>
<LangVersion>default</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion SunEngine.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SunEngine
**Version 2.9.8**
**Version 2.9.9**
***************************************************************
Do not delete this file! This file need to detect project root.
***************************************************************
Expand Down

0 comments on commit 7d579f1

Please sign in to comment.