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.

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

Jeplind Morico #3

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Jeplind Morico #3

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
aad797e
Jeplind Morico
Oct 26, 2020
064b5f9
POST, GET, PUT, PATCH, DELETE
Oct 26, 2020
41bfa7b
rev. post
Oct 26, 2020
a137772
rev. documentation
Oct 26, 2020
f636ff1
rev. perbaikan + register,login
Oct 27, 2020
b8bad8d
authtics,authorize,error-handler
Oct 27, 2020
c64ae31
Jeplind Morico
Nov 1, 2020
997d1dc
Jeplind Morico
Nov 1, 2020
cd048a5
Jeplind Morico
Nov 1, 2020
839696e
deploy to heroku
Nov 2, 2020
1b6b71b
fix port and package.json
Nov 2, 2020
f3a5d3f
add database production in config.json
Nov 2, 2020
5a8d93c
rev app.js
Nov 2, 2020
6011a00
rev. app.js
Nov 2, 2020
bbc81bc
trial config.json
Nov 2, 2020
8ea037d
trial config.json
Nov 2, 2020
80a10ce
remove file .env from server
Nov 2, 2020
1b15d3a
trial config and .env
Nov 2, 2020
dd40041
trial config.json
Nov 2, 2020
5fbf773
rev. user controller
Nov 2, 2020
34be628
try fix jwt and user controller
Nov 3, 2020
b632acb
fix config.json production
Nov 3, 2020
4920502
fix app.js
Nov 3, 2020
73363e8
fix main.js client
Nov 3, 2020
359f811
deploy heroku + deploy firebase
Nov 3, 2020
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
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop

This file was deleted.

50 changes: 50 additions & 0 deletions client/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
@import url('https://fonts.googleapis.com/css?family=Montserrat');

body{ font-family: 'Montserrat', sans-serif; background-color: #ffffff;}

*{
padding: 0;
margin: 0;
box-sizing: border-box;
}

.row{
background-color: #ffffff
;
border-radius: 31px;
}

img{
border-top-left-radius: 29px;
border-bottom-left-radius: 29px;
}

.btn1{
border: none;
outline: none;
height: 50px;
width: 100%;
background-color: black;
color: white;
border-radius: 4px;
font-weight: bold;
}

.btn1:hover{
background-color: white;
border: 1px solid;
color: black;
}

#logout:hover{
color: red;
}

#signin:hover{
color: #ffcc00;
}


#nav-weather{
font-size: small;
}
Binary file added client/doit.png
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.
Binary file added client/home-background.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.
243 changes: 239 additions & 4 deletions client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,246 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
<link rel="stylesheet" href="custom.css">
<!--Meta Google ID-->
<meta name="google-signin-client_id" content="691501624936-96mu937nob9bqu069dlefr3n7egdlf6s.apps.googleusercontent.com">

<title>Do.It</title>
</head>

<body>

<!--Navbar-->
<nav class="navbar navbar-light bg-light sticky-top">
<a href="#" class="navbar-brand">
<img id="logo" src="./doit.png" alt="logo" width="80px" height="80px" class="d-inline-block align-top" loading='lazy'>
</a>
<span class="navbar-text"><h2 style="color: #ffcc00">Your Plan Pals</h2></span>
<!--Navbar Content-->
<ul class="nav justify-content-end">
<li class="nav-item">
<a id="signin" href="#" class="nav-link active" onclick="showloginpage(event)"><h5>Login</h5></a>
</li>
<li class="nav-item">
<a href="#"><button id="btnshowregister" class="btn btn-warning" onclick="showregisterpage(event)">Register</button></a>
</li>
<li class="nav-item">
<a id="logout" href="#" class="nav-link active" onclick="logout(event)"><h5>Logout</h5></a>
</li>
</ul>
</nav>
<!--End Navbar-->

<!--Login-->
<section id="login-page" class="form my-4 mx-5">
<div class="container">
<div class="row no-gutters">
<div class="col-lg-5">
<img src="./quote.jpg" class="img-fluid" alt="">
</div>
<div class="col-lg-7 px-5 pt-5">
<h1 class="font-weight-bold py-3">Login</h1>
<form onsubmit="login(event)">
<div class="form-row">
<div class="col-lg-7">
<input id="inputemail" type="email" placeholder="Email-Address" class="form-control my-3 p-4">
</div>
</div>
<div class="form-row">
<div class="col-lg-7">
<input id="inputpassword" type="password" placeholder="******" class="form-control my-3 p-4">
</div>
</div>
<div class="form-row">
<div class="col-lg-7">
<button type="submit" class="btn1 mt-2 mb-5">Login</button>
</div>
</div>
<div class="form-row">
<div class="col-lg-7">
<!--Button Sign In Google-->
<div class="g-signin2" data-onsuccess="onSignIn"></div>
</div>
</div>
<br>
<p>Don't have account? <a href="#"> <button id="btn-login" class="btn btn-success btn-md" onclick="showregisterpage(event)">Register - It's Free</button></a></p>
</form>
</div>
</div>
</div>
</section>
<!--End Login-->

<!--Register-->
<section id="register-page" class="form my-4 mx-5">
<div class="container">
<div class="row no-gutters">
<div class="col-lg-5">
<img src="./quote.jpg" class="img-fluid" alt="">
</div>
<div class="col-lg-7 px-5 pt-5">
<h1 class="font-weight-bold py-3">Register</h1>
<form onsubmit="register(event)">
<div class="form-row">
<div class="col-lg-7">
<!--Email Register-->
<input id="email-register" type="email" placeholder="Email-Address" class="form-control my-3 p-4">
</div>
</div>
<div class="form-row">
<div class="col-lg-7">
<!--Password Register-->
<input id="password-register" type="password" placeholder="******" class="form-control my-3 p-4">
</div>
</div>
<div class="form-row">
<div class="col-lg-7">
<button type="submit" class="btn1 mt-2 mb-5">Register</button>
</div>
<p>Already have account <a href="#"> <button id="btn-register" class="btn btn-success btn-md" onclick="showloginpage(event)">Login Here</button></a></p>
</form>
</div>
</div>
</div>
</section>
<!--End Register-->

<!--Home-->
<section id="home-page" class="my-4 mx-5">
<div class="container">
<div class="row no-gutters">
<div class="col-lg-5">
<img src="./home-background.jpg" class="img-fluid" alt="">
</div>
<div class="col-lg-7 px-5 pt-4">
<h1 class="font-weight-bold py-3">Make Your Plan
</h1>
<button class="btn btn-warning" onclick="showAddActivity()">Add Activity</button>
<button class="btn btn-warning" onclick="list(event)">Show List</button>
<div class="col-7" id="weathers"></div>
</div>
</div>
</div>
</div>
</section>
<!--End-->

<!--Add List-->
<section id="list-page">
<div class="container">
<div class="row no-gutters">
<div class="col-lg-5">
<img src="./home-background.jpg" class="img-fluid" alt="">
</div>
<div class="col-lg-7 px-5 pt-4">
<h1 class="font-weight-bold py-3">Make Your Plan
</h1>
<button class="btn btn-warning" onclick="showAddActivity()">Add Activity</button>
<button class="btn btn-warning" onclick="list(event)">Show List</button>
<div class="col-lg-15" style="font-size: 0.8em;"><br>
<table class="table table-striped">
<thead>
<tr>
<th scope="col">No</th>
<th scope="col">Title</th>
<th scope="col">Description</th>
<th scope="col">Status</th>
<th scope="col">Date</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody id="list">
</tbody>
</table>
</div>
</div>
</div>
</div>
</section>
<!--End Add List-->

<!--Add Activity-->
<section id="add-activity-page" class="form my-4 mx-5">
<div class="container">
<div class="row no-gutters">
<div class="col-lg-5">
<img src="./home-background.jpg" class="img-fluid" alt="">
</div>
<div class="col-lg-7 px-5 pt-5">
<h1 class="font-weight-bold py-3">Add Your Plan</h1>
<button class="btn btn-warning" onclick="showAddActivity()">Add Activity</button>
<button class="btn btn-warning" onclick="list(event)">Show List</button>
<form onsubmit="addActivity(event)">
<div class="form-row">
<div class="col-lg-7">
<!--Title-->
<input id="title-activity" type="text" placeholder="e.g: Go To Gym" class="form-control my-3 p-4">
<label for="title" style="font-weight: bold;">Title</label>
</div>
</div>
<!--End Title-->

<!--Description-->
<div class="form-row">
<div class="col-lg-7">
<input id="description-activity" type="text" placeholder="e.g: Pull Up 10x" class="form-control my-3 p-4">
<label for="description" style="font-weight: bold;">Description</label>
</div>
</div>
<!--End Description-->

<!--Date-->
<div class="form-row">
<div class="col-lg-7">
<input id="date-activity" class="form-control my-3 p-4"
type="date" placeholder="e.g: 2020-11-1">
<label for="due_date" style="font-weight: bold;">Due Date</label>
</div>
</div>
<!--End Date-->

<div class="form-row">
<div class="col-lg-7">
<button type="submit" class="btn1 mt-2 mb-5">Submit</button>
</div>
</form>
</div>
</div>
</div>
</section>
<!--End Add Activity-->


<!--Edit-->
<section id="edit-page" class="form my-4 mx-5">
<div class="container">
<div class="row no-gutters">
<div class="col-lg-5">
<img src="./home-background.jpg" class="img-fluid" alt="">
</div>
<div class="col-lg-7 px-5 pt-5">
<h1 class="font-weight-bold py-3">Edit Your Plan</h1>
<button class="btn btn-warning" onclick="showAddActivity()">Add Activity</button>
<form id = edit-form>

</form>
</div>
</div>
</div>
</section>
<!--End Edit-->





<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://apis.google.com/js/platform.js" async defer></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@10"></script>
<script src="main.js"></script>
</body>
</html>
Loading