diff --git a/Gemfile.lock b/Gemfile.lock index ce93cbd..2f7444f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,47 +1,50 @@ GEM remote: https://rubygems.org/ specs: - coderay (1.0.9) - diff-lcs (1.2.5) - faraday (0.9.0) + coderay (1.1.1) + diff-lcs (1.3) + faraday (0.11.0) multipart-post (>= 1.2, < 3) - httparty (0.8.3) - multi_json (~> 1.0) - multi_xml - json (1.8.1) - jwt (0.1.11) - multi_json (>= 1.5) + httparty (0.14.0) + multi_xml (>= 0.5.2) + json (2.0.3) + jwt (1.5.6) method_source (0.8.2) - multi_json (1.8.4) - multi_xml (0.5.5) + multi_json (1.12.1) + multi_xml (0.6.0) multipart-post (2.0.0) - oauth2 (0.9.3) - faraday (>= 0.8, < 0.10) - jwt (~> 0.1.8) + oauth2 (1.3.1) + faraday (>= 0.8, < 0.12) + jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - pry (0.9.12.2) - coderay (~> 1.0.5) - method_source (~> 0.8) + rack (>= 1.2, < 3) + pry (0.10.4) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) - rack (1.5.2) - rack-protection (1.5.2) + rack (1.6.5) + rack-protection (1.5.3) rack - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.5) - sinatra (1.4.4) - rack (~> 1.4) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + sinatra (1.4.8) + rack (~> 1.5) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slop (3.4.6) - tilt (1.4.1) + tilt (>= 1.3, < 3) + slop (3.6.0) + tilt (2.0.7) PLATFORMS ruby @@ -53,3 +56,6 @@ DEPENDENCIES pry rspec sinatra + +BUNDLED WITH + 1.14.6 diff --git a/README.md b/README.md index a06bf97..9f5a2fd 100644 --- a/README.md +++ b/README.md @@ -30,41 +30,6 @@ in the terminal, and re-run ```ruby app.rb```. ## TODO -Attempt the following tasks. The list is meant to be progressively more -difficult and open-ended; the aim is to demonstrate your approach when dealing with programming issues and to test your initiative. Complete as much as you can within the time limit; you will not be penalised for not finishing the list. We are looking for self-motivated effort and to see how much of the groundwork you have grasped. - -Don't forget to ```git add .``` and ```git commit``` after each step, if you have made any changes to your code! - -* You should see a list of the profile data that you submitted to us when you -applied to We Got Coders. Use your knowledge of HTML / CSS to redesign and -layout the page in a presentable way. Show us what you can do with: - - * Headings - * Lists - * Backgrounds / Gradients - * Multiple columns - -* Add an image of yourself to your profile. Add CSS where necessary to ensure that it looks presentable. - -* Observe how the about field works. What makes it bound to the data from your profile? Add more fields so that you can edit your profile. - -* Add a field to the form so that you can add your Codecademy account to -your profile. You will need an input text box, with the appropriate ```name``` attribute. - -* Add some Javascript to the provided ``` \ No newline at end of file + diff --git a/views/index1.erb b/views/index1.erb new file mode 100644 index 0000000..1985517 --- /dev/null +++ b/views/index1.erb @@ -0,0 +1,164 @@ +<% if @profile %> +
+
+ +
+

+

+ <%= @profile["first_name"] %> + <%= @profile["last_name"] %> +

+ +

+
+ + +
+
+

# About Me

+

+ <%= @profile["first_name"] %> + <%= @profile["last_name"] %> +

+

+ DOB<%= @profile["dob"] %> + Gender <%= @profile["gender"] %> +

+

<%= @profile["about"] %>

+
+
+

# Contact Info

+
    +
  • Phone <%= @profile["phone_number"] %>
    • +
  • Email<%= @profile["email"] %>
    • +
  • Facebookfacebook.com/johndoe
    • +
  • Github<%= @profile["github"] %>
    • +
  • Twitter <%= @profile["tiwitter"] %>
    • +
  • CodeCadmey <%= @profile["codecademy"] %>
    • +
+
+
+ +
+ +
+

# WGC Profile(Edit)

+
+
+ Oct - 2017 +
+
+

Ambition

+

<%= @profile["ambition"] %>

+
+
+
+
+ Oct - 2017 +
+
+

Learning Dynamics

+

<%= @profile["learning_experience"] %>

+
+
+
+
+ Oct - 2017 +
+
+

Self Motivated Work

+

<%= @profile["projects"] %>

+
+ +
+
+
+ Oct - 2017 +
+
+

Why WGC

+

<%= @profile["rationale"] %>

+
+
+

How did I find WGC?

+

<%= @profile["how_did_you_hear"] %>

+
+ +
+ +
+
+ Oct - 2017 +
+
+

Programming Problems

+ My Prime Number Solution +
+
+
+
+ Oct - 2017 +
+
+

Stats

+ + 0 words found in Ambition section. +
+
+ +
+ +
+

# Programming Skills

+
+
+ HTML / CSS +
+
+
+
+ JavaScript +
+
+
+
+ Ruby on Rails +
+
+
+
+
+
+ + +<% else %> +
+

Authorise to retrive your profile

+Authorise + +
+<% end %> + + + diff --git a/views/main.erb b/views/main.erb index 3a91f8d..85ddc4a 100644 --- a/views/main.erb +++ b/views/main.erb @@ -4,19 +4,28 @@ - We Got Coders - My Amazing Application - + My Profile + + + + + + + + + - + -
- <%= yield %> -
+
+ <%= yield %> +
- \ No newline at end of file + diff --git a/views/primes.erb b/views/primes.erb index 335fa00..b6ebbd4 100644 --- a/views/primes.erb +++ b/views/primes.erb @@ -1,7 +1,10 @@

Prime Numbers

+<% @sum.each do |prime| %> -Sum : <%= @sum %> + Prime : <%= prime %> + +<% end %>
Back -
\ No newline at end of file +