Skip to content

Commit d7af5c9

Browse files
MikeAlvaradoMikeAlvarado
authored
Merge pull request #50 from ProyectoIntegrador2018/feature/Improve_Styles
Feature/improve styles
2 parents 6660ccf + 42f0f82 commit d7af5c9

File tree

9 files changed

+399
-272
lines changed

9 files changed

+399
-272
lines changed

‎app/assets/stylesheets/application.scss

+10
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
11
@import "bootstrap";
2+
3+
.btn-repo {
4+
width: 5em;
5+
}
6+
7+
body {
8+
background-color: #F8F9FA;
9+
font-family: 'Source Sans Pro', sans-serif;
10+
font-family: 'Roboto', sans-serif;
11+
}

‎app/views/layouts/_footer.html.erb

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<footer>
2+
<div class="container">
3+
<div class="row bg-light">
4+
5+
<div class="col-xs-12 col-sm-4 col-md-4 py-3">
6+
<p class="h1">Repo <a style="color:#03A9F4">I</a><a>/</a><a style="color:#F44336">O</a></p>
7+
<h5 class="text-left" style="color:#424242">Proyecto Integrador 2019</h5>
8+
</div>
9+
10+
<div class="col-xs-12 col-sm-4 col-md-4 py-3">
11+
<h5 style="color:#424242">Develop</h5>
12+
<ul class="list-unstyled quick-links">
13+
<li><a href="https://github.com/ProyectoIntegrador2018/repo-io"><i class="fa fa-angle-double-right"></i>Repository</a></li>
14+
<li><a href="https://github.com/ProyectoIntegrador2018"><i class="fa fa-angle-double-right"></i>Organization</a></li>
15+
<li><a href="https://drive.google.com/drive/folders/1K7-i7_sWDcglDcQIgT5MQqzg0uxiZcvg"><i class="fa fa-angle-double-right"></i>Documentation</a></li>
16+
</ul>
17+
</div>
18+
19+
<div class="col-xs-12 col-sm-4 col-md-4 py-3">
20+
<h5 style="color:#424242">Client</h5>
21+
<ul class="list-unstyled quick-links">
22+
<li><a href="mailto:[email protected]"><i class="fa fa-angle-double-right"></i>Email</a></li>
23+
</ul>
24+
</div>
25+
26+
</div>
27+
<div class="row">
28+
<div class="col-xs-12 col-sm-12 col-md-12 mt-2 mt-sm-2 text-center">
29+
<p><strong>Argentum</strong> is the organization that developed developed the system only for non-profit use.</p>
30+
<p class="h6">&copy All right Reversed.<a class="ml-2" href="https://tec.mx/es" target="_blank">Tecnológico de Monterrey</a></p>
31+
</div>
32+
</div>
33+
</div>
34+
</footer>
35+
36+
<!-- <div class="container">
37+
<h3 class="text-left">Tecnológico de Monterrey</h3>
38+
<h6 class="text-left">Proyecto Integrador 2019</h6>
39+
<a href="https://github.com/ProyectoIntegrador2018/repo-io">Github </a>
40+
</div> -->

‎app/views/layouts/_head.html.erb

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
66
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
77
<%= yield(:head) %>
8+
<link href="https://fonts.googleapis.com/css?family=Roboto|Source+Sans+Pro" rel="stylesheet">
89
</head>

‎app/views/layouts/_navbar.html.erb

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<% if current_user %>
2-
<ul class="navbar navbar-light bg-light fixed-top">
2+
<div>
3+
<ul class="navbar navbar-light bg-white fixed-top">
34
<div class="container">
4-
<a class="navbar-brand mb-0 h1 float-left" href="/repositories">Repo - io</a>
5+
<div class="float-left">
6+
<a href="/repositories" class="navbar-brand mb-0 h1">Repo <span style="color:#03A9F4">I</span>/<span style="color:#F44336">O</span></a>
7+
</div>
58
<div class=" float-right" >
6-
79
<div class="dropdown">
810
<button class="btn btn-secondary dropdown-toggle h5" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
911
<%= @username %>
@@ -15,4 +17,5 @@
1517
</div>
1618
</div>
1719
</ul>
20+
</div>
1821
<% end %>

‎app/views/layouts/application.html.erb

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<body>
55
<%= render 'layouts/navbar'%>
66
<%= yield %>
7+
<%= render 'layouts/footer'%>
78
</body>
89
</html>

‎app/views/repositories/_repo.html.erb

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
<div class="list-group">
2-
<ul>
3-
<% if org_repos_stored.length > 0%>
4-
<% org_repos_stored.each do |repo| %>
5-
<li class="container-fluid list-group-item">
6-
<div class="row">
2+
<ul style="padding-left: 0px;">
3+
<% if org_repos_stored.length > 0%>
4+
<% org_repos_stored.each do |repo| %>
5+
<li class="container-fluid list-group-item">
6+
<div class="row">
77

8-
<div class="col-4">
9-
<strong><a href="/repositories/<%= repo.id %>"><%=repo.name%></a></strong>
10-
</div>
11-
<div class="col-4">
12-
<em><%= repo.url %></em>
13-
</div>
14-
<div class="col-4 ">
15-
<%= link_to 'Delete', repo, class:"float-right delete_button", method: :delete, data: { confirm: 'Are you sure?' } %>
16-
</div>
17-
</div>
18-
</li>
19-
<% end %>
20-
<% end %>
21-
<% if org_repos_not_stored.length > 0 %>
22-
<% org_repos_not_stored.each do |repo2| %>
23-
<li class="container-fluid list-group-item">
24-
<div class="row">
25-
<div class="col-4">
26-
<p><%=repo2.name%></p>
27-
</div>
28-
<div class="col-4">
29-
<em><%= repo2.url %></em>
30-
</div>
31-
<div class="col-4">
32-
<%= form_for (Repository.new) do |f| %>
33-
<%= f.hidden_field :github_id, value: repo2.id %>
34-
<%= f.hidden_field :name, value: repo2.name %>
35-
<%= f.hidden_field :url, value: repo2.url %>
36-
<%= f.hidden_field :full_name, value: repo2.full_name %>
37-
<%= f.hidden_field :description, value: repo2.description %>
38-
<%= f.hidden_field :size, value: repo2.size %>
39-
<%= f.hidden_field :collaborator, value: repo2.collaborators_url %>
40-
<%= button_tag 'Add', class: 'button is-success float-right add_button ' %>
41-
<% end %>
42-
</div>
43-
</div>
44-
</li>
45-
<% end %>
46-
<% end %>
47-
</ul>
8+
<div class="col-4">
9+
<strong><a href="/repositories/<%= repo.id %>"><%=repo.name%></a></strong>
10+
</div>
11+
<div class="col-4">
12+
<em><%= repo.url %></em>
13+
</div>
14+
<div class="col-4 ">
15+
<%= link_to 'Delete', repo, class:"float-right delete_button btn btn-warning btn-repo", method: :delete, data: { confirm: 'Are you sure?' } %>
16+
</div>
17+
</div>
18+
</li>
19+
<% end %>
20+
<% end %>
21+
<% if org_repos_not_stored.length > 0 %>
22+
<% org_repos_not_stored.each do |repo2| %>
23+
<li class="container-fluid list-group-item">
24+
<div class="row">
25+
<div class="col-4">
26+
<p><%=repo2.name%></p>
27+
</div>
28+
<div class="col-4">
29+
<em><%= repo2.url %></em>
30+
</div>
31+
<div class="col-4">
32+
<%= form_for (Repository.new) do |f| %>
33+
<%= f.hidden_field :github_id, value: repo2.id %>
34+
<%= f.hidden_field :name, value: repo2.name %>
35+
<%= f.hidden_field :url, value: repo2.url %>
36+
<%= f.hidden_field :full_name, value: repo2.full_name %>
37+
<%= f.hidden_field :description, value: repo2.description %>
38+
<%= f.hidden_field :size, value: repo2.size %>
39+
<%= f.hidden_field :collaborator, value: repo2.collaborators_url %>
40+
<%= button_tag 'Add', class: 'button is-success float-right add_button btn btn-success btn-repo' %>
41+
<% end %>
42+
</div>
43+
</div>
44+
</li>
45+
<% end %>
46+
<% end %>
47+
</ul>
4848
</div>

‎app/views/repositories/index.html.erb

+90-74
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,85 @@
1-
<div class="container ">
2-
1+
<div class="container-fluid">
2+
3+
<div class="row bg-light">
4+
<div class="col-12 col-sm-12 py-3">
5+
<div class="container">
6+
<h2 class="text-left" style="padding: 2.8em 0px 0px 0px">Repositories</h3>
7+
<div class="row p-3">
8+
9+
<%= form_tag("orgs/repos", remote:true ,method: "get", id:"find_form" , class:"w-100") do %>
10+
<div class="row">
11+
<div class="col-3">
12+
<select class="form-control" autofocus name="org_name" id="org_name">
13+
<option selected value="">Choose organization...</option>
14+
<% @orgs_name.each do |org|%>
15+
<option value="<%=org%>"><%=org%></option>
16+
<% end %>
17+
</select>
18+
</div>
319

4-
<div class="row">
5-
<div class="col-12 col-sm-12 py-5 px-5 ">
6-
<h1 class="text-center" style="padding: 1em 0px 0px 0px">Repositories</h1>
7-
</div>
8-
</div>
9-
<div class="row bg-light p-4">
10-
11-
<%= form_tag("orgs/repos", remote:true ,method: "get", id:"find_form" , class:"w-100") do %>
12-
<div class="row">
13-
<div class="col-3">
14-
<select class="form-control" autofocus name="org_name" id="org_name">
15-
<option selected value="">Choose organization...</option>
16-
<% @orgs_name.each do |org|%>
17-
<option value="<%=org%>"><%=org%></option>
18-
<% end %>
19-
</select>
20+
<div class="col-4">
21+
<div class="input-group mb-3">
22+
<div class="input-group-prepend">
23+
<label class="input-group-text" for="start_date">Start date</label>
2024
</div>
2125

22-
<div class="col-4">
23-
<div class="input-group mb-3">
24-
<div class="input-group-prepend">
25-
<label class="input-group-text" for="start_date">Start date</label>
26-
</div>
27-
28-
<input class="form-control" as="date" type="date" id="from" name="from">
29-
</div>
26+
<input class="form-control" as="date" type="date" id="from" name="from">
27+
</div>
3028

29+
</div>
30+
<div class="col-4">
31+
<div class="input-group mb-3">
32+
<div class="input-group-prepend">
33+
<label class="input-group-text" for="end_date">End date</label>
3134
</div>
32-
<div class="col-4">
33-
<div class="input-group mb-3">
34-
<div class="input-group-prepend">
35-
<label class="input-group-text" for="end_date">End date</label>
36-
</div>
3735

38-
<input class="form-control" as="date" type="date" id="until" name="until">
39-
</div>
36+
<input class="form-control" as="date" type="date" id="until" name="until">
37+
</div>
4038

41-
</div>
42-
<div class="col-1">
43-
<input id="find_button" type="submit" class="btn btn-primary" value="Find" data-disabled-with="Find">
44-
</div>
4539
</div>
40+
<div class="col-1">
41+
<input id="find_button" type="submit" class="btn btn-secondary" value="Find" data-disabled-with="Find">
42+
</div>
43+
</div>
44+
4645

4746

47+
<% end %>
4848

49-
<% end %>
5049

51-
<div class="col-12 py-5 px-5 spinner_loading_ajax">
50+
51+
52+
</div>
53+
</div>
54+
</div>
55+
56+
</div>
57+
58+
<div class="row bg-white">
59+
<div class="col-12 col-sm-12 py-3">
60+
<div class="container" style="padding-left: 0px;padding-right: 0px;">
61+
62+
<div class="row p-4 spinner_loading_ajax">
63+
64+
<div class="col-12 py-5 px-5">
5265
<div class="d-flex justify-content-center">
5366
<div class="spinner-border" role="status">
5467
<span class="sr-only">Loading...</span>
5568
</div>
5669
</div>
70+
</div>
71+
5772
</div>
5873

59-
<div id="list_repos" class=" col-12 py-5 px-5">
74+
<div class="row p-4">
75+
<div id="list_repos" class=" col-12" style="padding-left: 0px;padding-right: 0px;">
6076

77+
</div>
6178
</div>
6279

63-
80+
</div>
6481
</div>
65-
66-
82+
</div>
6783
</div>
6884

6985

@@ -74,55 +90,55 @@
7490
<% end %>
7591

7692
<script>
77-
function show_repos(event, data){
78-
//data.repos contains partial rendered into string
79-
$("#list_repos").html(data.repos);
80-
$('.delete_button').on("click", function(){
81-
$(this).hide();
82-
$(this).parent().append("<button class='btn btn-primary float-right' type='button' disabled><span class='spinner-border spinner-border-sm' role='status' aria-hidden='true'></span><span class='sr-only'>Loading...</span> </button>");
93+
function show_repos(event, data){
94+
//data.repos contains partial rendered into string
95+
$("#list_repos").html(data.repos);
96+
$('.delete_button').on("click", function(){
97+
$(this).hide();
98+
$(this).parent().append("<button class='btn btn-primary float-right' type='button' disabled><span class='spinner-border spinner-border-sm' role='status' aria-hidden='true'></span><span class='sr-only'>Loading...</span> </button>");
8399

84-
});
85-
$('.add_button').on("click", function(){
86-
$(this).hide();
87-
$(this).parent().append("<button class='btn btn-primary float-right' type='button' disabled><span class='spinner-border spinner-border-sm' role='status' aria-hidden='true'></span><span class='sr-only'>Loading...</span> </button>");
88-
});
100+
});
101+
$('.add_button').on("click", function(){
102+
$(this).hide();
103+
$(this).parent().append("<button class='btn btn-primary float-right' type='button' disabled><span class='spinner-border spinner-border-sm' role='status' aria-hidden='true'></span><span class='sr-only'>Loading...</span> </button>");
104+
});
89105

90-
}
106+
}
91107

92-
function display_error(event, data){
108+
function display_error(event, data){
93109

94-
console.log(data);
95-
}
110+
console.log(data);
111+
}
96112

97-
function show_general_spinner(button){
113+
function show_general_spinner(button){
98114

99-
}
115+
}
100116

101-
$(document).ready(function() {
117+
$(document).ready(function() {
102118

103119

104120

105-
$(".spinner_loading_ajax").hide();
121+
$(".spinner_loading_ajax").hide();
106122

107-
$(document).ajaxStart(function(){
108-
if( $("#org_name option:selected").val() != ""){
109-
$('#list_repos').html("");
110-
$('.spinner_loading_ajax').show();
111-
}
123+
$(document).ajaxStart(function(){
124+
if( $("#org_name option:selected").val() != ""){
125+
$('#list_repos').html("");
126+
$('.spinner_loading_ajax').show();
127+
}
112128

113-
});
114-
$(document).ajaxStop(function(){
115-
$('.spinner_loading_ajax').hide();
116-
});
129+
});
130+
$(document).ajaxStop(function(){
131+
$('.spinner_loading_ajax').hide();
132+
});
117133

118-
$('#find_form').on('ajax:success', show_repos);
119-
$('#find_form').on('ajax:error', display_error);
134+
$('#find_form').on('ajax:success', show_repos);
135+
$('#find_form').on('ajax:error', display_error);
120136

121137

122138

123139

124140

125-
});
141+
});
126142

127143

128144
</script>

0 commit comments

Comments
 (0)