Merge pull request #57 from geodes-sms/revert-47-docker-implementation

Revert "[fix] issue #44 and issue #48"

.gitignore

@@ -1,18 +1,22 @@
 .DS_Store
-!index.php
+index.php
 relis_app/cache/*
+!application/cache/index.html
+!application/cache/.htaccess
 
 relis_app/logs/*
+!application/logs/index.html
+!application/logs/.htaccess
 
-cside/sessions/relis_session*
-relis_app/libraries/table_config/project/install_config*
-relis_app/libraries/table_config/project/temp/install_config*
-workspace/dslforge_workspace/*
+cside/sessions/*
+relis_app/libraries/table_config/project/temp/*
+relis_app/libraries/table_config/project/install*
+relis_app/libraries/table_config/table_*
+relis_app/config/config.php
 relis_app/config/database.php
-phpmyadmin/tmp/*
+.htaccess
 
 /vendor/
-derby*
 
 # IDE Files
 #-------------------------

README.md

@@ -27,39 +27,13 @@ High-level features supported:
 - Storage of studies (all but PDF)
 
 # Installation
-The project can be installed locally using docker. Make sure to follow the pre-requisite steps to have an up and running docker environment.
-
-### Pre-requisite:
-- Install docker on your local environment (download at: https://www.docker.com/products/docker-desktop)
-- Install docker-compose on your local environment (it comes by default with docker on mac and windows)
-- Run command "docker-compose" to check that docker is correctly installed
-- For Windows users, if Docker cannot start with the following error : 
-  "Hardware assisted virtualization and data execution protection must be enabled in the BIOS" then excute following steps:
-  - Enable features : Virtual Machine Platform, Windows Subsystem for Linux and Hyper-V using "Windows Features"
-    (See https://docs.docker.com/docker-for-windows/troubleshoot/#virtualization for more information)
-  - Restart you system and press esc key or any correspondent key to enter the BIOS settings in windows 
-  - Press f10 or other key to enter BIOS Setup
-  - Go to System Configuration then Device Configuration 
-  - Enable Virtualization 
-  - Restart your aystem
-  If Docker still not start with the error "Docker.ApiServices.WSL2.WslKernet NotInstalledException" then excute following steps:
-  - use the link https://docs.microsoft.com/en-us/windows/wsl/install-win10#step-4---download-the-linux-kernel-update-package to download and intall linux kernal update 
-  - Restart you system if Docker not start 
-
-### Build and run the application:
-1. Clone the project from GitHub (git clone https://github.com/geodes-sms/relis.git)
-2. Run command "docker-compose build" from the directory **relis_deployment/**
-3. Run command "docker-compose up -d" from the directory **relis_deployment/**
-(For **windows users** , if you get the error ``relis-application-service | standard_init_linux.go:211: exec user process caused "no such file or directory"``: check if the file ``relis_deployment/docker/entrypoint.sh`` EOL is not CRLF;  if it is, convert it from CRLF to LF and go back to step 2.)
-4. From your browser go to url **localhost:8083** to access the application, default credentials  are admin::123.
-5. For test purpose you can also access the database using PHPMyAdmin on **localhost:8083/phpmyadmin**, the user is root, no password required (You should use this feature only on the local environment). If you get the error "Incorrect permissions on the configuration file, it should not be write to everyone!" then add the statement $cfg['CheckConfigurationPermissions'] = false; to the phpmyadmin config file: relis-docker-implementation\phpmyadmin\config.inc.php
-
-### Usefull command
-To connect inside your docker container run the command "docker-compose exec relis-application-service bash" from the directory **relis_deployment/**
 
 
 # Distribution
 
+# Source code
+To compile the source code, you need the following dependencies:
+- 
 
 The source code is licensed under a [GNU GENERAL PUBLIC LICENSE 3](https://www.gnu.org/copyleft/gpl.html) ![GNU GPL v3](https://img.shields.io/badge/license-GPLv3-blue.svg)
 

cside/removed vendors.txt

@@ -0,0 +1,9 @@
+echarts 12 MB
+
+moment 5MB
+
+parsleyjs 3 MB
+
+pdfmake 4Mb
+
+raphael 1MB

install/install_form.php

@@ -69,14 +69,14 @@ function install_form($values=array(),$error=array()){?>
 			$db_host=(!empty($values['db_host']))?$values['db_host']:'localhost' ;
 			$db_user=(!empty($values['db_user']))?$values['db_user']:'root' ;
 		//	$db_pass=(!empty($values['db_pass']))?$values['db_pass']:'' ;
-			$db_name=(!empty($values['db_name']))?$values['db_name']:'relis_db' ;
+			$db_name=(!empty($values['db_name']))?$values['db_name']:'' ;
 
 			$full_name=(!empty($values['full_name']))?$values['full_name']:'Admin' ;
-			$user_mail=(!empty($values['user_mail']))?$values['user_mail']:'[email protected]' ;
-			$user_name=(!empty($values['user_name']))?$values['user_name']:'admin' ;
+			$user_mail=(!empty($values['user_mail']))?$values['user_mail']:'' ;
+			$user_name=(!empty($values['user_name']))?$values['user_name']:'' ;
 
-			$dsl_url=(!empty($values['dsl_url']))?$values['dsl_url']:'http://localhost:8088/relis/texteditor' ;
-			$dsl_workspace=(!empty($values['dsl_workspace']))?$values['dsl_workspace']:'/u/relis/public_html/workspace/dslforge_workspace' ;
+			$dsl_url=(!empty($values['dsl_url']))?$values['dsl_url']:'' ;
+			$dsl_workspace=(!empty($values['dsl_workspace']))?$values['dsl_workspace']:'' ;
 
 			$array_fields_db=array();
 			$array_fields_admin=array();
@@ -178,7 +178,7 @@ function install_form($values=array(),$error=array()){?>
 			$field=array(
 					'type'=>'password',
 					'id'=>'user_password',
-					'value'=>'123',
+					'value'=>'',
 					'label'=>'Administrator Password',
 					'extra_note'=>'Set the password for your Super User account and confirm it in the field below',
 					'is_required'=>True
@@ -188,7 +188,7 @@ function install_form($values=array(),$error=array()){?>
 			$field=array(
 					'type'=>'password',
 					'id'=>'user_password_v',
-					'value'=>'123',
+					'value'=>'',
 					'label'=>'Confirm Administrator Password',
 					'extra_note'=>'',
 					'is_required'=>True

index.php → model_ci_index.php

@@ -1,23 +1,39 @@
 <?php
-/* ReLiS - A Tool for conducting systematic literature reviews and mapping studies.
- * Copyright (C) 2018  Eugene Syriani
+/**
+ * CodeIgniter
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- * 
- * --------------------------------------------------------------------------
- * 
- *  :Author: Brice Michel Bigendako
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014 - 2016, British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
+ * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	https://codeigniter.com
+ * @since	Version 1.0.0
+ * @filesource
  */
 
 /*

model_install_index.php

@@ -0,0 +1,2 @@
+<?php
+header('Location: install/index.php');