From 04f74b43f48eddea632a369e20bb1990cd7dccaf Mon Sep 17 00:00:00 2001
From: Terho Uotila <terho.uotila@helsinki.fi>
Date: Fri, 18 Aug 2017 13:57:52 +0300
Subject: [PATCH] remove vendor directory

---
 app/views/base.html                                 |   6 +++---
 {vendor => assets}/bootstrap/css/bootstrap.min.css  |   0
 .../fonts/glyphicons-halflings-regular.eot          | Bin
 .../fonts/glyphicons-halflings-regular.svg          |   0
 .../fonts/glyphicons-halflings-regular.ttf          | Bin
 .../fonts/glyphicons-halflings-regular.woff         | Bin
 {vendor => assets}/bootstrap/js/bootstrap.min.js    |   0
 {vendor => assets/js}/jquery.min.js                 |   0
 {vendor => lib}/ConnectionTest/connection_test.php  |   0
 lib/database.php                                    |   2 +-
 10 files changed, 4 insertions(+), 4 deletions(-)
 rename {vendor => assets}/bootstrap/css/bootstrap.min.css (100%)
 rename {vendor => assets}/bootstrap/fonts/glyphicons-halflings-regular.eot (100%)
 rename {vendor => assets}/bootstrap/fonts/glyphicons-halflings-regular.svg (100%)
 rename {vendor => assets}/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {vendor => assets}/bootstrap/fonts/glyphicons-halflings-regular.woff (100%)
 rename {vendor => assets}/bootstrap/js/bootstrap.min.js (100%)
 rename {vendor => assets/js}/jquery.min.js (100%)
 rename {vendor => lib}/ConnectionTest/connection_test.php (100%)

diff --git a/app/views/base.html b/app/views/base.html
index 09650c87a..48aa70e91 100644
--- a/app/views/base.html
+++ b/app/views/base.html
@@ -13,7 +13,7 @@
 
     {% block head %}
       <!-- Bootstrap (tyylitiedosto) -->
-      <link href="{{base_path}}/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+      <link href="{{base_path}}/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
       <!-- Oma tyylitiedostomme -->
       <link href="{{base_path}}/assets/css/site.css" rel="stylesheet">
@@ -52,10 +52,10 @@
 
     {% block body %}
       <!-- jQuery -->
-      <script src="{{base_path}}/vendor/jquery.min.js"></script>
+      <script src="{{base_path}}/assets/js/jquery.min.js"></script>
 
       <!-- Bootstrap (skriptitiedosto) -->
-      <script src="{{base_path}}/vendor/bootstrap/js/bootstrap.min.js"></script>
+      <script src="{{base_path}}/assets/bootstrap/js/bootstrap.min.js"></script>
 
       <!-- Oma skriptitiedostomme -->
       <script src="{{base_path}}/assets/js/site.js"></script>
diff --git a/vendor/bootstrap/css/bootstrap.min.css b/assets/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from vendor/bootstrap/css/bootstrap.min.css
rename to assets/bootstrap/css/bootstrap.min.css
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.eot b/assets/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from vendor/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to assets/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.svg b/assets/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from vendor/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to assets/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf b/assets/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from vendor/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to assets/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/vendor/bootstrap/fonts/glyphicons-halflings-regular.woff b/assets/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from vendor/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to assets/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/vendor/bootstrap/js/bootstrap.min.js b/assets/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from vendor/bootstrap/js/bootstrap.min.js
rename to assets/bootstrap/js/bootstrap.min.js
diff --git a/vendor/jquery.min.js b/assets/js/jquery.min.js
similarity index 100%
rename from vendor/jquery.min.js
rename to assets/js/jquery.min.js
diff --git a/vendor/ConnectionTest/connection_test.php b/lib/ConnectionTest/connection_test.php
similarity index 100%
rename from vendor/ConnectionTest/connection_test.php
rename to lib/ConnectionTest/connection_test.php
diff --git a/lib/database.php b/lib/database.php
index 028f2928e..27d010cd3 100644
--- a/lib/database.php
+++ b/lib/database.php
@@ -29,7 +29,7 @@ public static function connection(){
       }
 
       public static function test_connection(){
-        require 'vendor/ConnectionTest/connection_test.php';
+        require 'lib/ConnectionTest/connection_test.php';
 
         exit();
       }