From 50617de3e8182754d07fc4404bade1e9156d82d4 Mon Sep 17 00:00:00 2001 From: Eirik Th S Date: Sat, 12 Jun 2021 20:46:46 +0200 Subject: [PATCH] Moved all web-files into www/ folder --- .gitignore | 8 ++++---- {css => www/css}/bootstrap.min.css | 0 {css => www/css}/bootstrap.min.css.map | 0 {css => www/css}/index.css | 0 {icon => www/icon}/basket2.svg | 0 {icon => www/icon}/check-all.svg | 0 {icon => www/icon}/dash-circle.svg | 0 {icon => www/icon}/dash.svg | 0 {icon => www/icon}/list-check.svg | 0 {icon => www/icon}/lock.svg | 0 {icon => www/icon}/pencil-square.svg | 0 {icon => www/icon}/plus-circle.svg | 0 {icon => www/icon}/plus.svg | 0 {icon => www/icon}/unlock.svg | 0 {icon => www/icon}/x-circle.svg | 0 index.php => www/index.php | 0 {js => www/js}/bootstrap.min.js | 0 {js => www/js}/bootstrap.min.js.map | 0 {js => www/js}/index.js | 0 {js => www/js}/jquery-3.5.1.min.js | 0 {js => www/js}/jquery-3.5.1.min.map | 0 {js => www/js}/popper.min.js | 0 {js => www/js}/popper.min.js.map | 0 login.php => www/login.php | 0 {plan => www/plan}/do.php | 0 {plan => www/plan}/index.php | 0 {plan => www/plan}/plan.js | 0 register.php => www/register.php | 0 robots.txt => www/robots.txt | 0 {webdata => www/webdata}/config.sample.php | 0 {webdata => www/webdata}/init.php | 3 ++- {webdata => www/webdata}/navbar.php | 0 {webdata => www/webdata}/setup.php | 0 33 files changed, 6 insertions(+), 5 deletions(-) rename {css => www/css}/bootstrap.min.css (100%) rename {css => www/css}/bootstrap.min.css.map (100%) rename {css => www/css}/index.css (100%) rename {icon => www/icon}/basket2.svg (100%) rename {icon => www/icon}/check-all.svg (100%) rename {icon => www/icon}/dash-circle.svg (100%) rename {icon => www/icon}/dash.svg (100%) rename {icon => www/icon}/list-check.svg (100%) rename {icon => www/icon}/lock.svg (100%) rename {icon => www/icon}/pencil-square.svg (100%) rename {icon => www/icon}/plus-circle.svg (100%) rename {icon => www/icon}/plus.svg (100%) rename {icon => www/icon}/unlock.svg (100%) rename {icon => www/icon}/x-circle.svg (100%) rename index.php => www/index.php (100%) rename {js => www/js}/bootstrap.min.js (100%) rename {js => www/js}/bootstrap.min.js.map (100%) rename {js => www/js}/index.js (100%) rename {js => www/js}/jquery-3.5.1.min.js (100%) rename {js => www/js}/jquery-3.5.1.min.map (100%) rename {js => www/js}/popper.min.js (100%) rename {js => www/js}/popper.min.js.map (100%) rename login.php => www/login.php (100%) rename {plan => www/plan}/do.php (100%) rename {plan => www/plan}/index.php (100%) rename {plan => www/plan}/plan.js (100%) rename register.php => www/register.php (100%) rename robots.txt => www/robots.txt (100%) rename {webdata => www/webdata}/config.sample.php (100%) rename {webdata => www/webdata}/init.php (98%) rename {webdata => www/webdata}/navbar.php (100%) rename {webdata => www/webdata}/setup.php (100%) diff --git a/.gitignore b/.gitignore index 13f68aa..bb48e41 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .idea/ -webdata/config.php -temp/ -css/archive/* -js/archive/* +www/webdata/config.php +www/temp/ +www/css/archive/* +www/js/archive/* diff --git a/css/bootstrap.min.css b/www/css/bootstrap.min.css similarity index 100% rename from css/bootstrap.min.css rename to www/css/bootstrap.min.css diff --git a/css/bootstrap.min.css.map b/www/css/bootstrap.min.css.map similarity index 100% rename from css/bootstrap.min.css.map rename to www/css/bootstrap.min.css.map diff --git a/css/index.css b/www/css/index.css similarity index 100% rename from css/index.css rename to www/css/index.css diff --git a/icon/basket2.svg b/www/icon/basket2.svg similarity index 100% rename from icon/basket2.svg rename to www/icon/basket2.svg diff --git a/icon/check-all.svg b/www/icon/check-all.svg similarity index 100% rename from icon/check-all.svg rename to www/icon/check-all.svg diff --git a/icon/dash-circle.svg b/www/icon/dash-circle.svg similarity index 100% rename from icon/dash-circle.svg rename to www/icon/dash-circle.svg diff --git a/icon/dash.svg b/www/icon/dash.svg similarity index 100% rename from icon/dash.svg rename to www/icon/dash.svg diff --git a/icon/list-check.svg b/www/icon/list-check.svg similarity index 100% rename from icon/list-check.svg rename to www/icon/list-check.svg diff --git a/icon/lock.svg b/www/icon/lock.svg similarity index 100% rename from icon/lock.svg rename to www/icon/lock.svg diff --git a/icon/pencil-square.svg b/www/icon/pencil-square.svg similarity index 100% rename from icon/pencil-square.svg rename to www/icon/pencil-square.svg diff --git a/icon/plus-circle.svg b/www/icon/plus-circle.svg similarity index 100% rename from icon/plus-circle.svg rename to www/icon/plus-circle.svg diff --git a/icon/plus.svg b/www/icon/plus.svg similarity index 100% rename from icon/plus.svg rename to www/icon/plus.svg diff --git a/icon/unlock.svg b/www/icon/unlock.svg similarity index 100% rename from icon/unlock.svg rename to www/icon/unlock.svg diff --git a/icon/x-circle.svg b/www/icon/x-circle.svg similarity index 100% rename from icon/x-circle.svg rename to www/icon/x-circle.svg diff --git a/index.php b/www/index.php similarity index 100% rename from index.php rename to www/index.php diff --git a/js/bootstrap.min.js b/www/js/bootstrap.min.js similarity index 100% rename from js/bootstrap.min.js rename to www/js/bootstrap.min.js diff --git a/js/bootstrap.min.js.map b/www/js/bootstrap.min.js.map similarity index 100% rename from js/bootstrap.min.js.map rename to www/js/bootstrap.min.js.map diff --git a/js/index.js b/www/js/index.js similarity index 100% rename from js/index.js rename to www/js/index.js diff --git a/js/jquery-3.5.1.min.js b/www/js/jquery-3.5.1.min.js similarity index 100% rename from js/jquery-3.5.1.min.js rename to www/js/jquery-3.5.1.min.js diff --git a/js/jquery-3.5.1.min.map b/www/js/jquery-3.5.1.min.map similarity index 100% rename from js/jquery-3.5.1.min.map rename to www/js/jquery-3.5.1.min.map diff --git a/js/popper.min.js b/www/js/popper.min.js similarity index 100% rename from js/popper.min.js rename to www/js/popper.min.js diff --git a/js/popper.min.js.map b/www/js/popper.min.js.map similarity index 100% rename from js/popper.min.js.map rename to www/js/popper.min.js.map diff --git a/login.php b/www/login.php similarity index 100% rename from login.php rename to www/login.php diff --git a/plan/do.php b/www/plan/do.php similarity index 100% rename from plan/do.php rename to www/plan/do.php diff --git a/plan/index.php b/www/plan/index.php similarity index 100% rename from plan/index.php rename to www/plan/index.php diff --git a/plan/plan.js b/www/plan/plan.js similarity index 100% rename from plan/plan.js rename to www/plan/plan.js diff --git a/register.php b/www/register.php similarity index 100% rename from register.php rename to www/register.php diff --git a/robots.txt b/www/robots.txt similarity index 100% rename from robots.txt rename to www/robots.txt diff --git a/webdata/config.sample.php b/www/webdata/config.sample.php similarity index 100% rename from webdata/config.sample.php rename to www/webdata/config.sample.php diff --git a/webdata/init.php b/www/webdata/init.php similarity index 98% rename from webdata/init.php rename to www/webdata/init.php index a6c126d..1660288 100644 --- a/webdata/init.php +++ b/www/webdata/init.php @@ -85,7 +85,8 @@ function loginUser($email, $pass) { session_start(); } else { - session_regenerate_id(true); +// session_regenerate_id(true); + session_regenerate_id(); } $_SESSION['user_id'] = $dbUserId; diff --git a/webdata/navbar.php b/www/webdata/navbar.php similarity index 100% rename from webdata/navbar.php rename to www/webdata/navbar.php diff --git a/webdata/setup.php b/www/webdata/setup.php similarity index 100% rename from webdata/setup.php rename to www/webdata/setup.php