Twanawebtech
diff --git a/‎.env.example
+3 b/‎.env.example
+3
diff --git a/‎.htaccess
100755100644
+6-8 b/‎.htaccess
100755100644
+6-8
diff --git a/‎public/Cloudant.php renamed to ‎Cloudant.php b/‎public/Cloudant.php renamed to ‎Cloudant.php
diff --git a/‎public/index.php renamed to ‎index.php
+7-2 b/‎public/index.php renamed to ‎index.php
+7-2
diff --git a/‎public/config.json
-14 b/‎public/config.json
-14
diff --git a/‎public/sag/.DS_Store renamed to ‎sag/.DS_Store b/‎public/sag/.DS_Store renamed to ‎sag/.DS_Store
diff --git a/‎public/sag/Sag.php renamed to ‎sag/Sag.php b/‎public/sag/Sag.php renamed to ‎sag/Sag.php
diff --git a/‎public/sag/SagCache.php renamed to ‎sag/SagCache.php b/‎public/sag/SagCache.php renamed to ‎sag/SagCache.php
diff --git a/‎public/sag/SagCouchException.php renamed to ‎sag/SagCouchException.php b/‎public/sag/SagCouchException.php renamed to ‎sag/SagCouchException.php
diff --git a/‎public/sag/SagException.php renamed to ‎sag/SagException.php b/‎public/sag/SagException.php renamed to ‎sag/SagException.php
diff --git a/‎public/sag/SagFileCache.php renamed to ‎sag/SagFileCache.php b/‎public/sag/SagFileCache.php renamed to ‎sag/SagFileCache.php
diff --git a/‎public/sag/SagMemoryCache.php renamed to ‎sag/SagMemoryCache.php b/‎public/sag/SagMemoryCache.php renamed to ‎sag/SagMemoryCache.php
diff --git a/‎public/sag/SagUserUtils.php renamed to ‎sag/SagUserUtils.php b/‎public/sag/SagUserUtils.php renamed to ‎sag/SagUserUtils.php
diff --git a/‎public/sag/httpAdapters/SagCURLHTTPAdapter.php renamed to ‎sag/httpAdapters/SagCURLHTTPAdapter.php b/‎public/sag/httpAdapters/SagCURLHTTPAdapter.php renamed to ‎sag/httpAdapters/SagCURLHTTPAdapter.php
diff --git a/‎public/sag/httpAdapters/SagHTTPAdapter.php renamed to ‎sag/httpAdapters/SagHTTPAdapter.php b/‎public/sag/httpAdapters/SagHTTPAdapter.php renamed to ‎sag/httpAdapters/SagHTTPAdapter.php
diff --git a/‎public/sag/httpAdapters/SagNativeHTTPAdapter.php renamed to ‎sag/httpAdapters/SagNativeHTTPAdapter.php b/‎public/sag/httpAdapters/SagNativeHTTPAdapter.php renamed to ‎sag/httpAdapters/SagNativeHTTPAdapter.php
diff --git a/‎public/index.html renamed to ‎templates/index.html
+3-3 b/‎public/index.html renamed to ‎templates/index.html
+3-3
@@ -0,0 +1,3 @@
+CLOUDANT_HOST=""
+CLOUDANT_USERNAME=""
+CLOUDANT_PASSWORD=""
@@ -1,10 +1,8 @@
-RewriteEngine On
-
-# Some hosts may require you to use the `RewriteBase` directive.
-# If you need to use the `RewriteBase` directive, it should be the
-# absolute physical path to the directory that contains this htaccess file.
-#
-# RewriteBase /
+RewriteEngine on
 
+RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [QSA,L]
+RewriteRule ^/?(api.*)$ index.php [L]
+
+RewriteCond $1 !^(index\.php|public)
+RewriteRule ^(.*)$ index.php/$1 [L]
@@ -19,12 +19,17 @@
   * This PHP file uses the Slim Framework to construct a REST API.
   * See Cloudant.php for the database functionality
   */
-require '../vendor/autoload.php';
+require 'vendor/autoload.php';
 require_once('./Cloudant.php');
 $app = new \Slim\Slim();
-$dotenv = new Dotenv\Dotenv(__DIR__ . '/../');
+$dotenv = new Dotenv\Dotenv(__DIR__);
 $dotenv->load();
 
+$app->get('/', function () {
+  global $app;
+    $app->render('index.html');
+});
+
 $app->get('/api/visitors', function () {
   global $app;
   $app->contentType('application/json');
 
@@ -9,7 +9,7 @@
 
     <!-- Bootstrap -->
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-    <link href="styles.css" rel="stylesheet">
+    <link href="public/styles.css" rel="stylesheet">
 </head>
 
 <body>
@@ -36,7 +36,7 @@ <h1>Welcome.</h1>
             	//POST request to API to create a new visitor entry in the database
                 $.ajax({
 				  method: "POST",
-				  url: "index.php/api/visitors",
+				  url: "./api/visitors",
 				  contentType: "application/json",
 				  data: JSON.stringify({name: name })
 				})
@@ -50,7 +50,7 @@ <h1>Welcome.</h1>
 
         //Retreive all the visitors from the database
         function getNames(){
-          $.get("index.php/api/visitors")
+          $.get("./api/visitors")
               .done(function(data) {
                   if(data.length > 0) {
                     $('#databaseNames').html("Database contents: " + JSON.stringify(data));
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+CLOUDANT_HOST=""`
	`2`	`+CLOUDANT_USERNAME=""`
	`3`	`+CLOUDANT_PASSWORD=""`