frontend resolve conflicts
This commit is contained in:
parent
ec10bce6af
commit
a58f8d901e
2 changed files with 21 additions and 6 deletions
|
@ -5,6 +5,8 @@ import { createPinia } from 'pinia'
|
||||||
import PrimeVue from 'primevue/config'
|
import PrimeVue from 'primevue/config'
|
||||||
import Aura from '@primeuix/themes/aura'
|
import Aura from '@primeuix/themes/aura'
|
||||||
import Ripple from 'primevue/ripple'
|
import Ripple from 'primevue/ripple'
|
||||||
|
import ToastService from 'primevue/toastservice';
|
||||||
|
|
||||||
|
|
||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import router from './router'
|
import router from './router'
|
||||||
|
@ -18,6 +20,8 @@ app.use(PrimeVue, {
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
app.use(pinia)
|
app.use(pinia)
|
||||||
|
app.use(ToastService);
|
||||||
|
app.use(createPinia())
|
||||||
app.use(router)
|
app.use(router)
|
||||||
app.directive('ripple', Ripple)
|
app.directive('ripple', Ripple)
|
||||||
|
|
||||||
|
|
|
@ -15,20 +15,33 @@
|
||||||
</section>
|
</section>
|
||||||
</FormField>
|
</FormField>
|
||||||
<Button type="submit" severity="secondary" label="Submit" />
|
<Button type="submit" severity="secondary" label="Submit" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</Form>
|
</Form>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<Checkbox v-model="remember" inputId="rememberme" binary/>
|
||||||
|
<label for="rememberme"> Rememberme </label>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
|
import InputText from 'primevue/inputtext';
|
||||||
|
import Button from 'primevue/button';
|
||||||
|
import Message from 'primevue/message';
|
||||||
|
import Password from 'primevue/password';
|
||||||
|
import Checkbox from 'primevue/checkbox';
|
||||||
|
|
||||||
|
import { FormField } from '@primevue/forms';
|
||||||
import { Form } from '@primevue/forms';
|
import { Form } from '@primevue/forms';
|
||||||
import { reactive } from 'vue';
|
|
||||||
import { zodResolver } from '@primevue/forms/resolvers/zod';
|
import { zodResolver } from '@primevue/forms/resolvers/zod';
|
||||||
import { z } from 'zod';
|
import { z } from 'zod';
|
||||||
import { useToast } from 'primevue/usetoast';
|
import { useToast } from 'primevue/usetoast';
|
||||||
|
import { ref } from "vue";
|
||||||
|
|
||||||
|
const remember = ref(false);
|
||||||
|
|
||||||
const toast = useToast();
|
const toast = useToast();
|
||||||
|
|
||||||
|
@ -47,8 +60,6 @@
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
@media (min-width: 1024px) {
|
@media (min-width: 1024px) {
|
||||||
.about {
|
.about {
|
||||||
|
|
Loading…
Add table
Reference in a new issue