Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config.env.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OIDC_REDIRECT_URI = env.get("PROFILES_OIDC_REDIRECT_URI", "http://localhost:8080/redirect_uri")

LDAP_BIND_DN = env.get("LDAP_BIND_DN", default="cn=profiles,ou=Apps,dc=csh,dc=rit,dc=edu")
LDAP_BIND_PASS = env.get("LDAP_BIND_PW", default=None)
LDAP_BIND_PASS = env.get("LDAP_BIND_PASS", default=None)

GIT_HASH = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('utf-8').rstrip()

Expand Down
14 changes: 14 additions & 0 deletions profiles/static/assets/images/csh_logo_white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion profiles/static/js/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ $(function() {
//show image upload on click
$(function() {
$("#self-picture").on('click', function () {
$("#upload-form").toggle()
let uploadForm = document.getElementById("upload-form");

if (uploadForm.classList.contains("d-none")) {
uploadForm.classList.remove("d-none");
} else {
uploadForm.classList.add("d-none");
}
});
});

Expand Down
64 changes: 55 additions & 9 deletions profiles/static/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
padding-top: 50px;
}

.img-circle {
border-radius: 50%;
}

.profile-img {
height: 250px;
width: 250px;
Expand Down Expand Up @@ -60,9 +56,10 @@

.badge {
font-size: 85%;
font-weight: 600;
}

.form-control-sm {
#search-field {
font-size: 13px !important;
}

Expand All @@ -72,7 +69,6 @@

body {
padding-top: 80px;
background-color: #eee;
}

a,
Expand All @@ -83,22 +79,72 @@ a:active {
text-decoration: none;
}

.badge-pink {
/* LDAP ROLE BADGES */

.badge-current-student {
color: #fff;
background-color: #bbb;
}
.badge-rtp {
color: #fff;
background-color: #ff9800;
}

.badge-eboard {
color: #fff;
background-color: #4caf50;
}

.badge-constitutional-maintainer {
color: #fff;
background-color: #e51c23;
}
.badge-3da {
color: #fff;
background-color: #cb42a9;
}

.badge-purple {
.badge-drink {
color: #fff;
background-color: #b0197e;
}

.badge-webmaster,
.badge-devcade,
.badge-mediapc {
color: #fff;
background-color: #2196f3;
}

.badge-wiki {
color: #fff;
background-color: #b19cd9;
}

.badge-strange {
.badge-segfault {
color: #000;
background-color: #ffffff;
font-family: "Comic Sans MS", "Comic Sans", cursive;
}

.badge-disabled {
color: #fff;
background-color: #181818;
}

.badge-misc {
background-color: var(--bs-secondary-bg);
color: var(--bs-secondary-text);
}

.color-twitter-blue {
color: #00aced;
}

.color-gh-purple {
color: #6e5494;
}

.profile-link,
.profile-link:hover,
.profile-link:visited {
Expand Down
79 changes: 38 additions & 41 deletions profiles/templates/include/head.html
Original file line number Diff line number Diff line change
@@ -1,58 +1,55 @@
<head>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="Computer Science House">

<title>CSH Profiles</title>

<link rel="manifest" href="/static/manifest.json">
<meta name="theme-color" href="https://themeswitcher.csh.rit.edu/api/colour">
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">

<link rel="stylesheet" type="text/css"
href="https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css">
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.16/css/dataTables.bootstrap4.min.css">


<!-- <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css"> -->
<link href="https://cdn.datatables.net/v/bs5/dt-3.0.2/rg-2.0.0/datatables.min.css" rel="stylesheet" integrity="sha384-Fz1bxJyFg3EBy0ujYq4j/XF5Ow3QmJNNjSaAHRT+fIz+d3EymzrRRXUa57NREved" crossorigin="anonymous">

<!-- Bootstrap core CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="https://themeswitcher.csh.rit.edu/api/get" media="screen">

<link rel="stylesheet" href="https://assets.csh.rit.edu/csh-material-bootstrap/5.3.11/dist/css/csh-material-bootstrap.min.css" media="screen">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.min.css">

<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet"/>

<link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">

<link rel="stylesheet" href="/static/style.css">

<script defer src="https://use.fontawesome.com/releases/v5.0.9/js/all.js"></script>

<script>
(function(h,o,u,n,d) {
h = h[d] = h[d] || { q: [], onReady: function (c) { h.q.push(c) } }
d = o.createElement(u); d.async = 1; d.src = n; d.crossOrigin=''
n = o.getElementsByTagName(u)[0]; n.parentNode.insertBefore(d, n)
})(window, document, 'script', 'https://www.datadoghq-browser-agent.com/us1/v6/datadog-rum.js', 'DD_RUM')

window.DD_RUM.onReady(function () {
window.DD_RUM.init({
applicationId: '65be0cac-59ab-4ad7-8c23-5a3e577893fe',
clientToken: 'pub2f0696fe063adeb0dc204547f4584f55',
site: 'datadoghq.com',
service: 'profiles',
env: '{{ DATADOG_ENV }}',
version: '{{ DATADOG_APP_VERSION }}',
sessionSampleRate: 100, // capture 100% of sessions
sessionReplaySampleRate: 100, // capture 100% of sessions with replay
trackResources: true, // Enable Resource tracking
trackUserInteractions: true, // Enable Action tracking
trackLongTasks: true, // Enable Long Tasks tracking

allowedTracingUrls: [ 'http://localhost:8080', 'https://profiles.csh.rit.edu', 'https://profiles-dev.csh.rit.edu'],
defaultPrivacyLevel: 'mask-user-input',
(function(h,o,u,n,d) {
h = h[d] = h[d] || { q: [], onReady: function (c) { h.q.push(c) } }
d = o.createElement(u); d.async = 1; d.src = n; d.crossOrigin=''
n = o.getElementsByTagName(u)[0]; n.parentNode.insertBefore(d, n)
})(window, document, 'script', 'https://www.datadoghq-browser-agent.com/us1/v6/datadog-rum.js', 'DD_RUM')

window.DD_RUM.onReady(function () {
window.DD_RUM.init({
applicationId: '65be0cac-59ab-4ad7-8c23-5a3e577893fe',
clientToken: 'pub2f0696fe063adeb0dc204547f4584f55',
site: 'datadoghq.com',
service: 'profiles',
env: '{{ DATADOG_ENV }}',
version: '{{ DATADOG_APP_VERSION }}',
sessionSampleRate: 100, // capture 100% of sessions
sessionReplaySampleRate: 100, // capture 100% of sessions with replay
trackResources: true, // Enable Resource tracking
trackUserInteractions: true, // Enable Action tracking
trackLongTasks: true, // Enable Long Tasks tracking

allowedTracingUrls: [ 'http://localhost:8080', 'https://profiles.csh.rit.edu', 'https://profiles-dev.csh.rit.edu'],
defaultPrivacyLevel: 'mask-user-input',
});
});
});
</script>

</head>
55 changes: 39 additions & 16 deletions profiles/templates/include/nav.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary">
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-primary py-1">

<div class="container">
<a class="navbar-brand" href="/">Profiles</a>
<a class="navbar-brand d-inline-flex align-items-center" href="/">
<img src="/static/assets/images/csh_logo_white.svg" width="30" height="30" class="" alt="CSH Logo">&nbsp;
Profiles
</a>

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01"
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor01"
aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand All @@ -17,7 +20,7 @@

<li class="nav-item dropdown">

<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" id="groups">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" id="groups">
Years
<span class="caret"></span>
</a>
Expand All @@ -32,7 +35,7 @@

<li class="nav-item dropdown">

<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" id="groups">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" id="groups">
Groups
<span class="caret"></span>
</a>
Expand All @@ -53,7 +56,7 @@
{% if info.rtp %}
<li class="nav-item dropdown">

<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" id="groups">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" id="groups">
Admin
<span class="caret"></span>
</a>
Expand All @@ -66,26 +69,46 @@
{% endif %}

</ul>
<ul class="nav navbar-nav ml-auto">
<form id="search" action="/search" method="GET">
<input class="form-control form-control-sm mr-sm-2" id="search-field" name="q" type="text" placeholder="Search">
<span class="nav-item fa fa-cog fa-spin" style="font-size:24px; color:#fff;display:none" id="load-icon"></span>
</form>
<ul class="navbar-nav ms-auto">
<li class="nav-item d-flex align-items-center">
<form id="search" class="d-flex" action="/search" method="GET">
<input class="form-control form-control-sm me-sm-2 bg-primary border-primary-subtle text-light" id="search-field" name="q" type="text" placeholder="Search">
<span class="nav-item fa fa-cog fa-spin text-light d-none text-md" id="load-icon"></span>
</form>
</li>
<li class="navbar-user dropdown">

<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" id="user01">
<img src="/image/{{ info.uid }}">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" id="user01">
<img src="/image/{{ info.uid }}" width="36" height="36" class="rounded-circle">
{{ info.uid }}
<span class="caret"></span>
</a>

<div class="dropdown-menu" aria-labelledby="user01">
<a class="dropdown-item" href="/">Profile</a>
<a class="dropdown-item" href="https://themeswitcher.csh.rit.edu/">Theme</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="/logout">Logout</a>
</div>
</li>

<li class="bd-theme nav-item dropdown align-content-center">
<a href="#" class="nav-link dropdown-toggle text-light d-flex align-items-center" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<i class="theme-icon-active bi bi-circle-half fs-5"></i>
<span class="bd-theme-text d-lg-none ms-2">Toggle Theme </span>
</a>
<ul class="dropdown-menu" aria-labelledby="bd-theme">
<button class="dropdown-item" aria-pressed="false" data-bs-theme-value="light">
<i class="bi bi-sun-fill"></i>
Light
</button>
<button class="dropdown-item" aria-pressed="false" data-bs-theme-value="dark">
<i class="bi bi-moon-fill"></i>
Dark
</button>
<button class="dropdown-item" aria-pressed="false" data-bs-theme-value="auto">
<i class="bi bi-circle-half"></i>
Auto
</button>
</ul>
</li>
</ul>
</div>
Expand All @@ -101,4 +124,4 @@
{% endfor %}
</div>
{% endif %}
{% endwith %}
{% endwith %}
10 changes: 6 additions & 4 deletions profiles/templates/include/scripts.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<!-- Bootstrap core JavaScript -->
<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>

<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/js/bootstrap.bundle.min.js" integrity="sha384-FKyoEForCGlyvwx9Hj09JcYn3nv7wiPVlz7YYwJrWVcXK/BmnVDxM+D2scQbITxI" crossorigin="anonymous"></script>
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.16/js/jquery.dataTables.js"></script>
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.16/js/dataTables.bootstrap4.min.js"></script>
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js"></script>

<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
<script src="https://cdn.datatables.net/v/bs5/dt-3.0.2/rg-2.0.0/datatables.min.js" integrity="sha384-7bviRGlMCugw2fDUIm2xSSOrWzCRgk0XswSMZAYXpoY4GPNOlBEKxXO8Q6JxPmhy" crossorigin="anonymous"></script>

<script src="https://assets.csh.rit.edu/csh-material-bootstrap/5.3.11/dist/css/csh-material-bootstrap.min.css" crossorigin="anonymous"></script>

<script src="https://assets.csh.rit.edu/csh-material-bootstrap/5.3.10/dist/js/color-modes.js"></script>
<script src="/static/js/adaptive-background.js"></script>

<script defer src="/static/js/search.js"></script>
<script defer src="/static/js/edit.js"></script>

<script type="text/javascript">
$(document).ready(function(){
$('[data-toggle="tooltip"]').tooltip()
$('[data-bs-toggle="tooltip"]').tooltip()
$.adaptiveBackground.run({
exclude: [ 'rgb(0,0,0)', 'rgb(255,255,255)' ],
shadeVariation: 'blend',
Expand Down
Loading
Loading