Stable version

DevNoam · Nov 2, 2024 · 9815d4e · 9815d4e
1 parent 8e90f87
commit 9815d4e
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 19 deletions.
diff --git a/Framework/Database.php b/Framework/Database.php
@@ -14,9 +14,8 @@ class Database
     */
     public function __construct()
     {
-        function loadEnv($path) {
             $env = [];
-            $lines = file($path, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+            $lines = file('../.env', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 
             foreach ($lines as $line) {
                 if (strpos(trim($line), '#') === 0) {
@@ -25,12 +24,6 @@ function loadEnv($path) {
                 list($key, $value) = explode('=', $line, 2);
                 $env[trim($key)] = trim($value);
             }
-
-            return $env;
-        }
-
-        $env = loadEnv(__DIR__ . '/../.env');
-
 
 
         $options = [

diff --git a/Routes.php b/Routes.php
@@ -4,11 +4,11 @@
     //GET
 $router->get('/', 'HomeController@panel', ['user']);
 $router->get('/cases', 'HomeController@cases', ['user']);
-$router->get('/case', 'inquiryController@initCasePage', ['user']);
-$router->get('/case/{id}', 'inquiryController@initCasePage', ['user']);
+$router->get('/case', 'InquiryController@initCasePage', ['user']);
+$router->get('/case/{id}', 'InquiryController@initCasePage', ['user']);
 $router->get('/reports', 'HomeController@reports' , ['user']);
 $router->get('/search', 'HomeController@searchCase', ['user']);
-$router->get('/printCase/{id}', 'inquiryController@printInquiry', ['user']);
+$router->get('/printCase/{id}', 'InquiryController@printInquiry', ['user']);
 $router->get('/profile', 'UserController@profile', ['user']);
 $router->get('/profile/{id}', 'UserController@profile', ['Admin']);
 $router->get('/settings', 'SettingsController@showSettings', ['Admin']); //Admins only /////1

diff --git a/.htaccess → public/.htaccess b/.htaccess → public/.htaccess
diff --git a/css/bulma.css → public/css/bulma.css b/css/bulma.css → public/css/bulma.css
diff --git a/css/main.css → public/css/main.css b/css/main.css → public/css/main.css
diff --git a/css/main.min.css → public/css/main.min.css b/css/main.min.css → public/css/main.min.css
diff --git a/index.php → public/index.php b/index.php → public/index.php
@@ -1,14 +1,14 @@
 <?php
-  require __DIR__ . '/vendor/autoload.php';
+  require __DIR__ . '/../vendor/autoload.php';
 
   use Framework\Router;
-  require 'helpers.php';
+  require_once('../helpers.php');
 
   session_start();
   new Framework\Database();
 
   $router = new Router();
-  $routes = require basePath('Routes.php');
+  $routes = require_once(basePath('Routes.php'));
 
   $uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
   $router->route($uri);

diff --git a/js/bulma.js → public/js/bulma.js b/js/bulma.js → public/js/bulma.js
diff --git a/js/chart.min old.js → public/js/chart.min old.js b/js/chart.min old.js → public/js/chart.min old.js
diff --git a/js/main.js → public/js/main.js b/js/main.js → public/js/main.js
diff --git a/js/main.min.js → public/js/main.min.js b/js/main.min.js → public/js/main.min.js
diff --git a/js/newchart.js → public/js/newchart.js b/js/newchart.js → public/js/newchart.js
diff --git a/js/newchart.min.js → public/js/newchart.min.js b/js/newchart.min.js → public/js/newchart.min.js
diff --git a/js/oldchart.min.js → public/js/oldchart.min.js b/js/oldchart.min.js → public/js/oldchart.min.js
diff --git a/warrantytrack.sql b/warrantytrack.sql
@@ -45,7 +45,7 @@ CREATE TABLE `cases` (
   `FixedDescription` text COMMENT 'Tell what was the problem and if the case has been resolved.',
   `Createdby` varchar(256) NOT NULL DEFAULT 'General' COMMENT 'Which agent created the case',
   `Supplier` varchar(256) DEFAULT 'UNKOWN' COMMENT 'Who is the supplier of the product. Warranty will be covered by the supplier.'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 --
 -- Triggers `cases`
@@ -78,7 +78,7 @@ CREATE TABLE `settings` (
   `Phone` varchar(16) DEFAULT NULL,
   `Email` text,
   `Logo` text
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 --
 -- Dumping data for table `settings`
@@ -99,15 +99,15 @@ CREATE TABLE `users` (
   `password` varchar(255) NOT NULL,
   `role` set('Admin','Technician','Supplier','Employee') NOT NULL DEFAULT 'Employee',
   `Name` varchar(64) DEFAULT NULL,
-  `session` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+  `session` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 --
 -- Dumping data for table `users`
 --
 
 INSERT INTO `users` (`id`, `username`, `password`, `role`, `Name`, `session`) VALUES
-(1, 'Admin', '$2y$10$KaEcfN5lPFHmb4fwjLF80.7VmdzYSH3kh5scv7lPEm/2tI5fz4Ct6', 'Admin', 'Administrator', '');
+(1, 'Admin', '$2y$10$KaEcfN5lPFHmb4fwjLF80.7VmdzYSH3kh5scv7lPEm/2tI5fz4Ct6', 'Admin', 'Administrator', 'ld40g38n15jufsbslnjbrrbei1');
 
 --
 -- Indexes for dumped tables