From 33543cc12546fc0ae6d02875ae6abed9468f414a Mon Sep 17 00:00:00 2001 From: Tim Krehan Date: Thu, 23 May 2019 08:58:48 +0200 Subject: [PATCH] renamed bin to js --- .htaccess | 2 +- cont/adduser.php | 2 +- cont/error.php | 2 +- cont/list.php | 4 ++-- cont/manageRecipe.php | 6 +++--- cont/recipe.php | 2 +- cont/recipes.php | 3 +-- cont/settings.php | 2 +- index.php | 6 +++--- install/install.php | 2 +- install/install_adduser.php | 4 ++-- {bin => js}/adduser.js | 0 {bin => js}/autocomplete.js | 0 {bin => js}/bootstrap.bundle.min.js | 0 {bin => js}/edit-recipe.js | 0 {bin => js}/error.js | 0 {bin => js}/index.js | 0 {bin => js}/jquery.js | 0 {bin => js}/list.js | 3 --- {bin => js}/main.js | 0 {bin => js}/manageRecipe.js | 0 {bin => js}/recipe.js | 0 {bin => js}/search.js | 0 {bin => js}/settings.js | 0 style/helper.css | 4 ++++ 25 files changed, 21 insertions(+), 21 deletions(-) rename {bin => js}/adduser.js (100%) rename {bin => js}/autocomplete.js (100%) rename {bin => js}/bootstrap.bundle.min.js (100%) rename {bin => js}/edit-recipe.js (100%) rename {bin => js}/error.js (100%) rename {bin => js}/index.js (100%) rename {bin => js}/jquery.js (100%) rename {bin => js}/list.js (97%) rename {bin => js}/main.js (100%) rename {bin => js}/manageRecipe.js (100%) rename {bin => js}/recipe.js (100%) rename {bin => js}/search.js (100%) rename {bin => js}/settings.js (100%) diff --git a/.htaccess b/.htaccess index 10363e5..0ab1e54 100644 --- a/.htaccess +++ b/.htaccess @@ -6,7 +6,7 @@ RewriteRule ^([a-zA-Z0-9-]+)$ ?site=$1 #alles, was versucht ein Script aufzurufen - RewriteRule /bin/(.+) /bin/$1 + RewriteRule /js/(.+) /js/$1 #Error Seite RewriteRule ^error/([a-zA-Z0-9-_]+)$ ?site=error&id=$1 diff --git a/cont/adduser.php b/cont/adduser.php index 0f98a8d..a30473e 100644 --- a/cont/adduser.php +++ b/cont/adduser.php @@ -1,6 +1,6 @@ - +

Benutzer hinzufügen

diff --git a/cont/error.php b/cont/error.php index 10dcbc1..7af44f4 100644 --- a/cont/error.php +++ b/cont/error.php @@ -3,7 +3,7 @@ Installationsfehler - +
diff --git a/cont/list.php b/cont/list.php index a20b59c..32fc1c4 100644 --- a/cont/list.php +++ b/cont/list.php @@ -1,4 +1,4 @@ - +

Liste

@@ -28,7 +28,7 @@ $checked = ""; } - print_r("
"); + print_r("
"); print_r("
"); print_r("
$item->Anzahl $item->Einheit
"); print_r("
$item->Name
"); diff --git a/cont/manageRecipe.php b/cont/manageRecipe.php index f1687cc..d901687 100644 --- a/cont/manageRecipe.php +++ b/cont/manageRecipe.php @@ -2,7 +2,7 @@ if($_SERVER["REQUEST_URI"]!="/new-recipe"){ $submitFunction = "update"; $title = "Bearbeiten"; - $script = ''; + $script = ''; $additionalInput = ""; } else{ @@ -12,8 +12,8 @@ $additionalInput = ""; } ?> - - + +

diff --git a/cont/recipe.php b/cont/recipe.php index 24ea778..f63b911 100644 --- a/cont/recipe.php +++ b/cont/recipe.php @@ -1,4 +1,4 @@ - + --> - +

Rezepte

diff --git a/cont/settings.php b/cont/settings.php index d934441..8f6cdb5 100644 --- a/cont/settings.php +++ b/cont/settings.php @@ -1,4 +1,4 @@ - +

Einstellungen

diff --git a/index.php b/index.php index 51ac862..5de9285 100644 --- a/index.php +++ b/index.php @@ -45,8 +45,8 @@ $user->get_info($_COOKIE["token"]); } ?> - - + + Einkaufsliste @@ -100,7 +100,7 @@ $user->get_info($_COOKIE["token"]); } echo "
"; ?> - + diff --git a/install/install.php b/install/install.php index fca2ea7..c51f15a 100644 --- a/install/install.php +++ b/install/install.php @@ -39,7 +39,7 @@ - + diff --git a/install/install_adduser.php b/install/install_adduser.php index 83e30f5..a4231d8 100644 --- a/install/install_adduser.php +++ b/install/install_adduser.php @@ -4,8 +4,8 @@ - - + + Benutzer hinzufügen diff --git a/bin/adduser.js b/js/adduser.js similarity index 100% rename from bin/adduser.js rename to js/adduser.js diff --git a/bin/autocomplete.js b/js/autocomplete.js similarity index 100% rename from bin/autocomplete.js rename to js/autocomplete.js diff --git a/bin/bootstrap.bundle.min.js b/js/bootstrap.bundle.min.js similarity index 100% rename from bin/bootstrap.bundle.min.js rename to js/bootstrap.bundle.min.js diff --git a/bin/edit-recipe.js b/js/edit-recipe.js similarity index 100% rename from bin/edit-recipe.js rename to js/edit-recipe.js diff --git a/bin/error.js b/js/error.js similarity index 100% rename from bin/error.js rename to js/error.js diff --git a/bin/index.js b/js/index.js similarity index 100% rename from bin/index.js rename to js/index.js diff --git a/bin/jquery.js b/js/jquery.js similarity index 100% rename from bin/jquery.js rename to js/jquery.js diff --git a/bin/list.js b/js/list.js similarity index 97% rename from bin/list.js rename to js/list.js index 5b234dc..d551cbe 100644 --- a/bin/list.js +++ b/js/list.js @@ -18,9 +18,6 @@ function highlightNewEntry(){ newRow.removeClass($(checkBox).data("color")); newRow.addClass("alert-primary"); setTimeout(function () { - newRow.css({ - transition: ".5s" - }); newRow.removeClass("alert-primary"); newRow.addClass($(checkBox).data("color")); }, 1000); diff --git a/bin/main.js b/js/main.js similarity index 100% rename from bin/main.js rename to js/main.js diff --git a/bin/manageRecipe.js b/js/manageRecipe.js similarity index 100% rename from bin/manageRecipe.js rename to js/manageRecipe.js diff --git a/bin/recipe.js b/js/recipe.js similarity index 100% rename from bin/recipe.js rename to js/recipe.js diff --git a/bin/search.js b/js/search.js similarity index 100% rename from bin/search.js rename to js/search.js diff --git a/bin/settings.js b/js/settings.js similarity index 100% rename from bin/settings.js rename to js/settings.js diff --git a/style/helper.css b/style/helper.css index 8d0be50..cb92307 100644 --- a/style/helper.css +++ b/style/helper.css @@ -6,4 +6,8 @@ .close_toast { pointer-events: all; +} + +.list-row { + transition: .5s; } \ No newline at end of file