Skip to content

Commit

Permalink
Removes Bower and NPM Requirement
Browse files Browse the repository at this point in the history
* No longer requires Bower & NPM to install jscolor.
* Adds Composer requirement of jscolor and a plugin that will move it to the correct directory post install.
* Updates composer.json & composer.lock to lock down versions of packages more accurately.
* Removes All bower config and references
* Removes nodejs buildpack from Heroku config
* Updates readme to remove Bower/Node docs
  • Loading branch information
iturgeon committed Jun 7, 2017
1 parent 4d361a5 commit 60bce9f
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 152 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

1 change: 0 additions & 1 deletion .buildpacks
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
https://github.com/heroku/heroku-buildpack-nodejs
https://github.com/heroku/heroku-buildpack-php
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,11 @@ To start the Heroku deployment process, you can click the button below, please n
## System Requirements
* Apache or Nginx webserver
* PHP 5.4, 5.5, or 5.6 (some users have modified the code to work on 5.3)
* Bower
* MySQL or PostgreSQL

If you're using PHP 5.3:

* Convert all empty array initializations from using the newer `[]` syntax to use the older `array()` syntax.
* If you have `short_open_tag` disabled, you'll need to change all `<?=` to `<?php echo`

## Installing Bower Dependencies
[Bower](http://bower.io/) is used to install JavaScript dependencies. Composer automatically runs Bower during install in the next step, so install Bower before continuing.

> Currently there is only one bower library installed. You can also install manually by cloning [JSColor](https://github.com/callumacrae/JSColor) library into `assets/js/vendor/JSColor/`.

## Installing Composer Dependencies
UDOIT uses [Composer](https://getcomposer.org/) to install PHP dependencies. So `cd` into your UDOIT directory and run this command before anything else:
Expand All @@ -67,7 +60,7 @@ UDOIT uses [Composer](https://getcomposer.org/) to install PHP dependencies. So
$ php composer.phar install
```

The libraries (other then Quail) that we rely on can be found in `bower.json` and `composer.json`.
The libraries (other then Quail) that we rely on can be found in `composer.json`.

Please refer to the documentation for these three libraries for additional information.

Expand All @@ -77,7 +70,7 @@ Make sure the `reports` directory in the root of UDOIT is *writable by your webs
## Database Setup
UDOIT works with MySQL, MariaDB, or PostgreSQL

1. Create a database for UDOIT.
1. Create a database for UDOIT.
2. Create a user with access to your database

### Database Config
Expand All @@ -100,7 +93,7 @@ Edit `config/localConfig.php`:

### Installing Database Tables

There are only two tables required. To create them, run the creation script below. You'll need to complete the db steps above first.
To create the required tables, run the creation script below. You'll need to complete the db steps above first.

```
$ php lib/db_create_tables.php
Expand Down
3 changes: 0 additions & 3 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@
"heroku-postgresql:hobby-dev"
],
"buildpacks": [
{
"url": "https://github.com/heroku/heroku-buildpack-nodejs"
},
{
"url": "https://github.com/heroku/heroku-buildpack-php"
}
Expand Down
20 changes: 0 additions & 20 deletions bower.json

This file was deleted.

45 changes: 28 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,30 +63,41 @@
"role": "Contributor"
}
],
"scripts": {
"post-install-cmd": [
"bower install"
],
"post-update-cmd": [
"bower install"
],
"compile": [
"bower install"
]
},
"repositories" : [
{
"type" : "package",
"package" : {
"name" : "EastDesire/jscolor",
"version" : "1.4.2",
"source" : {
"url" : "https://github.com/EastDesire/jscolor.git",
"type" : "git",
"reference" : "tags/v1.4.2"
}
}
}
],
"require": {
"php": "^5.4.0 || ^5.5.0 || ^5.6.0",
"nategood/httpful": "*",
"zaininnari/html-minifier": "dev-master",
"mpdf/mpdf": "dev-master",
"league/plates": "~3.1",
"ext-pdo": "*",
"monolog/monolog": "^1.21"
"ext-gd": "*",
"nategood/httpful": "^0.2.20",
"zaininnari/html-minifier": "^0.4.2",
"mpdf/mpdf": "^6.1.3",
"league/plates": "^3.1.1",
"monolog/monolog": "^1.21",
"mnsami/composer-custom-directory-installer": "1.1.*",
"EastDesire/jscolor":"1.4.2"
},
"require-dev": {
"phpunit/phpunit": "4.8.*",
"phpspec/prophecy": "1.3.1",
"symfony/yaml": "v2.8.9",
"heroku/heroku-buildpack-php": "*"
"heroku/heroku-buildpack-php": "v121"
},
"extra": {
"installer-paths": {
"./public/assets/js/vendor/{$name}":["EastDesire/jscolor"]
}
}
}
Loading

0 comments on commit 60bce9f

Please sign in to comment.