Skip to content

Commit

Permalink
main and about
Browse files Browse the repository at this point in the history
  • Loading branch information
nourshokry committed Oct 23, 2022
1 parent e9bd61d commit 86d0898
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 3 deletions.
122 changes: 122 additions & 0 deletions frontend/about_us.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<html lang="en">
<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="">

<title>TroVino</title>

<!-- Bootstrap core CSS -->
<link href="css/bootstrap.css" rel="stylesheet">
<link href="css/bootstrap-reboot.min.css" rel="stylesheet">
<link href="css/bootstrap-grid.min.css" rel="stylesheet">
<link href="css/bootstrap-utilities.min.css" rel="stylesheet">

<!-- Custom styles for this template -->
<link href="css/dashboard.css" rel="stylesheet">
</head>

<body>
<nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0">
<a id="trovinoToggle" class="navbar-brand col-sm-3 col-md-2 mr-0" style="font-weight: bold; font-size: 30px; padding-left: 20px;" href="#">TroVino</a>

<div class="col-sm-8 col-md-9">&nbsp;</div>
<div class="col-sm-1 col-md-1"><img src="2560px-Coop.png" style="width: 100px;height: auto;"></div>
</nav>

<div class="container-fluid">
<div class="row">
<nav class="col-md-2 d-none d-md-block bg-light sidebar" id="sidebar" data-collapsed="false">
<div class="sidebar-sticky" style="display: block !important; background-color: #ebecf0; ">
<ul class="nav flex-column">
<li class="nav-item">
<a class="nav-link active" href="#">
<span class="sr-only">&nbsp;</span>
</a>
</li>
<li class="nav-item">
<div style="padding: 10px;"><div class="input-group mb-2">
<input type="text" class="form-control" style = "font-size: 20px; padding-bottom: 10px"placeholder="My cellar ..." aria-label="My cellar" aria-describedby="My cellar">
<button class="btn btn-outline-secondary" type="button" id="search-btn"><i data-feather="search"></i></button>
</div></div>
</li>
<li class="nav-item">
<a class="nav-link" style = "color: black;font-size: 23px ; padding-top: 10px; padding-bottom: 30px;" href="#">
<span style = "color: #FFA400;" data-feather="tag"></span>
Scan and label
</a>
</li>
<li class="nav-item">
<a class="nav-link" style = "color: black; font-size: 23px; padding-bottom: 30px;" href="#">
<span style = "color: #FFA400;" data-feather="users"></span>
Recommend wine
</a>
</li>
<li class="nav-item">
<a class="nav-link" style = "color:black; font-size: 23px; padding-bottom:30px; " href="#">
<span style = "color: #FFA400;" data-feather="info"></span>
About
</a>
</li>
</ul>
</div>
</nav>

<main id="mainscreen" role="main" class="col-md-9 ml-sm-auto col-lg-10 pt-3 px-4">
<h2 style="margin-top: 10px;">About us</h2>

<img style="width:500; margin-top: 20px;" src="team10.jpeg"/>
</br>
<h5 style= "margin-top: 20px;">
Make your wine cellar spark joy! At BaselHack 2022, 8 motivated hackers got together to develop a wine manager.</p>
<p>This is TroVino - find my wine!</p>
</h5>
</br>
<h6 style= "margin-top: 20px;">Andrei, Jozef, Miruna, Noel, Nour, Omar, Phaina, Rui </p> </h6>


</main>
</div>
</div>

<style>
#mainscreen {
margin-left: 16.66666667%;
}
</style>

<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery-3.6.1.min.js"></script>
<script src="js/popper.min.js"></script>
<script src="js/bootstrap.bundle.js"></script>

<!-- Icons -->
<script src="https://unpkg.com/feather-icons/dist/feather.min.js"></script>
<script>
feather.replace()
</script>

<script>
$("#mainscreen").load("templates/scancode.html");
</script>

<script>
$("#trovinoToggle").click(function (){
if($("#sidebar").attr("data-collapsed") == "false") {
console.log("collapse");
$("#sidebar").attr("data-collapsed", "true");
$("#sidebar").css({"transform": "translate(-100%, 0)"});
} else {
console.log("show");
$("#sidebar").attr("data-collapsed", "false");
$("#sidebar").css({"transform": "translate(0%, 0)"});
}
});
</script>

</body>
</html>

6 changes: 3 additions & 3 deletions frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@
</div></div>
</li>
<li class="nav-item">
<a class="nav-link" style = "font-size: 20px ; padding-top: 10px; padding-bottom: 30px;" href="#">
<a class="nav-link" style = "font-size: 10px ; padding-top: 10px; padding-bottom: 30px;" href="#">
<span data-feather="tag"></span>
Scan and label
</a>
</li>
<li class="nav-item">
<a class="nav-link" style = "font-size: 20px; padding-bottom: 30px;" href="#">
<a class="nav-link" style = "font-size: 10px; padding-bottom: 30px;" href="#">
<span data-feather="users"></span>
Recommend wine
</a>
</li>
<li class="nav-item">
<a class="nav-link" style = "font-size: 20px" href="#">
<a class="nav-link" style = "font-size: 10px" href="#">
<span data-feather="info"></span>
About
</a>
Expand Down
Binary file added frontend/team10.jpeg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 86d0898

Please sign in to comment.