Skip to content

GitLab

Verified Commit 86aed9b7 authored by David Haynes's avatar David Haynes 🙆
Browse files

Landing page redesign complete 

- the footer is not responsive enough, this is something masonstrap should address
parent 3ff900a7
Pipeline #2107 passed with stages
in 2 minutes and 48 seconds
Hide whitespace changes
Inline Side-by-side
go/go/templates/landing.html
View file @ 86aed9b7
......@@ -6,78 +6,99 @@ SRCT Go • Welcome
{% block content %}
<div class="page-header">
<div class="page-header mb-5">
<div class="row">
<div class="col-md-12">
<h1><i class="fa fa-link"></i> Go</h1>
<p class="lead">University-branded URL shortening</p>
<div class="col">
<h1><i class="fas fa-link"></i> Go</h1>
<p class="lead">University-branded URL shortening</p>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<h3>What is Go?</h3>
<legend></legend>
<p>
Go provides University-branded URL shortening for student organizations,
administration, and ULife groups. Any approved user can generate a
<a href="https://go.gmu.edu">go.gmu.edu</a> address
that can redirect to a longer URL.
<br></br>
Go is a product of the
George Mason University <a href="https://srct.gmu.edu">Student-Run Computing and Technology</a>
student organization.
<div class="row mb-5 ">
<div class="col-md-4 d-flex align-items-stretch">
<div class="card landing-card shadow-hover mb-3">
<div class="card-header">
<h5>What is Go?</h5>
</div>
<div class="card-body">
<p class="card-text">
Go provides University-branded URL shortening for student organizations, administration,
and ULife groups. Any approved user can generate a
<a href="https://go.gmu.edu">go.gmu.edu</a> address that can redirect to a longer URL.
</p>
<p class="card-text">
Go is a product of the George Mason University
<a href="https://srct.gmu.edu">Student-Run Computing and Technology</a>
student organization.
</p>
</div>
</div>
</div>
<div class="col-md-4">
<h3>Why should I use Go?</h3>
<legend></legend>
<p>Go features:</p>
<ul class="fa-ul">
<div class="col-md-4 d-flex align-items-stretch">
<div class="card landing-card shadow-hover mb-3">
<div class="card-header">
<h5>Why should I use Go?</h5>
</div>
<div class="card-body">
<p class="card-text">
Go features:
<ul class="fa-ul">
<li>
<span class="fa-li mt-1">
<i class="fas fa-check-square"></i>
Data tracking on the number of clicks a Go link gets.
</li>
</span>Data tracking on the number of clicks a Go link gets.</li>
<li>
<span class="fa-li mt-1">
<i class="fas fa-check-square"></i>
Options to share Go links across various social media platforms.
</span>Options to share Go links across various social media platforms.
</li>
<li>
<span class="fa-li mt-1">
<i class="fas fa-check-square"></i>
QR Code generation at various resolutions, ready to be shared.
</span>QR Code generation at various resolutions, ready to be shared.
</li>
<li>
<span class="fa-li mt-1">
<i class="fas fa-check-square"></i>
Optional expiration for links after particular times.
</li>
</ul>
</span>Optional expiration for links after particular times.</li>
</ul>
</p>
</div>
</div>
</div>
<div class="col-md-4">
<h3>How do I access Go?</h3>
<legend></legend>
<p>
In order to prevent abuse of the URL shortener, access to Go
is moderated by SRCT administrators. New users will need to fill out
a registration form in order to become an approved user.
<br></br>
Additionally, only users with a current, valid Mason username and password
may request to be approved.
<div class="col-md-4 d-flex align-items-stretch">
<div class="card landing-card shadow-hover mb-3">
<div class="card-header">
<h5>How do I access Go?</h5>
</div>
<div class="card-body">
<p class="card-text">
In order to prevent abuse of the URL shortener, access to Go is moderated by SRCT
administrators. New users will need to fill out a registration form in
order to become an approved user.
</p>
<p class="card-text">
Additionally, only users with a current, valid Mason username and password may request
to be approved.
</p>
</div>
</div>
</div>
</div>
<hr />
<div class="row">
<div class="col-md-4">
<a href="{% url 'go_login' %}" class="btn btn-primary btn-block">Log In</a>
</div>
<div class="col-md-6">
<a href="{% url 'go_login' %}" class="btn btn-outline-primary btn-block shadow-hover mb-3">
<i class="fas fa-sign-in-alt"></i> Log In</a>
</div>
<div class="col-md-4">
<a href="{% url 'signup' %}" class="btn btn-primary btn-block">Sign Up</a>
</div>
<div class="col-md-6">
<a href="{% url 'signup' %}" class="btn btn-outline-primary btn-block shadow-hover mb-3">
<i class="fas fa-user-plus"></i> Sign Up</a>
</div>
</div>
{% endblock %}
{% endblock %}
\ No newline at end of file
go/go/templates/layouts/navbar.html
View file @ 86aed9b7
......@@ -46,7 +46,7 @@
{% else %}
<li class="nav-item">
<a class="nav-link" href="{% url 'go_login' %}">
Log In <i class="fa fa-sign-in fa-fw"></i>
<i class="fas fa-sign-in-alt"></i> Log In
</a>
</li>
{% endif %}
......
go/go/views.py
View file @ 86aed9b7
......@@ -68,7 +68,8 @@ def index(request):
else:
urls = urls.order_by("-date_created")
# Render my_links passing the list of URL's, Domain, and Sort Methods to the template
# Render my_links passing the list of URL's, Domain, and Sort Methods to
# the template
return render(request, 'core/index.html', {
'urls': urls,
'domain': domain,
......@@ -94,8 +95,8 @@ def new_link(request):
# Initialize a URL form
url_form = URLForm(host=request.META.get('HTTP_HOST')) # unbound form
# If a POST request is received, then the user has submitted a form and it's
# time to parse the form and create a new URL object
# If a POST request is received, then the user has submitted a form and
# it's time to parse the form and create a new URL object
if request.method == 'POST':
# Now we initialize the form again but this time we have the POST
# request
......@@ -113,7 +114,8 @@ def new_link(request):
# Redirect to the shiny new URL
return redirect('view', res.short)
# Else, there is an error, redisplay the form with the validation errors
# Else, there is an error, redisplay the form with the validation
# errors
else:
# Render index.html passing the form to the template
return render(request, 'core/new_link.html', {
......
go/static/css/global.css
View file @ 86aed9b7
.begin {
margin-top: 6rem;
}
\ No newline at end of file
}
.landing-card {
box-shadow: 0 0 4px 2px rgba(0,0,0,.2);
}
.pointer:hover,.shadow-hover {
cursor:pointer
}
.shadow-hover {
position:relative;
transition:all .5s cubic-bezier(.165,.84,.44,1)
}
.shadow-hover:after {
content:"";
box-shadow:0 0 16px 2px rgba(0,0,0,.2);
border-radius:inherit;
opacity:0;
position:absolute;
top:0;
left:0;
width:100%;
height:100%;
z-index:-1;
transition:opacity .5s cubic-bezier(.165,.84,.44,1)
}
.shadow-hover:focus:after,.shadow-hover:hover:after {
opacity:1
}
\ No newline at end of file
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