Skip to content

Commit

Permalink
Resolved #26, Dframe 4.1 update
Browse files Browse the repository at this point in the history
  • Loading branch information
dusta committed Apr 10, 2020
1 parent 979cf31 commit e89a86c
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 35 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ php:
- 7.1
- 7.2
- 7.3

# We don't want to run linux commands as super user
sudo: false

Expand All @@ -12,7 +12,7 @@ branches:
only: master

install:
composer install
script:
composer install

script:
- vendor/bin/phpunit
1 change: 1 addition & 0 deletions app/Bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* @license http://yourLicenceUrl/ (Licence Name)
*/

use Dframe\Router;

require_once __DIR__ . '/../web/config.php';
Expand Down
3 changes: 2 additions & 1 deletion dframe-cli
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use Dframe\Cli\Command;
require_once __DIR__ . '/vendor/autoload.php';
require_once __DIR__ . '/web/config.php';

$cli = ((new class () extends Command {})->run($argv));
$cli = ((new class () extends Command {
})->run($argv));

/* vim: set expandtab tabstop=2 shiftwidth=2: */
?>
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit bootstrap="app/Bootstrap.php" colors="true">

<testsuites>
<testsuite name="AppTests">
<directory suffix="Test.php">./tests/</directory>
Expand Down
4 changes: 2 additions & 2 deletions server.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* DframeFramework
* Copyright (c) Sławomir Kaleta
*
* @author Sławomir Kaleta <slaszka@gmail.com>
* @author Sławomir Kaleta <slaszka@gmail.com>
* @license https://github.com/dframe/dframe/blob/master/LICENCE (MIT)
*/

Expand All @@ -21,4 +21,4 @@
return false;
}

require_once __DIR__ . '/web/index.php';
require_once __DIR__ . '/web/index.php';
1 change: 0 additions & 1 deletion tests/RunTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
*
* @author Sławek Kaleta <slaszka@gmail.com>
*/

class RunTest extends TestCase
{
public function testCreateController()
Expand Down
9 changes: 5 additions & 4 deletions web/config.php
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<?php

$debugAllowed = [
'127.0.0.1',
'::1',
];

// DEBUG configuration
if (isset($_SERVER['REMOTE_ADDR']) and in_array($_SERVER['REMOTE_ADDR'], $debugAllowed)) {
ini_set('display_errors', "1"); // Debug setings
error_reporting(E_ALL); // Debug setings
ini_set('display_errors', "1"); // Debug settings
error_reporting(E_ALL); // Debug settings
define('MOD_REWRITE', true); // Mod rewrite (ex. task=page&action=login -> page/login )
define('setErrorLog', true); // DB show error
} else {
ini_set('display_errors', "0"); // Debug setings
error_reporting(E_ALL); // Debug setings
ini_set('display_errors', "0"); // Debug settings
error_reporting(E_ALL); // Debug settings
define('MOD_REWRITE', true); // Mod rewrite (ex. task=page&action=login -> page/login )
define('setErrorLog', false); // DB show error
}
Expand Down
26 changes: 14 additions & 12 deletions web/css/grid.css
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
body {
padding-top: 2rem;
padding-bottom: 2rem;
padding-top: 2rem;
padding-bottom: 2rem;
}

h3 {
margin-top: 2rem;
margin-top: 2rem;
}

.row {
margin-bottom: 1rem;
margin-bottom: 1rem;
}

.row .row {
margin-top: 1rem;
margin-bottom: 0;
margin-top: 1rem;
margin-bottom: 0;
}

[class*="col-"] {
padding-top: 1rem;
padding-bottom: 1rem;
background-color: rgba(86,61,124,.15);
border: 1px solid rgba(86,61,124,.2);
padding-top: 1rem;
padding-bottom: 1rem;
background-color: rgba(86, 61, 124, .15);
border: 1px solid rgba(86, 61, 124, .2);
}

hr {
margin-top: 2rem;
margin-bottom: 2rem;
margin-top: 2rem;
margin-bottom: 2rem;
}
20 changes: 10 additions & 10 deletions web/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
}

.font-slim {
font-size: 1.0rem;
line-height: 1;
font-size: 1.0rem;
line-height: 1;
}

.footer {
position: absolute;
bottom: 0;
width: 100%;
height: 60px;
line-height: 60px;
background-color: #ffffff;
font-size: 0.75rem;
position: absolute;
bottom: 0;
width: 100%;
height: 60px;
line-height: 60px;
background-color: #ffffff;
font-size: 0.75rem;
}

.footer .text-muted {
color: rgba(108, 117, 125, 0.4) !important;
}

.footer .text-muted a {
color: rgba(108, 117, 125, 0.4) !important;
}

0 comments on commit e89a86c

Please sign in to comment.