Skip to content

Commit

Permalink
Resolving merge issues after repository rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt1nAHat committed Apr 5, 2021
2 parents c40db82 + f52cf3f commit adef0c3
Show file tree
Hide file tree
Showing 5 changed files with 248 additions and 39 deletions.
14 changes: 7 additions & 7 deletions lectures.html
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,13 @@ <h3>About</h3>
<br> <br>
<b>Contact:</b>
</p>
<!--
<a href="https://www.linkedin.com/in/ahmed-omran-5a1933129/"
target="_blank"><img src="images/linkedin-square.svg"
class="contactLogo"></a>
<a href="mailto:[email protected]" target="_blank"><img
src="images/envelope-line.svg" class="contactLogo" id="email"></a>-->
<a href="https://scholar.google.com/citations?user=ZkF5QKcAAAAJ&hl=en"
<!-- <a href="https://www.linkedin.com/in/briannekent/" target="_blank"><img
src="images/linkedin-square.svg" class="contactLogo"></a>
<a href="https://twitter.com/Brianne_Kent" target="_blank"><img
src="images/twitter-round.svg" class="contactLogo"></a>
<a href="mailto:[email protected]" target="_blank"><img
src="images/envelope-line.svg" class="contactLogo" id="email"></a> -->
<a href="https://scholar.google.com/citations?user=JzVWTVMAAAAJ"
target="_blank"><img src="images/google-scholar.svg"
class="contactLogo" id="scholar"></a>
</div>
Expand Down
110 changes: 110 additions & 0 deletions lectures_payment.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<!DOCTYPE html>
<html>

<head>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>HPQC Labs: High Performance & Quantum Computing</title>
<meta name="keywords" content="" />
<meta name="description" content="" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
rel="stylesheet" />
<link href="default.css" rel="stylesheet" type="text/css" media="all" />
<link href="lectures.css" rel="stylesheet" type="text/css" media="all" />
<link href="lectures_tickets.css" rel="stylesheet" type="text/css" media="all" />
<!--<link href="lectures.html" rel="stylesheet" type="text/css" media="all" />-->
<link href="fonts.css" rel="stylesheet" type="text/css" media="all" />
<link href="AOS\aos.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/[email protected]/slick/slick.css" />

<link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">
<link rel="manifest" href="site.webmanifest">
<link rel="shortcut icon" href="images/favicon.ico" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>

<!--[if IE 6]><link href="default_ie6.css" rel="stylesheet" type="text/css" /><![endif]-->

</head>

<body>
<div id="menu">
<div class="navbar-toggle" id="navbar-toggle">
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<a href="index.html" class="logo">
<img src="images/HPQC_Labs.svg" class="logoImg">
<span class="logoTxt">HPQC Labs</span>
</a>
<ul class="main-nav" id="main-nav">
<li><a href="index.html" accesskey="1" title="">Homepage</a></li>
<li><a href="people.html" accesskey="2" title="">People</a></li>
<li><a href="https://github.com/HPQC-LABS" accesskey="3" title="">Research</a></li>
<li><a href="by-laws.html" accesskey="4" title="">By-laws</a></li>
<li class="dropmenu">
<div class="current_page_item"><a class="dropbtn" accesskey="6" id="selection" title="">Lectures</a>
</div>
<div class="content">
<a href="lectures.html" title="">Lectures</a>
<a href="LaTeX.html">LaTeX Setup</a>
</div>
</li>
<li><a href="college.html" accesskey="5" title="">HPQC College</a></li>
</ul>
</div>

<div id="banner">&nbsp;</div>
<div id="featured">
<div class="container">
<div id="donation">
<h3>For people not currently paying tuition at HPQC College</h3>
<br>
<p style="color:black">
We are asking for a very small donation for you to register. We are a not-for-profit school.<br>
Limited space is available for people from outside the college.
<br>
<br>
Donation requested for individual lectures: 20 Canadian dollars / 16 US dollars.<br>
For three lectures: 50 Canadian Dollars / 40 USD.<br>
<br>
<br>
Donations can be made directly by e-transfer to [email protected], or by the methods available below.<br>
A small processing fee may be added if using one of the methods below.</p>
<div id="smart-button-container">
<div id="options">
<select id="item-options">
<!-- <option value="Test" price="1">Test</option> -->
<option value="1 Lecture" price="21">1 lecture: $20</option>
<option value="2 Lectures" price="41">2 lectures: $40</option>
<option value="3 Lectures" price="51">3 lectures: $50</option>
</select>
<select style="visibility: hidden" id="quantitySelect"></select>
</div>
<div id="paypal-button-container"></div>
</div>
<script src="https://www.paypal.com/sdk/js?client-id=Ad6783gW_8HR4Qi8H7EZmje6ZRKZRw2Ji2nsvFl8sHXVsgerwA1NHDnLRpapuKG6ze0yWRmx1ZK0PD3Y&currency=CAD"
data-sdk-integration-source="button-factory"></script>
<script src="lectures_payment.js"></script>
</div>
</div>
</div>
<div id="copyright" class="container" , style="background:#79C255" ;>
<p>&copy; HPQC Labs. All rights reserved. </p>
</div>
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="lectures.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>

<script src="AOS\aos.js"></script>
<script>
AOS.init();
</script>
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected]/slick/slick.min.js"></script>
</body>
</html>
84 changes: 84 additions & 0 deletions lectures_payment.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
function initPayPalButton() {
var shipping = 0;
var itemOptions = document.querySelector("#smart-button-container #item-options");
var quantity = parseInt();
var quantitySelect = document.querySelector("#smart-button-container #quantitySelect");
if (!isNaN(quantity)) {
quantitySelect.style.visibility = "visible";
}
var orderDescription = 'Lecture Series Ticket';
if (orderDescription === '') {
orderDescription = 'Item';
}
paypal.Buttons({
style: {
shape: 'rect',
color: 'gold',
layout: 'vertical',
label: 'paypal',
},
createOrder: function (data, actions) {
var selectedItemDescription = itemOptions.options[itemOptions.selectedIndex].value;
var selectedItemPrice = parseFloat(itemOptions.options[itemOptions.selectedIndex].getAttribute("price"));
var tax = (0 === 0) ? 0 : (selectedItemPrice * (parseFloat(0) / 100));
if (quantitySelect.options.length > 0) {
quantity = parseInt(quantitySelect.options[quantitySelect.selectedIndex].value);
} else {
quantity = 1;
}
tax *= quantity;
tax = Math.round(tax * 100) / 100;
var priceTotal = quantity * selectedItemPrice + parseFloat(shipping) + tax;
priceTotal = Math.round(priceTotal * 100) / 100;
var itemTotalValue = Math.round((selectedItemPrice * quantity) * 100) / 100;
return actions.order.create({
purchase_units: [{
description: orderDescription,
amount: {
currency_code: 'CAD',
value: priceTotal,
breakdown: {
item_total: {
currency_code: 'CAD',
value: itemTotalValue,
},
shipping: {
currency_code: 'CAD',
value: shipping,
},
tax_total: {
currency_code: 'CAD',
value: tax,
}
}
},
items: [{
name: selectedItemDescription,
unit_amount: {
currency_code: 'CAD',
value: selectedItemPrice,
},
quantity: quantity
}]
}],
application_context: {
shipping_preference: 'NO_SHIPPING'
},
payer: {
address: {
country_code: 'CA'
}
}
});
},
onApprove: function (data, actions) {
return actions.order.capture().then(function (details) {
alert('Transaction completed by ' + details.payer.name.given_name + '!');
});
},
onError: function (err) {
console.log(err);
},
}).render('#paypal-button-container');
}
initPayPalButton();
16 changes: 16 additions & 0 deletions people.css
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,22 @@
*/

/*Formatting text for title headers (Faculty, Students, etc.)*/
.personBio ul
{
color: black;
list-style-type: disc;
display: block;
text-align: left;
list-style-position:inside
}

.personBio li
{
color: black;
display: list-item;
margin-bottom: 5px;
}

.peopleTitle
{
font-size: 26px;
Expand Down
63 changes: 31 additions & 32 deletions people.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,37 @@
<html>

<head>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>HPQC Labs: High Performance & Quantum Computing</title>
<meta name="keywords" content="" />
<meta name="description" content="" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap"
rel="stylesheet" />
<link href="default.css" rel="stylesheet" type="text/css" media="all" />
<link href="people.css" rel="stylesheet" type="text/css" media="all" />
<link href="fonts.css" rel="stylesheet" type="text/css" media="all" />
<link href="Plugins/AOS/aos.css" rel="stylesheet">


<link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">
<link rel="manifest" href="site.webmanifest">
<link rel="shortcut icon" href="images/favicon.ico" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script>
window.MathJax = {
tex: {
// inlineMath: [['$', '$'], ['\\(', '\\)']],
packages: { '[+]': ['mhchem'] }
},
loader: { load: ['[tex]/mhchem'] },
};
</script>
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<!--[if IE 6]><link href="default_ie6.css" rel="stylesheet" type="text/css" /><![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>HPQC Labs: High Performance & Quantum Computing</title>
<meta name="keywords" content="" />
<meta name="description" content="" />
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@400;600;700&display=swap" rel="stylesheet" />
<link href="default.css" rel="stylesheet" type="text/css" media="all" />
<link href="people.css" rel="stylesheet" type="text/css" media="all" />
<link href="fonts.css" rel="stylesheet" type="text/css" media="all" />
<link href="Plugins/AOS/aos.css" rel="stylesheet">


<link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="images/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="images/favicon-16x16.png">
<link rel="manifest" href="site.webmanifest">
<link rel="shortcut icon" href="images/favicon.ico" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script>
window.MathJax = {
tex: {
// inlineMath: [['$', '$'], ['\\(', '\\)']],
packages: {'[+]': ['mhchem']}
},
loader: {load: ['[tex]/mhchem']},
};
</script>
<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<!--[if IE 6]><link href="default_ie6.css" rel="stylesheet" type="text/css" /><![endif]-->

</head>

Expand Down

0 comments on commit adef0c3

Please sign in to comment.