diff --git a/app/src/components/specific/home/MyContribution/MyContribution.vue b/app/src/components/specific/home/MyContribution/MyContribution.vue index af4125c..29d83a5 100644 --- a/app/src/components/specific/home/MyContribution/MyContribution.vue +++ b/app/src/components/specific/home/MyContribution/MyContribution.vue @@ -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 diff --git a/app/src/components/specific/home/TheActivationAwaitor.vue b/app/src/components/specific/home/TheActivationAwaitor.vue index d604a1a..e191195 100644 --- a/app/src/components/specific/home/TheActivationAwaitor.vue +++ b/app/src/components/specific/home/TheActivationAwaitor.vue @@ -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"]); @@ -65,6 +65,9 @@ onMounted(() => { if (useUserStore().me?.id) { router.push("/"); } + if (!loginStore.login) { + router.push("/login"); + } timer = setInterval(attemptLogin, 4000); }); diff --git a/collectme.php b/collectme.php index 7463221..259eff7 100644 --- a/collectme.php +++ b/collectme.php @@ -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 @@ -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__; diff --git a/docker-compose.yml b/docker-compose.yml index 92ff9bf..f58bc72 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: