Merge branch 'main' into new-ui

resources/js/components/forms/CheckboxInput.vue

@@ -1,7 +1,7 @@
 <template>
   <div :class="wrapperClass">
     <v-checkbox :id="id?id:name" v-model="compVal" :disabled="disabled" :name="name" @input="$emit('input',$event)">
-      {{ label }}
+      {{ label }} <span v-if="required" class="text-red-500 required-dot">*</span>
     </v-checkbox>
     <small v-if="help" :class="theme.default.help">
       <slot name="help">{{ help }}</slot>

resources/js/components/forms/FlatSelectInput.vue

@@ -6,6 +6,9 @@
       {{ label }}
       <span v-if="required" class="text-red-500 required-dot">*</span>
     </label>
+    <small v-if="help" :class="theme.SelectInput.help" class="block mb-2">
+      <slot name="help">{{ help }}</slot>
+    </small>
 
     <loader v-if="loading" key="loader" class="h-6 w-6 text-nt-blue mx-auto" />
     <div v-for="(option, index) in options" v-else :key="option[optionKey]"
@@ -22,9 +25,6 @@
       </div>
     </div>
 
-    <small v-if="help" :class="theme.SelectInput.help">
-      <slot name="help">{{ help }}</slot>
-    </small>
     <has-error v-if="hasValidation" :form="form" :field="name" />
   </div>
 </template>

resources/js/components/forms/ToggleSwitchInput.vue

@@ -0,0 +1,31 @@
+<template>
+    <div :class="wrapperClass">
+      <div class="flex">
+        <v-switch :id="id?id:name" v-model="compVal" class="inline-block mr-2" :disabled="disabled" :name="name" @input="$emit('input',$event)" />
+        <span>{{ label }} <span v-if="required" class="text-red-500 required-dot">*</span></span>
+      </div>
+      <small v-if="help" :class="theme.default.help">
+        <slot name="help">{{ help }}</slot>
+      </small>
+      <has-error v-if="hasValidation" :form="form" :field="name" />
+    </div>
+  </template>
+  
+  <script>
+  import inputMixin from '~/mixins/forms/input'
+  
+  import VSwitch from './components/VSwitch'
+  export default {
+    name: 'ToggleSwitchInput',
+  
+    components: { VSwitch },
+    mixins: [inputMixin],
+    props: {},
+  
+    mounted () {
+      this.compVal = !!this.compVal
+      this.$emit('input', !!this.compVal)
+    }
+  }
+  </script>
+  

resources/js/components/forms/components/VSwitch.vue

@@ -1,42 +1,15 @@
 <template>
-  <div>
-    <Motion
-      v-model="value"
-      :options="{
-        duration: 150,
-      }"
-      :trigger="[
-        'bg-gray-200 border-gray-300 duration-100 dark:bg-gray-700 dark:border-gray-600',
-        'bg-gray-200 dark:bg-gray-700',
-        'bg-nt-blue border-nt-blue',
-        'bg-nt-blue duration-100',
-      ]"
-      class="inline-flex items-center h-6 w-12 p-1 border rounded-full cursor-pointer focus:outline-none"
-      @click="$emit('input',!internalValue)"
-    >
-      <Motion
-        v-model="internalValue"
-        tag="span"
-        :options="{
-          duration: 150,
-        }"
-        :trigger="[
-          'translate-x-0 duration-150',
-          'rounded-2xl scale-75 duration-100',
-          'translate-x-6 duration-100',
-          'scale-100 duration-150',
-        ]"
-        class="inline-block h-4 w-4 rounded-full bg-white dark:bg-gray-500 shadow"
-      />
-    </Motion>
+  <div @click="onClick">
+    <div class="inline-flex items-center h-6 w-12 p-1 bg-gray-300 border rounded-full cursor-pointer focus:outline-none transition-all transform ease-in-out duration-100" :class="{'bg-nt-blue': internalValue}">
+      <div class="inline-block h-4 w-4 rounded-full bg-white shadow transition-all transform ease-in-out duration-150 rounded-2xl scale-100" :class="{'translate-x-5.5': internalValue}" />
+    </div>
   </div>
 </template>
 
 <script>
-import Motion from 'tinymotion'
 export default {
   name: 'VSwitch',
-  components: { Motion },
+  components: { },
 
   props: {
     value: { type: Boolean, default: false }
@@ -48,14 +21,7 @@ export default {
     }
   },
 
-  computed: {
-    sizeClasses () {
-      if (this.size === 'small') {
-        return 'w-3 h-3'
-      }
-      return 'w-5 h-5'
-    }
-  },
+  computed: {},
 
   watch: {
     value (val) {
@@ -68,12 +34,10 @@ export default {
   },
 
   methods: {
+    onClick () {
+      this.$emit('input', !this.internalValue)
+      this.internalValue = !this.internalValue
+    }
   }
 }
-</script>
-
-<style scoped>
-.translate-x-6 {
-  --tw-translate-x: 1.4rem !important;
-}
-</style>
+</script>

resources/js/components/forms/index.js

@@ -16,6 +16,7 @@ import ImageInput from './ImageInput'
 import DateInput from './DateInput';
 import RatingInput from './RatingInput';
 import FlatSelectInput from './FlatSelectInput';
+import ToggleSwitchInput from './ToggleSwitchInput';
 
 // Components that are registered globaly.
 [
@@ -34,7 +35,8 @@ import FlatSelectInput from './FlatSelectInput';
   RichTextAreaInput,
   DateInput,
   RatingInput,
-  FlatSelectInput
+  FlatSelectInput,
+  ToggleSwitchInput
 ].forEach(Component => {
   Vue.component(Component.name, Component)
 })