Skip to content

F
final_project
Commit e955b633 authored by Jasmine Principe's avatar Jasmine Principe
Browse files
Options

Merge branch 'master' of https://gitlab.discs.ateneo.edu/evilla_gomez_guian_principe/final_project

parents 25f2162f 6a870e05
Show whitespace changes
Inline Side-by-side
Showing with 341 additions and 5 deletions
Halalan/app/controllers/about_controller.rb 0 → 100644
View file @ e955b633
class AboutController < ApplicationController
def index
render "pages/about.html.erb"
end
def evilla
render "/about/evilla.html.erb"
end
def gomez
render "/about/gomez.html.erb"
end
def guian
render "/about/guian.html.erb"
end
def principe
render "/about/principe.html.erb"
end
end
Halalan/app/views/about/evilla.html.erb 0 → 100644
View file @ e955b633
<% provide(:about, "active") %>
<% provide(:title, "About") %>
<div class="container">
<div class="row">
</div>
<div class="col-md-2">
</div>
<div class="col-md-4">
<h1 class="heading">Galen Solo E. Evilla</h1>
<div class="row">
<p>&emsp;<b>What do you want to be when you grow up?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Happy ka ba kay Sir Happy?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Kapag nagluto si Sir Happy, Happy Meal ba tawag dun?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Expected grade sa MIS21?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Ano ang favorite final fantasy mo? </b>
<br>
<i>&emsp;&emsp;Insert Answer Here)</i>
<br>
&emsp;<b>(For the purposes of being in this institution, the question was censored)</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
</p>
</div>
</div>
<div class="col-md-4">
<%=image_tag("evilla.jpg")%>
</div>
<div class="col-md-2">
</div>
</div>
</div>
</div>
</div>
<hr>
<div class="about">
<div class ="row">
<center>
<h3>The Developers</h3>
<h5>
<a href="/about/evilla">Evilla, Galen Solo E.</a> •
<a href="/about/gomez">Gomez, Feliz Marie B.</a> •
<a href="/about/guian">Guian, April D.</a> •
<a href="/about/principe">Principe, Jasmine Nicole G.</a>
</h5>
</center>
<hr>
</div>
</div>
</div>
</div>
<footer>
<p>&copy; 2016 ParkingLotMIS21 Inc.</p>
</footer>
</div>
Halalan/app/views/about/gomez.html.erb 0 → 100644
View file @ e955b633
<% provide(:about, "active") %>
<% provide(:title, "About") %>
<div class="container">
<div class="row">
</div>
<div class="col-md-2">
</div>
<div class="col-md-4">
<h1 class="heading">Feliz Marie B. Gomez</h1>
<div class="row">
<p>&emsp;<b>What do you want to be when you grow up?</b>
<br>
<i>&emsp;&emsp;Tall</i>
<br>
&emsp;<b>Happy ka ba kay Sir Happy?</b>
<br>
<i>&emsp;&emsp;Yes!</i>
<br>
&emsp;<b>Kapag nagluto si Sir Happy, Happy Meal ba tawag dun?</b>
<br>
<i>&emsp;&emsp;Eyyyy, witty</i>
<br>
&emsp;<b>Expected grade sa MIS21?</b>
<br>
<i>&emsp;&emsp;D (basta kapag major subjects, i wants the D hehe)</i>
<br>
&emsp;<b>Ano ang favorite final fantasy mo? </b>
<br>
<i>&emsp;&emsp;<strike>69</strike>. Final Fantasy 6 at Final Fantasy 9 ;)</i>
<br>
&emsp;<b>(For the purposes of being in this institution, the question was censored)</b>
<br>
<i>&emsp;&emsp;AY GRABE SIYA HAHAHAHA</i>
</p>
</div>
</div>
<div class="col-md-4">
<%=image_tag("gomez.jpg")%>
</div>
<div class="col-md-2">
</div>
</div>
</div>
</div>
</div>
<hr>
<div class="about">
<div class ="row">
<center>
<h3>The Developers</h3>
<h5>
<a href="/about/evilla">Evilla, Galen Solo E.</a> •
<a href="/about/gomez">Gomez, Feliz Marie B.</a> •
<a href="/about/guian">Guian, April D.</a> •
<a href="/about/principe">Principe, Jasmine Nicole G.</a>
</h5>
</center>
<hr>
</div>
</div>
</div>
</div>
<footer>
<p>&copy; 2016 ParkingLotMIS21 Inc.</p>
</footer>
</div>
Halalan/app/views/about/guian.html.erb 0 → 100644
View file @ e955b633
<% provide(:about, "active") %>
<% provide(:title, "About") %>
<div class="container">
<div class="row">
</div>
<div class="col-md-2">
</div>
<div class="col-md-4">
<h1 class="heading">April D. Guian</h1>
<div class="row">
<p>&emsp;<b>What do you want to be when you grow up?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Happy ka ba kay Sir Happy?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Kapag nagluto si Sir Happy, Happy Meal ba tawag dun?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Expected grade sa MIS21?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Ano ang favorite final fantasy mo? </b>
<br>
<i>&emsp;&emsp;Insert Answer Here)</i>
<br>
&emsp;<b>(For the purposes of being in this institution, the question was censored)</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
</p>
</div>
</div>
<div class="col-md-4">
<%=image_tag("guian.jpeg")%>
</div>
<div class="col-md-2">
</div>
</div>
</div>
</div>
</div>
<hr>
<div class="about">
<div class ="row">
<center>
<h3>The Developers</h3>
<h5>
<a href="/about/evilla">Evilla, Galen Solo E.</a> •
<a href="/about/gomez">Gomez, Feliz Marie B.</a> •
<a href="/about/guian">Guian, April D.</a> •
<a href="/about/principe">Principe, Jasmine Nicole G.</a>
</h5>
</center>
<hr>
</div>
</div>
</div>
</div>
<footer>
<p>&copy; 2016 ParkingLotMIS21 Inc.</p>
</footer>
</div>
Halalan/app/views/about/principe.html.erb 0 → 100644
View file @ e955b633
<% provide(:about, "active") %>
<% provide(:title, "About") %>
<div class="container">
<div class="row">
</div>
<div class="col-md-2">
</div>
<div class="col-md-4">
<h1 class="heading">Jasmine Nicole G. Principe</h1>
<div class="row">
<p>&emsp;<b>What do you want to be when you grow up?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Happy ka ba kay Sir Happy?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Kapag nagluto si Sir Happy, Happy Meal ba tawag dun?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Expected grade sa MIS21?</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
<br>
&emsp;<b>Ano ang favorite final fantasy mo? </b>
<br>
<i>&emsp;&emsp;Insert Answer Here)</i>
<br>
&emsp;<b>(For the purposes of being in this institution, the question was censored)</b>
<br>
<i>&emsp;&emsp;Insert Answer Here</i>
</p>
</div> </div>
<div class="col-md-4">
<%=image_tag("principe.jpg")%>
</div>
<div class="col-md-2">
</div>
</div>
</div>
</div>
</div>
<hr>
<div class="about">
<div class ="row">
<center>
<h3>The Developers</h3>
<h5>
<a href="/about/evilla">Evilla, Galen Solo E.</a> •
<a href="/about/gomez">Gomez, Feliz Marie B.</a> •
<a href="/about/guian">Guian, April D.</a> •
<a href="/about/principe">Principe, Jasmine Nicole G.</a>
</h5>
</center>
<hr>
</div>
</div>
</div>
</div>
<footer>
<p>&copy; 2016 ParkingLotMIS21 Inc.</p>
</footer>
</div>
Halalan/app/views/layouts/_navbar.html.erb
View file @ e955b633
......@@ -6,9 +6,6 @@
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" ><b>Halalan PH</b></a>
</div>
......@@ -16,10 +13,12 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li><%= link_to "Home", root_path %></li>
<li><%= link_to "Candidates", admin_candidates_path %></li>
<li><%= link_to "Positions", admin_positions_path %></li>
<li><a href="/voting/votes">Vote now</li>
<li> <a href="/about">About</a> </li>
<%if user_signed_in?%>
<li class="dropdown">
......
Halalan/app/views/layouts/application.html.erb
View file @ e955b633
<!DOCTYPE html>
<html>
<head>
<title>HalalanPH</title>
<title>Halalan PH</title>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
......
Halalan/app/views/pages/about.html.erb 0 → 100644
View file @ e955b633
<% provide(:about, "active") %>
<% provide(:title, "About") %>
<div class="container">
<div class="row">
<div class="col-md-7">
<h1 class="heading">About The Developers</h1>
<h3><a href="/about/evilla">Evilla, Galen Solo E.</a></h3>
<h3><a href="/about/gomez">Gomez, Feliz Marie B.</a></h3>
<h3><a href="/about/guian">Guian, April D.</a></h3>
<h3><a href="/about/principe">Principe, Jasmine Nicole G.</a></h3>
<hr>
<footer>
<p>&copy; 2016 ParkingLotMIS21 Inc.</p>
</footer>
</div>
Halalan/app/views/pages/index.html.erb
View file @ e955b633
<h1>HalalanPH</h1>
<h1>Halalan PH</h1>
<% if user_signed_in? %>
<% case current_user.role %>
......
Halalan/config/routes.rb
View file @ e955b633
......@@ -8,6 +8,13 @@ Rails.application.routes.draw do
get "/profile", to: "users/profile#index"
get "/voting/new/:id", to: "voting/votes#new"
get "/about" => "pages#about", as: :about
get "/about/evilla", to: "about#evilla"
get "/about/gomez", to: "about#gomez"
get "/about/guian", to: "about#guian"
get "/about/principe", to: "about#principe"
namespace :voting do
resources :votes
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment