Skip to content

Commit

Permalink
Step 3
Browse files Browse the repository at this point in the history
  • Loading branch information
matianxing1992 committed Jan 31, 2019
1 parent dddd179 commit 94d585e
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 1 deletion.
Binary file added app/assets/images/Tianxing.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Unity.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions app/controllers/pages_controller.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
class PagesController < ApplicationController

def home

end

def tma1
# render 'profile.html.erb'
end

def review
# render 'review.html.erb'
end
end
37 changes: 37 additions & 0 deletions app/views/pages/review.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<h1>Unity</h1>

<p>
Unity is the best game engine that I have ever met. It has a lot of strong fuctions for all
</p>
<h2>Rank: 5</h2>
<p>
<%= link_to 'https://unity3d.com/', 'https://unity3d.com/' %>
</p>
<ul>
<li><h2>Useful tools to create video games</h2></li>
<li><h2>Availble to learners for free</h2></li>
</ul>

<ul>
<li>Maker: Unity Technologies</li>
<li>Year: 2019</li>
<li>Version: Unity 2018.3</li>

<form action="" method="get">
<p>Comments: <input type="textarea" name="comments" /></p>
<p>Ranking:<input list="ranking" /> <datalist id="ranking">
<option value="1">
<option value="2">
<option value="3">
<option value="4">
<option value="5">
</datalist>
<button type="button">Submit</button>
</form>

</ul>




<%= image_tag("Unity.PNG") %>
16 changes: 16 additions & 0 deletions app/views/pages/tma1.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<h1>Tianxing Ma</h1>
<h2>Computer Science</h2>

<p>
Hello! Welcome to the page about Tianxing Ma !
</p>
<ul>
<li>Coming From China</li>
<li>Love Video Game</li>
</ul>

<p>
<%= link_to 'https://github.com/matianxing1992/wapp', 'https://github.com/matianxing1992/wapp' %>
</p>

<%= image_tag("Tianxing.jpg") %>
5 changes: 4 additions & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
Rails.application.routes.draw do
get 'pages/home'
root to: "page#home"

get "tma1", to: "pages#tma1", as: "tma1"
get "review", to: "pages#review", as: "review"
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end

0 comments on commit 94d585e

Please sign in to comment.