QRouland/ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new file: .gitconfig

Browse Source 
modified:   .gitignore
	modified:   SRC/app/config/app.php
	new file:   SRC/app/controllers/testBd.php
	modified:   SRC/app/routes.php
	new file:   SRC/app/views/testBd.php
This commit is contained in:
www 2015-02-08 22:43:20 +01:00
parent 2fb8c09b8c
commit 2f1aa2d596
9 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.bash_history Normal file
View File

@ -0,0 +1,14 @@
ls
git commit -a
git config --global user.email www@37.187.101.7
git config --global user.name www
git commit -a
git push
ls
cd SRC/
ls
clear
ls
git pull
git pull
exit

3
.gitconfig Normal file
View File

@ -0,0 +1,3 @@
[user]
email = www@37.187.101.7
name = www

4
.gitignore vendored
View File

@ -5,3 +5,7 @@
*.aux *.aux
*.lof *.lof
*.pdf *.pdf
SRC/app/config/local/database.php
SRC/app/config/database.php

2
SRC/app/config/app.php
View File

@ -13,7 +13,7 @@ return array(
| |
*/ */
'debug' => false, 'debug' => true,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

6
SRC/app/config/database.php
View File

@ -55,9 +55,9 @@ return array(
'mysql' => array( 'mysql' => array(
'driver' => 'mysql', 'driver' => 'mysql',
'host' => 'localhost', 'host' => 'localhost',
'database' => 'forge', 'database' => 'moduleweb',
'username' => 'forge', 'username' => 'root',
'password' => '', 'password' => 'l3miashs2015',
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',

18
SRC/app/config/local/database.php
View File

@ -19,29 +19,17 @@ return array(
*/ */
'connections' => array( 'connections' => array(
'mysql' => array( 'mysql' => array(
'driver' => 'mysql', 'driver' => 'mysql',
'host' => 'localhost', 'host' => 'localhost',
'database' => 'homestead', 'database' => 'moduleweb',
'username' => 'homestead', 'username' => 'root',
'password' => 'secret', 'password' => 'l3miashs2015',
'charset' => 'utf8', 'charset' => 'utf8',
'collation' => 'utf8_unicode_ci', 'collation' => 'utf8_unicode_ci',
'prefix' => '', 'prefix' => '',
), ),
'pgsql' => array(
'driver' => 'pgsql',
'host' => 'localhost',
'database' => 'homestead',
'username' => 'homestead',
'password' => 'secret',
'charset' => 'utf8',
'prefix' => '',
'schema' => 'public',
),
), ),
); );

9
SRC/app/controllers/testBd.php Normal file
View File

@ -0,0 +1,9 @@
<?php
class testBd extends BaseController {
public function getS()
{
$r = DB::select('select s from test where id = 1');
return View::make('testBd', array('s' => $r[0]->s));
}
}

2
SRC/app/routes.php
View File

@ -27,3 +27,5 @@ Route::get('home', function()
{ {
return View::make('home'); return View::make('home');
}); });
Route::get('testBd', 'testBd@getS');

5
SRC/app/views/testBd.php Normal file
View File

@ -0,0 +1,5 @@
<html>
<body>
<h1>S = <?php echo $s; ?></h1>
</body>
</html>