Merge branch 'master' of https://gitlab.com/wm-managementsystem/willamall-admin

.idea/php.xml

@@ -122,6 +122,9 @@
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-iconv" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher-contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
+      <path value="$PROJECT_DIR$/vendor/org_heigl/ghostscript" />
+      <path value="$PROJECT_DIR$/vendor/wm/portfolio" />
+      <path value="$PROJECT_DIR$/vendor/wm/blog" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.2" />

.idea/vcs.xml

@@ -2,9 +2,11 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/wm-blog" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/wm-common" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/wm-core" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/wm-crm" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/modules/wm-portfolio" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/modules/wm-reservation" vcs="Git" />
   </component>
 </project>

.idea/willamall-admin.iml

@@ -49,6 +49,7 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/nikic/php-parser" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/nunomaduro/collision" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/opis/closure" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/org_heigl/ghostscript" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/paragonie/random_compat" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
@@ -119,9 +120,11 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/tijsverkoyen/css-to-inline-styles" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/vlucas/phpdotenv" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/wm/blog" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/wm/common" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/wm/core" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/wm/crm" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/wm/portfolio" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/wm/reservation" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/wm/store" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/zendframework/zend-diactoros" />

composer.json

@@ -19,7 +19,7 @@
         "wm/core": "dev-master",
         "wm/crm": "dev-master",
         "wm/reservation": "dev-master",
-        "wm/store": "dev-master",
+        "wm/portfolio": "dev-master",
         "wm/blog": "dev-master",
         "zircote/swagger-php": "^3.0"
     },
@@ -92,7 +92,7 @@
         },
         {
             "type": "path",
-            "url": "./modules/wm-store"
+            "url": "./modules/wm-portfolio"
         }
     ]
 }

resources/js/Global/components/Drawer/SideBar.vue

@@ -96,7 +96,7 @@ export default {
                 {
                     titleEn: " Portfolio Management ",
                     titleFa: " مدیریت نمونه کارها ",
-                    icon: "rss",
+                    icon: "art-gallery",
                     href: '/portfolio',
                 },
                 {

resources/js/Global/mixins/commingSoon.js

@@ -5,6 +5,9 @@ var CommingSoonArray = [
     "prescription",
     "crm-setting",
     "crm-statistics",
+    "portfolio-statistics",
+    "blog-statistics",
+    "blog-post",
 ];
 const commingSoon = {
     methods: {

resources/js/Global/plugins/auth.js

@@ -18,10 +18,10 @@ if (UserService.get()) {
     store.commit('auth/SET_AUTH_USER', UserService.get())
 }
 
-if (CategoryNameService.get()) {
+// if (CategoryNameService.get()) {
-    Globalstore.commit('common/SET_CATEGORY_NAME', CategoryNameService.get())
+//     Globalstore.commit('common/SET_CATEGORY_NAME', CategoryNameService.get())
-} else {
+// } else {
     Globalstore.dispatch('common/loadCategoryName');
-}
+// }
 
 import '@Global/services/errorHandler.services'

resources/js/Global/plugins/tinymce.js

@@ -0,0 +1,69 @@
+//tinymce
+import Vue from "vue";
+import tinymce from "tinymce/tinymce";
+import "tinymce/themes/modern";
+Vue.use(tinymce);
+// skin css
+import "tinymce/skins/lightgray/skin.min.css";
+import "tinymce/skins/lightgray/content.min.css";
+//plugins
+import "tinymce/plugins/advlist";
+import "tinymce/plugins/autolink";
+import "tinymce/plugins/lists";
+import "tinymce/plugins/paste";
+import "tinymce/plugins/link";
+import "tinymce/plugins/preview";
+import "tinymce/plugins/anchor";
+import "tinymce/plugins/charmap";
+import "tinymce/plugins/print";
+import "tinymce/plugins/image";
+import "tinymce/plugins/searchreplace";
+import "tinymce/plugins/directionality";
+import "tinymce/plugins/wordcount";
+// import "tinymce/plugins/help";
+import "tinymce/plugins/table";
+import "tinymce/plugins/media";
+import "tinymce/plugins/insertdatetime";
+import "tinymce/plugins/fullscreen";
+import "tinymce/plugins/code";
+import "tinymce/plugins/visualblocks";
+import "tinymce/langs/fa_IR";
+import "@Global/scss/plugins/tinymce.css";
+import axios from 'axios';
+export const initTiny = (batch_id) => ({
+    skin: false,
+    height: 500,
+    menubar: false,
+    directionality : 'rtl',
+    language: 'fa_IR',
+    plugins: [
+        "advlist autolink lists link image charmap print preview anchor",
+        "searchreplace visualblocks code fullscreen",
+        "insertdatetime media table paste code wordcount directionality"
+    ],
+    toolbar:
+        "undo redo | fontsizeselect formatselect | bold italic backcolor | \
+        alignleft aligncenter alignright alignjustify | \
+        bullist numlist outdent indent | removeformat | image | ltr rtl",
+    // 'fontselect'
+    // font_formats : "IranYekan=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;AkrutiKndPadmini=Akpdmi-n",
+    fontsize_formats: '10pt 12pt 14pt 16pt 18pt 20pt 22pt 24pt 36pt 60pt 72pt',
+    images_upload_url: "/api/files",
+    images_upload_base_path: "/api/files",
+    images_upload_credentials: true,
+    automatic_uploads: false,
+    file_picker_types: "file image media",
+    content_style: 'body { font-family: "iranyekan", "Montserrat" !important; }',
+    images_upload_handler: async function(blobInfo, success, failure) {  
+        let formData = new FormData();
+        formData.append("file", blobInfo.blob(), blobInfo.filename());
+        formData.append("batch_id", batch_id);
+        let response = await axios.post('/api/file', formData);
+
+        if (response && response.status == 200) {
+            return success(response.path);
+        } else {
+            return failure("HTTP Error: " + response.status);
+        }
+    }
+});

resources/js/Global/policy/index.js

@@ -1,8 +1,12 @@
 import CRMPolicy from '@CRM/policy';
+import BlogPolicy from '@Blog/policy';
+import PortfolioPolicy from '@Portfolio/policy';
 import CorePolicy from '@Core/policy';
 import CommonPolicy from '@Common/policy';
 
 export default {
+    ...PortfolioPolicy,
+    ...BlogPolicy,
     ...CRMPolicy,
     ...CorePolicy,
     ...CommonPolicy,

resources/js/Global/scss/Misc.scss

@@ -192,12 +192,25 @@
     width: calc(100% - 45px);
     float: right;
 }
+.hasHelp .v-autocomplete, .hasHelp .vue-treeselect {
+    width: calc(100% - 45px);
+    float: right;
+}
+.hasConfig.hasHelp .v-autocomplete, .hasConfig.hasHelp .vue-treeselect {
+    width: calc(100% - 90px);
+    float: right;
+}
+
 
 .hasConfig .v-btn {
     float: right;
     margin-top: 20px;
     margin-right: 10px;
 }
+.hasConfig .v-btn:nth-of-type(2) {
+    margin-right: 5px;
+}
+
 
 .hasConfig .v-card__text {
     width: calc(100% - 50px);
@@ -243,3 +256,10 @@
 /* --------------------------------------------------------
                         Float Buttons :: End
 -------------------------------------------------------- */
+
+.color-square {
+    width: 16px;
+    height: 16px;
+    border-radius: 8px;
+    margin-left: 8px;
+}

resources/js/Global/scss/Modify.scss

@@ -432,6 +432,9 @@ $Value in $Shadows {
 .v-expansion-panel-header {
     padding: 0px;
 }
+.v-expansion-panels.flat .v-expansion-panel.v-expansion-panel--active.v-item--active {
+    border: none;
+}
 
 
 // ------------------------------------------------------------------

resources/js/Global/scss/_vars.scss

@@ -29,7 +29,6 @@ $TealShadow:rgba(0, 137, 123, 0.2);
 $Colors: (Red: $Red, Orange: $Orange, Yellow: $Yellow, Gold: $Gold, Purple: $Purple, Blue: $Blue, Green: $Green, Cyan: $Cyan, LightGray: $LightGray, Gray: $Gray, Brown: $Brown, Black: $Black, White: $White);
 $colors: (red: $Red, orange: $Orange, yellow: $Yellow, gold: $Gold, purple: $Purple, blue: $Blue, green: $Green, cyan: $Cyan, gray: $Gray, brown: $Brown, black: $Black, white: $White, tael: $Teal);
 $Shadows: (red: $RedShadow, orange: $OrangeShadow, yellow: $YellowShadow, gold: $GoldShadow, purple: $PurpleShadow, blue: $BlueShadow, green: $GreenShadow, cyan: $CyanShadow, gray: $GrayShadow, 'grey lighten-3': $LightGrayShadow, brown: $BrownShadow, black: $BlackShadow, white: $WhiteShadow, teal: $TealShadow);
-
 :root {
     --color-red: #ee3552;
     --color-orange: #ff6b57;
@@ -47,5 +46,8 @@ $Shadows: (red: $RedShadow, orange: $OrangeShadow, yellow: $YellowShadow, gold:
     --color-light-gray: #e6e6e6;
     --color-light-blue: #C9D3EC;
     --color-link-hover: #181b31;
-
+    //------------------------Module Colors
+    --color-portfolio: #915117;
+    --color-client: #32c5d2;
+    --color-task: #ac3773;
 }

resources/js/Global/scss/plugins/tinymce.css

@@ -0,0 +1,7 @@
+
+.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset {
+    font-family:"iranyekan", "Montserrat", "tinymce"!important;
+}
+.mce-monospace {
+    font-family:"iranyekan", "Montserrat", "tinymce"!important;
+}

resources/js/Global/utils/category-name/modules/common.js

@@ -1,7 +1,7 @@
 export default {
     task: {
-        my_task: {name: '', name_en: ''},
+        my_task: {name: ' وظایف من ', name_en: ' My Tasks '},
-        my_request: {name: '', name_en: ''},
+        my_request: {name: ' درخواست های من ', name_en: ' My Requests '},
         title: {
             add: {name: 'تعریف وظیفه ', name_en: ' Define a Task '},
             add_category: {name: 'افزودن نوع وظیفه', name_en: ' Add a Task Type '},

resources/js/Global/utils/category-name/modules/crm.js

@@ -49,4 +49,8 @@ export default{
         request: {name: 'درخواســت های مـــن', name_en: 'MY Requests'},
         client: {name: 'مشتــــــــریان مـــــــــن ', name_en: 'My Clients'}
     }
+
+
 }
+
+

resources/js/Global/utils/colors/index.js

@@ -0,0 +1,12 @@
+export default [
+    { name: 'قرمز', color:'red'},
+    { name: 'نارنجی', color:'orange'},
+    { name: 'زرد', color:'yellow'},
+    { name: 'طلایی', color:'gold'},
+    { name: 'بنفش', color:'purple'},
+    { name: 'آبی', color:'blue'},
+    { name: 'سبز', color:'green'},
+    { name: 'فیروزه ای', color:'cyan'},
+    { name: 'قهوه ای', color:'brown'},
+    { name: 'مشکی', color:'black'},
+];

resources/js/Global/utils/module-color/moduleColor.js

@@ -1,6 +1,6 @@
 export default {
-    Task: 'cyan',
+    task: 'purple',
-    CRM: 'cyan',
+    client: 'cyan',
-    Portfolio: 'cyan',
+    portfolio: 'brown',
-    Portfolio: 'cyan',
+    blog: 'orange',
 }

resources/js/Home/views/Home.vue

@@ -7,15 +7,16 @@
                 v-for="( module ,key ) in getModules"
                 :key="key"
             >
+
                 <wm-tile
                     :TileClass="module.title_class"
-                    :TitleEn="module.title_en"
+                    :TitleEn="$_name(`${module.slug}.name_en`)"
-                    :TitleFa="module.title_fa"
+                    :TitleFa="$_name(`${module.slug}.name`)"
                     :GradientBegin="module.gradient_begin"
                     :GradientEnd="module.gradient_end"
                     :ImageURL="module.img_url"
                     :ImageHeight="module.img_height"
-                ></wm-tile>
+                />
             </a>
         </v-layout>
         <router-link v-if="getAuthUser.is_owner == 'true' || hostname == originHostName" :to="{name: 'AddModule'}">

webpack.mix.js

@@ -30,8 +30,8 @@ mix.js('resources/js/Home/app.js', 'public/js/vue/Home');
 require('./modules/wm-core/webpack.mix');
 require('./modules/wm-common/webpack.mix');
 require('./modules/wm-crm/webpack.mix');
-require('./modules/wm-store/webpack.mix');
 require('./modules/wm-blog/webpack.mix');
+require('./modules/wm-portfolio/webpack.mix');
 
 require('./modules/wm-reservation/webpack.mix');