From cacde9f159acf4774f2ce391f4ff0f3e8ae573ba Mon Sep 17 00:00:00 2001 From: Thomas Gerot Date: Fri, 25 Dec 2015 12:59:32 -0600 Subject: [PATCH 1/3] Clarified instructions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 62a0f5e..382ded1 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ Platform for the EasyCTF 2016 competition. If you have Vagrant installed, setting up the platform should be a piece of cake. -1. Navigate to the root directory of this project. -2. Perform a `vagrant up` to create a virtual machine using the Vagrantfile. -3. Perform a `vagrant ssh` to SSH into the virtual machine. +1. Navigate to the root directory of this project in Git Bash. +2. Enter the command `vagrant up` to create a virtual machine using the Vagrantfile. +3. Enter the command `vagrant ssh` to SSH into the virtual machine. 4. Once you're inside the virtual machine, run `deploy` to start the server. 5. Open [localhost:8080](http://localhost:8080) on your local machine to see if it works. From 619b8e24406fb054e04472bcd4bdef3fa5cd063b Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Fri, 25 Dec 2015 14:07:13 -0600 Subject: [PATCH 2/3] technically, any terminal would do --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 382ded1..6ac0d17 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Platform for the EasyCTF 2016 competition. If you have Vagrant installed, setting up the platform should be a piece of cake. -1. Navigate to the root directory of this project in Git Bash. +1. Navigate to the root directory of this project in a terminal. 2. Enter the command `vagrant up` to create a virtual machine using the Vagrantfile. 3. Enter the command `vagrant ssh` to SSH into the virtual machine. 4. Once you're inside the virtual machine, run `deploy` to start the server. From c744f44a37d6cc57dffaa58fdddb5c0c7f6585c4 Mon Sep 17 00:00:00 2001 From: Charles Truluck Date: Sat, 26 Dec 2015 00:01:19 -0500 Subject: [PATCH 3/3] Converted from Semantic-UI to Bootstrap --- web/index.html | 50 +++++++++++++++++++---------- web/pages/about.html | 3 +- web/pages/login.html | 44 ++++++++------------------ web/pages/register.html | 70 ++++++++++++++++++++++++----------------- 4 files changed, 91 insertions(+), 76 deletions(-) diff --git a/web/index.html b/web/index.html index 34c218b..ecba155 100644 --- a/web/index.html +++ b/web/index.html @@ -2,31 +2,49 @@ EasyCTF 2016 - + + -
-
- - EasyCTF - - Home - About -
- Register - Login -
-
-
+
- + - \ No newline at end of file + diff --git a/web/pages/about.html b/web/pages/about.html index 7d877fd..37dd96e 100644 --- a/web/pages/about.html +++ b/web/pages/about.html @@ -1 +1,2 @@ -

About

\ No newline at end of file +

About

+

(insert stuff here)

diff --git a/web/pages/login.html b/web/pages/login.html index a681a59..5f0e7dc 100644 --- a/web/pages/login.html +++ b/web/pages/login.html @@ -1,33 +1,15 @@ -
-
-

- -
Log-in to your account
-

-
-
-
-
- - -
-
-
-
- - -
-
- -
- -
-
-
-
- Register - Forgot Password? -
-
+
+

Log-in

+
+
+ + + +
+
+Register + | +Forgot Password +
diff --git a/web/pages/register.html b/web/pages/register.html index b90c033..3e5868e 100644 --- a/web/pages/register.html +++ b/web/pages/register.html @@ -1,39 +1,53 @@ +

Register

-
-
-
-
+
+ +
+ +
- +
+
-
+ +
- +
+
-
-
-
+ +
- +
+
-
+ +
- +
+
-
-
-
- - -
-
- -
-
-
-
-
- - + +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ + +
+ +
+