Skip to content

Commit

Permalink
Updated build
Browse files Browse the repository at this point in the history
Updated vee-validate 3 and fix his usage in all components.
Updated Installer.
Removed editor assets.
Updated project dependencies.
Updated ES6 usage.
Updated readme.
  • Loading branch information
uatrend committed Sep 8, 2019
1 parent 0216a9d commit a5df73e
Show file tree
Hide file tree
Showing 422 changed files with 1,857 additions and 36,715 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
**/app/bundle/**/*.js
# Ignor assets
/app/assets/*
/app/system/modules/editor/app/assets/*
# Don't ignore editor assets
!/app/system/modules/editor/app/assets/tinymce_skin
# Ignore vendor folder
/app/vendor/*
# Ignor module assets
Expand Down
157 changes: 18 additions & 139 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td width="50%">
<td width="45%">
<img src="https://cloud.githubusercontent.com/assets/1716665/14317675/ba034b8c-fc09-11e5-81ed-f10f37d86ea5.png" width="100%" title="hover text">
</td>
<td width="50%">
<img src="https://user-images.githubusercontent.com/24713453/63487166-a062b100-c4c3-11e9-817e-8a11c730472c.png" width="100%" alt="accessibility text">
<td width="55%">
<img src="https://user-images.githubusercontent.com/24713453/64491316-d56f5180-d280-11e9-91b7-68d309489ffe.png" width="100%" alt="accessibility text">
</td>
</tr>
</table>
Expand All @@ -23,143 +23,22 @@ Build includes:
- Blog extension
- Theme One

[Install from source](#install) before installation. The installation procedure is the same as in the official [documentation](https://pagekit.com/docs/getting-started/installation).
Download the latest [build](https://github.com/uatrend/pagekit/releases) or [install from source](#install) before installation.
The installation procedure is the same as in the official [documentation](https://pagekit.com/docs/getting-started/installation).

Marketplace functionality like install, update and remove works the same like in original version. Before enabling extensions, update them for compatibility. Debug mode and debug panel work the same as in the main version.
Marketplace functionality like install, update and remove works the same like in original version.
**Note!** Before enabling extensions, update them for compatibility. Debug mode and debug panel work the same as in the main version.

------

### Major changes:

**Required PHP Version - 7.2 or higher.**
- **Required PHP Version - 7.2 or higher.**
- **[Updated all project dependencies](https://github.com/uatrend/pagekit/blob/develop/package.json).**
- **Updated all core javascript components**.
- **Removed jQuery**.

<table width="100%" cellspacing="0" cellpadding="0" border="0">
<thead>
<tr>
<th colspan="2">Updated</th>
<th colspan="2">Added</th>
</tr>
</thead>
<tbody align="center" width="100%">
<tr>
<td width="50%">
Vue
</td>
<td>
2.6.10
</td>
<td width="50%">
Vue-event-manager
</td>
<td width="20%">
2.1.2
</td>
</tr>
<tr>
<td>
Vue-resource
</td>
<td>
1.5.1
</td>
<td>
Vee-validate
</td>
<td>
2.2.15
</td>
</tr>
<tr>
<td>
UIkit
</td>
<td>
3.1.7
</td>
<td>
Vue-nestable
</td>
<td>
2.4.3
</td>
</tr>
<tr>
<td>
Lodash
</td>
<td>
4.17.15
</td>
<td>
Flatpickr
</td>
<td>
4.6.2
</td>
</tr>
<tr>
<td>
Webpack
</td>
<td>
4.39.3
</td>
<td>
Tinymce
</td>
<td>
5.0.14
</td>
</tr>
<tr>
<td>
Gulp
</td>
<td>
4.0.2
</td>
<td width="50%" colspan="2">
</td>
</tr>
<tr>
<td>
Symfony Framework
</td>
<td>
4.3
</td>
<td width="50%" colspan="2">
</td>
</tr>
<tr>
<td>
Composer
</td>
<td>
1.9
</td>
<td width="50%" colspan="2">
</td>
</tr>
<tr>
<td>
<a href="https://github.com/uatrend/codemirror" target="_blank">Codemirror</a>
</td>
<td>
5.48.4
</td>
<td width="50%" colspan="2">
</td>
</tr>
</tbody>
</table>

**Updated all core javascript components** for compability with new dependencies. Several bugs that are present in the original assembly have been fixed, some styles have been changed for ease of use. The mobile version has remained the same with minor changes.

Added components for **UIkit 3** - **autocomplete, pagination, htmleditor**.
Location: ``` app/system/modules/theme/js/components```

Removed **jQuery**, **Bower**.
Several bugs that are present in the original assembly have been fixed, some styles have been changed for ease of use. The mobile version has remained the same with minor changes.

## <a name="install"></a>Install from source

Expand Down Expand Up @@ -230,9 +109,9 @@ $ gulp cldr

## Admin Theme

Theme is fully compatible with **UIkit 3**.
Changed default admin theme - script, layout and colors. Added side and top menus with dropdowns.
For individual markup of each page added class page in the body tag generated via php.
Theme is fully compatible with **UIkit 3**.
Changed default admin theme - script, layout and colors. Added side and top menus with dropdowns.
For individual markup of each page added class page in the body tag generated via php.

Example, class for dashboard page look like:

Expand All @@ -242,13 +121,13 @@ Example, class for dashboard page look like:

## Editor Settings

Added the ability to select an editor in the settings: HTML Editor, Tinymce or Codemirror.
Moved all editor component dependencies to: ``` app/system/modules/editor/app/assets```.
Added the ability to select an editor in the settings: HTML Editor, Tinymce or Codemirror.
Moved all editor component dependencies to: ``` app/system/modules/editor/app/assets```.
Added split mode for Tinymce.

## Theme Plugin

(added to core ```/app/system/app/lib/theme.js```)
(added to core ```/app/system/app/lib/theme.js```)

Ability to programmatically configure the buttons, dropdown lists, pagination and search form in the top menu for each component used (see code).

Expand Down
8 changes: 4 additions & 4 deletions app/installer/app/components/marketplace.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@

<script>
module.exports = {
import Package from '../lib/package';
mixins: [
require('../lib/package'),
],
export default {
mixins: [Package],
props: {
api: { type: String, default: '' },
Expand Down
4 changes: 2 additions & 2 deletions app/installer/app/components/package-details.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@

<script>
const Version = require('../lib/version');
import Version from '../lib/version';
module.exports = {
export default {
props: {
api: {
Expand Down
16 changes: 8 additions & 8 deletions app/installer/app/components/package-manager.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module.exports = {
import Package from '../lib/package';
import PackageUpload from './package-upload.vue';
import PackageDetails from './package-details.vue';

mixins: [
// Package,
require('../lib/package'),
Theme.Mixins.Helper
],
export default {

mixins: [Package,Theme.Mixins.Helper],

data() {
return _.extend({
Expand Down Expand Up @@ -116,8 +116,8 @@ module.exports = {
},

components: {
'package-upload': require('./package-upload.vue').default,
'package-details': require('./package-details.vue').default,
'package-upload': PackageUpload,
'package-details': PackageDetails
},

};
15 changes: 6 additions & 9 deletions app/installer/app/components/package-upload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@

<script>
module.exports = {
import Package from '../lib/package';
import PackageDetails from './package-details.vue';
mixins: [
// Package
require('../lib/package'),
Theme.Mixins.Helper
],
export default {
mixins: [Package, Theme.Mixins.Helper],
props: {
api: { type: String, default: '' },
Expand Down Expand Up @@ -155,9 +154,7 @@ module.exports = {
},
components: {
'package-details': require('./package-details.vue').default,
'package-details': PackageDetails
},
};
Expand Down
11 changes: 6 additions & 5 deletions app/installer/app/lib/install.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<!-- <div> -->

<v-modal ref="output" :options="options">
<div class="uk-modal-header uk-flex uk-flex-middle">
<h2>{{ 'Installing %title% %version%' | trans({title:pkg.title,version:pkg.version}) }}</h2>
Expand All @@ -25,14 +25,16 @@
<a v-show="status == 'success'" class="uk-button uk-button-primary" @click.prevent="enable">{{ 'Enable' | trans }}</a>
</div>
</v-modal>
<!-- </div> -->

</template>

<script>
module.exports = {
import Output from './output';
export default {
mixins: [require('./output')],
mixins: [Output],
methods: {
Expand All @@ -42,7 +44,6 @@ module.exports = {
self = this;
// return this.$http.post('admin/system/package/install', {package: pkg, packagist: Boolean(packagist)},null , {xhr: this.init()}).then(function () {
return this.$http.get('admin/system/package/install', { params: { package: pkg, packagist: Boolean(packagist) }, progress() { self.init(this); } }).then(function () {
this.scrollToEnd();
if (this.status === 'success' && packages) {
Expand Down
2 changes: 1 addition & 1 deletion app/installer/app/lib/output.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {

data() {
return {
Expand Down
6 changes: 3 additions & 3 deletions app/installer/app/lib/package.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const Install = Vue.extend(require('./install.vue').default);
const Uninstall = Vue.extend(require('./uninstall.vue').default);
const Update = Vue.extend(require('./update.vue').default);

module.exports = {
export default {

methods: {

Expand Down Expand Up @@ -56,8 +56,8 @@ module.exports = {

error(message) {
this.$notify(message.data, 'danger');
},
}

},
}

};
11 changes: 6 additions & 5 deletions app/installer/app/lib/uninstall.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<!-- <div> -->

<v-modal ref="output" :options="options">
<div class="uk-modal-header uk-flex uk-flex-middle">
<h2>{{ 'Removing %title% %version%' | trans({title:pkg.title,version:pkg.version}) }}</h2>
Expand All @@ -24,14 +24,16 @@
<a class="uk-button uk-button-secondary" @click.prevent="close">{{ 'Close' | trans }}</a>
</div>
</v-modal>
<!-- </div> -->

</template>

<script>
module.exports = {
import Output from './output';
export default {
mixins: [require('./output')],
mixins: [Output],
methods: {
Expand All @@ -40,7 +42,6 @@ module.exports = {
self = this;
// return this.$http.post('admin/system/package/uninstall', {name: pkg.name}, {xhr: this.init()}).then(function () {
return this.$http.get('admin/system/package/uninstall', { params: { name: pkg.name }, progress() { self.init(this); } }).then(function () {
this.scrollToEnd();
if (this.status === 'success' && packages) {
Expand Down
Loading

0 comments on commit a5df73e

Please sign in to comment.