From 0507d27ebbffe777cb92a4ba1725107e029b07ea Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Sat, 14 Mar 2020 20:21:40 +0100 Subject: [PATCH] Change structure to separate frontend and sql update path of sql-data --- .gitignore | 1 + docker-compose.yml | 6 +++--- Dockerfile => frontend/Dockerfile | 0 {css => frontend/css}/style.css | 0 dbConnect.php => frontend/dbConnect.php | 0 {img => frontend/img}/header_blue.png | Bin {img => frontend/img}/header_lime.png | Bin {img => frontend/img}/header_pink.png | Bin index.php => frontend/index.php | 0 {js => frontend/js}/app.js | 0 {js => frontend/js}/contentloader.js | 0 {js => frontend/js}/particles.js | 0 {js => frontend/js}/stats.js | 0 {php => frontend/php}/generateLink.php | 0 {php => frontend/php}/logout.php | 0 {php => frontend/php}/showentries.php | 0 {php => frontend/php}/signup.php | 0 {segments => frontend/segments}/_404.html | 0 {segments => frontend/segments}/_entryForm.php | 0 {segments => frontend/segments}/_footer.html | 0 {segments => frontend/segments}/_header.php | 0 {segments => frontend/segments}/_headerSession.php | 0 {segments => frontend/segments}/_home.php | 0 .../segments}/_indexTestLoginVals.php | 0 {segments => frontend/segments}/_login.php | 0 {segments => frontend/segments}/_myFriendsBook.php | 0 {segments => frontend/segments}/_register.php | 0 27 files changed, 4 insertions(+), 3 deletions(-) rename Dockerfile => frontend/Dockerfile (100%) rename {css => frontend/css}/style.css (100%) rename dbConnect.php => frontend/dbConnect.php (100%) rename {img => frontend/img}/header_blue.png (100%) rename {img => frontend/img}/header_lime.png (100%) rename {img => frontend/img}/header_pink.png (100%) rename index.php => frontend/index.php (100%) rename {js => frontend/js}/app.js (100%) rename {js => frontend/js}/contentloader.js (100%) rename {js => frontend/js}/particles.js (100%) rename {js => frontend/js}/stats.js (100%) rename {php => frontend/php}/generateLink.php (100%) rename {php => frontend/php}/logout.php (100%) rename {php => frontend/php}/showentries.php (100%) rename {php => frontend/php}/signup.php (100%) rename {segments => frontend/segments}/_404.html (100%) rename {segments => frontend/segments}/_entryForm.php (100%) rename {segments => frontend/segments}/_footer.html (100%) rename {segments => frontend/segments}/_header.php (100%) rename {segments => frontend/segments}/_headerSession.php (100%) rename {segments => frontend/segments}/_home.php (100%) rename {segments => frontend/segments}/_indexTestLoginVals.php (100%) rename {segments => frontend/segments}/_login.php (100%) rename {segments => frontend/segments}/_myFriendsBook.php (100%) rename {segments => frontend/segments}/_register.php (100%) diff --git a/.gitignore b/.gitignore index e69de29..cb0882e 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +sql/db-data/**/* diff --git a/docker-compose.yml b/docker-compose.yml index 8222ba9..bb3e4f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,17 +7,17 @@ services: ports: - "5455:3306" volumes: - - "db-data:/var/lib/mysql" + - "./sql/db-data:/var/lib/mysql" environment: MYSQL_ROOT_PASSWORD: "Test" webserver: build: - context: . + context: ./frontend ports: - "80:80" volumes: - - "./:/var/www/html" + - "./frontend:/var/www/html" depends_on: - db diff --git a/Dockerfile b/frontend/Dockerfile similarity index 100% rename from Dockerfile rename to frontend/Dockerfile diff --git a/css/style.css b/frontend/css/style.css similarity index 100% rename from css/style.css rename to frontend/css/style.css diff --git a/dbConnect.php b/frontend/dbConnect.php similarity index 100% rename from dbConnect.php rename to frontend/dbConnect.php diff --git a/img/header_blue.png b/frontend/img/header_blue.png similarity index 100% rename from img/header_blue.png rename to frontend/img/header_blue.png diff --git a/img/header_lime.png b/frontend/img/header_lime.png similarity index 100% rename from img/header_lime.png rename to frontend/img/header_lime.png diff --git a/img/header_pink.png b/frontend/img/header_pink.png similarity index 100% rename from img/header_pink.png rename to frontend/img/header_pink.png diff --git a/index.php b/frontend/index.php similarity index 100% rename from index.php rename to frontend/index.php diff --git a/js/app.js b/frontend/js/app.js similarity index 100% rename from js/app.js rename to frontend/js/app.js diff --git a/js/contentloader.js b/frontend/js/contentloader.js similarity index 100% rename from js/contentloader.js rename to frontend/js/contentloader.js diff --git a/js/particles.js b/frontend/js/particles.js similarity index 100% rename from js/particles.js rename to frontend/js/particles.js diff --git a/js/stats.js b/frontend/js/stats.js similarity index 100% rename from js/stats.js rename to frontend/js/stats.js diff --git a/php/generateLink.php b/frontend/php/generateLink.php similarity index 100% rename from php/generateLink.php rename to frontend/php/generateLink.php diff --git a/php/logout.php b/frontend/php/logout.php similarity index 100% rename from php/logout.php rename to frontend/php/logout.php diff --git a/php/showentries.php b/frontend/php/showentries.php similarity index 100% rename from php/showentries.php rename to frontend/php/showentries.php diff --git a/php/signup.php b/frontend/php/signup.php similarity index 100% rename from php/signup.php rename to frontend/php/signup.php diff --git a/segments/_404.html b/frontend/segments/_404.html similarity index 100% rename from segments/_404.html rename to frontend/segments/_404.html diff --git a/segments/_entryForm.php b/frontend/segments/_entryForm.php similarity index 100% rename from segments/_entryForm.php rename to frontend/segments/_entryForm.php diff --git a/segments/_footer.html b/frontend/segments/_footer.html similarity index 100% rename from segments/_footer.html rename to frontend/segments/_footer.html diff --git a/segments/_header.php b/frontend/segments/_header.php similarity index 100% rename from segments/_header.php rename to frontend/segments/_header.php diff --git a/segments/_headerSession.php b/frontend/segments/_headerSession.php similarity index 100% rename from segments/_headerSession.php rename to frontend/segments/_headerSession.php diff --git a/segments/_home.php b/frontend/segments/_home.php similarity index 100% rename from segments/_home.php rename to frontend/segments/_home.php diff --git a/segments/_indexTestLoginVals.php b/frontend/segments/_indexTestLoginVals.php similarity index 100% rename from segments/_indexTestLoginVals.php rename to frontend/segments/_indexTestLoginVals.php diff --git a/segments/_login.php b/frontend/segments/_login.php similarity index 100% rename from segments/_login.php rename to frontend/segments/_login.php diff --git a/segments/_myFriendsBook.php b/frontend/segments/_myFriendsBook.php similarity index 100% rename from segments/_myFriendsBook.php rename to frontend/segments/_myFriendsBook.php diff --git a/segments/_register.php b/frontend/segments/_register.php similarity index 100% rename from segments/_register.php rename to frontend/segments/_register.php