Skip to content

Commit

Permalink
Merge branch 'master' of github.com:wtg/wtg.github.io
Browse files Browse the repository at this point in the history
  • Loading branch information
@kochman
kochman committed May 25, 2017
2 parents 967b640 + 3b9b7b5 commit 45b0509
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 85 deletions.
8 changes: 8 additions & 0 deletions static/projects.css
View file
Expand Up @@ -86,6 +86,14 @@
font-weight: 400;
}

.project .badge {
font-size: 100%;
}

.project .card-title a:hover {
text-decoration: none;
}

.project .description {
padding-top: 0;
font-size: 19px;
Expand Down
187 changes: 102 additions & 85 deletions templates/index.html
View file
@@ -1,114 +1,131 @@
<!doctype html>
<html>

<head>
<title>Web Technologies Group</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<link rel="stylesheet" href="/static/projects.css">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>Web Technologies Group</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<link rel="stylesheet" href="/static/projects.css">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
</head>

<body>

<div class="header fixed-top">
<div class="container">
<div class="wtg-logo d-inline-block">
<img src="/static/wtg.svg" width="100" height="30" alt="">
</div>
<div class="float-right">
<a href="https://github.com/wtg" class="btn btn-sm btn-outline-danger">GitHub</a>
<a href="mailto:webtech@union.rpi.edu" class="btn btn-sm btn-outline-danger">Email</a>
<div class="header fixed-top">
<div class="container">
<div class="wtg-logo d-inline-block">
<img src="/static/wtg.svg" width="100" height="30" alt="">
</div>
<div class="float-right">
<a href="https://github.com/wtg" class="btn btn-sm btn-outline-danger">GitHub</a>
<a href="mailto:webtech@union.rpi.edu" class="btn btn-sm btn-outline-danger">Email</a>
</div>
</div>
</div>
</div>

<section class="jumbotron text-center">
<div class="container">
<h1 class="jumbotron-heading">Web Technologies Group</h1>
<p class="lead text-muted">
Creating technological solutions to serve the students of
<span class="d-inline-block">Rensselaer Polytechnic Institute.</span>
Take a look at some of our projects below, and then get involved!
</p>
<p>
<a href="https://github.com/wtg" class="btn btn-sm btn-outline-danger">Visit WebTech on GitHub</a>
<a href="mailto:webtech@union.rpi.edu" class="btn btn-sm btn-outline-danger">Email WebTech</a>
</p>
</div>
</section>
<section class="jumbotron text-center">
<div class="container">
<h1 class="jumbotron-heading">Web Technologies Group</h1>
<p class="lead text-muted">
Creating technological solutions to serve the students of
<span class="d-inline-block">Rensselaer Polytechnic Institute.</span> Take a look at some of our projects below, and then get involved!
</p>
<p>
<a href="https://github.com/wtg" class="btn btn-sm btn-outline-danger">Visit WebTech on GitHub</a>
<a href="mailto:webtech@union.rpi.edu" class="btn btn-sm btn-outline-danger">Email WebTech</a>
</p>
</div>
</section>

<!-- <nav class="navbar navbar-light sticky-top">
<!-- <nav class="navbar navbar-light sticky-top">
</nav> -->

<div class="projects">
<div class="container card-columns">
{% for project in projects %}
<div class="project card">
<div class="card-block">
<h3 class="card-title name">
{{ project.name }}
</h3>
{% if project.repo.homepage %}
<a class="btn btn-outline-danger btn-sm" href="{{ project.repo.homepage }}">Use</a>
{% endif %}
<a class="btn btn-secondary btn-sm" href="{{ project.repo.html_url }}">View code</a>
<a class="btn btn-secondary btn-sm" href="{{ project.repo.html_url + '/issues' }}">{{ project.repo.open_issues_count_text }}</a>
</div>
<div class="card-block description">
<p class="card-text">{{ project.repo.description }}</p>
</div>
<ul class="list-group list-group-flush">
{% for commit in project.commits %}
<li class="list-group-item">
<p class="commit-message" style="white-space: pre-wrap;">{{ commit.commit.message }}</p>
<div class="user-info">
<a href="{{ commit.author.html_url }}">
<img class="user-avatar" src="{{ commit.author.avatar_url }}">
<div class="projects">
<div class="container card-columns">
{% for project in projects %}
<div class="project card">
<div class="card-block">
<div class="card-title">
<h3 class="name">
{{ project.name }}
</h3>
<a href="{{ project.repo.html_url + '/watchers' }}">
<span class="badge badge-default">
<i class="fa fa-eye" aria-hidden="true"></i> {{ project.repo.subscribers_count }}
</span>
</a>
<a href="{{ commit.author.html_url }}">
<span class="user-name">{{ commit.author.name }}</span>
<a href="{{ project.repo.html_url + '/stargazers' }}">
<span class="badge badge-default">
<i class="fa fa-star" aria-hidden="true"></i> {{ project.repo.stargazers_count }}
</span>
</a>
<a href="{{ commit.html_url }}" class="float-right">
<code class="commit-hash">{{ commit.sha[:7] }}</code>
<a href="{{ project.repo.html_url + '/network' }}">
<span class="badge badge-default">
<i class="fa fa-code-fork" aria-hidden="true"></i> {{ project.repo.forks_count }}
</span>
</a>
</div>
</li>
{% endfor %}
</ul>
{% if project.repo.homepage %}
<a class="btn btn-outline-danger btn-sm" href="{{ project.repo.homepage }}">Use</a> {% endif %}
<a class="btn btn-secondary btn-sm" href="{{ project.repo.html_url }}">View code</a>
<a class="btn btn-secondary btn-sm" href="{{ project.repo.html_url + '/issues' }}">{{ project.repo.open_issues_count_text }}</a>
</div>
<div class="card-block description">
<p class="card-text">{{ project.repo.description }}</p>
</div>
<ul class="list-group list-group-flush">
{% for commit in project.commits %}
<li class="list-group-item">
<p class="commit-message" style="white-space: pre-wrap;">{{ commit.commit.message }}</p>
<div class="user-info">
<a href="{{ commit.author.html_url }}">
<img class="user-avatar" src="{{ commit.author.avatar_url }}">
</a>
<a href="{{ commit.author.html_url }}">
<span class="user-name">{{ commit.author.name }}</span>
</a>
<a href="{{ commit.html_url }}" class="float-right">
<code class="commit-hash">{{ commit.sha[:7] }}</code>
</a>
</div>
</li>
{% endfor %}
</ul>
</div>
{% endfor %}
</div>
{% endfor %}
</div>
</div>

{#
<div class="contributors">
<div class="container">
<div class="row text-center">
<div class="col-sm-12">
<h2 class="display-4 section-title">Contributors</h2>
{#
<div class="contributors">
<div class="container">
<div class="row text-center">
<div class="col-sm-12">
<h2 class="display-4 section-title">Contributors</h2>
</div>
</div>
</div>
<div class="row">
<div class="col-3 col-sm-4 col-md-2 contributor text-center" v-for="contributor in allContributors" v-if="users[contributor.login] && users[contributor.login].name">
<img class="user-avatar" v-bind:src="users[contributor.login].avatar_url">
<p>{{ users[contributor.login].name }}</p>
<div class="row">
<div class="col-3 col-sm-4 col-md-2 contributor text-center" v-for="contributor in allContributors" v-if="users[contributor.login] && users[contributor.login].name">
<img class="user-avatar" v-bind:src="users[contributor.login].avatar_url">
<p>{{ users[contributor.login].name }}</p>
</div>
</div>
</div>
</div>
</div>
#}
#}

<footer class="text-muted text-center">
<div class="container">
<p>
This website was created by the
<span class="d-inline-block">Web Technologies Group</span>
of the
<span class="d-inline-block"><a href="http://sg.rpi.edu/senate/">Rensselaer Union Student Senate</a>.</span>
</p>
</div>
</footer>
<footer class="text-muted text-center">
<div class="container">
<p>
This website was created by the
<span class="d-inline-block">Web Technologies Group</span> of the
<span class="d-inline-block"><a href="http://sg.rpi.edu/senate/">Rensselaer Union Student Senate</a>.</span>
</p>
</div>
</footer>

<script src="/static/projects.js"></script>
<script src="/static/projects.js"></script>

</body>

</html>

0 comments on commit 45b0509

Please sign in to comment.