Merge pull request 'merge dev to master' (#53) from dev into master

Reviewed-on: WillaEngine-Project/WillaEngine#53

Dockerfile

@@ -0,0 +1,25 @@
+FROM dfs1368/laravel-php-fpm:7.4
+
+WORKDIR /var/www
+
+RUN apt install -y sendmail libpng-dev
+RUN docker-php-ext-install gd
+RUN echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
+
+COPY modules /var/www/modules
+COPY database /var/www/database
+COPY composer.json /var/www/
+COPY composer.lock /var/www/
+
+RUN composer install --no-scripts
+
+COPY . /var/www
+
+RUN chown -R www-data:www-data \
+        /var/www/public \
+        /var/www/storage \
+        /var/www/bootstrap/cache
+
+RUN mv .env.prod .env
+
+RUN php artisan optimize

config/filesystems.php

@@ -79,7 +79,8 @@ return [
             'region' => 'us-east-1',
             'bucket' => env('MINIO_BUCKET','your minio bucket name'),
             'endpoint' => env('MINIO_ENDPOINT','http://localhost:8000'),
-            'url' => 'https://cdn.willaspace.com/'. env('MINIO_BUCKET')
+            'url' => 'https://cdn.willaspace.com/'. env('MINIO_BUCKET'),
+            'use_path_style_endpoint' => true,
         ],
 
     ],

resources/js/Global/components/Inputs/RadioGroup.vue

@@ -1,7 +1,7 @@
 <template>
     <v-row :class="`radio-group ${theme}`">
         <v-col v-for="(item, index) in items" :key="index"  :xl="item[itemSize]" :lg="item[itemSize]" class="pt-0"  @click="changeSelected($event, item || {})">
-            <div :class="{'active': isActive(item), [item[itemTheme]]: true, ['theme-' + item[itemColor] ]: true, ['bubble']: true}">
+            <div :disabled="item[itemDisabled]" :class="{'active': isActive(item), [item[itemTheme]]: true, ['theme-' + item[itemColor] ]: true, ['bubble']: true}">
                 <div class="body">
                     <div v-if="item[itemIcon]" :class="`icon ${(item[itemIconClass]) ? item[itemIconClass] : ''}`">
                         <v-icon>WMi-{{ item[itemIcon] }}</v-icon>
@@ -34,6 +34,7 @@
             multiple: {default: false},
             name: {default: 'default_name'},
             theme: String,
+            itemDisabled: {default: 'disabled'},
         },
         computed: {
             currentSelect: {
@@ -47,6 +48,9 @@
         },
         methods: {
             changeSelected($event, item) {
+                if (item[this.itemDisabled]) {
+                    return true;
+                }
                 if (Array.isArray(this.value) || this.multiple) {
                     this.changeSelectedMultiple(item);
                 } else {
@@ -165,7 +169,7 @@
         }
     }
 
-    .bubble:hover, .bubble.active {
+    .bubble:not([disabled=disabled]):hover, .bubble.active {
         opacity: 1;
     }