tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating all dependencies

This commit is contained in:
weryques 2018-03-27 12:33:44 -03:00
parent 33d10c6d51
commit cbb0bdf707
7 changed files with 4360 additions and 2134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6388
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

30
package.json
View File

@ -4,11 +4,11 @@
"author": "Eduardo <eduardo.humberto1992@gmail.com>",
"private": true,
"scripts": {
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --inline --hot",
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
"dev": "cross-env NODE_ENV=development webpack --mode development --open --inline --hot",
"build": "cross-env NODE_ENV=production webpack --mode production --progress --hide-modules"
},
"dependencies": {
"axios": "^0.17.1",
"axios": "^0.18.0",
"buefy": "^0.6.3",
"bulma": "^0.6.2",
"fs": "0.0.1-security",
@ -20,32 +20,34 @@
"qs": "^6.5.1",
"sass-loader": "^6.0.6",
"tls": "0.0.1",
"vue": "^2.5.13",
"vue": "^2.5.16",
"vue-router": "^3.0.1",
"vuedraggable": "^2.16.0",
"vuex": "^3.0.1"
},
"devDependencies": {
"autoprefixer": "^7.2.5",
"autoprefixer": "^8.2.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.1",
"babel-preset-es2015": "^6.0.0",
"babel-preset-stage-2": "^6.24.1",
"cross-env": "^3.0.0",
"css-loader": "^0.25.0",
"cross-env": "^5.1.4",
"css-loader": "^0.28.11",
"cypress": "^2.1.0",
"element-theme-chalk": "^2.1.0",
"eslint": "^4.19.1",
"eslint-loader": "^2.0.0",
"eslint-plugin-vue": "^4.4.0",
"file-loader": "^0.9.0",
"file-loader": "^1.1.11",
"postcss-loader": "^2.1.0",
"sass-resources-loader": "^1.3.2",
"style-loader": "^0.19.1",
"vue-custom-element": "^1.0.13",
"vue-loader": "^13.7.1",
"vue-template-compiler": "^2.5.13",
"webpack": "^3.10.0",
"webpack-dev-server": "^2.11.1"
"style-loader": "^0.20.3",
"vue-custom-element": "^2.1.0",
"vue-loader": "^14.2.2",
"vue-template-compiler": "^2.5.16",
"webpack": "^4.3.0",
"webpack-cli": "^2.0.13",
"webpack-dev-server": "^3.1.1"
}
}

13
src/admin/js/main.js
View File

@ -1,6 +1,6 @@
// Main imports
import Vue from 'vue'
import Buefy from 'buefy'
import Vue from 'vue';
import Buefy from 'buefy';
// Custom elements
import Text from '../../classes/field-types/text/Text.vue';
@ -32,11 +32,13 @@ import store from '../../js/store/store'
import router from './router'
import { I18NPlugin, UserPrefsPlugin, RouterHelperPlugin, ConsolePlugin } from './utilities';
// Configure and Register Plugins
// Changing title of pages
router.beforeEach((to, from, next) => {
document.title = to.meta.title
next()
document.title = to.meta.title;
next();
});
// Configure and Register Plugins
Vue.use(Buefy);
Vue.use(I18NPlugin);
Vue.use(UserPrefsPlugin);
@ -65,6 +67,7 @@ Vue.component('tainacan-filter-selectbox', FilterSelectbox);
Vue.component('tainacan-filter-autocomplete', FilterAutocomplete);
Vue.component('tainacan-filter-checkbox', FilterCheckbox);
Vue.component('tainacan-filter-taginput', FilterTaginput);
/* Others */
Vue.component('help-button', HelpButton);
Vue.component('draggable', draggable);

28
src/classes/field-types/category/class-tainacan-category.php
View File

@ -2,6 +2,10 @@
namespace Tainacan\Field_Types;
use Tainacan\Entities\Field;
use Tainacan\Entities\Item_Metadata_Entity;
use Tainacan\Repositories\Fields;
defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
/**
@ -44,7 +48,7 @@ class Category extends Field_Type {
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @param $itemMetadata Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
@ -58,7 +62,7 @@ class Category extends Field_Type {
name="'.$itemMetadata->get_field()->get_name().'"></tainacan-selectbox>';
}
public function validate_options(\Tainacan\Entities\Field $field) {
public function validate_options( Field $field) {
if ( !in_array($field->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
return true;
@ -66,7 +70,7 @@ class Category extends Field_Type {
if (empty($this->get_option('taxonomy_id')))
return ['taxonomy_id' => __('Please select a category', 'tainacan')];
$Tainacan_Fields = \Tainacan\Repositories\Fields::getInstance();
$Tainacan_Fields = Fields::getInstance();
$category_fields = $Tainacan_Fields->fetch([
'collection_id' => $field->get_collection_id(),
@ -90,18 +94,18 @@ class Category extends Field_Type {
return true;
}
/**
* Validate item based on field type categories options
*
* @param TainacanEntitiesItem_Metadata_Entity $item_metadata
* @return bool Valid or not
*/
public function validate(\Tainacan\Entities\Item_Metadata_Entity $item_metadata) {
* Validate item based on field type categories options
*
* @param Item_Metadata_Entity $item_metadata
*
* @return bool Valid or not
*/
public function validate( Item_Metadata_Entity $item_metadata) {
$item = $item_metadata->get_item();
$field = $item_metadata->get_field();
if ( !in_array($item->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
return true;

2
src/classes/repositories/class-tainacan-items.php
View File

@ -319,7 +319,7 @@ class Items extends Repository {
* @param $wp_query
* @return string
*/
public function title_in_posts_where( $where, &$wp_query ) {
public function title_in_posts_where( $where, $wp_query ) {
global $wpdb;
if ( $post_title_in = $wp_query->get( 'post_title_in' ) ) {
if(is_array( $post_title_in ) && isset( $post_title_in['value']) ){

2
src/js/main.js
View File

@ -7,7 +7,7 @@ import { eventFilterBus } from './event-bus-filters';
import Buefy from 'buefy'
Vue.use(Buefy)
Vue.use(Buefy);
Vue.use(VueCustomElement);

31
webpack.config.js
View File

@ -1,5 +1,5 @@
var path = require('path')
var webpack = require('webpack')
let path = require('path');
let webpack = require('webpack');
module.exports = {
entry: {
@ -65,7 +65,10 @@ module.exports = {
node: {
fs: 'empty'
},
}
performance: {
hints: false
},
};
if (process.env.NODE_ENV === 'production') {
module.exports.devtool = 'inline-source-map';
@ -76,16 +79,16 @@ if (process.env.NODE_ENV === 'production') {
NODE_ENV: '"production"'
}
}),
new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false
}
}),
new webpack.LoaderOptionsPlugin({
minimize: true
})
// new webpack.optimize.UglifyJsPlugin({
// compress: {
// warnings: false
// }
// }),
// new webpack.LoaderOptionsPlugin({
// minimize: true
// })
]);
module.exports.resolve.alias = {
'vue$': 'vue/dist/vue.min.js'
}
// module.exports.resolve.alias = {
// 'vue$': 'vue/dist/vue.min.js'
// }
}