From 6869b5671a8d98c395219e4d260de4f47a5b9276 Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 25 Jul 2016 16:39:05 +0300 Subject: [PATCH 1/9] added Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..bd83989 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM php:7.0-apache +COPY . /var/www/html/ +EXPOSE 80 From 3a48bd5451b6a733d2a0edfe6706bb9316ee64ce Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 25 Jul 2016 18:25:59 +0300 Subject: [PATCH 2/9] Feature dockerfile (#2) * edit readme * edit readme * edit readme * edit readme * edit readme * edit readme --- README => README.md | 55 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) rename README => README.md (51%) diff --git a/README b/README.md similarity index 51% rename from README rename to README.md index 04c4fb3..fdccd62 100644 --- a/README +++ b/README.md @@ -1,10 +1,11 @@ -********************************************************** -* project: Open Source, Web-based IAT -* authors: Winter Mason (m@winteram.com) -* Steven Allon -* Pinar Ozturk -* source: https://github.com/winteram/IAT -********************************************************** +PROJECT INFO: +------------ + +- project: Open Source, Web-based IAT +- authors: Winter Mason (m@winteram.com) +- Steven Allon +- Pinar Ozturk +- source: https://github.com/winteram/IAT OVERVIEW: --------- @@ -52,9 +53,37 @@ OUTPUT: The output files are in the "output" folder within the template folder for the active IAT. The columns are as follows: -Trial # -Round # -Category Label -Category Index (which item within the category) -Errors -Reaction Time (in milliseconds) +* Trial # +* Round # +* Category Label +* Category Index (which item within the category) +* Errors +* Reaction Time (in milliseconds) + + + +Instruction to run locally: +--------------------------- + +Prerequisites: [git-scm](https://git-scm.com/), [docker](https://www.docker.com/products/docker). +Inside *nix terminal or windows command-line, cd into a directory of yours and: + +```bash +git clone https://github.com/pazams/IAT.git +cd IAT +docker build -t my-iat . +docker run -d -p 3000:80 --name my-running-iat my-iat +docker exec -it my-running-iat bash +# following 2 line inside docker image +sh setup.sh +exit +``` + +now, in your browser navgiate to these urls: +* http://localhost:3000/ +* http://localhost:3000/experimenter.php + +Note this setup is for local environment. + +For production environment, additional security measures are needed It is recommended to deny direct access to any php files except for index.php . Read more about it [here](http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access). +Also it is advised to remove `experimenter.php` in production, or add authentication layer. From e65453bc4c58640e3563c1b7259ff3776944408a Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 25 Jul 2016 18:14:25 +0300 Subject: [PATCH 3/9] edit readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index fdccd62..9d5aa6f 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,6 @@ The columns are as follows: * Reaction Time (in milliseconds) - Instruction to run locally: --------------------------- From 50d1c6bd361977219346938229cb3a049305a489 Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 25 Jul 2016 18:17:46 +0300 Subject: [PATCH 4/9] edit readme --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 9d5aa6f..9637b5f 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,7 @@ exit ``` now, in your browser navgiate to these urls: +<<<<<<< HEAD * http://localhost:3000/ * http://localhost:3000/experimenter.php @@ -86,3 +87,13 @@ Note this setup is for local environment. For production environment, additional security measures are needed It is recommended to deny direct access to any php files except for index.php . Read more about it [here](http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access). Also it is advised to remove `experimenter.php` in production, or add authentication layer. +======= +http://localhost:3000/ +http://localhost:3000/experimenter.php + +Note this setup is for local environment. +For production environment, additional security measures are needed +It is recommended to deny direct access to any php files except for index.php +More info at http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access +Also it is advised to remove http://localhost:3000/experimenter.php in production, or add authentication layer. +>>>>>>> eef8dd3... edit readme From 4fecb50f584547e8f67468f820f75b65b670c1db Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 25 Jul 2016 18:20:16 +0300 Subject: [PATCH 5/9] edit readme --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index 9637b5f..9d5aa6f 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,6 @@ exit ``` now, in your browser navgiate to these urls: -<<<<<<< HEAD * http://localhost:3000/ * http://localhost:3000/experimenter.php @@ -87,13 +86,3 @@ Note this setup is for local environment. For production environment, additional security measures are needed It is recommended to deny direct access to any php files except for index.php . Read more about it [here](http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access). Also it is advised to remove `experimenter.php` in production, or add authentication layer. -======= -http://localhost:3000/ -http://localhost:3000/experimenter.php - -Note this setup is for local environment. -For production environment, additional security measures are needed -It is recommended to deny direct access to any php files except for index.php -More info at http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access -Also it is advised to remove http://localhost:3000/experimenter.php in production, or add authentication layer. ->>>>>>> eef8dd3... edit readme From c9cde699a994850c2be2fbcc875e0d481dd2a6ca Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 25 Jul 2016 18:23:22 +0300 Subject: [PATCH 6/9] edit readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d5aa6f..272a354 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,6 @@ The columns are as follows: * Errors * Reaction Time (in milliseconds) - Instruction to run locally: --------------------------- @@ -68,7 +67,7 @@ Prerequisites: [git-scm](https://git-scm.com/), [docker](https://www.docker.com/ Inside *nix terminal or windows command-line, cd into a directory of yours and: ```bash -git clone https://github.com/pazams/IAT.git +git clone https://github.com/winteram/IAT cd IAT docker build -t my-iat . docker run -d -p 3000:80 --name my-running-iat my-iat From d1fdbec4eefe0aa1d25016959690561558a8bcf2 Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 25 Jul 2016 18:23:50 +0300 Subject: [PATCH 7/9] edit readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 272a354..ff8d7c8 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Prerequisites: [git-scm](https://git-scm.com/), [docker](https://www.docker.com/ Inside *nix terminal or windows command-line, cd into a directory of yours and: ```bash -git clone https://github.com/winteram/IAT +git clone https://github.com/pazams/IAT.git cd IAT docker build -t my-iat . docker run -d -p 3000:80 --name my-running-iat my-iat From 84cb8b87170ce8c8b9474c7c9a912ac8e5be49c3 Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 3 Oct 2016 14:26:43 +0300 Subject: [PATCH 8/9] edit readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff8d7c8..11add2b 100644 --- a/README.md +++ b/README.md @@ -83,5 +83,5 @@ now, in your browser navgiate to these urls: Note this setup is for local environment. -For production environment, additional security measures are needed It is recommended to deny direct access to any php files except for index.php . Read more about it [here](http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access). +For production environment, additional security measures are needed. It is recommended to deny direct access some php files. Read more about it [here](http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access). Also it is advised to remove `experimenter.php` in production, or add authentication layer. From ba50b9fbe49e2841ab818c5e635e052412839dca Mon Sep 17 00:00:00 2001 From: pazams Date: Mon, 3 Oct 2016 14:43:46 +0300 Subject: [PATCH 9/9] edit readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11add2b..01f41a7 100644 --- a/README.md +++ b/README.md @@ -83,5 +83,5 @@ now, in your browser navgiate to these urls: Note this setup is for local environment. -For production environment, additional security measures are needed. It is recommended to deny direct access some php files. Read more about it [here](http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access). +For production environment, additional security measures are needed. It is recommended to deny direct access to some php files. Read more about it [here](http://stackoverflow.com/questions/2679524/block-direct-access-to-a-file-over-http-but-allow-php-script-access). Also it is advised to remove `experimenter.php` in production, or add authentication layer.