Merge branch 'master' of github.com:cornernote/minetest-bower

README.md

@@ -26,6 +26,14 @@ composer install
 
 ## Using Heroku
 
+Setup:
+
+```
+sudo apt-get install postgresql-client
+wget -O- https://toolbelt.heroku.com/install-ubuntu.sh | sh
+heroku login
+```
+
 Deploy:
 
 ```
@@ -50,16 +58,24 @@ Bash with vim
 heroku vim
 ```
 
-View database:
+View logs:
+
+```
+heroku logs --tail
+```
+
+Connect to database:
 
 ```
 heroku pg:psql
 ```
 
-View logs:
+Database commands:
 
 ```
-heroku logs --tail
+\dt # list tables
+\d+ package # describe package table
+DELETE FROM package WHERE name='modname'; # delete a package
 ```
 
 More info:

composer.json

@@ -7,7 +7,7 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": ">=2.0.5",
+        "yiisoft/yii2": ">=2.0.9",
         "yiisoft/yii2-bootstrap": "*",
         "fxp/composer-asset-plugin": "*",
         "kartik-v/yii2-widgets": "^3.4",

src/models/Package.php

@@ -577,13 +577,16 @@ class Package extends ActiveRecord
         return '<pre>' . $bower . '</pre>';
     }
 
+    /**
+     * @return string
+     */
     public function getKeywordsHtml()
     {
         $keywordsHtml = [];
         $keywords = explode(',', $this->keywords);
         foreach ($keywords as $keyword) {
             $keyword = trim($keyword);
-            $keywordsHtml[] = $keyword;
+            $keywordsHtml[] = Html::a($keyword, ['/mod/index', 'search' => $keyword]);
         }
         return implode(', ', $keywordsHtml);
     }

src/views/mod/_search.php

@@ -11,7 +11,7 @@ use yii\helpers\Html;
 <div class="package-search">
 
     <?php $form = ActiveForm::begin([
-        'action' => ['index'],
+        'action' => ['/mod/index'],
         'method' => 'get',
     ]); ?>
 

src/views/mod/_view.php

@@ -27,7 +27,11 @@ use yii\helpers\Html;
                 'hideIfEmpty' => true,
                 'attributes' => [
                     'description',
-                    'keywords',
+                    [
+                        'label' => 'Keywords',
+                        'value' => $model->getKeywordsHtml(),
+                        'format' => 'raw',
+                    ],
                     //[
                     //    'label' => 'Authors',
                     //    'value' => $model->getAuthorsHtml(),

src/views/mod/view.php

@@ -10,7 +10,7 @@ use yii\helpers\Html;
 
 $this->title = $model->name;
 $this->params['breadcrumbs'][] = ['label' => 'Mods', 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
+$this->params['breadcrumbs'][] = (new GithubMarkdown())->parse($this->title);
 ?>
 <div class="mod-view">
 
@@ -25,7 +25,11 @@ $this->params['breadcrumbs'][] = $this->title;
                 'attributes' => [
                     'name',
                     //'description',
-                    'keywords',
+                    [
+                        'label' => 'Keywords',
+                        'value' => $model->getKeywordsHtml(),
+                        'format' => 'raw',
+                    ],
                     [
                         'label' => 'Authors',
                         'value' => $model->getAuthorsHtml(),

src/views/site/index.php

@@ -25,6 +25,10 @@ $this->params['jumbotron'] = '/site/_index-jumbotron';
 
         <p>If you'd like to run a Minetest Bower mirror, this is encouraged and simple to set up. Simply copy the <?= Html::a('this JSON file', ['/package/index']) ?> to your website and update it periodically.</p>
 
+        <h2>Search Mods</h2>
+
+        <?php echo $this->render('/mod/_search', ['model' => new PackageSearch()]); ?>
+
         <h2>Browse Mods</h2>
 
         <div class="row">
@@ -57,7 +61,7 @@ $this->params['jumbotron'] = '/site/_index-jumbotron';
             ?>
         </div>
 
-        <h2>Using Bower to Manage Mods and Dependancies</h2>
+        <h2>Using Bower to Manage Mods and Dependencies</h2>
 
         <p>If you are familiar with CLI, you can use Minetest Bower to install Minetest mods and dependency mods quickly and easily under Linux, Windows, and Mac OS X. Minetest Bower needs primarily two software packages named NodeJS and Git, which are easy to install.</p>