alireza_hassani
/
willaengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/administrator/utils/gitea/git/repositories/willaengine-project/willaengine

Browse Source
pull/87/head
Farid Saravi 4 years ago
parent 5598b1ede4 12936e0bfd
commit 118f1c733e
8 changed files with 418 additions and 315 deletions
Show Stats Download Patch File Download Diff File

21
Dockerfile
Unescape View File

@ -0,0 +1,21 @@
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 database /var/www/database
COPY composer.* /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 php artisan optimize

26
Jenkinsfile vendored
Unescape View File

@ -0,0 +1,26 @@
pipeline {
agent {
node {
label 'willa'
}
}
stages {
stage('build') {
steps {
sh ' docker build -t registry.willaspace.com/willaspace/$IMAGE_NAME:latest .'
sh 'cd /home/administrator/apps/$IMAGE_NAME/;./BuildDocker'
}
}
stage('deploy') {
steps {
sh 'cd /home/administrator/apps/$IMAGE_NAME/ ; docker-compose up -d'
}
}
}
environment {
IMAGE_NAME = 'karmmania'
}
}

35
composer.json
Unescape View File

@ -24,7 +24,7 @@
"wm/portfolio": "dev-master",
"wm/product": "dev-master",
"wm/service": "dev-master",
"wm/store": "dev-dev",
"wm/store": "dev-master",
"zircote/swagger-php": "^3.0"
},
"provide": {
@ -76,38 +76,39 @@
"@php artisan key:generate --ansi"
]
},
"repositories": [
{
"type": "path",
"url": "./modules/wm-crm"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/crm.git"
},
{
"type": "path",
"url": "./modules/wm-common"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/common.git"
},
{
"type": "path",
"url": "./modules/wm-core"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/core.git"
},
{
"type": "path",
"url": "./modules/wm-blog"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/blog.git"
},
{
"type": "path",
"url": "./modules/wm-portfolio"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/portfolio.git"
},
{
"type": "path",
"url": "./modules/wm-product"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/product.git"
},
{
"type": "path",
"url": "./modules/wm-service"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/service.git"
},
{
"type": "path",
"url": "./modules/wm-store"
"type": "vcs",
"url": "https://58848959365c8b792ba52b7552230260bddd9762@git.willaspace.com/WillaEngine-Project/store.git"
}
]
}

563
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

3
config/filesystems.php
Unescape View File

@ -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,
],
],

8
resources/js/Global/components/Inputs/RadioGroup.vue
Unescape View File

@ -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;
}

43
resources/js/Global/components/Inputs/TooltipButton.vue
Unescape View File

@ -10,16 +10,19 @@
<template v-slot:activator="{ on }">
<v-btn
slot="activator"
fab
:color="buttonColor"
:dark="dark"
:light="light"
v-on="on"
@click="$emit('click')"
@click="$emit('click', $event)"
:small="small"
:large="large"
:x-large="xLarge"
:x-small="xSmall"
:type="type"
:outlined="outlined"
:icon="onlyIcon"
fab
>
<v-icon dark>{{ icon }}</v-icon>
</v-btn>
@ -48,12 +51,6 @@ export default {
type: String,
default: "black",
},
top: {
type: Boolean,
default: function () {
return !this.bottom && !this.left && !this.right ? true : false;
},
},
bottom: {
type: Boolean,
default: false,
@ -70,21 +67,13 @@ export default {
type: String,
default: "fade-transition",
},
dark: {
type: Boolean,
default: function () {
return !this.light ? true : false;
},
},
light: {
type: Boolean,
default: false,
},
small: {
type: Boolean,
default: function () {
return !this.large && !this.xSmall && !this.xLarge ? true : false;
},
default: false,
},
large: {
type: Boolean,
@ -98,6 +87,26 @@ export default {
type: Boolean,
default: false,
},
type: {
type: String,
default: "button",
},
outlined: {
type: Boolean,
default: false,
},
onlyIcon: {
type: Boolean,
default: false,
},
},
computed: {
top() {
return !this.bottom && !this.left && !this.right ? true : false;
},
dark() {
return !this.light ? true : false;
},
},
};
</script>

34
resources/js/Global/utils/common/CreateFilterObject.js vendored
Unescape View File

@ -2,67 +2,69 @@ const createFilterObject = filters => {
let filterObject = {};
for (const key in filters) {
if (filters.hasOwnProperty(key)) {
if (filters[key]["type"]) {
if (filters[key] && typeof filters[key]["type"] !== "undefined") {
let filterValue = window[filters[key]["type"]](filters[key]);
if (filterValue) {
filterObject[key] = filterValue;
}
} else {
filterObject[key] = filters[key];
}
}
}
var filters= {};
var filters = {};
for (var filter in filterObject) {
if(filterObject.hasOwnProperty(filter)){
if (filterObject.hasOwnProperty(filter)) {
filters[`filters[${filter}]`] = filterObject[filter];
}
}
return filters;
};
window['between'] = function (filter) {
window["between"] = function(filter) {
var value = null;
if (filter.val1 && filter.val2) {
value = `<${filter.val1},${filter.val2}>`;
} else if (filter.val1) {
filter.val = filter.val1;
value = greater(filter);
} else if(filter.val2) {
} else if (filter.val2) {
filter.val = filter.val2;
value = less(filter);
}
return value;
}
window['greater'] = function (filter) {
};
window["greater"] = function(filter) {
var value = null;
if (filter.val) {
value = `(ge)${filter.val}`;
}
return value;
}
window['less'] = function (filter) {
};
window["less"] = function(filter) {
var value = null;
if (filter.val) {
value = `(le)${filter.val}`;
}
return value;
}
};
window['like'] = function(filter) {
window["like"] = function(filter) {
var value = null;
if (filter.val) {
if (filter.val !== null) {
value = `%${filter.val}%`;
}
return value;
}
window['in'] = function(filter) {
};
window["in"] = function(filter) {
var value = null;
if (filter.val) {
if (Array.isArray(filter.val)) {
value = filter.val.join(',');
value = filter.val.join(",");
} else {
value = `${filter.val}`;
}
}
return value;
}
};
export default createFilterObject;

Write Preview
Loading…
Cancel
Save