Skip to content

Commit

Permalink
Big refactor, v2.0.0, PR #8
Browse files Browse the repository at this point in the history
Merge commits:
  Update assets files for WP Plugins Directory
  Deploy: Make naked version even more naked
  Rename author to "Redbit s.r.o." (slug redbitcz)
  Add product icon for
  Rename plugin as "SimpleShop.cz" (slug simpleshop-cz)
  Add readme.txt
  Literally mark MIT license as compatible with GNU General Public License
  Refactoring
  Fix Code style
  Refactor classes
  • Loading branch information
jakubboucek committed Sep 15, 2018
2 parents 6bee451 + 475d4ea commit b87f712
Show file tree
Hide file tree
Showing 35 changed files with 2,018 additions and 1,835 deletions.
4 changes: 3 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

License IS COMPATIBLE with GNU General Public License.
Binary file added assets/banner-772x250.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/screenshot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/screenshot-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/screenshot-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions deploy-exclude.lst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.idea*
*.idea*
*nbproject*
*assets*
*dist*
composer.json
composer.lock
Expand Down
8 changes: 4 additions & 4 deletions deploy.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @author Redbit s.r.o. <[email protected]>
*/

$deploy = new DeployScript( 'simple-shop-connector' );
$deploy = new DeployScript( 'simpleshop-cz' );
$deploy->distDir = __DIR__ . '/dist';

try {
Expand Down Expand Up @@ -92,7 +92,7 @@ private function buildPackage() {
__DIR__ . '/' . $this->productName . '.php',
array(
'Version: dev-master' => sprintf( 'Version: %s', $this->getNakedVersion() ),
'define(\'SSC_PLUGIN_VERSION\',\'dev-master\');' => sprintf( 'define(\'SSC_PLUGIN_VERSION\',\'%s\');',
'define( \'SIMPLESHOP_PLUGIN_VERSION\', \'dev-master\' );' => sprintf( 'define( \'SIMPLESHOP_PLUGIN_VERSION\', \'%s\' );',
$this->version ),
),
$this->distDir
Expand Down Expand Up @@ -191,12 +191,12 @@ private function zip( $fileOrPath, $zip, $baseDir = __DIR__ ) {
}

/**
* Strips "v" from versions (v1.2.3 -> 1.2.3)
* Strips "v" from versions (v1.2.3-beta -> 1.2.3)
*
* @return bool|string
*/
private function getNakedVersion() {
return substr( $this->version, 1 );
return preg_replace('/^v(\d+\.\d+\.\d+)(?:-.*)+$/D', '$1', $this->version);
}

/**
Expand Down
Binary file added img/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
249 changes: 0 additions & 249 deletions includes/class.ssc_access.php

This file was deleted.

Loading

0 comments on commit b87f712

Please sign in to comment.