Skip to content

Commit

Permalink
Merge pull request #12 from grueneschweiz/dev
Browse files Browse the repository at this point in the history
2.0.2
  • Loading branch information
cyrillbolliger authored Sep 7, 2022
2 parents 323b986 + e59b5d5 commit 25c127e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,11 @@ import BaseButton from "@/components/base/BaseButton.vue";
import MyContributionSteps from "@/components/specific/home/MyContribution/MyContributionSteps.vue";
import { useGroupStore } from "@/stores/GroupStore";
import { myCurrentObjectiveSettings } from "@/components/specific/home/MyContribution/MyContributionCurrentObjectiveSettings";
import { useRouter } from "vue-router";
import router from "@/router/index";
import isLoginPage from "@/router/isLoginPage";
const userStore = useUserStore();
const groupStore = useGroupStore();
const router = useRouter();
onMounted(() => {
userStore
Expand Down
5 changes: 4 additions & 1 deletion app/src/components/specific/home/TheActivationAwaitor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import { useLoginStore } from "@/stores/LoginStore";
import { onBeforeUnmount, onMounted } from "vue";
import { useSessionStore } from "@/stores/SessionStore";
import router from "@/router";
import {useUserStore} from "@/stores/UserStore";
import { useUserStore } from "@/stores/UserStore";

const emit = defineEmits(["login"]);

Expand All @@ -65,6 +65,9 @@ onMounted(() => {
if (useUserStore().me?.id) {
router.push("/");
}
if (!loginStore.login) {
router.push("/login");
}

timer = setInterval(attemptLogin, 4000);
});
Expand Down
4 changes: 2 additions & 2 deletions collectme.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Plugin Name: Collectme
* Plugin URI: https://github.com/grueneschweiz/collectme
* Description: Handle signature collections with ease.
* Version: 2.0.1
* Version: 2.0.2
* Requires at least: 6.0
* Requires PHP: 8.1
* Author: Cyrill Bolliger
Expand All @@ -23,7 +23,7 @@
die;
}

const COLLECTME_VERSION = '2.0.0';
const COLLECTME_VERSION = '2.0.2';
const COLLECTME_PLUGIN_NAME = __FILE__;
const COLLECTME_BASE_PATH = __DIR__;

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
- "host.docker.internal:host-gateway"

mysql:
image: "mysql:5.6"
image: "mysql:5.7"
volumes:
- "db:/var/lib/mysql"
environment:
Expand Down

0 comments on commit 25c127e

Please sign in to comment.