Skip to content

Commit 85da878

Browse files
SamuelTalletSamuelTallet
committed
Code refactoring
1 parent 8fdb519 commit 85da878

12 files changed

+91
-91
lines changed

‎index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* @var string
3535
* Example: //127.0.0.1:5000/mongo
3636
*/
37-
define('MPG_BASE_URL', $baseUrl);
37+
define('MPG\BASE_URL', $baseUrl);
3838

3939
$router = require ABS_PATH . '/routes.php';
4040

‎routes.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
);
6565

6666
$router->get(
67-
Request::getPath() . '/getDatabaseNetworkGraph',
68-
DatabasesController::class . '@getNetworkGraph'
67+
Request::getPath() . '/getDatabaseGraph',
68+
DatabasesController::class . '@getGraph'
6969
);
7070

7171
$router->get(

‎source/js/visualizeDatabase.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ MPG.drawVisNetwork = function() {
7474

7575
MPG.helpers.doAjaxRequest(
7676
'GET',
77-
MPG_BASE_URL + '/getDatabaseNetworkGraph',
77+
MPG_BASE_URL + '/getDatabaseGraph',
7878
function(response) {
7979

8080
var visNetworkContainer = document.querySelector('#vis-network-container');

‎source/php/MPG/DatabasesController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function visualize() : ViewResponse {
3636

3737
}
3838

39-
public function getNetworkGraph() : JsonResponse {
39+
public function getGraph() : JsonResponse {
4040

4141
$networkGraph = [
4242
'visData' => [
@@ -45,7 +45,7 @@ public function getNetworkGraph() : JsonResponse {
4545
'id' => 1,
4646
'label' => 'MongoDB server',
4747
'shape' => 'image',
48-
'image' => MPG_BASE_URL . '/assets/images/leaf-icon.svg',
48+
'image' => BASE_URL . '/assets/images/leaf-icon.svg',
4949
'size' => 32
5050
]
5151
],
@@ -73,7 +73,7 @@ public function getNetworkGraph() : JsonResponse {
7373
'id' => $nodeCounter,
7474
'label' => 'DB: ' . $databaseName,
7575
'shape' => 'image',
76-
'image' => MPG_BASE_URL . '/assets/images/database-icon.svg',
76+
'image' => BASE_URL . '/assets/images/database-icon.svg',
7777
'size' => 24
7878
];
7979

@@ -87,7 +87,7 @@ public function getNetworkGraph() : JsonResponse {
8787
'id' => $nodeCounter,
8888
'label' => 'Coll: ' . $collectionInfo['name'],
8989
'shape' => 'image',
90-
'image' => MPG_BASE_URL . '/assets/images/document-icon.svg',
90+
'image' => BASE_URL . '/assets/images/document-icon.svg',
9191
'size' => 24
9292
];
9393

‎source/php/MPG/Request.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static function getPath() : string {
5151
*/
5252
public static function redirectTo(string $route) {
5353

54-
header('Location: ' . MPG_BASE_URL . $route);
54+
header('Location: ' . BASE_URL . $route);
5555
exit;
5656

5757
}

‎views/importDocuments.view.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
<title><?php echo MPG\APP_NAME . ' v' . MPG\VERSION; ?></title>
99

10-
<link rel="icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-icon.svg">
11-
<link rel="mask-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12-
<link rel="apple-touch-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-ios-icon.png">
10+
<link rel="icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-icon.svg">
11+
<link rel="mask-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12+
<link rel="apple-touch-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-ios-icon.png">
1313

14-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/ubuntu-font.css">
15-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/fontawesome-custom.css">
16-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/bootstrap.min.css">
17-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/source/css/inner.css">
14+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/ubuntu-font.css">
15+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/fontawesome-custom.css">
16+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/bootstrap.min.css">
17+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/source/css/inner.css">
1818

1919
<script>
20-
var MPG_BASE_URL = '<?php echo MPG_BASE_URL; ?>';
20+
var MPG_BASE_URL = '<?php echo MPG\BASE_URL; ?>';
2121
</script>
2222

23-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/_base.js"></script>
24-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/importDocuments.js"></script>
23+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/_base.js"></script>
24+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/importDocuments.js"></script>
2525

2626
</head>
2727

‎views/manageCollections.view.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
<title><?php echo MPG\APP_NAME . ' v' . MPG\VERSION; ?></title>
99

10-
<link rel="icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-icon.svg">
11-
<link rel="mask-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12-
<link rel="apple-touch-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-ios-icon.png">
10+
<link rel="icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-icon.svg">
11+
<link rel="mask-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12+
<link rel="apple-touch-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-ios-icon.png">
1313

14-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/ubuntu-font.css">
15-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/fontawesome-custom.css">
16-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/bootstrap.min.css">
17-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/source/css/inner.css">
14+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/ubuntu-font.css">
15+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/fontawesome-custom.css">
16+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/bootstrap.min.css">
17+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/source/css/inner.css">
1818

1919
<script>
20-
var MPG_BASE_URL = '<?php echo MPG_BASE_URL; ?>';
20+
var MPG_BASE_URL = '<?php echo MPG\BASE_URL; ?>';
2121
</script>
2222

23-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/_base.js"></script>
24-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/manageCollections.js"></script>
23+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/_base.js"></script>
24+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/manageCollections.js"></script>
2525

2626
</head>
2727

‎views/manageIndexes.view.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
<title><?php echo MPG\APP_NAME . ' v' . MPG\VERSION; ?></title>
99

10-
<link rel="icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-icon.svg">
11-
<link rel="mask-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12-
<link rel="apple-touch-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-ios-icon.png">
10+
<link rel="icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-icon.svg">
11+
<link rel="mask-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12+
<link rel="apple-touch-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-ios-icon.png">
1313

14-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/ubuntu-font.css">
15-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/fontawesome-custom.css">
16-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/bootstrap.min.css">
17-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/source/css/inner.css">
14+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/ubuntu-font.css">
15+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/fontawesome-custom.css">
16+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/bootstrap.min.css">
17+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/source/css/inner.css">
1818

1919
<script>
20-
var MPG_BASE_URL = '<?php echo MPG_BASE_URL; ?>';
20+
var MPG_BASE_URL = '<?php echo MPG\BASE_URL; ?>';
2121
</script>
2222

23-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/_base.js"></script>
24-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/manageIndexes.js"></script>
23+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/_base.js"></script>
24+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/manageIndexes.js"></script>
2525

2626
</head>
2727

‎views/manageUsers.view.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
<title><?php echo MPG\APP_NAME . ' v' . MPG\VERSION; ?></title>
99

10-
<link rel="icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-icon.svg">
11-
<link rel="mask-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12-
<link rel="apple-touch-icon" href="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-ios-icon.png">
10+
<link rel="icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-icon.svg">
11+
<link rel="mask-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-safari-icon.svg" color="#6eb825">
12+
<link rel="apple-touch-icon" href="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-ios-icon.png">
1313

14-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/ubuntu-font.css">
15-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/fontawesome-custom.css">
16-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/assets/css/bootstrap.min.css">
17-
<link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/source/css/inner.css">
14+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/ubuntu-font.css">
15+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/fontawesome-custom.css">
16+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/assets/css/bootstrap.min.css">
17+
<link rel="stylesheet" href="<?php echo MPG\BASE_URL; ?>/source/css/inner.css">
1818

1919
<script>
20-
var MPG_BASE_URL = '<?php echo MPG_BASE_URL; ?>';
20+
var MPG_BASE_URL = '<?php echo MPG\BASE_URL; ?>';
2121
</script>
2222

23-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/_base.js"></script>
24-
<script src="<?php echo MPG_BASE_URL; ?>/source/js/manageUsers.js"></script>
23+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/_base.js"></script>
24+
<script src="<?php echo MPG\BASE_URL; ?>/source/js/manageUsers.js"></script>
2525

2626
</head>
2727

‎views/parts/menu.view.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<nav class="navbar sticky-top">
22

3-
<a class="navbar-brand" href="<?php echo MPG_BASE_URL; ?>/">
4-
<img class="navbar-brand-icon" src="<?php echo MPG_BASE_URL; ?>/assets/images/mpg-icon.svg" width="24" height="24" />
3+
<a class="navbar-brand" href="<?php echo MPG\BASE_URL; ?>/">
4+
<img class="navbar-brand-icon" src="<?php echo MPG\BASE_URL; ?>/assets/images/mpg-icon.svg" width="24" height="24" />
55
<?php echo MPG\APP_NAME; ?>
66
</a>
77

88
<div class="navbar-nav">
9-
<a class="nav-item nav-link<?php echo ('manageCollections' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG_BASE_URL; ?>/manageCollections" href="<?php echo MPG_BASE_URL; ?>/manageCollections">Manage collections</a>
10-
<a class="nav-item nav-link<?php echo ('importDocuments' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG_BASE_URL; ?>/importDocuments" href="<?php echo MPG_BASE_URL; ?>/importDocuments">Import documents</a>
11-
<a class="nav-item nav-link<?php echo ('visualizeDatabase' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG_BASE_URL; ?>/visualizeDatabase" href="<?php echo MPG_BASE_URL; ?>/visualizeDatabase">Visualize database</a>
12-
<a class="nav-item nav-link<?php echo ('queryDatabase' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG_BASE_URL; ?>/queryDatabase" href="<?php echo MPG_BASE_URL; ?>/queryDatabase">Query database</a>
13-
<a class="nav-item nav-link<?php echo ('manageIndexes' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG_BASE_URL; ?>/manageIndexes" href="<?php echo MPG_BASE_URL; ?>/manageIndexes">Manage indexes</a>
14-
<a class="nav-item nav-link<?php echo ('manageUsers' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG_BASE_URL; ?>/manageUsers" href="<?php echo MPG_BASE_URL; ?>/manageUsers">Manage users</a>
15-
<a class="nav-item nav-link" href="<?php echo MPG_BASE_URL; ?>/logout">Logout</a>
9+
<a class="nav-item nav-link<?php echo ('manageCollections' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG\BASE_URL; ?>/manageCollections" href="<?php echo MPG\BASE_URL; ?>/manageCollections">Manage collections</a>
10+
<a class="nav-item nav-link<?php echo ('importDocuments' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG\BASE_URL; ?>/importDocuments" href="<?php echo MPG\BASE_URL; ?>/importDocuments">Import documents</a>
11+
<a class="nav-item nav-link<?php echo ('visualizeDatabase' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG\BASE_URL; ?>/visualizeDatabase" href="<?php echo MPG\BASE_URL; ?>/visualizeDatabase">Visualize database</a>
12+
<a class="nav-item nav-link<?php echo ('queryDatabase' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG\BASE_URL; ?>/queryDatabase" href="<?php echo MPG\BASE_URL; ?>/queryDatabase">Query database</a>
13+
<a class="nav-item nav-link<?php echo ('manageIndexes' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG\BASE_URL; ?>/manageIndexes" href="<?php echo MPG\BASE_URL; ?>/manageIndexes">Manage indexes</a>
14+
<a class="nav-item nav-link<?php echo ('manageUsers' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG\BASE_URL; ?>/manageUsers" href="<?php echo MPG\BASE_URL; ?>/manageUsers">Manage users</a>
15+
<a class="nav-item nav-link" href="<?php echo MPG\BASE_URL; ?>/logout">Logout</a>
1616
</div>
1717

1818
<button id="menu-toggle-button"><i class="fa fa-bars" aria-hidden="true"></i></button>

0 commit comments

Comments
 (0)