Skip to content

First Merge #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JuanPCF1 merged 7 commits into from
Feb 19, 2023
Merged

First Merge #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6783be
Sign-up #1
JuanPCF1 Feb 18, 2023
213d81d
template
emmtrinidad Feb 18, 2023
d271d2c
more website work
emmtrinidad Feb 19, 2023
dab6a99
Merge with Juan and ET #1
JuanPCF1 Feb 19, 2023
004f153
bruh
emmtrinidad Feb 19, 2023
573686b
Merge pull request #2 from andin2/et-branch
JuanPCF1 Feb 19, 2023
a60705c
A bit better more friends
JuanPCF1 Feb 19, 2023
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
17 changes: 13 additions & 4 deletions ProjectX.htm → Sing-up.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,25 @@
<!--Start of Jquery-->
<script>
$(document).ready(function() {
$("h1").addClass("animated bounce");

$(".page-header").css("color", "#ffcd00")
$(".page-header").css("outline", "##000000")
});
</script>

<!--Start of HTML-->
<body>
<div class="container-fluid">
<h1 class="text-primary">Calgary Hacks 2023</h1>
<p>Hello World!</p>
<header>
<div class="page-header">
<h1 class="text-center">Project X</h1>
</div>
</header>






</div>
</body>
</html>
61 changes: 61 additions & 0 deletions home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<!doctype html>
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="styles.css">

<div class="top">
<div class="d-flex justify-content-center">
<font class="logo" size="+1">placeholder</font>
<a href="schedule.html"><button class="topbutton" id="schedule">schedule</button>
</a>
<a href="socials.html"><button class="topbutton" id="socials">socials</button></a>
<a href="settings.html"><button class="topbutton" id="settings">settings</button></a>
<div class="searchbar"><input type="text" id="search" name="search"><button class="topbutton" id="search">search</button></div>
<div class="cornerprofilepic dropdown"><button class="cornerprofilepic"><img src="smilingjordan.jpg" alt="profile picture"></button>
<div class="dropdown-content">
sup
<br><br>
<a href="#">about me</a>
<a href="#">preferences</a>
<button>log out</button>
</div>
</div>

</div>
</div>



<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>

</head>
<body>
<div class="container-fluid">

<div class="personal-info">
<br>&nbsp;<div class="profile-picture"><img src="smilingjordan.jpg" alt="profile picture"></div><br>
<br>&nbsp;<font size="+3">Jenny Talls</font>
<br>&nbsp;<a href="#">About myself</a>
</div>
<div class="d-flex justify-content-center" >
<div class="events">
<div class="d-flex justify-content-center" >
<font size="+5">Nothing new right now :(
<br>Why not go check out some <a href="socials.html">clubs?</a>
</font>
</div>
</div>
</div>
</div>
</body>
</html>
31 changes: 31 additions & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// $(function(){
// $("input[name='options']").click(a);
// });

// function a(){
// alert("test");


// $("input[name='options']").parent().addClass("active");
// }

let btn1 = document.getElementById("option1")
let btn2 = document.getElementById("option2")
let btn3 = document.getElementById("option3")

btn1.addEventListener('mouseover', function(){
btn1.style.color = "yellow";
btn2.style.color = "black";
btn3.style.color = "black";

})
btn2.addEventListener('mouseover', function(){
btn2.style.color = "yellow";
btn1.style.color = "black";
btn3.style.color = "black";
})
btn3.addEventListener('mouseover', function(){
btn3.style.color = "yellow";
btn2.style.color = "black";
btn1.style.color = "black";
})
47 changes: 47 additions & 0 deletions schedule.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="styles.css">

<div class="top">
<div class="d-flex justify-content-center">
<font class="logo" size="+1">placeholder</font>
<a href="home.html"><button class="topbutton" id="home">home</button></a>
<a href="socials.html"><button class="topbutton" id="socials">socials</button></a>
<a href="settings.html"><button class="topbutton" id="settings">settings</button></a>
<div class="searchbar"><input type="text" id="search" name="search"><button class="topbutton" id="search">search</button></div>
<div class="cornerprofilepic"></div>

</div>
</div>




</head>
<body>
<div class="container-fluid">

<br><div class="d-flex justify-content-center">
Toggle master schedule &nbsp;
<label class="switch">
<input type="checkbox">
<span class="slider"></span>
</label>
<div class="calendar">

</div>
</div>

</div>

</body>



</html>
43 changes: 43 additions & 0 deletions settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!doctype html>
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="styles.css">

<div class="top">
<div class="d-flex justify-content-center">
<font class="logo" size="+1">placeholder</font>
<a href="home.html"><button class="topbutton" id="home">home</button></a>
<a href="schedule.html"><button class="topbutton" id="schedule">schedule</button>
</a>
<a href="socials.html"><button class="topbutton" id="socials">socials</button></a>
<div class="searchbar"><input type="text" id="search" name="search"><button class="topbutton" id="search">search</button></div>
<div class="dropdown">
<button class="cornerprofilepic">
<img src="smilingjordan.jpg" alt="profile picture">
</button>
<div class="dropdown-content">
sup
<br><br>
<a href="#">about me</a>
<a href="#">preferences</a>
<button>log out</button>
</div>
</div>

</div>
</div>


</head>
<body>



</body>
</html>
Binary file added smilingjordan.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 63 additions & 0 deletions socials.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="styles.css">

<div class="top">
<div class="d-flex justify-content-center">
<font class="logo" size="+1">placeholder</font>
<a href="home.html"><button class="topbutton" id="home">home</button></a>
<a href="schedule.html"><button class="topbutton" id="schedule">schedule</button>
</a>
<a href="settings.html"><button class="topbutton" id="settings">settings</button></a>
<div class="searchbar"><input type="text" id="search" name="search"><button class="topbutton" id="search">search</button></div>
<div class="cornerprofilepic"></div>
</div>
</div>




</head>
<body>
<div class="d-flex justify-content-center btn-group" data-toggle="buttons">
<font size="+5">

<button id="option1" class="social-buttons"><font color="yellow">clubs</font></button>
<button type="radio" id="option2" class="social-buttons"><a href="socialsclasses.html" style="text-decoration: none;" class="socials-switch">classes</a></button>
<button type="radio" id="option3" class="social-buttons"><a href="socialspeople.html" style="text-decoration: none;" class="socials-switch">people</a></button>

</font>
</div>
<div class="d-flex justify-content-center">
<div class="clubs-template">
<div class="d-flex left-clubs flex-column">
<font color="white" size="+1">Your clubs</font>
<br>
<div class="d-flex justify-content-start">
<div class="class-square"><font color="white">this is a club</font></div> &nbsp;
<div class="class-square"><font color="white">this is a club</font></div> &nbsp;
</div>
<br>
<div class="d-flex justify-content-start">
<div class="class-square"><font color="white">this is a club</font></div> &nbsp;
<div class="class-square"><font color="white">this is a club</font></div> &nbsp;
&nbsp;&nbsp;<a href="#">Find new clubs</a>
</div>
<br>
<a href="#"><font color="white" size="+1">more</font></a>
</div>
</div>
</div>




</body>
<script href="index.js"></script>
</html>
60 changes: 60 additions & 0 deletions socialsclasses.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="styles.css">

<div class="top">
<div class="d-flex justify-content-center">
<font class="logo" size="+1">placeholder</font>
<a href="home.html"><button class="topbutton" id="home">home</button></a>
<a href="schedule.html"><button class="topbutton" id="schedule">schedule</button>
</a>
<a href="settings.html"><button class="topbutton" id="settings">settings</button></a>
<div class="searchbar"><input type="text" id="search" name="search"><button class="topbutton" id="search">search</button></div>
<div class="cornerprofilepic"></div>
</div>
</div>




</head>
<body>
<div class="d-flex justify-content-center btn-group" data-toggle="buttons">
<font size="+5">

<button type="radio" id="option3" class="social-buttons"><a href="socials.html" style="text-decoration: none;" class="socials-switch">clubs</a></button>
<button type="radio" id="option2" class="social-buttons"><font color="yellow">classes</font></button>
<button type="radio" id="option3" class="social-buttons"><a href="socialspeople.html" style="text-decoration: none;" class="socials-switch">people</a></button>

</font>
</div>
<div class="d-flex justify-content-center">
<div class="clubs-template">
<div class="d-flex left-clubs flex-column">
<div class="d-flex justify-content-start">
<div class="class-square"><font color="white">this is a class</font></div> &nbsp;
<div class="class-square"><font color="white">this is a class</font></div> &nbsp;
</div>
<br>
<div class="d-flex justify-content-start">
<div class="class-square"><font color="white">this is a class</font></div> &nbsp;
<div class="class-square"><font color="white">this is a class</font></div> &nbsp;
&nbsp;&nbsp;<a href="#">Add/remove classes</a>
</div>
<br>
<a href="#"><font color="white" size="+1">more</font></a>
</div>
</div>
</div>



</body>
<script href="index.js"></script>
</html>
Loading