-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathindex.html
More file actions
248 lines (229 loc) · 11.9 KB
/
index.html
File metadata and controls
248 lines (229 loc) · 11.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
<!DOCTYPE html>
<html ng-app="compufscar">
<head>
<meta charset="utf-8">
<title>Comp UFSCar</title>
<link href="assets/css/bootstrap.min.css" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Merriweather:400,300,700' rel='stylesheet' type='text/css'>
<link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="assets/css/wrapper.css" rel="stylesheet">
<link href="assets/css/style.css" rel="stylesheet">
</head>
<body>
<div id="wrapper">
<div id="sidebar-wrapper" class="hero-sidebar">
<div class="container-fluid">
<figure class="text-center">
<img src="assets/img/logo.png"
alt="Computing UFSCar: collaborative repositories for projects and classes' tasks."
title="Computing UFSCar: collaborative repositories for projects and classes' tasks."
class="logo"/>
</figure>
<hr>
<ul class="nav nav-pills nav-stacked">
<a href="#tr" title="Introduction">
<li class="nav-item">
<i class="fa fa-home"></i>
</li>
</a>
<a href="#members" title="Members">
<li class="nav-item">
<i class="fa fa-users"></i>
</li>
</a>
<a href="#repos" title="Repositories">
<li class="nav-item">
<i class="fa fa-space-shuttle"></i>
</li>
</a>
<a href="#contributing" title="Contributing">
<li class="nav-item">
<i class="fa fa-share-alt"></i>
</li>
</a>
</ul>
<hr>
<footer class="text-center">
<ul class="nav nav-pills nav-stacked">
<a href="http://dc.ufscar.br" class="link-warning"
target="_blank" title="UFSCar's Computing Department web page.">
<li class="nav-item"><i class="fa fa-university"></i></li>
</a>
<a href="https://github.com/comp-ufscar"
target="_blank" title="Comp-UFSCar GitHub Organization.">
<li class="nav-item"><i class="fa fa-github-alt"></i></li>
</a>
</ul>
</footer>
</div>
</div>
<div id="page-content-wrapper">
<div class="container">
<section name="tr" id="tr" class="content-section">
<h1><a href="#tr">Computing UFSCar</a></h1>
<p>
This website contains information about the <a href="https://github.com/comp-ufscar">comp-ufscar</a>
organization at github and its <a href="#repos">repositories</a>.
We appreciate you spending time at Comp-UFSCar. Please consider <a
href="#contributing">contributing</a> to our repositories.
</p>
<p class="alert alert-warning">
<strong>Important!</strong> <a href="https://github.com/comp-ufscar">comp-ufscar</a>
was created by students and it is not associated with or maintained by employees of
the Computing department at Federal University of São Carlos or any individual linked
and/or constrained by any kind of formal contract to public institutions or private
enterprises.
</p>
</section>
<section name="members" id="members" class="content-section">
<h2><a href="#members">Members</a></h2>
<div ng-controller="MembersController as membersList" ng-init="membersList.load()" class="list-members">
<div ng-show="!membersList.members.$resolved">
<i class="fa fa-cog fa-3x fa-spin" style="color: #ccc"></i>
</div>
<div class="row">
<div ng-repeat="member in membersList.members" class="col-sm-1 text-center">
<a href="{{ member.html_url}}" title="{{member.login}}'s GitHub page.">
<img src="{{member.avatar_url}}" alt="{{member.login}}'s GitHub page."
class="img-responsive img-rounded"/>
</a>
</div>
</div>
</div>
</section>
<section name="repos" id="repos" class="content-section"
ng-controller="RepositoriesController as repositoriesList" ng-init="repositoriesList.load()">
<h2><a href="#repos">Repositories</a></h2>
<input type="text" placeholder="Search in repositories (e.g., name, language)"
ng-model="repositorysearch"
class="form-control"><br/>
<span ng-show="!repositoriesList.repositories.$resolved">
<i class="fa fa-cog fa-3x fa-spin" style="color: #ccc"></i>
</span>
<table class="table" ng-show="repositoriesList.repositories.$resolved">
<thead>
<tr>
<th>Name</th>
<th>Created</th>
<th>Last Pushed</th>
<th>Stats</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="repository in repositoriesList.repositories | filter: repositorysearch">
<td>
<a href="{{repository.html_url}}" target="_blank">
{{repository.name}}
</a>
<br/>
<small>{{ repository.description }}</small>
</td>
<td>
<small>{{repository.created_at.toLocaleDateString()}}</small>
</td>
<td>
<small>{{repository.pushed_at.toLocaleDateString()}}</small>
</td>
<td>
<span ng-show="repository.forks_count"
title="{{ repository.forks_count }} forks."
class="label label-primary label-pill">
{{repository.forks_count}}
</span>
<span ng-show="repository.stargazers_count"
title="{{ repository.stargazers_count }} stargazers."
class="label label-warning label-pill">
{{repository.stargazers_count}}
</span>
</td>
</tr>
</tbody>
</table>
</section>
<section name="contributing" id="contributing" class="content-section">
<h2><a href="#contributing">Contributing</a></h2>
<p>
There are many students at the Computing dept. and the number of repositories can grow awfully fast.
Everyone's welcome to contribute to the organization, but we ask you to <strong>follow</strong>
these guidelines.
</p>
<div name="share-notes" id="share-notes">
<h3>
<i class="fa fa-angle-right"></i>
<a href="#share-notes">I would like to share my classes' notes</a></h3>
<p>
The repository <a
href="https://github.com/Comp-UFSCar/comp-ufscar-classes">comp-ufscar-classes</a> keeps
all files that aren't directly
related to code or technical production. It's organized by
<code>classes > professor > year.term > content</code> and future
contributions should follow this structure. Please refer to the comp-ufscar-classes'
<a href="https://github.com/Comp-UFSCar/comp-ufscar-classes/blob/master/README.md">README.md</a>
file for more information.
</p>
</div>
<div name="share-project" id="share-project">
<div class="content-section">
<h3>
<i class="fa fa-angle-right"></i>
<a href="#share-project">I want to share a project</a></h3>
<p>
Projects are kept in repositories that reference a <strong>class</strong>, without
distinguishing year or term.
</p>
<p>
Don't <code>ctrl+c ctrl+v</code> your project onto repositories if you were versioning it
with Git before! This will erase all commit logs and lose track of how your project
progressed throughout its development.
To merge your project with the class repository
<strong>without losing the commit log</strong>,
follow the procedure below:
</p>
<p>
First, <strong>conform your project</strong> to our standard:
</p>
<pre class="code code-shell">
$ cd /path/to/your/repository
$ git checkout -b comp-ufscar-merging
$ mkdir projects/{project_name} -p # Create the folders projects and projects/{project_name}.
$ mv !(.git) projects/{project_name}/ # Move everything to the created folder.
$ git add . --all
$ git commit -m "Conform project for Comp-UFSCar merging."
$ git push --all</pre>
<p class="alert alert-warning">
<strong>Caution!</strong> Please make sure that the
<code>{project_name}</code> chosen isn't already being
used by other project in the given class' repository.
</p>
<p>
Now <strong>merge your project</strong>
and the class repository.
</p>
<pre class="code code-shell">
$ cd /path/to/comp-ufscar/class/repository
$ git remote add {repository} https://github.com/{username}/{repository}.git
$ git fetch {repository}
$ git merge {repository}/comp-ufscar-merging
$ git remote remove {repository}
$ git push</pre>
<p>
This procedure is recommended as it will merge the
list of commits while preserving paths.
Other options might be found at
<a href="http://stackoverflow.com/questions/1425892">
How do you merge two git repository? (Stack Overflow)</a>.
</p>
</div>
</div>
</section>
</div>
</div>
</div>
<script src="node_modules/angular/angular.js" charset="utf-8"></script>
<script src="node_modules/angular-resource/angular-resource.js" charset="utf-8"></script>
<script src="node_modules/angular-route/angular-route.js" charset="utf-8"></script>
<script src="app/app.js" charset="utf-8"></script>
<script src="app/members/controller.js" charset="utf-8"></script>
<script src="app/repositories/controller.js" charset="utf-8"></script>
</body>
</html>