From b64c6d835e95259748237f04f2c515bb7011710e Mon Sep 17 00:00:00 2001 From: boris Date: Thu, 21 Nov 2024 12:33:19 +0000 Subject: [PATCH] add template files and compose file, fix syntax errors in template --- .docker-compose.yml.swp | Bin 1024 -> 0 bytes .idea/.gitignore | 0 .idea/.name | 1 - .idea/Ecobuddy.iml | 0 .idea/MVCtemplate.iml | 9 - .idea/dataSources.xml | 12 +- .idea/encodings.xml | 0 .idea/jsLibraryMappings.xml | 6 + .idea/misc.xml | 0 .idea/modules.xml | 5 +- .idea/php.xml | 8 +- .idea/scopes/scope_settings.xml | 0 .idea/sqldialects.xml | 6 + .idea/vcs.xml | 0 .~lock.Assessment Brief Form 2024-25.docx# | 0 Assessment Brief Form 2024-25.docx | Bin ecobuddy.sqlite => Databases/ecobuddy.sqlite | Bin 65536 -> 65536 bytes MVCTemplate.zip | Bin 225287 -> 0 bytes Models/Database.php | 35 + Models/FacilityData.php | 52 + Models/FacilityDataSet.php | 30 + Models/Paginator.php | 1 + Models/User.php | 75 + Models/UserData.php | 25 + Models/UserDataSet.php | 59 + README.md | 0 Views/index.phtml | 35 +- Views/page1.phtml | 5 - Views/page2.phtml | 5 - Views/template/footer.phtml | 3 +- Views/template/header.phtml | 75 +- Views/template/loginError.phtml | 0 Views/template/loginModal.phtml | 29 + Views/template/logoutButton.phtml | 4 + Views/template/pagination.phtml | 0 css/bootstrap-theme.css | 0 css/bootstrap-theme.css.map | 0 css/bootstrap-theme.min.css | 0 css/bootstrap.css | 16828 +++++++++++------ css/bootstrap.css.map | 2 +- css/bootstrap.min.css | 13 +- css/my-style.css | 21 +- docker-compose.yml | 27 - eco database design v3.docx | Bin fonts/glyphicons-halflings-regular.eot | Bin fonts/glyphicons-halflings-regular.svg | 0 fonts/glyphicons-halflings-regular.ttf | Bin fonts/glyphicons-halflings-regular.woff | Bin images/new_uos_logo.jpg | Bin index.php | 26 +- js/bootstrap.js | 6211 ++++-- js/bootstrap.min.js | 11 +- logincontroller.php | 33 - page1.php | 10 - page2.php | 10 - 55 files changed, 16384 insertions(+), 7288 deletions(-) delete mode 100644 .docker-compose.yml.swp mode change 100644 => 100755 .idea/.gitignore delete mode 100644 .idea/.name mode change 100644 => 100755 .idea/Ecobuddy.iml delete mode 100644 .idea/MVCtemplate.iml mode change 100644 => 100755 .idea/dataSources.xml mode change 100644 => 100755 .idea/encodings.xml create mode 100755 .idea/jsLibraryMappings.xml mode change 100644 => 100755 .idea/misc.xml mode change 100644 => 100755 .idea/modules.xml mode change 100644 => 100755 .idea/php.xml mode change 100644 => 100755 .idea/scopes/scope_settings.xml create mode 100644 .idea/sqldialects.xml mode change 100644 => 100755 .idea/vcs.xml mode change 100644 => 100755 .~lock.Assessment Brief Form 2024-25.docx# mode change 100644 => 100755 Assessment Brief Form 2024-25.docx rename ecobuddy.sqlite => Databases/ecobuddy.sqlite (99%) mode change 100644 => 100755 delete mode 100644 MVCTemplate.zip create mode 100644 Models/Database.php create mode 100644 Models/FacilityData.php create mode 100644 Models/FacilityDataSet.php create mode 100644 Models/Paginator.php create mode 100644 Models/User.php create mode 100644 Models/UserData.php create mode 100644 Models/UserDataSet.php mode change 100644 => 100755 README.md delete mode 100644 Views/page1.phtml delete mode 100644 Views/page2.phtml create mode 100644 Views/template/loginError.phtml create mode 100644 Views/template/loginModal.phtml create mode 100644 Views/template/logoutButton.phtml create mode 100644 Views/template/pagination.phtml mode change 100644 => 100755 css/bootstrap-theme.css mode change 100644 => 100755 css/bootstrap-theme.css.map mode change 100644 => 100755 css/bootstrap-theme.min.css mode change 100644 => 100755 css/my-style.css delete mode 100755 docker-compose.yml mode change 100644 => 100755 eco database design v3.docx mode change 100644 => 100755 fonts/glyphicons-halflings-regular.eot mode change 100644 => 100755 fonts/glyphicons-halflings-regular.svg mode change 100644 => 100755 fonts/glyphicons-halflings-regular.ttf mode change 100644 => 100755 fonts/glyphicons-halflings-regular.woff mode change 100644 => 100755 images/new_uos_logo.jpg delete mode 100644 logincontroller.php delete mode 100644 page1.php delete mode 100644 page2.php diff --git a/.docker-compose.yml.swp b/.docker-compose.yml.swp deleted file mode 100644 index bf23edd24e70b5b0c793191cd0d84a3be1b2ee08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmYc?$V<%2S1{KzVn6{tA9)yx^7Bhj1aWYZ@{2Nybwe^T^RfdHQ*=X2EDW%!Ovz8q iPA$?+&d)8#FHY5~%+0~7Y*cVG1V%%EHX#s-ZY%)lOcU<_ diff --git a/.idea/.gitignore b/.idea/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 4eebc8d..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -MVCtemplate \ No newline at end of file diff --git a/.idea/Ecobuddy.iml b/.idea/Ecobuddy.iml old mode 100644 new mode 100755 diff --git a/.idea/MVCtemplate.iml b/.idea/MVCtemplate.iml deleted file mode 100644 index 5762f75..0000000 --- a/.idea/MVCtemplate.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml old mode 100644 new mode 100755 index e671eb5..678a2c5 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,12 +1,20 @@ - + sqlite.xerial true org.sqlite.JDBC - jdbc:sqlite:$PROJECT_DIR$/ecobuddy.sqlite + jdbc:sqlite:$PROJECT_DIR$/Databases/ecobuddy.sqlite $ProjectFileDir$ + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.45.1/org/xerial/sqlite-jdbc/3.45.1.0/sqlite-jdbc-3.45.1.0.jar + + + file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.45.1/org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml old mode 100644 new mode 100755 diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100755 index 0000000..9f737c1 --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml old mode 100644 new mode 100755 diff --git a/.idea/modules.xml b/.idea/modules.xml old mode 100644 new mode 100755 index 7dd4e10..2d42445 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,7 @@ - + - - + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml old mode 100644 new mode 100755 index 41de6c9..0a7086f --- a/.idea/php.xml +++ b/.idea/php.xml @@ -10,5 +10,11 @@