Skip to content

Commit

Permalink
- start using composer for managing php dependencies
Browse files Browse the repository at this point in the history 
- start using bower for js/css dependencies
- thus remove git submodules etc.
- fixed a couple of paths
  • Loading branch information
@rubenarslan
rubenarslan committed Jul 24, 2013
1 parent 66580c9 commit 5454e14
Show file tree
Hide file tree
Showing 1,281 changed files with 299,894 additions and 76 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
@@ -1,4 +1,5 @@
tmp/*
config/*
vendor/*
*.*~
.DS_Store
21 changes: 0 additions & 21 deletions .gitmodules
View file
@@ -1,21 +0,0 @@
[submodule "vendors/Markdown"]
path = vendors/Markdown
url = https://github.com/michelf/php-markdown
[submodule "webroot/js/vendor/select2"]
path = webroot/js/vendor/select2
url = https://github.com/ivaynberg/select2
[submodule "vendors/PHPMailer"]
path = vendors/PHPMailer
url = https://github.com/PHPMailer/PHPMailer
[submodule "vendors/password_compat"]
path = vendors/password_compat
url = https://github.com/ircmaxell/password_compat
[submodule "webroot/js/vendor/Font-Awesome"]
path = webroot/js/vendor/Font-Awesome
url = https://github.com/FortAwesome/Font-Awesome
[submodule "vendors/PHPExcel"]
path = vendors/PHPExcel
url = https://github.com/PHPOffice/PHPExcel
[submodule "webroot/js/vendor/webshim"]
path = webroot/js/vendor/webshim
url = https://github.com/aFarkas/webshim
0 LICENSE → LICENSE.md
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Model/DB.php
View file
Expand Up @@ -5,7 +5,7 @@ class DB extends PDO
#make a connection
public function __construct()
{
require_once INCLUDE_ROOT. "config/settings.php";
require_once INCLUDE_ROOT. "config/database.php";


$db = new DATABASE_CONFIG();
Expand Down
2 changes: 1 addition & 1 deletion Model/Email.php
View file
@@ -1,7 +1,7 @@
<?php
// todo: should check email log so that it never sends more than three emails to the same user in a short amount of time.
require_once INCLUDE_ROOT."Model/RunUnit.php";
require_once INCLUDE_ROOT. 'vendors/Markdown/Michelf/Markdown.php';
#require_once INCLUDE_ROOT. 'vendor/michelf/php-markdown/Markdown.php';
use \Michelf\Markdown AS Markdown;

class Email extends RunUnit {
Expand Down
2 changes: 1 addition & 1 deletion Model/EmailAccount.php
View file
@@ -1,5 +1,5 @@
<?php
require_once INCLUDE_ROOT ."vendors/PHPMailer/class.phpmailer.php";
#require_once INCLUDE_ROOT ."vendor/phpmailer/phpmailer/class.phpmailer.php";
class EmailAccount
{
public function __construct($fdb, $id, $user_id)
Expand Down
2 changes: 1 addition & 1 deletion Model/Page.php
View file
@@ -1,6 +1,6 @@
<?php
require_once INCLUDE_ROOT."Model/RunUnit.php";
require_once INCLUDE_ROOT. 'vendors/Markdown/Michelf/Markdown.php';
#require_once INCLUDE_ROOT. 'vendor/michelf/php-markdown/Michelf/Markdown.php';
use \Michelf\Markdown AS Markdown;

class Page extends RunUnit {
Expand Down
2 changes: 1 addition & 1 deletion Model/Pause.php
View file
@@ -1,6 +1,6 @@
<?php
require_once INCLUDE_ROOT."Model/RunUnit.php";
require_once INCLUDE_ROOT. 'vendors/Markdown/Michelf/Markdown.php';
#require_once INCLUDE_ROOT. 'vendor/michelf/php-markdown/Michelf/Markdown.php';
use \Michelf\Markdown AS Markdown;

class Pause extends RunUnit {
Expand Down
7 changes: 3 additions & 4 deletions Model/RunUnit.php
View file
Expand Up @@ -216,10 +216,9 @@ private function makeOpenCPU()
{
require_once INCLUDE_ROOT . "Model/OpenCPU.php";

global $head;
$head = '
<script type="text/javascript" src="'.WEBROOT.'js/vendor/knitr.js"></script>
<link rel="stylesheet" href="'.WEBROOT.'css/knitr.css" type="text/css">';
global $css,$js;
$css = '<link rel="stylesheet" href="'.WEBROOT.'assets/knitr.css" type="text/css">';
$js = '<script type="text/javascript" src="'.WEBROOT.'assets/knitr.js"></script>';

$openCPU = new OpenCPU();
$openCPU->addUserData($this->getUserDataInRun());
Expand Down
6 changes: 3 additions & 3 deletions Model/SpreadsheetReader.php
View file
@@ -1,6 +1,6 @@
<?php
## Get Markdown class
require_once INCLUDE_ROOT. 'vendors/Markdown/Michelf/Markdown.php';
#require_once INCLUDE_ROOT. 'vendor/michelf/php-markdown/Michelf/Markdown.php';
use \Michelf\Markdown AS Markdown;

class SpreadsheetReader
Expand Down Expand Up @@ -34,7 +34,7 @@ protected function objectFromArray($array)
ini_set('memory_limit', '256M');

// Include PHPExcel_IOFactory
require_once INCLUDE_ROOT.'vendors/PHPExcel/Classes/PHPExcel/IOFactory.php';
# require_once INCLUDE_ROOT.'vendor/phpoffice/phpexcel/phpexcel/Classes/PHPExcel/IOFactory.php';

$objPHPExcel = new PHPExcel();
array_unshift($array, array_keys(current($array)));
Expand Down Expand Up @@ -194,7 +194,7 @@ public function readItemTableFile($inputFileName)
$this->errors = $this->messages = array();

// Include PHPExcel_IOFactory
require_once INCLUDE_ROOT.'vendors/PHPExcel/Classes/PHPExcel/IOFactory.php';
# require_once INCLUDE_ROOT.'vendor/phpoffice/phpexcel/Classes/PHPExcel/IOFactory.php';

define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');

Expand Down
2 changes: 1 addition & 1 deletion Model/User.php
View file
@@ -1,6 +1,6 @@
<?php
require_once INCLUDE_ROOT . "Model/DB.php";
require_once INCLUDE_ROOT . 'vendors/password_compat/lib/password.php';
#require_once INCLUDE_ROOT . 'vendor/ircmaxell/password-compat/lib/password.php';

class User
{
Expand Down
35 changes: 22 additions & 13 deletions View/header.php
View file
Expand Up @@ -12,42 +12,51 @@
?>
<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="<?=WEBROOT?>assets/bower_components/bootstrap/css/bootstrap-responsive.min.css">
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/select2/3.4.1/select2.css">

<?php
else:
?>
<link rel="stylesheet" type="text/css" href="<?=WEBROOT?>js/vendor/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="<?=WEBROOT?>js/vendor/Font-Awesome/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="<?=WEBROOT?>assets/bower_components/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="<?=WEBROOT?>assets/bower_components/font-awesome/css/font-awesome.css">
<link rel="stylesheet" href="<?=WEBROOT?>assets/bower_components/bootstrap/css/bootstrap-responsive.css">
<link rel="stylesheet" type="text/css" href="<?=WEBROOT?>assets/bower_components/select2/select2.css">

<?php
endif;
?>
<link rel="stylesheet" href="<?=WEBROOT?>js/vendor/bootstrap/css/bootstrap-responsive.min.css">
<!--[if IE 7]>
<link rel="stylesheet" href="css/font-awesome-ie7.min.css">
<link rel="stylesheet" href="assets/bower_components/font-awesome/css/font-awesome-ie7.min.css">
<![endif]-->
<link rel="stylesheet" type="text/css" href="<?=WEBROOT?>js/vendor/select2/select2.css">
<link rel="stylesheet" href="<?=WEBROOT?>css/main.css" type="text/css" media="screen">
<link rel="stylesheet" href="<?=WEBROOT?>assets/main.css" type="text/css" media="screen">
<?php echo isset($css)?$css:'' ?>


<?php
if(ONLINE):
?>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.js"></script>
<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
<script src="<?=WEBROOT?>assets/modernizr-2.6.2-respond-1.1.0.min.js"></script>
<script src="//cdn.jsdelivr.net/webshim/1.10.9/polyfiller.js"></script>
<script type="text/javascript" src="//cdn.jsdelivr.net/select2/3.4.1/select2.min.js"></script>

<?php
else:
?>
<script src="<?=WEBROOT?>js/vendor/jquery-1.10.2.min.js"></script>
<script src="<?=WEBROOT?>js/vendor/bootstrap/js/bootstrap.min.js"></script>
<script src="<?=WEBROOT?>js/vendor/webshim/src/polyfiller.js"></script>
<script src="<?=WEBROOT?>assets/bower_components/jquery/jquery.js"></script>
<script src="<?=WEBROOT?>assets/bower_components/bootstrap/js/bootstrap.js"></script>
<script src="<?=WEBROOT?>assets/modernizr-2.6.2-respond-1.1.0.min.js"></script>
<script src="<?=WEBROOT?>assets/bower_components/webshim/demos/js-webshim/minified/polyfiller.js"></script>
<script type="text/javascript" src="<?=WEBROOT?>assets/bower_components/select2/select2.js"></script>

<?php
endif;
?>
<script src="<?=WEBROOT?>js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
<script src="<?=WEBROOT?>js/main.js"></script>
<script type="text/javascript" src="<?=WEBROOT?>js/vendor/select2/select2.js"></script>
<script src="<?=WEBROOT?>assets/main.js"></script>

<?php echo isset($head)?$head:'' ?>
<?php echo isset($js)?$js:'' ?>
</head>
<body>
<header class="study-header">
Expand Down
23 changes: 23 additions & 0 deletions composer.json
View file
@@ -0,0 +1,23 @@
{
"name": "rubenarslan/formr",
"description": "make complex (longitudinal, network, diary, ...) studies using spreadsheets and give feedback with R graphs",
"version": "0.1.0",
"keywords": ["form", "survey", "study", "psychology", "R", "feedback"],
"homepage": "https://github.com/rubenarslan/formr",
"license": "BSD-2-Clause-FreeBSD",
"authors": [
{
"name": "Ruben C. Arslan",
"email": "rubenarslan@gmail.com",
"homepage": "https://github.com/rubenarslan",
"role": "Developer"
}
],
"require": {
"php": ">=5.4.0",
"michelf/php-markdown": "1.3.*",
"ircmaxell/password-compat": "1.0.*",
"phpoffice/phpexcel": "1.7.*",
"phpmailer/phpmailer": "5.2.*"
}
}

0 comments on commit 5454e14

Please sign in to comment.