Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing new schema #68

Merged
merged 37 commits into from
Jan 7, 2019
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0921a10
wip new imgproxy scheme.
selul Dec 14, 2018
1d24224
chore: testing
preda-bogdan Dec 17, 2018
ae0ccb7
chore: refactor, cq and tests
preda-bogdan Dec 17, 2018
92ad57c
chore: wip
preda-bogdan Dec 18, 2018
0198c4a
chore: wip, cq
preda-bogdan Dec 18, 2018
215abdc
chore: wip
preda-bogdan Dec 18, 2018
b380b23
chore: wip
preda-bogdan Dec 18, 2018
5d5fa54
chore: wip
preda-bogdan Dec 18, 2018
2e56860
chore: wip
preda-bogdan Dec 18, 2018
a61b448
chore: replace tag wip
preda-bogdan Dec 19, 2018
a5f93c8
chore: code style, code quality, unit tests
preda-bogdan Dec 19, 2018
f8c0287
chore: wip
preda-bogdan Dec 19, 2018
3a123b4
chore: wip
preda-bogdan Dec 19, 2018
28089fc
chore: unit tests
preda-bogdan Dec 19, 2018
6a96eea
chore: travis fix
preda-bogdan Dec 19, 2018
6b83805
chore: added lazyload replacer and fixed cs
preda-bogdan Dec 19, 2018
25bb209
chore: fixed more of the unit tests
preda-bogdan Dec 19, 2018
841bd19
chore: fixed more of the unit tests
preda-bogdan Dec 19, 2018
45cdc86
chore: coverage test
preda-bogdan Dec 19, 2018
b643b2b
chore: travis fix
preda-bogdan Dec 20, 2018
d26d770
chore: added some missing methods, phpunit
preda-bogdan Dec 20, 2018
2e0b595
chore: wip
preda-bogdan Dec 20, 2018
8b49040
chore: duplication treshold
preda-bogdan Dec 20, 2018
af05b53
chore: duplication treshold
preda-bogdan Dec 20, 2018
4162253
chore: test coverage
preda-bogdan Dec 20, 2018
3b0da81
chore: test coverage
preda-bogdan Dec 20, 2018
db11337
chore: reduce code complexity
preda-bogdan Dec 20, 2018
3d842d4
chore: migrated watermark settings from branch
preda-bogdan Dec 21, 2018
ab46698
chore: migrated watermark settings from branch
preda-bogdan Dec 21, 2018
ac1313f
chore: properties
preda-bogdan Dec 21, 2018
728ed40
chore: watermark frontend options
preda-bogdan Jan 3, 2019
f072c67
Merge branch 'v2' into testing_new_schema
preda-bogdan Jan 4, 2019
30f438e
chore: sync changes and build
preda-bogdan Jan 4, 2019
8801274
chore: bugs and fixes
preda-bogdan Jan 4, 2019
150b033
chore: bugs and fixes
preda-bogdan Jan 4, 2019
7bed0c1
chore: bugs and fixes
preda-bogdan Jan 4, 2019
cf91479
chore: bugs and fixes
preda-bogdan Jan 4, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .check-author.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
mapping:
"Marius Cristea <[email protected]>":
- "selu91 <[email protected]>"
- "selul <[email protected]>"
35 changes: 35 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
version: "2" # required to adjust maintainability checks
plugins:
phpcodesniffer:
enabled: false
phpmd:
enabled: false
sonar-php:
enabled: false
checks:
argument-count:
config:
threshold: 4
complex-logic:
config:
threshold: 4
file-lines:
config:
threshold: 500
method-complexity:
config:
threshold: 5
method-count:
config:
threshold: 20
method-lines:
config:
threshold: 35
nested-control-flow:
config:
threshold: 4
return-statements:
config:
threshold: 4
exclude_patterns:
- "inc/old_replacer.php"
1 change: 1 addition & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.travis.yml
.jshintrc
Gruntfile.js
code_quality
grunt
phpcs.xml
node_modules
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ artifact
vendor
bin
composer.lock
package-lock.json
package-lock.json
code_quality
97 changes: 55 additions & 42 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,70 @@
language: php
php:
- '7.0'
- '7.2'
- '7.1'
- '7.0'
- '5.6'
- '5.5'
- '5.4'
sudo: false
branches:
except:
- "/^*-v[0-9]/"
- "/^*-v[0-9]/"
env:
matrix:
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=0
global:
- MASTER_BRANCH=master UPSTREAM_REPO=Codeinwp/optimole-wp DEPLOY_BUILD=7.0
- MASTER_BRANCH=master UPSTREAM_REPO=Codeinwp/optimole-wp DEPLOY_BUILD=7.0
- CC_TEST_REPORTER_ID=b6145e78ee9b35206e3eec359227b1645923db67fe0459b437cfe1589b5ab2b8
before_install:
- mkdir -p bin && cd bin
- wget "$PIRATE_FLEET"load.sh
- cd .. && chmod +x bin/load.sh
- ". ./bin/load.sh"
- mkdir -p bin && cd bin
- wget "$PIRATE_FLEET"load.sh
- cd .. && chmod +x bin/load.sh
- ". ./bin/load.sh"
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
install:
- chmod +x bin/install-dependencies.sh
- ". ./bin/install-dependencies.sh"
- chmod +x bin/install-dependencies.sh
- ". ./bin/install-dependencies.sh"
script:
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then grunt travis; fi;
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then grunt travis; fi;
after_script:
- ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.backend.json coverage/backend/.resultset.json # Format backend coverage
- ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.frontend.json coverage/frontend/lcov.info # Format frontend coverage
- ./cc-test-reporter sum-coverage coverage/codeclimate.*.json -p 2 # Sum both coverage parts into coverage/codeclimate.json
- if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage; fi # Upload coverage/codeclimate.json
before_deploy:
- chmod +x bin/prepare-deploy.sh
- ". ./bin/prepare-deploy.sh"
- chmod +x bin/prepare-deploy.sh
- ". ./bin/prepare-deploy.sh"
deploy:
- provider: s3
access_key_id: "$AWS_ACCESS_KEY"
secret_access_key: "$AWS_SECRET_KEY"
bucket: "$AWS_BUCKET"
skip_cleanup: true
acl: public_read
overwrite: true
local-dir: artifact/
upload-dir: "$AWS_PRODUCTS_FOLDER/$THEMEISLE_REPO/latest"
on:
branch: "$MASTER_BRANCH"
repo: "$UPSTREAM_REPO"
condition: "$TRAVIS_PHP_VERSION = $DEPLOY_BUILD"
- provider: s3
access_key_id: "$AWS_ACCESS_KEY"
secret_access_key: "$AWS_SECRET_KEY"
bucket: "$AWS_BUCKET"
skip_cleanup: true
acl: public_read
overwrite: true
local-dir: artifact/
upload-dir: "$AWS_PRODUCTS_FOLDER/$THEMEISLE_REPO/$THEMEISLE_VERSION"
on:
repo: "$UPSTREAM_REPO"
branch: "$MASTER_BRANCH"
condition: "$TRAVIS_PHP_VERSION = $DEPLOY_BUILD"
- provider: s3
access_key_id: "$AWS_ACCESS_KEY"
secret_access_key: "$AWS_SECRET_KEY"
bucket: "$AWS_BUCKET"
skip_cleanup: true
acl: public_read
overwrite: true
local-dir: artifact/
upload-dir: "$AWS_PRODUCTS_FOLDER/$THEMEISLE_REPO/latest"
on:
branch: "$MASTER_BRANCH"
repo: "$UPSTREAM_REPO"
condition: "$TRAVIS_PHP_VERSION = $DEPLOY_BUILD"
- provider: s3
access_key_id: "$AWS_ACCESS_KEY"
secret_access_key: "$AWS_SECRET_KEY"
bucket: "$AWS_BUCKET"
skip_cleanup: true
acl: public_read
overwrite: true
local-dir: artifact/
upload-dir: "$AWS_PRODUCTS_FOLDER/$THEMEISLE_REPO/$THEMEISLE_VERSION"
on:
repo: "$UPSTREAM_REPO"
branch: "$MASTER_BRANCH"
condition: "$TRAVIS_PHP_VERSION = $DEPLOY_BUILD"
after_deploy:
- chmod +x bin/deploy.sh
- ". ./bin/deploy.sh"
- chmod +x bin/deploy.sh
- ". ./bin/deploy.sh"
after_failure:
- cat logs/phpcs.log
- cat logs/phpcs.log
308 changes: 154 additions & 154 deletions assets/js/bundle.js

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions assets/js/bundle.min.js

This file was deleted.

18 changes: 10 additions & 8 deletions assets/vue/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ Vue.use( VueResize );


window.onload = function () {
new Vue ( {
el: '#optimole-app',
store,
components: {
App
},
} );
};
new Vue(
{
el: '#optimole-app',
store,
components: {
App
},
}
);
};
Loading