Skip to content
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.

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

basic FE #2

Merged
merged 1 commit into from
Apr 18, 2019
Merged
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
Binary file added client/images/color1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/images/color2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/images/color3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/images/color4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/images/color5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/images/slides/04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/images/slides/05.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
152 changes: 150 additions & 2 deletions client/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<!DOCTYPE html>
<html lang="en">

Expand All @@ -7,11 +8,158 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="main.css">
<title>Clean City</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<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://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<link rel="stylesheet" href="style.css">
<script src="main.js"></script>
</head>

<body>
Clean City
<script src="./main.js"></script>

<header>
<nav class="navbar navbar-expand-lg navbar-light " >

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active ">
<a class="nav-link scrolly" href="#home">Home <span class="sr-only"></span></a>
</li>
<li class="nav-item active">
<a class="nav-link scrolly" href="#upload">Upload</a>
</li>
<li class="nav-item active">
<a class="nav-link scrolly " href="#">About Us</a>
</li>
</ul>

</div>
</nav>
</header>

<section id="home">
<div id="carouselExampleIndicators" data-interval="2000" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
<li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
<li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
<li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
</ol>
<div class="carousel-inner">
<div class="carousel-item active">
<img src="images/slides/04.jpg" style="height: 600px" class="d-block w-100" alt="...">
</div>
<div class="carousel-item">
<img src="images/slides/05.jpg" style="height: 600px" class="d-block w-100" alt="...">
</div>
<div class="carousel-item">
<img src="images/slides/04.jpg" style="height: 600px" class="d-block w-100" alt="...">
</div>
</div>
<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
<br>
<div class="container">
<div class="row">
<div class="col-md-4">
<div class="thumbnail">
<img src="images/color5.png" alt="Lights" style="width:100%;height:300px">


</div>
</div>
<div class="col-md-4">
<div class="thumbnail">

<img src="images/color2.png" alt="Nature" style="width:100%;height:300px">

</div>
</div>
<div class="col-md-4">
<div class="thumbnail">
<img src="images/color3.png" alt="Fjords" style="width:100%;height:300px">

</div>
</div>


</div>
</div>
<br><br>
</section>
<section id="upload">

<div class="uploadform border border-primary rounded"></span>


<div style="padding: 20px">
<h3>Any problems in your area?
Post them here!</h3><br>
<form action="#">

<div class="container">
<div class="row">
<div class="col">
<b>Name&emsp;&emsp;</b><input id="name" placeholder="Your name here"><br><br>
</div>
<div class="col">
<b>Location&emsp;&emsp;</b><input id="location" placeholder="Location(area,state)"><br><br>
</div>
</div><br>
<div class="row">

<label><b>&emsp;Description of the report&emsp;&emsp;</b></label>
<textarea placeholder="Short Description" id="description" rows="2" cols="50"></textarea>
<br><br>
</div>
<br>
<div class="row">
<div class="col">
<div class="form-group">
<label><b>Select type of report</b></label>
<select class="form-control" id="problemtype">
<option>Garbage Heap</option>
<option>Accident</option>
<option>Water Shortage</option>
<option>Electricity cut off</option>
<option>Crime</option>
</select>
</div>
</div>
<div class="col">

<div class="form-group">
<label for="picfile"><b>Upload Image</b></label>
<input type="file" class="form-control-file" id="picfile">
</div>
</div>
</div>
</div>

<button style="margin-left: 4em" type ="submit" class="btn btn-primary">Submit</button>

<button style="margin-left: 4em" type="reset" class="btn btn-primary">Reset</button>
</fieldset>
</form>
</div>
</div>
<br><br>
</section>
</body>

</html>
4 changes: 4 additions & 0 deletions client/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.uploadform{
width: 800px;
margin: 0 auto;
}
7 changes: 7 additions & 0 deletions client/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

// Scrolly.
$('.scrolly')
.scrolly({
speed: 2000,
offset: $header.outerHeight()
});