Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-03 04:25:24 +02:00
Code Issues Releases Activity

Fix/fix block registration (#1059)

Browse source 
* fix disable button

* add backend env for restricting registration

* update state management

* add allow_signup to app info

* move allow_signup to backend only

* cleanup docker-compose

* potential darkmode fix

* fix missing variable

* add banner on login page

* use random bools for tests

* fix initial state bug

* fix state reset
This commit is contained in:
Hayden 2022-03-15 17:34:53 -08:00 • committed by GitHub
parent 3c2744a3da
commit 13e157827c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 107 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

12
frontend/pages/login.vue
View file

@ -4,7 +4,7 @@
fluid
class="d-flex justify-center align-center"
:class="{
'bg-off-white': !$vuetify.theme.dark,
'bg-off-white': !$vuetify.theme.dark && !isDark,
}"
>
<v-card tag="section" class="d-flex flex-column align-center" width="600px">
@ -108,6 +108,8 @@
<script lang="ts">
import { defineComponent, ref, useContext, computed, reactive } from "@nuxtjs/composition-api";
import { useDark } from "@vueuse/core";
import { useAppInfo } from "~/composables/api";
import { alert } from "~/composables/use-toast";
import { useToggleDarkMode } from "~/composables/use-utils";
export default defineComponent({
@ -115,9 +117,9 @@ export default defineComponent({
setup() {
const toggleDark = useToggleDarkMode();
const isDark = useDark();
const { $auth } = useContext();
const context = useContext();
const form = reactive({
email: "",
@ -127,7 +129,9 @@ export default defineComponent({
const loggingIn = ref(false);
const allowSignup = computed(() => context.env.ALLOW_SIGNUP as boolean);
const appInfo = useAppInfo();
const allowSignup = computed(() => appInfo.value?.allowSignup || false);
async function authenticate() {
if (form.email.length === 0 || form.password.length === 0) {
@ -148,6 +152,7 @@ export default defineComponent({
// See https://github.com/nuxt-community/axios-module/issues/550
// Import $axios from useContext()
// if ($axios.isAxiosError(error) && error.response?.status === 401) {
// @ts-ignore - see above
if (error.response?.status === 401) {
alert.error("Invalid Credentials");
} else {
@ -158,6 +163,7 @@ export default defineComponent({
}
return {
isDark,
form,
loggingIn,
allowSignup,

31
frontend/pages/register.vue
View file

@ -6,8 +6,8 @@
<v-form ref="domRegisterForm" @submit.prevent="register()">
<div class="d-flex justify-center my-2">
<v-btn-toggle v-model="joinGroup" mandatory tile group color="primary">
<v-btn :value="false" small @click="joinGroup = false"> Create a Group </v-btn>
<v-btn :value="true" small @click="joinGroup = true"> Join a Group </v-btn>
<v-btn :value="false" small @click="toggleJoinGroup"> Create a Group </v-btn>
<v-btn :value="true" small @click="toggleJoinGroup"> Join a Group </v-btn>
</v-btn-toggle>
</div>
<v-text-field
@ -99,12 +99,12 @@
</template>
<script lang="ts">
import { computed, defineComponent, reactive, toRefs, ref, useRouter, watch } from "@nuxtjs/composition-api";
import { computed, defineComponent, reactive, toRefs, ref, useRouter } from "@nuxtjs/composition-api";
import { validators } from "@/composables/use-validators";
import { useUserApi } from "~/composables/api";
import { alert } from "~/composables/use-toast";
import { useRouterQuery } from "@/composables/use-router";
import { VForm} from "~/types/vuetify";
import { useRouteQuery } from "@/composables/use-router";
import { VForm } from "~/types/vuetify";
export default defineComponent({
layout: "basic",
@ -117,18 +117,22 @@ export default defineComponent({
});
const allowSignup = computed(() => process.env.AllOW_SIGNUP);
const token = useRouterQuery("token");
const token = useRouteQuery("token");
watch(token, (newToken) => {
if (newToken) {
form.groupToken = newToken;
}
});
if (token) {
if (token.value) {
state.joinGroup = true;
}
function toggleJoinGroup() {
if (state.joinGroup) {
state.joinGroup = false;
token.value = "";
} else {
state.joinGroup = true;
form.group = "";
}
}
const domRegisterForm = ref<VForm | null>(null);
const form = reactive({
@ -163,6 +167,7 @@ export default defineComponent({
return {
token,
toggleJoinGroup,
domRegisterForm,
validators,
allowSignup,